Author: julien_viet Date: 2009-09-01 09:21:58 -0400 (Tue, 01 Sep 2009) New Revision: 144 Modified: components/pc/trunk/build/pom.xml components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/PortletApplicationModelFactory.java components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/impl/AnnotationPortletApplication10MetaData.java components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/impl/AnnotationPortletApplication20MetaData.java components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/AbstractMetaDataTestCase.java components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/CustomPortletModeTestEverythingTestCase.java components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/CustomWindowStateTestEverythingTestCase.java components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/GeneralMetaDataTestCase.java components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/PortletTestEverythingTestCase.java components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/SecurityConstraintTestEverythingTestCase.java components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/UserAttributeTestEverythingTestCase.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerInfoBuilder.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/CustomPortletModeMetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/CustomWindowStateMetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/ListenerMetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/PortletApplication10MetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/PortletApplication20MetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/PublicRenderParameterMetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/UserAttributeMetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/common/ContainerRuntimeMetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/common/InitParamMetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/event/EventDefinitionMetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/event/EventDefinitionReferenceMetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/filter/FilterMappingMetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/PortletInfoMetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/PortletPreferenceMetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/PortletPreferencesMetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/SecurityRoleRefMetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/SupportsMetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/security/SecurityConstraintMetaData.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/security/UserDataConstraintMetaData.java Log: - add back JBoss XB version change for deploying in AS 5.1 Modified: components/pc/trunk/build/pom.xml =================================================================== --- components/pc/trunk/build/pom.xml 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/build/pom.xml 2009-09-01 13:21:58 UTC (rev 144) @@ -30,7 +30,7 @@ <version.javax.servlet.jsp>2.1</version.javax.servlet.jsp> <version.apache.tomcat>5.5.12</version.apache.tomcat> <version.jboss-logging>2.0.4.GA</version.jboss-logging> - <version.jbossxb>2.0.0.GA</version.jbossxb> + <version.jbossxb>2.0.1.GA</version.jbossxb> <version.jboss-remoting>2.5.0.GA</version.jboss-remoting> <version.jboss.serialization>1.0.3.GA</version.jboss.serialization> <version.gatein.common>2.0.0-SNAPSHOT</version.gatein.common> @@ -39,7 +39,7 @@ <version.log4j>1.2.14</version.log4j> <version.apache.commons-logging>1.1.1</version.apache.commons-logging> <version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient> - <version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer> + <version.jboss.microcontainer>2.0.6.GA</version.jboss.microcontainer> <version.jboss.reflect>2.0.2.GA</version.jboss.reflect> <version.cargo>1.0.1-SNAPSHOT</version.cargo> <version.junit>3.8.2</version.junit> Modified: components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java =================================================================== --- components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java 2009-09-01 13:21:58 UTC (rev 144) @@ -54,7 +54,7 @@ import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; -import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver; +import org.jboss.xb.binding.resolver.MutableSchemaResolver; import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory; import java.io.IOException; @@ -76,13 +76,13 @@ try { SingletonSchemaResolverFactory factory = SingletonSchemaResolverFactory.getInstance(); - DefaultSchemaResolver resolver = (DefaultSchemaResolver)factory.getSchemaBindingResolver(); + MutableSchemaResolver resolver = factory.getSchemaBindingResolver(); /** SchemaResolver */ - resolver.addSchemaLocation(PORTLET_JSR_168_NS, "portlet-app_1_0.xsd"); - resolver.addSchemaLocation(PORTLET_JSR_286_NS, "portlet-app_2_0.xsd"); - resolver.addClassBinding(PORTLET_JSR_286_NS, AnnotationPortletApplication20MetaData.class); - resolver.addClassBinding(PORTLET_JSR_168_NS, AnnotationPortletApplication10MetaData.class); + resolver.mapSchemaLocation(PORTLET_JSR_168_NS, "portlet-app_1_0.xsd"); + resolver.mapSchemaLocation(PORTLET_JSR_286_NS, "portlet-app_2_0.xsd"); + resolver.mapLocationToClass(PORTLET_JSR_286_NS, AnnotationPortletApplication20MetaData.class); + resolver.mapLocationToClass(PORTLET_JSR_168_NS, AnnotationPortletApplication10MetaData.class); } catch (Exception e) { Modified: components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/PortletApplicationModelFactory.java =================================================================== --- components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/PortletApplicationModelFactory.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/PortletApplicationModelFactory.java 2009-09-01 13:21:58 UTC (rev 144) @@ -722,7 +722,7 @@ UserDataConstraintMetaData md = (UserDataConstraintMetaData)object; if ("transport-guarantee".equals(localName)) { - md.setTransportQuarantee(TransportGuarantee.valueOf(value)); + md.setTransportGuarantee(TransportGuarantee.valueOf(value)); } } Modified: components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/impl/AnnotationPortletApplication10MetaData.java =================================================================== --- components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/impl/AnnotationPortletApplication10MetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/impl/AnnotationPortletApplication10MetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -37,7 +37,8 @@ * @version $Revision$ */ @XmlRootElement(name = "portlet-app") -@XmlType(name = "portlet-appType") +@XmlType(name = "portlet-appType", propOrder={"portlets", "customPortletModes", "customWindowStates", "userAttributes", + "securityConstraints", "portletCollection"}) @JBossXmlSchema(xmlns = {@XmlNs(namespaceURI = PortletMetaDataConstants.PORTLET_JSR_168_NS, prefix = "portlet")}, ignoreUnresolvedFieldOrClass = false, namespace = PortletMetaDataConstants.PORTLET_JSR_168_NS, Modified: components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/impl/AnnotationPortletApplication20MetaData.java =================================================================== --- components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/impl/AnnotationPortletApplication20MetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/impl/AnnotationPortletApplication20MetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -38,7 +38,9 @@ */ @XmlRootElement(name = "portlet-app") -@XmlType(name = "portlet-appType") +@XmlType(name = "portlet-appType", propOrder={"portlets", "customPortletModes", "customWindowStates", "userAttributes", + "securityConstraints", "resourceBundle", "filters", "filterMapping", "defaultNamespace", "events", + "publicRenderParameters", "listeners", "containerRuntimeOptions"}) @JBossXmlSchema(xmlns = {@XmlNs(namespaceURI = PortletMetaDataConstants.PORTLET_JSR_286_NS, prefix = "portlet")}, ignoreUnresolvedFieldOrClass = false, namespace = PortletMetaDataConstants.PORTLET_JSR_286_NS, Modified: components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/AbstractMetaDataTestCase.java =================================================================== --- components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/AbstractMetaDataTestCase.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/AbstractMetaDataTestCase.java 2009-09-01 13:21:58 UTC (rev 144) @@ -39,8 +39,9 @@ import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; -import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver; +import org.jboss.xb.binding.resolver.MutableSchemaResolver; import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory; +import org.jboss.xb.builder.JBossXBBuilder; import org.xml.sax.SAXException; import static org.jboss.unit.api.Assert.*; import org.jboss.util.xml.JBossEntityResolver; @@ -62,7 +63,7 @@ protected static SingletonSchemaResolverFactory factory; /** The schema resolver. */ - protected static DefaultSchemaResolver resolver; + protected static MutableSchemaResolver resolver; /** The unmarshaller. */ protected Unmarshaller unmarshaller = null; @@ -81,17 +82,16 @@ try { factory = SingletonSchemaResolverFactory.getInstance(); - resolver = (DefaultSchemaResolver) factory.getSchemaBindingResolver(); + resolver = factory.getSchemaBindingResolver(); - /** SchemaResolver */ - // The two following lines are not effective, we need for now to register xsd globally -// resolver.addSchemaLocation(PORTLET_JSR_168_NS, "portlet-app_1_0.xsd"); -// resolver.addSchemaLocation(PORTLET_JSR_286_NS, "portlet-app_2_0.xsd"); JBossEntityResolver.registerEntity(PORTLET_JSR_168_NS, "metadata/portlet-app_1_0.xsd"); JBossEntityResolver.registerEntity(PORTLET_JSR_286_NS, "metadata/portlet-app_2_0.xsd"); - resolver.addClassBinding(PORTLET_JSR_286_NS, AnnotationPortletApplication20MetaData.class); - resolver.addClassBinding(PORTLET_JSR_168_NS, AnnotationPortletApplication10MetaData.class); + /** SchemaResolver */ + resolver.mapSchemaLocation(PORTLET_JSR_168_NS, "portlet-app_1_0.xsd"); + resolver.mapSchemaLocation(PORTLET_JSR_286_NS, "portlet-app_2_0.xsd"); + resolver.mapLocationToClass(PORTLET_JSR_286_NS, AnnotationPortletApplication20MetaData.class); + resolver.mapLocationToClass(PORTLET_JSR_168_NS, AnnotationPortletApplication10MetaData.class); } catch (Exception e) { @@ -103,7 +103,7 @@ { if (ANNOTATION_BINDING.equals(parser)) { - return this.unmarshallAnnotation(file); + return this.unmarshallAnnotation(file, AnnotationPortletApplication10MetaData.class); } else if (FACTORY_BINDING.equals(parser)) { @@ -119,7 +119,7 @@ { if (ANNOTATION_BINDING.equals(parser)) { - return (PortletApplication20MetaData)this.unmarshallAnnotation(file); + return this.unmarshallAnnotation(file, AnnotationPortletApplication20MetaData.class); } else if (FACTORY_BINDING.equals(parser)) { @@ -131,19 +131,6 @@ } } - private PortletApplication10MetaData unmarshallAnnotation(String file) throws JBossXBException, SAXException, - IOException - { - /** validate */ - unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - unmarshaller.setNamespaceAware(true); - unmarshaller.setSchemaValidation(true); - unmarshaller.setValidation(true); - - /** unmarshal */ - return (PortletApplication10MetaData) unmarshaller.unmarshal(getPath(file), resolver); - } - private PortletApplication10MetaData unmarshallWithFactory(String file) throws JBossXBException { /** validate */ @@ -158,6 +145,18 @@ null); } + private <T> T unmarshallAnnotation(String file, Class<T> clazz) throws JBossXBException + { + /** validate */ + unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + unmarshaller.setNamespaceAware(true); + unmarshaller.setSchemaValidation(true); + unmarshaller.setValidation(true); + + /** unmarshal */ + return clazz.cast(unmarshaller.unmarshal(getPath(file), JBossXBBuilder.build(clazz))); + } + protected String getPath(String file) { URL url = Thread.currentThread().getContextClassLoader().getResource(file); Modified: components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/CustomPortletModeTestEverythingTestCase.java =================================================================== --- components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/CustomPortletModeTestEverythingTestCase.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/CustomPortletModeTestEverythingTestCase.java 2009-09-01 13:21:58 UTC (rev 144) @@ -63,8 +63,7 @@ } catch (Exception e) { - e.printStackTrace(); - fail(); + fail(e); } } @@ -76,7 +75,7 @@ String xmlFile = "metadata/customPortletMode/portlet2.xml"; - PortletApplication10MetaData md = unmarshall10(xmlFile); + PortletApplication20MetaData md = unmarshall20(xmlFile); assertNotNull(md); assertTrue(md instanceof PortletApplication20MetaData); assertEquals("2.0", md.getVersion()); @@ -106,8 +105,7 @@ } catch (Exception e) { - e.printStackTrace(); - fail(); + fail(e); } } Modified: components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/CustomWindowStateTestEverythingTestCase.java =================================================================== --- components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/CustomWindowStateTestEverythingTestCase.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/CustomWindowStateTestEverythingTestCase.java 2009-09-01 13:21:58 UTC (rev 144) @@ -76,7 +76,7 @@ String xmlFile = "metadata/customWindowState/portlet2.xml"; - PortletApplication10MetaData md = unmarshall10(xmlFile); + PortletApplication20MetaData md = unmarshall20(xmlFile); assertNotNull(md); assertTrue(md instanceof PortletApplication20MetaData); assertEquals("2.0", md.getVersion()); Modified: components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/GeneralMetaDataTestCase.java =================================================================== --- components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/GeneralMetaDataTestCase.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/GeneralMetaDataTestCase.java 2009-09-01 13:21:58 UTC (rev 144) @@ -52,8 +52,7 @@ } catch (Exception e) { - e.printStackTrace(); - fail("No exception expected"); + fail(e, "No exception expected"); } } @@ -62,15 +61,14 @@ { try { - PortletApplication10MetaData md = this.unmarshall10("metadata/general/portlet2.xml"); + PortletApplication20MetaData md = unmarshall20("metadata/general/portlet2.xml"); assertNotNull(md); assertTrue(md instanceof PortletApplication20MetaData); assertEquals("2.0", md.getVersion()); } catch (Exception e) { - e.printStackTrace(); - fail(); + fail(e, "No exception expected"); } } @@ -108,8 +106,7 @@ } catch (Exception e) { - e.printStackTrace(); - fail(); + fail(e, "No exception expected"); } } @@ -128,8 +125,7 @@ } catch(Exception e) { - e.printStackTrace(); - fail(); + fail(e, "No exception expected"); } } @@ -138,14 +134,13 @@ { try { - PortletApplication10MetaData md = this.unmarshall10("metadata/general/portlet-app_2_0.xml"); + PortletApplication20MetaData md = this.unmarshall20("metadata/general/portlet-app_2_0.xml"); assertEquals("2.0", md.getVersion()); assertTrue(md instanceof PortletApplication20MetaData); } catch(Exception e) { - e.printStackTrace(); - fail(); + fail(e, "No exception expected"); } } } Modified: components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/PortletTestEverythingTestCase.java =================================================================== --- components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/PortletTestEverythingTestCase.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/PortletTestEverythingTestCase.java 2009-09-01 13:21:58 UTC (rev 144) @@ -224,7 +224,7 @@ { String xmlFile = "metadata/portlet/portlet2.xml"; - PortletApplication10MetaData md = unmarshall10(xmlFile); + PortletApplication20MetaData md = this.unmarshall20(xmlFile); assertNotNull(md); assertTrue(md instanceof PortletApplication20MetaData); assertEquals("2.0", md.getVersion()); @@ -384,7 +384,7 @@ { String xmlFile = "metadata/portlet/portlet2-jsr286.xml"; - PortletApplication10MetaData md = unmarshall10(xmlFile); + PortletApplication20MetaData md = this.unmarshall20(xmlFile); assertNotNull(md); assertTrue(md instanceof PortletApplication20MetaData); assertEquals("2.0", md.getVersion()); Modified: components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/SecurityConstraintTestEverythingTestCase.java =================================================================== --- components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/SecurityConstraintTestEverythingTestCase.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/SecurityConstraintTestEverythingTestCase.java 2009-09-01 13:21:58 UTC (rev 144) @@ -56,7 +56,7 @@ assertNotNull(scd1); assertEquals("test", scd1.getDisplayName().getDefaultString()); assertEquals("Test", scd1.getDisplayName().getString(new Locale("de"), false)); - assertEquals(TransportGuarantee.NONE, scd1.getUserDataConstraint().getTransportQuarantee()); + assertEquals(TransportGuarantee.NONE, scd1.getUserDataConstraint().getTransportGuarantee()); assertEquals("foo", scd1.getPortletList().getPortletNames().get(0)); assertEquals("foobar", scd1.getPortletList().getPortletNames().get(1)); @@ -64,7 +64,7 @@ SecurityConstraintMetaData scd2 = md.getSecurityConstraints().get(1); assertNotNull(scd2); - assertEquals(TransportGuarantee.INTEGRAL, scd2.getUserDataConstraint().getTransportQuarantee()); + assertEquals(TransportGuarantee.INTEGRAL, scd2.getUserDataConstraint().getTransportGuarantee()); assertEquals("foo", scd2.getPortletList().getPortletNames().get(0)); assertEquals("fooConstraint", scd1.getUserDataConstraint().getDescription().getDefaultString()); assertEquals("FooConstraint", scd1.getUserDataConstraint().getDescription().getString(new Locale("de"), false)); @@ -137,7 +137,7 @@ String xmlFile = "metadata/security/portlet2.xml"; - PortletApplication10MetaData md = unmarshall10( xmlFile); + PortletApplication20MetaData md = this.unmarshall20( xmlFile); assertNotNull(md); assertTrue(md instanceof PortletApplication20MetaData); assertEquals("2.0", md.getVersion()); @@ -148,14 +148,14 @@ assertEquals("Test", scd1.getDisplayName().getString(new Locale("de"), false)); assertEquals("foo", scd1.getId()); - assertEquals(TransportGuarantee.NONE, scd1.getUserDataConstraint().getTransportQuarantee()); + assertEquals(TransportGuarantee.NONE, scd1.getUserDataConstraint().getTransportGuarantee()); assertEquals("foo", scd1.getPortletList().getPortletNames().get(0)); assertEquals("foobar", scd1.getPortletList().getPortletNames().get(1)); SecurityConstraintMetaData scd2 = md.getSecurityConstraints().get(1); assertNotNull(scd2); - assertEquals(TransportGuarantee.INTEGRAL, scd2.getUserDataConstraint().getTransportQuarantee()); + assertEquals(TransportGuarantee.INTEGRAL, scd2.getUserDataConstraint().getTransportGuarantee()); assertEquals("foo", scd2.getPortletList().getPortletNames().get(0)); assertEquals("fooConstraint", scd1.getUserDataConstraint().getDescription().getDefaultString()); assertEquals("FooConstraint", scd1.getUserDataConstraint().getDescription().getString(new Locale("de"), false)); Modified: components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/UserAttributeTestEverythingTestCase.java =================================================================== --- components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/UserAttributeTestEverythingTestCase.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/UserAttributeTestEverythingTestCase.java 2009-09-01 13:21:58 UTC (rev 144) @@ -75,7 +75,7 @@ { String xmlFile = "metadata/userAttribute/portlet2.xml"; - PortletApplication10MetaData md = unmarshall10(xmlFile); + PortletApplication20MetaData md = this.unmarshall20(xmlFile); assertNotNull(md); assertTrue(md instanceof PortletApplication20MetaData); Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerInfoBuilder.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerInfoBuilder.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerInfoBuilder.java 2009-09-01 13:21:58 UTC (rev 144) @@ -835,7 +835,7 @@ { if (securityConstraintMD.getPortletList().getPortletNames().contains(portletMD.getPortletName())) { - containerSecurity.addTransportGuarantee(securityConstraintMD.getUserDataConstraint().getTransportQuarantee()); + containerSecurity.addTransportGuarantee(securityConstraintMD.getUserDataConstraint().getTransportGuarantee()); } } Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/CustomPortletModeMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/CustomPortletModeMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/CustomPortletModeMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -33,7 +33,7 @@ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -@XmlType(name = "custom-portlet-modeType") +@XmlType(name = "custom-portlet-modeType", propOrder={"description", "portletMode", "portalManaged"}) public class CustomPortletModeMetaData extends DescribableMetaData { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/CustomWindowStateMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/CustomWindowStateMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/CustomWindowStateMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -32,7 +32,7 @@ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -@XmlType(name = "custom-window-stateType") +@XmlType(name = "custom-window-stateType", propOrder={"description", "windowState"}) public class CustomWindowStateMetaData extends DescribableMetaData { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/ListenerMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/ListenerMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/ListenerMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -36,7 +36,7 @@ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -@XmlType(name = "listenerType") +@XmlType(name = "listenerType", propOrder={"description", "displayName", "listenerClass"}) public class ListenerMetaData extends DescribableMetaData { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/PortletApplication10MetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/PortletApplication10MetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/PortletApplication10MetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -51,7 +51,8 @@ */ @XmlRootElement(name = "portlet-app") -@XmlType(name = "portlet-appType") +@XmlType(name = "portlet-appType", propOrder={"portlets", "customPortletModes", "customWindowStates", "userAttributes", + "securityConstraints", "portletCollection"}) public class PortletApplication10MetaData { /** The portlet application id. */ Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/PortletApplication20MetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/PortletApplication20MetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/PortletApplication20MetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -32,6 +32,7 @@ import java.util.Set; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.gatein.pc.portlet.impl.metadata.adapter.ContainerRuntimeAdapter; @@ -45,6 +46,9 @@ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ +@XmlType(name = "portlet-appType", propOrder={"portlets", "customPortletModes", "customWindowStates", "userAttributes", + "securityConstraints", "resourceBundle", "filters", "filterMapping", "defaultNamespace", "events", + "publicRenderParameters", "listeners", "containerRuntimeOptions"}) public class PortletApplication20MetaData extends PortletApplication10MetaData { /** The resource bundle (JSR 286) */ Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/PublicRenderParameterMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/PublicRenderParameterMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/PublicRenderParameterMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -36,7 +36,7 @@ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -@XmlType(name = "public-render-parameterType") +@XmlType(name = "public-render-parameterType", propOrder={"description", "identifier", "name", "qname", "alias"}) public class PublicRenderParameterMetaData extends DescribableMetaData { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/UserAttributeMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/UserAttributeMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/UserAttributeMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -32,7 +32,7 @@ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -@XmlType(name = "user-attributeType") +@XmlType(name = "user-attributeType", propOrder={"description", "name"}) public class UserAttributeMetaData extends DescribableMetaData { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/common/ContainerRuntimeMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/common/ContainerRuntimeMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/common/ContainerRuntimeMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -32,7 +32,7 @@ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -@XmlType(name = "container-runtime-optionType") +@XmlType(name = "container-runtime-optionType", propOrder={"name", "values"}) public class ContainerRuntimeMetaData { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/common/InitParamMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/common/InitParamMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/common/InitParamMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -32,7 +32,7 @@ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -@XmlType(name = "init-paramType") +@XmlType(name = "init-paramType", propOrder={"description", "name", "value"}) public class InitParamMetaData extends DescribableMetaData { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/event/EventDefinitionMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/event/EventDefinitionMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/event/EventDefinitionMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -38,7 +38,7 @@ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -@XmlType(name = "event-definitionType") +@XmlType(name = "event-definitionType", propOrder={"description", "qname", "name", "alias", "valueType"}) public class EventDefinitionMetaData extends DescribableMetaData { /** The event definition id */ Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/event/EventDefinitionReferenceMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/event/EventDefinitionReferenceMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/event/EventDefinitionReferenceMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -31,7 +31,7 @@ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -@XmlType(name = "event-definition-referenceType") +@XmlType(name = "event-definition-referenceType", propOrder={"name", "qname"}) public class EventDefinitionReferenceMetaData { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/filter/FilterMappingMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/filter/FilterMappingMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/filter/FilterMappingMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -33,7 +33,7 @@ * @version $Revision$ */ -@XmlType(name = "filter-mappingType") +@XmlType(name = "filter-mappingType", propOrder={"name", "portletNames"}) public class FilterMappingMetaData { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/PortletInfoMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/PortletInfoMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/PortletInfoMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -31,7 +31,7 @@ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -@XmlType(name = "portlet-infoType") +@XmlType(name = "portlet-infoType", propOrder={"title", "shortTitle", "keywords"}) public class PortletInfoMetaData { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/PortletPreferenceMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/PortletPreferenceMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/PortletPreferenceMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -33,7 +33,7 @@ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -@XmlType(name = "portlet-preferenceType") +@XmlType(name = "portlet-preferenceType", propOrder={"name", "value", "readOnly"}) public class PortletPreferenceMetaData { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/PortletPreferencesMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/PortletPreferencesMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/PortletPreferencesMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -37,7 +37,7 @@ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -@XmlType(name = "portlet-preferencesType") +@XmlType(name = "portlet-preferencesType", propOrder={"portletPreferences", "preferenceValidator"}) public class PortletPreferencesMetaData { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/SecurityRoleRefMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/SecurityRoleRefMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/SecurityRoleRefMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -34,7 +34,7 @@ * @version $Revision$ */ -@XmlType(name = "security-role-refType") +@XmlType(name = "security-role-refType", propOrder={"description", "roleName", "roleLink"}) public class SecurityRoleRefMetaData extends DescribableMetaData { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/SupportsMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/SupportsMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/portlet/SupportsMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -35,7 +35,7 @@ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -@XmlType(name = "supportsType") +@XmlType(name = "supportsType", propOrder={"mimeType", "portletModes", "windowStates"}) public class SupportsMetaData { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/security/SecurityConstraintMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/security/SecurityConstraintMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/security/SecurityConstraintMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -34,7 +34,7 @@ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -@XmlType(name = "security-constraintType") +@XmlType(name = "security-constraintType", propOrder={"displayName", "portletList", "userDataConstraint"}) public class SecurityConstraintMetaData { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/security/UserDataConstraintMetaData.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/security/UserDataConstraintMetaData.java 2009-09-01 12:04:37 UTC (rev 143) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/security/UserDataConstraintMetaData.java 2009-09-01 13:21:58 UTC (rev 144) @@ -33,7 +33,7 @@ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -@XmlType(name = "user-data-constraint") +@XmlType(name = "user-data-constraint", propOrder={"description", "transportGuarantee"}) public class UserDataConstraintMetaData extends DescribableMetaData { @@ -62,12 +62,12 @@ } @XmlElement(name = "transport-guarantee") - public TransportGuarantee getTransportQuarantee() + public TransportGuarantee getTransportGuarantee() { return transportQuarantee; } - public void setTransportQuarantee(TransportGuarantee transportQuarantee) + public void setTransportGuarantee(TransportGuarantee transportQuarantee) { this.transportQuarantee = transportQuarantee; }