Author: thomas.heute(a)jboss.com Date: 2009-11-25 02:49:55 -0500 (Wed, 25 Nov 2009) New Revision: 796 Modified: portal/trunk/.classpath portal/trunk/component/pc/pom.xml portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js portal/trunk/pom.xml Log: Upgrade dependencies on components: <org.gatein.common.version>2.0.0-CR02</org.gatein.common.version> <org.gatein.wci.version>2.0.0-CR01</org.gatein.wci.version> <org.gatein.pc.version>2.1.0-CR01</org.gatein.pc.version> GTNPORTAL-291: Add BridgeInterceptor to enable Apache Bridges Tested on jPetstore Struts portlet Modified: portal/trunk/.classpath =================================================================== --- portal/trunk/.classpath 2009-11-25 07:36:51 UTC (rev 795) +++ portal/trunk/.classpath 2009-11-25 07:49:55 UTC (rev 796) @@ -1,5 +1,50 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry kind="src" output="component/common/target/classes" path="component/common/src/main/java"/> + <classpathentry kind="src" output="component/common/target/test-classes" path="component/common/src/test/java"/> + <classpathentry excluding="**" kind="src" output="component/common/target/test-classes" path="component/common/src/test/resources"/> + <classpathentry kind="src" output="component/resources/target/classes" path="component/resources/src/main/java"/> + <classpathentry kind="src" output="component/resources/target/test-classes" path="component/resources/src/test/java"/> + <classpathentry kind="src" output="component/pc/target/classes" path="component/pc/src/main/java"/> + <classpathentry kind="src" output="component/pc/target/test-classes" path="component/pc/src/test/java"/> + <classpathentry excluding="**" kind="src" output="component/pc/target/test-classes" path="component/pc/src/test/resources"/> + <classpathentry kind="src" output="component/xml-parser/target/classes" path="component/xml-parser/src/main/java"/> + <classpathentry kind="src" output="component/xml-parser/target/test-classes" path="component/xml-parser/src/test/java"/> + <classpathentry excluding="**" kind="src" output="component/xml-parser/target/test-classes" path="component/xml-parser/src/test/resources"/> + <classpathentry kind="src" output="component/wsrp/target/classes" path="component/wsrp/src/main/java"/> + <classpathentry kind="src" output="component/scripting/target/classes" path="component/scripting/src/main/java"/> + <classpathentry kind="src" output="component/scripting/target/test-classes" path="component/scripting/src/test/java"/> + <classpathentry excluding="**" kind="src" output="component/scripting/target/test-classes" path="component/scripting/src/test/resources"/> + <classpathentry kind="src" output="component/web/target/classes" path="component/web/src/main/java"/> + <classpathentry kind="src" output="component/web/target/test-classes" path="component/web/src/test/java"/> + <classpathentry excluding="**" kind="src" output="component/web/target/test-classes" path="component/web/src/test/resources"/> + <classpathentry kind="src" output="component/identity/target/classes" path="component/identity/src/main/java"/> + <classpathentry kind="src" output="component/identity/target/test-classes" path="component/identity/src/test/java"/> + <classpathentry kind="src" output="component/portal/target/classes" path="component/portal/src/main/java"/> + <classpathentry kind="src" output="component/portal/target/test-classes" path="component/portal/src/test/java"/> + <classpathentry excluding="**" kind="src" output="component/portal/target/test-classes" path="component/portal/src/test/resources"/> + <classpathentry kind="src" output="component/application-registry/target/classes" path="component/application-registry/src/main/java"/> + <classpathentry kind="src" output="component/application-registry/target/test-classes" path="component/application-registry/src/test/java"/> + <classpathentry kind="src" output="webui/core/target/classes" path="webui/core/src/main/java"/> + <classpathentry kind="src" output="webui/core/target/test-classes" path="webui/core/src/test/java"/> + <classpathentry kind="src" output="webui/eXo/target/classes" path="webui/eXo/src/main/java"/> + <classpathentry kind="src" output="gadgets/core/target/classes" path="gadgets/core/src/main/java"/> + <classpathentry kind="src" output="webui/portal/target/classes" path="webui/portal/src/main/java"/> + <classpathentry kind="src" output="component/dashboard/target/classes" path="component/dashboard/src/main/java"/> + <classpathentry excluding="**" kind="src" output="component/dashboard/target/classes" path="component/dashboard/src/main/resources"/> + <classpathentry kind="src" output="gadgets/eXoGadgets/target/classes" path="gadgets/eXoGadgets/src/main/java"/> + <classpathentry kind="src" output="portlet/dashboard/target/classes" path="portlet/dashboard/src/main/java"/> + <classpathentry kind="src" output="portlet/exoadmin/target/classes" path="portlet/exoadmin/src/main/java"/> + <classpathentry kind="src" output="portlet/web/target/classes" path="portlet/web/src/main/java"/> + <classpathentry excluding="**" kind="src" output="server/tomcat/patch/target/classes" path="server/tomcat/patch/src/main/tomcat"/> + <classpathentry kind="src" output="server/tomcat/plugin/target/classes" path="server/tomcat/plugin/src/main/java"/> + <classpathentry excluding="**" kind="src" output="server/jboss/patch/target/classes" path="server/jboss/patch/src/main/jboss"/> + <classpathentry kind="src" output="server/jboss/plugin/target/classes" path="server/jboss/plugin/src/main/java"/> + <classpathentry kind="src" output="sample/extension/config/target/classes" path="sample/extension/config/src/main/java"/> + <classpathentry kind="src" output="sample/extension/jar/target/classes" path="sample/extension/jar/src/main/java"/> + <classpathentry kind="src" output="sample/portal/config/target/classes" path="sample/portal/config/src/main/java"/> + <classpathentry kind="src" output="sample/portal/jar/target/classes" path="sample/portal/jar/src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: portal/trunk/component/pc/pom.xml =================================================================== --- portal/trunk/component/pc/pom.xml 2009-11-25 07:36:51 UTC (rev 795) +++ portal/trunk/component/pc/pom.xml 2009-11-25 07:49:55 UTC (rev 796) @@ -89,6 +89,11 @@ </exclusions> </dependency> <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-bridge</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> <version>${org.gatein.wci.version}</version> Modified: portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java =================================================================== --- portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2009-11-25 07:36:51 UTC (rev 795) +++ portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2009-11-25 07:49:55 UTC (rev 796) @@ -22,6 +22,7 @@ import org.exoplatform.container.ExoContainer; import org.exoplatform.container.ExoContainerContext; import org.gatein.pc.api.PortletInvoker; +import org.gatein.pc.bridge.BridgeInterceptor; import org.gatein.pc.federation.FederatingPortletInvoker; import org.gatein.pc.federation.impl.FederatingPortletInvokerService; import org.gatein.pc.mc.PortletApplicationDeployer; @@ -83,8 +84,10 @@ requestAttributeConversationInterceptor.setNext(eventPayloadInterceptor); CCPPInterceptor ccppInterceptor = new CCPPInterceptor(); ccppInterceptor.setNext(requestAttributeConversationInterceptor); + BridgeInterceptor bridgepInterceptor = new BridgeInterceptor(); + bridgepInterceptor.setNext(ccppInterceptor); ProducerCacheInterceptor producerCacheInterceptor = new ProducerCacheInterceptor(); - producerCacheInterceptor.setNext(ccppInterceptor); + producerCacheInterceptor.setNext(bridgepInterceptor); ContextDispatcherInterceptor contextDispatcherInterceptor = new ContextDispatcherInterceptor(); contextDispatcherInterceptor.setNext(producerCacheInterceptor); SecureTransportInterceptor secureTransportInterceptor = new SecureTransportInterceptor(); Modified: portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2009-11-25 07:36:51 UTC (rev 795) +++ portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2009-11-25 07:49:55 UTC (rev 796) @@ -53,7 +53,8 @@ new Project("org.exoplatform.portal", "exo.portal.component.resources", "jar", module.version); module.component.common = - new Project("org.exoplatform.portal", "exo.portal.component.common", "jar", module.version); + new Project("org.exoplatform.portal", "exo.portal.component.common", "jar", module.version). + addDependency(new Project("org.gatein.common", "common-logging", "jar", commonVersion)); module.component.pc = new Project("org.exoplatform.portal", "exo.portal.component.pc", "jar", module.version). @@ -61,6 +62,7 @@ addDependency(new Project("javax.ccpp", "ccpp", "jar", "1.0")). addDependency(new Project("javax.xml.bind", "jaxb-api", "jar", "2.1")). addDependency(new Project("org.gatein.pc", "pc-api", "jar", pcVersion)). + addDependency(new Project("org.gatein.pc", "pc-bridge", "jar", pcVersion)). addDependency(new Project("org.gatein.pc", "pc-portlet", "jar", pcVersion)). addDependency(new Project("org.gatein.pc", "pc-mc", "jar", pcVersion)). addDependency(new Project("org.gatein.pc", "pc-controller", "jar", pcVersion)). @@ -72,6 +74,7 @@ addDependency(new Project("log4j", "log4j", "jar", "1.2.14")). addDependency(new Project("org.jboss", "jbossxb", "jar", "2.0.1.GA")). addDependency(new Project("org.jboss.logging", "jboss-logging-spi", "jar", "2.0.5.GA")). + addDependency(new Project("org.apache.portals.bridges", "portals-bridges-common", "jar", "1.0.4")). addDependency(new Project("org.jboss", "jboss-common-core", "jar", "2.2.9.GA")); Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2009-11-25 07:36:51 UTC (rev 795) +++ portal/trunk/pom.xml 2009-11-25 07:49:55 UTC (rev 796) @@ -43,9 +43,9 @@ <org.exoplatform.jcr.version>1.12.0-Beta04</org.exoplatform.jcr.version> <org.jibx.version>1.2.1</org.jibx.version> <org.shindig.version>SNAPSHOT-r790473</org.shindig.version> - <org.gatein.common.version>2.0.0-Beta03</org.gatein.common.version> - <org.gatein.wci.version>2.0.0-Beta02</org.gatein.wci.version> - <org.gatein.pc.version>2.1.0-Beta02</org.gatein.pc.version> + <org.gatein.common.version>2.0.0-CR02</org.gatein.common.version> + <org.gatein.wci.version>2.0.0-CR01</org.gatein.wci.version> + <org.gatein.pc.version>2.1.0-CR01</org.gatein.pc.version> <org.jboss.identity.idm>1.0.0.Beta3</org.jboss.identity.idm> <org.gatein.wsrp.version>1.0.0-Beta01</org.gatein.wsrp.version> <org.gatein.mop.version>1.0.0-Beta10</org.gatein.mop.version>