Author: manaRH Date: 2010-06-23 09:56:27 -0400 (Wed, 23 Jun 2010) New Revision: 13291 Modified: branches/community/Seam_2_2/examples/build.xml branches/community/Seam_2_2/examples/metawidget/booking/resources/WEB-INF/metawidget.xml branches/community/Seam_2_2/examples/metawidget/dvdstore/resources/WEB-INF/metawidget.xml branches/community/Seam_2_2/examples/metawidget/groovybooking/resources/WEB-INF/metawidget.xml Log: JBSEAM-4567 - upgraded metawidget to 0.95 Modified: branches/community/Seam_2_2/examples/build.xml =================================================================== --- branches/community/Seam_2_2/examples/build.xml 2010-06-23 10:19:19 UTC (rev 13290) +++ branches/community/Seam_2_2/examples/build.xml 2010-06-23 13:56:27 UTC (rev 13291) @@ -618,14 +618,14 @@ <target name="getmetawidget-war" if="metawidget-war.lib"> <copyInlineDependencies id="metawidget" scope="runtime" todir="${lib.dir}"> - <dependency groupId="org.metawidget" artifactId="metawidget" version="0.75"/> + <dependency groupId="org.metawidget" artifactId="metawidget" version="0.95"/> </copyInlineDependencies> </target> <target name="getmetawidget-ear" if="metawidget-ear.lib"> <copyInlineDependencies id="metawidget" scope="runtime" todir="${lib.dir}"> - <dependency groupId="org.metawidget" artifactId="metawidget-frontend" version="0.75"/> - <dependency groupId="org.metawidget" artifactId="metawidget-backend" version="0.75"/> + <dependency groupId="org.metawidget" artifactId="metawidget-frontend" version="0.95"/> + <dependency groupId="org.metawidget" artifactId="metawidget-backend" version="0.95"/> </copyInlineDependencies> </target> Modified: branches/community/Seam_2_2/examples/metawidget/booking/resources/WEB-INF/metawidget.xml =================================================================== --- branches/community/Seam_2_2/examples/metawidget/booking/resources/WEB-INF/metawidget.xml 2010-06-23 10:19:19 UTC (rev 13290) +++ branches/community/Seam_2_2/examples/metawidget/booking/resources/WEB-INF/metawidget.xml 2010-06-23 13:56:27 UTC (rev 13291) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <metawidget xmlns="http://metawidget.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://metawidget.org http://metawidget.org/metawidget-1.0.xsd" version="1.0"> + xsi:schemaLocation="http://metawidget.org http://metawidget.org/xsd/metawidget-1.0.xsd" version="1.0"> <htmlMetawidget xmlns="java:org.metawidget.faces.component.html"> <rendererType> @@ -11,29 +11,43 @@ <string>divStyleClasses</string> <string>entry,label,required,input,error errors</string> </parameter> - <widgetBuilder> - <compositeWidgetBuilder xmlns="urn:java:org.metawidget.widgetbuilder.composite" config="CompositeWidgetBuilderConfig"> - <widgetBuilders> - <list> - <richFacesWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder.richfaces"/> - <htmlWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder"/> - </list> - </widgetBuilders> - </compositeWidgetBuilder> - </widgetBuilder> + <inspector> <compositeInspector xmlns="java:org.metawidget.inspector.composite" config="CompositeInspectorConfig"> <inspectors> - <list> + <array> + <propertyTypeInspector xmlns="java:org.metawidget.inspector.propertytype"/> <metawidgetAnnotationInspector xmlns="java:org.metawidget.inspector.annotation"/> - <propertyTypeInspector xmlns="java:org.metawidget.inspector.propertytype"/> <facesInspector xmlns="java:org.metawidget.inspector.faces"/> <jpaInspector xmlns="java:org.metawidget.inspector.jpa"/> <hibernateValidatorInspector xmlns="java:org.metawidget.inspector.hibernate.validator"/> - </list> + </array> </inspectors> </compositeInspector> </inspector> + + <widgetBuilder> + <compositeWidgetBuilder xmlns="java:org.metawidget.widgetbuilder.composite" config="CompositeWidgetBuilderConfig"> + <widgetBuilders> + <array> + <overriddenWidgetBuilder xmlns="java:org.metawidget.faces.component.widgetbuilder"/> + <readOnlyWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder"/> + <richFacesWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder.richfaces"/> + <htmlWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder"/> + </array> + </widgetBuilders> + </compositeWidgetBuilder> + </widgetBuilder> + + <widgetProcessors> + <array> + <requiredAttributeProcessor xmlns="java:org.metawidget.faces.component.widgetprocessor"/> + <standardBindingProcessor xmlns="java:org.metawidget.faces.component.widgetprocessor"/> + <readableIdProcessor xmlns="java:org.metawidget.faces.component.widgetprocessor"/> + <standardConverterProcessor xmlns="java:org.metawidget.faces.component.widgetprocessor"/> + </array> + </widgetProcessors> + </htmlMetawidget> </metawidget> \ No newline at end of file Modified: branches/community/Seam_2_2/examples/metawidget/dvdstore/resources/WEB-INF/metawidget.xml =================================================================== --- branches/community/Seam_2_2/examples/metawidget/dvdstore/resources/WEB-INF/metawidget.xml 2010-06-23 10:19:19 UTC (rev 13290) +++ branches/community/Seam_2_2/examples/metawidget/dvdstore/resources/WEB-INF/metawidget.xml 2010-06-23 13:56:27 UTC (rev 13291) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <metawidget xmlns="http://metawidget.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://metawidget.org http://metawidget.org/metawidget-1.0.xsd" version="1.0"> + xsi:schemaLocation="http://metawidget.org http://metawidget.org/xsd/metawidget-1.0.xsd" version="1.0"> <htmlMetawidget xmlns="java:org.metawidget.faces.component.html"> <parameter> @@ -11,28 +11,30 @@ <parameter> <string>messageStyleClass</string> <string>cntError</string> - </parameter> + </parameter> + <inspector> <compositeInspector xmlns="java:org.metawidget.inspector.composite" config="CompositeInspectorConfig"> <inspectors> - <list> + <array> + <propertyTypeInspector xmlns="java:org.metawidget.inspector.propertytype"/> <metawidgetAnnotationInspector xmlns="java:org.metawidget.inspector.annotation"/> - <propertyTypeInspector xmlns="java:org.metawidget.inspector.propertytype"/> <facesInspector xmlns="java:org.metawidget.inspector.faces"/> <jpaInspector xmlns="java:org.metawidget.inspector.jpa"/> <hibernateValidatorInspector xmlns="java:org.metawidget.inspector.hibernate.validator"/> - <jbpmInspector xmlns="java:org.metawidget.inspector.jbpm" config="JbpmInspectorConfig"> + <pageflowInspector xmlns="java:org.metawidget.inspector.jbpm" config="org.metawidget.inspector.impl.BaseXmlInspectorConfig"> <inputStreams> - <list> + <array> <resource>checkout.jpdl.xml</resource> <resource>newuser.jpdl.xml</resource> - </list> + </array> </inputStreams> - </jbpmInspector> - </list> + </pageflowInspector> + </array> </inspectors> </compositeInspector> </inspector> + </htmlMetawidget> </metawidget> \ No newline at end of file Modified: branches/community/Seam_2_2/examples/metawidget/groovybooking/resources/WEB-INF/metawidget.xml =================================================================== --- branches/community/Seam_2_2/examples/metawidget/groovybooking/resources/WEB-INF/metawidget.xml 2010-06-23 10:19:19 UTC (rev 13290) +++ branches/community/Seam_2_2/examples/metawidget/groovybooking/resources/WEB-INF/metawidget.xml 2010-06-23 13:56:27 UTC (rev 13291) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <metawidget xmlns="http://metawidget.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://metawidget.org http://metawidget.org/metawidget-1.0.xsd" version="1.0"> + xsi:schemaLocation="http://metawidget.org http://metawidget.org/xsd/metawidget-1.0.xsd" version="1.0"> <htmlMetawidget xmlns="java:org.metawidget.faces.component.html"> <rendererType> @@ -11,49 +11,63 @@ <string>divStyleClasses</string> <string>entry,label,required,output,error errors</string> </parameter> - <widgetBuilder> - <compositeWidgetBuilder xmlns="urn:java:org.metawidget.widgetbuilder.composite" config="CompositeWidgetBuilderConfig"> - <widgetBuilders> - <list> - <richFacesWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder.richfaces"/> - <htmlWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder"/> - </list> - </widgetBuilders> - </compositeWidgetBuilder> - </widgetBuilder> + <inspector> <compositeInspector xmlns="java:org.metawidget.inspector.composite" config="CompositeInspectorConfig"> <inspectors> - <list> + <array> + <propertyTypeInspector xmlns="java:org.metawidget.inspector.propertytype" config="org.metawidget.inspector.impl.BaseObjectInspectorConfig"> + <propertyStyle> + <groovyPropertyStyle xmlns="java:org.metawidget.inspector.impl.propertystyle.groovy"/> + </propertyStyle> + </propertyTypeInspector> <metawidgetAnnotationInspector xmlns="java:org.metawidget.inspector.annotation" config="org.metawidget.inspector.impl.BaseObjectInspectorConfig"> <propertyStyle> - <class>org.metawidget.inspector.impl.propertystyle.groovy.GroovyPropertyStyle</class> + <groovyPropertyStyle xmlns="java:org.metawidget.inspector.impl.propertystyle.groovy"/> </propertyStyle> </metawidgetAnnotationInspector> - <propertyTypeInspector xmlns="java:org.metawidget.inspector.propertytype" config="org.metawidget.inspector.impl.BaseObjectInspectorConfig"> + <facesInspector xmlns="java:org.metawidget.inspector.faces" config="FacesInspectorConfig"> <propertyStyle> - <class>org.metawidget.inspector.impl.propertystyle.groovy.GroovyPropertyStyle</class> + <groovyPropertyStyle xmlns="java:org.metawidget.inspector.impl.propertystyle.groovy"/> </propertyStyle> - </propertyTypeInspector> - <facesInspector xmlns="java:org.metawidget.inspector.faces" config="org.metawidget.inspector.impl.BaseObjectInspectorConfig"> - <propertyStyle> - <class>org.metawidget.inspector.impl.propertystyle.groovy.GroovyPropertyStyle</class> - </propertyStyle> </facesInspector> <jpaInspector xmlns="java:org.metawidget.inspector.jpa" config="JpaInspectorConfig"> <propertyStyle> - <class>org.metawidget.inspector.impl.propertystyle.groovy.GroovyPropertyStyle</class> + <groovyPropertyStyle xmlns="java:org.metawidget.inspector.impl.propertystyle.groovy"/> </propertyStyle> </jpaInspector> <hibernateValidatorInspector xmlns="java:org.metawidget.inspector.hibernate.validator" config="org.metawidget.inspector.impl.BaseObjectInspectorConfig"> <propertyStyle> - <class>org.metawidget.inspector.impl.propertystyle.groovy.GroovyPropertyStyle</class> + <groovyPropertyStyle xmlns="java:org.metawidget.inspector.impl.propertystyle.groovy"/> </propertyStyle> </hibernateValidatorInspector> - </list> + </array> </inspectors> </compositeInspector> </inspector> + + <widgetBuilder> + <compositeWidgetBuilder xmlns="java:org.metawidget.widgetbuilder.composite" config="CompositeWidgetBuilderConfig"> + <widgetBuilders> + <array> + <overriddenWidgetBuilder xmlns="java:org.metawidget.faces.component.widgetbuilder"/> + <readOnlyWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder"/> + <richFacesWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder.richfaces"/> + <htmlWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder"/> + </array> + </widgetBuilders> + </compositeWidgetBuilder> + </widgetBuilder> + + <widgetProcessors> + <array> + <requiredAttributeProcessor xmlns="java:org.metawidget.faces.component.widgetprocessor"/> + <standardBindingProcessor xmlns="java:org.metawidget.faces.component.widgetprocessor"/> + <readableIdProcessor xmlns="java:org.metawidget.faces.component.widgetprocessor"/> + <standardConverterProcessor xmlns="java:org.metawidget.faces.component.widgetprocessor"/> + </array> + </widgetProcessors> + </htmlMetawidget> </metawidget> \ No newline at end of file