Author: thomas.heute(a)jboss.com Date: 2009-08-27 17:12:44 -0400 (Thu, 27 Aug 2009) New Revision: 106 Removed: components/pc/trunk/exo/ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/state/MapStateConverter.java components/pc/trunk/test/src/main/java/org/gatein/pc/test/ExoKernelIntegration.java Modified: components/pc/trunk/.classpath components/pc/trunk/.project components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/SimplePortletInvocationContext.java components/pc/trunk/build/pom.xml components/pc/trunk/mc/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/pc/src/main/java/org/gatein/pc/container/ContainerPortletInvoker.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/info/ContainerInfoBuilder.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/CustomPortletModeMetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/CustomWindowStateMetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/ListenerMetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/PortletApplication10MetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/PortletApplication20MetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/PublicRenderParameterMetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/UserAttributeMetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/common/ContainerRuntimeMetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/common/InitParamMetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/event/EventDefinitionMetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/event/EventDefinitionReferenceMetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/filter/FilterMappingMetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/PortletInfoMetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/PortletPreferenceMetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/PortletPreferencesMetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/SecurityRoleRefMetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/SupportsMetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/security/SecurityConstraintMetaData.java components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/security/UserDataConstraintMetaData.java components/pc/trunk/pom.xml components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/admin/ui/AdminPortlet.java components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/jsp/ControllerFilter.java components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml components/pc/trunk/test/pom.xml components/pc/trunk/test/src/test/build.xml components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml Log: - Upgraded JBoss XB to 2.0.1.GA - Tried to rollback using MC instead of eXo Kernel -> the remote tests won't run Modified: components/pc/trunk/.classpath =================================================================== --- components/pc/trunk/.classpath 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/.classpath 2009-08-27 21:12:44 UTC (rev 106) @@ -27,6 +27,6 @@ <classpathentry kind="src" path="pc/src/test/java"/> <classpathentry kind="src" path="pc/src/test/resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: components/pc/trunk/.project =================================================================== --- components/pc/trunk/.project 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/.project 2009-08-27 21:12:44 UTC (rev 106) @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>portlet</name> + <name>pc</name> <comment></comment> <projects> </projects> <buildSpec> <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> + <name>org.maven.ide.eclipse.maven2Builder</name> <arguments> </arguments> </buildCommand> <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> + <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> </buildCommand> Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/SimplePortletInvocationContext.java =================================================================== --- components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/SimplePortletInvocationContext.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/SimplePortletInvocationContext.java 2009-08-27 21:12:44 UTC (rev 106) @@ -24,8 +24,6 @@ import java.io.IOException; import java.io.Writer; -import java.util.Iterator; -import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -35,11 +33,9 @@ import org.gatein.pc.api.ContainerURL; import org.gatein.pc.api.RenderURL; import org.gatein.pc.api.ResourceURL; -import org.gatein.pc.api.StateString; import org.gatein.pc.api.URLFormat; import org.gatein.pc.api.spi.PortletInvocationContext; - /** * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> * @version $Revision$ @@ -50,13 +46,11 @@ private MarkupInfo markupInfo; private String baseURL; private HttpServletResponse response; - private HttpServletRequest request; - public SimplePortletInvocationContext(MarkupInfo markupInfo, String baseURL, HttpServletRequest request, HttpServletResponse response) + public SimplePortletInvocationContext(MarkupInfo markupInfo, String baseURL, HttpServletResponse response) { this.markupInfo = markupInfo; this.baseURL = baseURL; - this.request = request; this.response = response; } @@ -94,24 +88,9 @@ url += "&portal:type=" + type; - url += "&portal:isSecure=" + request.isSecure(); + //TODO: fix this part + url += "&portal:isSecure=" + "false"; - if (containerURL instanceof ActionURL) - { - ActionURL actionURL = (ActionURL) containerURL; - Map<String, String[]> map = StateString.decodeOpaqueValue(actionURL.getInteractionState().getStringValue()); - Iterator<String> keys = map.keySet().iterator(); - while (keys.hasNext()) - { - String key = keys.next(); - String[] values = map.get(key); - for (String value : values) - { - url += "&" + key + "=" + value; - } - } - } - return url; } @@ -120,5 +99,6 @@ String url = renderURL(containerURL, format); writer.write(url); } + } Modified: components/pc/trunk/build/pom.xml =================================================================== --- components/pc/trunk/build/pom.xml 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/build/pom.xml 2009-08-27 21:12:44 UTC (rev 106) @@ -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.2.1.GA</version.jboss-remoting> <version.gatein.common>trunk-SNAPSHOT</version.gatein.common> <version.gatein.wci>trunk-SNAPSHOT</version.gatein.wci> @@ -38,7 +38,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/pom.xml =================================================================== --- components/pc/trunk/mc/pom.xml 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/mc/pom.xml 2009-08-27 21:12:44 UTC (rev 106) @@ -42,8 +42,14 @@ </execution> </executions> <configuration> - <testsuites> - <testsuite> + <jpda>false</jpda> + <jpdaPort>9000</jpdaPort> + <jpdaSuspend>true</jpdaSuspend> + <failOnError>false</failOnError> + <assertions>true</assertions> + + <testsuites> + <testsuite> <config>local-jboss-unit.xml</config> </testsuite> </testsuites> 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-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java 2009-08-27 21:12:44 UTC (rev 106) @@ -52,7 +52,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; @@ -74,13 +74,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-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/PortletApplicationModelFactory.java 2009-08-27 21:12:44 UTC (rev 106) @@ -724,7 +724,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-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/impl/AnnotationPortletApplication10MetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -37,7 +37,7 @@ * @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-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/impl/AnnotationPortletApplication20MetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -25,8 +25,12 @@ import org.gatein.pc.impl.metadata.PortletApplication20MetaData; import org.gatein.pc.impl.metadata.PortletMetaDataConstants; +import org.jboss.xb.annotations.JBossXmlConstants; +import org.jboss.xb.annotations.JBossXmlModelGroup; import org.jboss.xb.annotations.JBossXmlSchema; +import javax.xml.bind.annotation.XmlAccessOrder; +import javax.xml.bind.annotation.XmlAccessorOrder; import javax.xml.bind.annotation.XmlNs; import javax.xml.bind.annotation.XmlNsForm; import javax.xml.bind.annotation.XmlRootElement; @@ -38,11 +42,11 @@ */ @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, elementFormDefault = XmlNsForm.QUALIFIED) public class AnnotationPortletApplication20MetaData extends PortletApplication20MetaData { -} \ No newline at end of file +} 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-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/AbstractMetaDataTestCase.java 2009-08-27 21:12:44 UTC (rev 106) @@ -36,14 +36,15 @@ import static org.gatein.pc.impl.metadata.PortletMetaDataConstants.*; import org.jboss.unit.api.pojo.annotations.Parameter; +import org.jboss.util.xml.JBossEntityResolver; 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; /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> @@ -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 unmarshallAnnotation(file, AnnotationPortletApplication20MetaData.class); } else if (FACTORY_BINDING.equals(parser)) { @@ -131,19 +131,19 @@ } } + /* 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); +// return clazz.cast(unmarshaller.unmarshal(is, JBossXBBuilder.build(clazz))); + return (PortletApplication10MetaData) unmarshaller.unmarshal(getPath(file), JBossXBBuilder.build(PortletApplication10MetaData.class)); } - +*/ private PortletApplication10MetaData unmarshallWithFactory(String file) throws JBossXBException { /** validate */ @@ -157,7 +157,19 @@ return (PortletApplication10MetaData) unmarshaller.unmarshal(getStream(file), new ValueTrimmingFilter(factory), 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-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/CustomPortletModeTestEverythingTestCase.java 2009-08-27 21:12:44 UTC (rev 106) @@ -76,7 +76,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()); 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-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/CustomWindowStateTestEverythingTestCase.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/GeneralMetaDataTestCase.java 2009-08-27 21:12:44 UTC (rev 106) @@ -62,7 +62,7 @@ { try { - PortletApplication10MetaData md = this.unmarshall10("metadata/general/portlet2.xml"); + PortletApplication20MetaData md = this.unmarshall20("metadata/general/portlet2.xml"); assertNotNull(md); assertTrue(md instanceof PortletApplication20MetaData); assertEquals("2.0", md.getVersion()); @@ -138,7 +138,7 @@ { 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); } 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-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/PortletTestEverythingTestCase.java 2009-08-27 21:12:44 UTC (rev 106) @@ -224,7 +224,7 @@ { String xmlFile = "metadata/portlet/portlet2.xml"; - PortletApplication10MetaData md = unmarshall10(xmlFile); + PortletApplication20MetaData md = 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 = 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-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/SecurityConstraintTestEverythingTestCase.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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 = 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-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/mc/src/test/java/org/gatein/pc/mc/metadata/UserAttributeTestEverythingTestCase.java 2009-08-27 21:12:44 UTC (rev 106) @@ -75,7 +75,7 @@ { String xmlFile = "metadata/userAttribute/portlet2.xml"; - PortletApplication10MetaData md = unmarshall10(xmlFile); + PortletApplication20MetaData md = unmarshall20(xmlFile); assertNotNull(md); assertTrue(md instanceof PortletApplication20MetaData); Modified: components/pc/trunk/pc/src/main/java/org/gatein/pc/container/ContainerPortletInvoker.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/container/ContainerPortletInvoker.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/container/ContainerPortletInvoker.java 2009-08-27 21:12:44 UTC (rev 106) @@ -205,8 +205,8 @@ public PortletImpl(PortletContainer container) { this.container = container; - //this.context = PortletContext.createPortletContext(container.getPortletApplication().getId() + "." + container.getId()); - this.context = PortletContext.createPortletContext(container.getPortletApplication().getId().substring(1) + "/" + container.getId()); + this.context = PortletContext.createPortletContext(container.getPortletApplication().getId() + "." + container.getId()); + //this.context = PortletContext.createPortletContext(container.getPortletApplication().getId().substring(1) + "/" + container.getId()); } public PortletContext getContext() Modified: components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/info/ContainerInfoBuilder.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/info/ContainerInfoBuilder.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/info/ContainerInfoBuilder.java 2009-08-27 21:12:44 UTC (rev 106) @@ -836,7 +836,7 @@ { if (securityConstraintMD.getPortletList().getPortletNames().contains(portletMD.getPortletName())) { - containerSecurity.addTransportGuarantee(securityConstraintMD.getUserDataConstraint().getTransportQuarantee()); + containerSecurity.addTransportGuarantee(securityConstraintMD.getUserDataConstraint().getTransportGuarantee()); } } Modified: components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/CustomPortletModeMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/CustomPortletModeMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/CustomPortletModeMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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/pc/src/main/java/org/gatein/pc/impl/metadata/CustomWindowStateMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/CustomWindowStateMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/CustomWindowStateMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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/pc/src/main/java/org/gatein/pc/impl/metadata/ListenerMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/ListenerMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/ListenerMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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/pc/src/main/java/org/gatein/pc/impl/metadata/PortletApplication10MetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/PortletApplication10MetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/PortletApplication10MetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -51,7 +51,7 @@ */ @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/pc/src/main/java/org/gatein/pc/impl/metadata/PortletApplication20MetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/PortletApplication20MetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/PortletApplication20MetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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.impl.metadata.adapter.ContainerRuntimeAdapter; @@ -45,6 +46,7 @@ * @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/pc/src/main/java/org/gatein/pc/impl/metadata/PublicRenderParameterMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/PublicRenderParameterMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/PublicRenderParameterMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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/pc/src/main/java/org/gatein/pc/impl/metadata/UserAttributeMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/UserAttributeMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/UserAttributeMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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/pc/src/main/java/org/gatein/pc/impl/metadata/common/ContainerRuntimeMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/common/ContainerRuntimeMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/common/ContainerRuntimeMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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/pc/src/main/java/org/gatein/pc/impl/metadata/common/InitParamMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/common/InitParamMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/common/InitParamMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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/pc/src/main/java/org/gatein/pc/impl/metadata/event/EventDefinitionMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/event/EventDefinitionMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/event/EventDefinitionMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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/pc/src/main/java/org/gatein/pc/impl/metadata/event/EventDefinitionReferenceMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/event/EventDefinitionReferenceMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/event/EventDefinitionReferenceMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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/pc/src/main/java/org/gatein/pc/impl/metadata/filter/FilterMappingMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/filter/FilterMappingMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/filter/FilterMappingMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -33,7 +33,7 @@ * @version $Revision$ */ -@XmlType(name = "filter-mappingType") +@XmlType(name = "filter-mappingType", propOrder={"name", "portletNames"}) public class FilterMappingMetaData { Modified: components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/PortletInfoMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/PortletInfoMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/PortletInfoMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/PortletPreferenceMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/PortletPreferenceMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/PortletPreferenceMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/PortletPreferencesMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/PortletPreferencesMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/PortletPreferencesMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/SecurityRoleRefMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/SecurityRoleRefMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/SecurityRoleRefMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/SupportsMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/SupportsMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/portlet/SupportsMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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/pc/src/main/java/org/gatein/pc/impl/metadata/security/SecurityConstraintMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/security/SecurityConstraintMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/security/SecurityConstraintMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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/pc/src/main/java/org/gatein/pc/impl/metadata/security/UserDataConstraintMetaData.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/security/UserDataConstraintMetaData.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/metadata/security/UserDataConstraintMetaData.java 2009-08-27 21:12:44 UTC (rev 106) @@ -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 { @@ -41,7 +41,7 @@ private String id; /** The user transport quarantee */ - private TransportGuarantee transportQuarantee; + private TransportGuarantee transportGuarantee; public UserDataConstraintMetaData() {} @@ -62,13 +62,13 @@ } @XmlElement(name = "transport-guarantee") - public TransportGuarantee getTransportQuarantee() + public TransportGuarantee getTransportGuarantee() { - return transportQuarantee; + return transportGuarantee; } - public void setTransportQuarantee(TransportGuarantee transportQuarantee) + public void setTransportGuarantee(TransportGuarantee transportGuarantee) { - this.transportQuarantee = transportQuarantee; + this.transportGuarantee = transportGuarantee; } } \ No newline at end of file Deleted: components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/state/MapStateConverter.java =================================================================== --- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/state/MapStateConverter.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/state/MapStateConverter.java 2009-08-27 21:12:44 UTC (rev 106) @@ -1,136 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2009, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.gatein.pc.impl.state; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.gatein.pc.api.PortletStateType; -import org.gatein.pc.api.state.PropertyMap; -import org.gatein.pc.state.SimplePropertyMap; -import org.gatein.pc.state.StateConversionException; -import org.gatein.pc.state.StateConverter; -import org.gatein.pc.state.producer.PortletState; - -/** - * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> - * @version $Revision$ - */ -public class MapStateConverter implements StateConverter -{ - - public <S extends Serializable> S marshall(PortletStateType<S> stateType, PortletState state) - throws StateConversionException, IllegalArgumentException - { - if (stateType.getJavaType().equals(HashMap.class)) - { - Object map = marshall(state); - return (S)map; - } - else - { - throw new UnsupportedOperationException(); - } - } - - public HashMap marshall(PortletState state) - { - if (state == null) - { - throw new IllegalArgumentException("No null state"); - } - - HashMap map = new HashMap(); - Iterator<String> iKeys = state.getProperties().keySet().iterator(); - while (iKeys.hasNext()) - { - String key = iKeys.next(); - List<String> propList = state.getProperties().getProperty(key); - - map.put(key, propList.toArray()); - } - - map.put("portletID", state.getPortletId()); - - return map; - } - - public <S extends Serializable> PortletState unmarshall(PortletStateType<S> stateType, S marshalledState) - throws StateConversionException, IllegalArgumentException - { - if (stateType.getJavaType().equals(HashMap.class)) - { - HashMap map = (HashMap)marshalledState; - return unmarshall(map); - } - else - { - throw new UnsupportedOperationException(); - } - } - - public PortletState unmarshall(Map marshalledState) - { - if (marshalledState == null) - { - throw new IllegalArgumentException("No null map"); - } - - PropertyMap properties = new SimplePropertyMap(marshalledState.size()); - - - Iterator<String> iKeys = marshalledState.keySet().iterator(); - while (iKeys.hasNext()) - { - String key = iKeys.next(); - if (key != "portletID") - { - Object mapValue = marshalledState.get(key); - - if (mapValue instanceof Object[]) - { - Object[] values = (Object[])mapValue; - - List valueList = new ArrayList<String>(); - for (Object value: values) - { - if (value instanceof String) - valueList.add((String)value); - } - - properties.put(key, valueList); - } - } - } - - String portletID = (String) marshalledState.get("portletID"); - - return new PortletState(portletID, properties); - } - -} - Modified: components/pc/trunk/pom.xml =================================================================== --- components/pc/trunk/pom.xml 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/pom.xml 2009-08-27 21:12:44 UTC (rev 106) @@ -41,7 +41,6 @@ <module>samples</module> <module>docs</module> <module>api</module> - <module>exo</module> </modules> <activation> <activeByDefault>true</activeByDefault> Modified: components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml =================================================================== --- components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2009-08-27 21:12:44 UTC (rev 106) @@ -77,9 +77,13 @@ <include>org.gatein.common:common-mc</include> <include>org.gatein.pc:pc-controller</include> <include>org.gatein.pc:pc-mc</include> + + <include>org.gatein.pc:pc-exo-integration</include> <include>org.gatein.pc:pc-samples</include> <include>org.jboss:jboss-common-core</include> + <include>org.jboss.microcontainer:jboss-kernel</include> + <include>org.jboss.microcontainer:jboss-dependency</include> <include>org.jboss:jboss-reflect</include> <include>org.jboss:jboss-mdr</include> <include>org.jboss:jbossxb</include> Modified: components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/admin/ui/AdminPortlet.java =================================================================== --- components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/admin/ui/AdminPortlet.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/admin/ui/AdminPortlet.java 2009-08-27 21:12:44 UTC (rev 106) @@ -60,8 +60,8 @@ if (applicationId != null) { // Use an alias - //PortletApplicationRegistry registry = (PortletApplicationRegistry)getPortletContext().getAttribute("PortletApplicationDeployer"); - PortletApplicationRegistry registry = (PortletApplicationRegistry)getPortletContext().getAttribute("jboss.portal:service=PortletApplicationDeployer"); + PortletApplicationRegistry registry = (PortletApplicationRegistry)getPortletContext().getAttribute(WebBootstrap.BEAN_PREFIX + "PortletApplicationDeployer"); + //PortletApplicationRegistry registry = (PortletApplicationRegistry)getPortletContext().getAttribute("jboss.portal:service=PortletApplicationDeployer"); // ManagedPortletApplication application = registry.getManagedPortletApplication(applicationId); Modified: components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/jsp/ControllerFilter.java =================================================================== --- components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/jsp/ControllerFilter.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/jsp/ControllerFilter.java 2009-08-27 21:12:44 UTC (rev 106) @@ -47,6 +47,7 @@ import org.gatein.pc.controller.state.PortletPageNavigationalStateSerialization; import org.gatein.common.io.IOTools; import org.gatein.common.io.SerializationFilter; +import org.gatein.common.mc.bootstrap.WebBootstrap; import org.gatein.common.util.Base64; import org.gatein.common.util.Base64.EncodingOption; import org.gatein.wci.util.RequestDecoder; @@ -101,11 +102,8 @@ public void doFilter(HttpServletRequest req, HttpServletResponse resp, FilterChain chain) throws IOException, ServletException, PortletInvokerException { - //PortletInvoker invoker = (PortletInvoker)getServletContext().getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker"); + PortletInvoker invoker = (PortletInvoker)getServletContext().getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker"); - ExoContainer exoContainer = ExoContainerContext.getCurrentContainer(); - PortletInvoker invoker = (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class); - // PortalPrepareResponse prepareResponse = new PortalPrepareResponse(req, resp); Modified: components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml =================================================================== --- components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2009-08-27 21:12:44 UTC (rev 106) @@ -26,10 +26,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5"> -<!-- <context-param> + <context-param> <param-name>jboss.portal.mc.beans_resource_location</param-name> <param-value>/WEB-INF/jboss-portal-beans.xml</param-value> - </context-param> --> + </context-param> <filter> <filter-name>ErrorHandlingFilter</filter-name> <filter-class>org.gatein.pc.portal.ErrorHandlingFilter</filter-class> @@ -46,18 +46,12 @@ <filter-name>ControllerFilter</filter-name> <url-pattern>*.jsp</url-pattern> </filter-mapping> - <listener> -<!-- <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> --> - <listener-class>org.gatein.pc.portal.exo.kernel.KernelListener</listener-class> + <listener> + <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> </listener> <servlet> <servlet-name>ContainerServlet</servlet-name> <servlet-class>org.gatein.wci.impl.tomcat.TC6ContainerServlet</servlet-class> - <load-on-startup>0</load-on-startup> + <load-on-startup>1</load-on-startup> </servlet> - <servlet> - <servlet-name>exoint</servlet-name> - <servlet-class>org.gatein.pc.exo.ExoKernelIntegration</servlet-class> - <load-on-startup>0</load-on-startup> - </servlet> </web-app> Modified: components/pc/trunk/test/pom.xml =================================================================== --- components/pc/trunk/test/pom.xml 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/test/pom.xml 2009-08-27 21:12:44 UTC (rev 106) @@ -287,8 +287,8 @@ <property name="dependency.gatein-pc-pc.jar" value="${maven.dependency.org.gatein.pc.pc-pc.jar.path}"/> <property name="dependency.gatein-pc-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/> <property name="dependency.gatein-pc-mc.jar" value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/> - <property name="dependency.gatein-pc-tests.test-jar" value="${maven.dependency.org.gatein.pc.pc-pc.tests.jar.path}"/> -<!-- <property name="dependency.portal-portlet-tests.test-jar" value="${maven.dependency.org.gatein.pc.portlet-portlet.tests.jar.path}"/> --> + <property name="dependency.gatein-pc-tests.test-jar" value="${maven.dependency.org.gatein.pc.pc-pc.tests.test-jar.path}"/> + <!-- <property name="dependency.gatein-pc-tests.test-jar" value="${maven.dependency.org.gatein.pc.pc-pc.tests.jar.path}"/> --> <property name="dependency.gatein-pc-api.jar" value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/> <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/> Deleted: components/pc/trunk/test/src/main/java/org/gatein/pc/test/ExoKernelIntegration.java =================================================================== --- components/pc/trunk/test/src/main/java/org/gatein/pc/test/ExoKernelIntegration.java 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/ExoKernelIntegration.java 2009-08-27 21:12:44 UTC (rev 106) @@ -1,175 +0,0 @@ -/* - * JBoss, a division of Red Hat - * Copyright 2009, Red Hat Middleware, LLC, and individual - * contributors as indicated by the @authors tag. See the - * copyright.txt in the distribution for a full listing of - * individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.gatein.pc.test; - -import org.exoplatform.container.ExoContainer; -import org.exoplatform.container.ExoContainerContext; -import org.gatein.pc.PortletInvokerInterceptor; -import org.gatein.pc.api.PortletInvoker; -import org.gatein.pc.aspects.portlet.CCPPInterceptor; -import org.gatein.pc.aspects.portlet.ConsumerCacheInterceptor; -import org.gatein.pc.aspects.portlet.ContextDispatcherInterceptor; -import org.gatein.pc.aspects.portlet.EventPayloadInterceptor; -import org.gatein.pc.aspects.portlet.PortletCustomizationInterceptor; -import org.gatein.pc.aspects.portlet.ProducerCacheInterceptor; -import org.gatein.pc.aspects.portlet.RequestAttributeConversationInterceptor; -import org.gatein.pc.aspects.portlet.SecureTransportInterceptor; -import org.gatein.pc.aspects.portlet.ValveInterceptor; -import org.gatein.pc.container.ContainerPortletDispatcher; -import org.gatein.pc.container.ContainerPortletInvoker; -import org.gatein.pc.impl.state.MapStateConverter; -import org.gatein.pc.impl.state.StateConverterV0; -import org.gatein.pc.impl.state.StateManagementPolicyService; -import org.gatein.pc.impl.state.producer.PortletStatePersistenceManagerService; -import org.gatein.pc.state.StateConverter; -import org.gatein.pc.state.producer.PortletStatePersistenceManager; -import org.gatein.pc.state.producer.ProducerPortletInvoker; -import org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter; -import org.gatein.wci.ServletContainer; -import org.jboss.unit.remote.driver.RemoteTestDriverServer; - -import javax.servlet.http.HttpServlet; - -/** - * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> - * @version $Revision$ - */ -@SuppressWarnings("serial") -public class ExoKernelIntegration extends HttpServlet -{ - - //protected PortletApplicationDeployer portletApplicationRegistry; - protected TestPortletApplicationDeployer portletApplicationRegistry; - protected GenericServiceExporter testDriverServerExporter; - - public void init() - { - - RemoteTestDriverServer testDriverServer = new RemoteTestDriverServer(); - testDriverServerExporter = new GenericServiceExporter("socket://localhost:5400", testDriverServer, "org.jboss.unit.remote.driver.RemoteTestDriver"); - - ExoContainer container = ExoContainerContext.getCurrentContainer(); - - // The producer persistence manager - PortletStatePersistenceManagerService producerPersistenceManager = new PortletStatePersistenceManagerService(); - // register the persistence manager so that it can be used by WSRP - container.registerComponentInstance(PortletStatePersistenceManager.class, producerPersistenceManager); - - // The producer state management policy - StateManagementPolicyService producerStateManagementPolicy = new StateManagementPolicyService(); - producerStateManagementPolicy.setPersistLocally(true);//false); - - // The producer state converter - StateConverter producerStateConverter = new StateConverterV0();//MapStateConverter(); - - // The portlet container invoker - ContainerPortletInvoker containerPortletInvoker = new ContainerPortletInvoker(); - // continued below - - - // The portlet application deployer - portletApplicationRegistry = new TestPortletApplicationDeployer();//new PortletApplicationDeployer(); - portletApplicationRegistry.setContainerPortletInvoker(containerPortletInvoker); - portletApplicationRegistry.setDriver(testDriverServer); - - //Container Stack - ContainerPortletDispatcher portletContainerDispatcher = new ContainerPortletDispatcher(); - EventPayloadInterceptor eventPayloadInterceptor = new EventPayloadInterceptor(); - eventPayloadInterceptor.setNext(portletContainerDispatcher); - RequestAttributeConversationInterceptor requestAttributeConversationInterceptor = new RequestAttributeConversationInterceptor(); - requestAttributeConversationInterceptor.setNext(eventPayloadInterceptor); - CCPPInterceptor ccppInterceptor = new CCPPInterceptor(); - ccppInterceptor.setNext(requestAttributeConversationInterceptor); - ProducerCacheInterceptor producerCacheInterceptor = new ProducerCacheInterceptor(); - producerCacheInterceptor.setNext(ccppInterceptor); - ContextDispatcherInterceptor contextDispatcherInterceptor = new ContextDispatcherInterceptor(); - contextDispatcherInterceptor.setNext(producerCacheInterceptor); - SecureTransportInterceptor secureTransportInterceptor = new SecureTransportInterceptor(); - secureTransportInterceptor.setNext(contextDispatcherInterceptor); - ValveInterceptor valveInterceptor = new ValveInterceptor(); - valveInterceptor.setPortletApplicationRegistry(portletApplicationRegistry); - valveInterceptor.setNext(secureTransportInterceptor); - - // inject ServletContainer in objects that need it - ServletContainer servletContainer = (ServletContainer)container.getComponentInstance(ServletContainer.class); - portletApplicationRegistry.setServletContainer(servletContainer); - contextDispatcherInterceptor.setServletContainer(servletContainer); - - // The portlet container invoker continued - containerPortletInvoker.setNext(valveInterceptor); - - // The producer portlet invoker - ProducerPortletInvoker producerPortletInvoker = new ProducerPortletInvoker(); - producerPortletInvoker.setNext(containerPortletInvoker); - producerPortletInvoker.setPersistenceManager(producerPersistenceManager); - producerPortletInvoker.setStateManagementPolicy(producerStateManagementPolicy); - producerPortletInvoker.setStateConverter(producerStateConverter); - - // register producer portlet invoker so that WSRP can use it - container.registerComponentInstance(ProducerPortletInvoker.class, producerPortletInvoker); - - // The consumer portlet invoker - PortletCustomizationInterceptor portletCustomizationInterceptor = new PortletCustomizationInterceptor(); - portletCustomizationInterceptor.setNext(producerPortletInvoker); - ConsumerCacheInterceptor consumerCacheInterceptor = new ConsumerCacheInterceptor(); - consumerCacheInterceptor.setNext(portletCustomizationInterceptor); - PortletInvokerInterceptor consumerPortletInvoker = new PortletInvokerInterceptor(); - consumerPortletInvoker.setNext(consumerCacheInterceptor); - - //container.registerComponentInstance(PortletInvoker.class, consumerPortletInvoker); - - // Federating portlet invoker - //FederatingPortletInvoker federatingPortletInvoker = new FederatingPortletInvokerService(); - - // register local portlet invoker with federating portlet invoker - //federatingPortletInvoker.registerInvoker(LOCAL_PORTLET_INVOKER_ID, containerPortletInvoker);//containerPortletInvoker); - - /* register with container */ - container.registerComponentInstance(PortletInvoker.class, consumerPortletInvoker); - - portletApplicationRegistry.start(); - - try - { - testDriverServerExporter.start(); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - - public void destroy() - { - if (portletApplicationRegistry != null) - { - portletApplicationRegistry.stop(); - } - if (testDriverServerExporter != null) - { - testDriverServerExporter.stop(); - } - } -} - Modified: components/pc/trunk/test/src/test/build.xml =================================================================== --- components/pc/trunk/test/src/test/build.xml 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/test/src/test/build.xml 2009-08-27 21:12:44 UTC (rev 106) @@ -591,6 +591,8 @@ <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> <property name="cargo.rmi.port" value="1099"/> + <property name="cargo.jvmargs" value="-Dxb.builder.useUnorderedSequence=true"/> + <!--<property name="cargo.jvmargs" value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>--> <deployable type="war" file="${test.temp.lib}/jboss-4.2/portlet-test.war"/> </configuration> Modified: components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml =================================================================== --- components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2009-08-27 21:12:44 UTC (rev 106) @@ -34,11 +34,6 @@ <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> </listener> <servlet> - <servlet-name>exoint</servlet-name> - <servlet-class>org.gatein.pc.test.ExoKernelIntegration</servlet-class> - <load-on-startup>0</load-on-startup> - </servlet> - <servlet> <servlet-name>ContainerServlet</servlet-name> <servlet-class>org.gatein.wci.impl.tomcat.TC6ContainerServlet</servlet-class> <load-on-startup>0</load-on-startup> Modified: components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml =================================================================== --- components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2009-08-27 18:24:13 UTC (rev 105) +++ components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2009-08-27 21:12:44 UTC (rev 106) @@ -34,12 +34,6 @@ <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> </listener> <servlet> - <servlet-name>exoint</servlet-name> - <servlet-class>org.gatein.pc.test.ExoKernelIntegration</servlet-class> - <load-on-startup>0</load-on-startup> - </servlet> - - <servlet> <servlet-name>ContainerServlet</servlet-name> <servlet-class>org.gatein.wci.impl.tomcat.TC6ContainerServlet</servlet-class> <load-on-startup>0</load-on-startup>