August 2009 - gatein-commits - Jboss List Archives

gatein SVN: r118 - in components/common/trunk: mc/src/main/java/org and 1 other directory.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2009-08-28 20:08:05 -0400 (Fri, 28 Aug 2009) New Revision: 118 Removed: components/common/trunk/common/src/main/java/org/jboss/ components/common/trunk/mc/src/main/java/org/jboss/ Log: remove legacy dirs

15 years, 4 months

1
0
0 / 0

gatein SVN: r117 - components/wci/trunk/wci/src/main/java/org.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2009-08-28 20:06:57 -0400 (Fri, 28 Aug 2009) New Revision: 117 Removed: components/wci/trunk/wci/src/main/java/org/jboss/ Log: remove legacy dir

15 years, 4 months

1
0
0 / 0

gatein SVN: r114 - components/pc/trunk.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2009-08-28 19:37:34 -0400 (Fri, 28 Aug 2009) New Revision: 114 Removed: components/pc/trunk/api/ components/pc/trunk/bridge/ components/pc/trunk/build/ components/pc/trunk/controller/ components/pc/trunk/docs/ components/pc/trunk/federation/ components/pc/trunk/jsr168api/ components/pc/trunk/management/ components/pc/trunk/mc/ components/pc/trunk/pc/ components/pc/trunk/pom.xml components/pc/trunk/portal/ components/pc/trunk/samples/ components/pc/trunk/test/ Log: remove Deleted: components/pc/trunk/pom.xml =================================================================== --- components/pc/trunk/pom.xml 2009-08-28 23:36:03 UTC (rev 113) +++ components/pc/trunk/pom.xml 2009-08-28 23:37:34 UTC (rev 114) @@ -1,106 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.gatein.pc</groupId> - <artifactId>module-aggregator</artifactId> - <packaging>pom</packaging> - <name>GateIn - Portlet Container (aggregator)</name> - <version>trunk-SNAPSHOT</version> - - <dependencies/> - - <distributionManagement> - <repository> -  -  - <id>repository.jboss.org</id> - <url>file://${jboss.repository.root}</url> - </repository> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - <uniqueVersion>true</uniqueVersion> - </snapshotRepository> - </distributionManagement> - - <profiles> - <profile> - <id>default</id> - <modules> - <module>build</module> - <module>jsr168api</module> - <module>pc</module> - <module>controller</module> - <module>bridge</module> - <module>federation</module> - <module>management</module> - <module>mc</module> - <module>test</module> - <module>portal</module> - <module>samples</module> - <module>docs</module> - <module>api</module> - </modules> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - </profile> - <profile> - <id>docs</id> - <modules> - <module>docs</module> - </modules> - </profile> - <profile> - <id>test</id> - <modules> - <module>build</module> - <module>portlet</module> - <module>controller</module> - <module>mc</module> - <module>test</module> - </modules> - </profile> - <profile> - <id>portal</id> - <modules> - <module>build</module> - <module>portlet</module> - <module>controller</module> - <module>mc</module> - <module>portal</module> - <module>samples</module> - </modules> - </profile> - <profile> - <id>release</id> - <modules> - <module>build</module> - <module>portlet</module> - <module>controller</module> - <module>mc</module> - <module>portal</module> - <module>samples</module> - <module>docs</module> - </modules> - </profile> - </profiles> - - <modules> - </modules> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <aggregate>true</aggregate> - </configuration> - </plugin> - </plugins> - </reporting> - - -</project>

15 years, 4 months

1
0
0 / 0

gatein SVN: r113 - components/wci/trunk.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2009-08-28 19:36:03 -0400 (Fri, 28 Aug 2009) New Revision: 113 Removed: components/wci/trunk/build/ components/wci/trunk/exo/ components/wci/trunk/pom.xml components/wci/trunk/wci/ Log: remove Deleted: components/wci/trunk/pom.xml =================================================================== --- components/wci/trunk/pom.xml 2009-08-28 23:35:23 UTC (rev 112) +++ components/wci/trunk/pom.xml 2009-08-28 23:36:03 UTC (rev 113) @@ -1,74 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.gatein.wci</groupId> - <artifactId>module-aggregator</artifactId> - <packaging>pom</packaging> - <name>GateIn - Web Container Integration component (aggregator)</name> - <version>trunk-SNAPSHOT</version> - <url>http://labs.jboss.com/jbossportal</url> - - <dependencies /> - - <distributionManagement> - <repository> -  -  - <id>repository.jboss.org</id> - <url>file://${jboss.repository.root}</url> - </repository> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - <uniqueVersion>true</uniqueVersion> - </snapshotRepository> - </distributionManagement> - - <modules> - <module>build</module> - <module>wci</module> - <module>exo</module> - </modules> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <aggregate>true</aggregate> - </configuration> - </plugin> - </plugins> - </reporting> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <configuration> -  - <aggregate>true</aggregate> - </configuration> - <executions> - <execution> - <phase>test</phase> - <goals> - <goal>report-only</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project>

15 years, 4 months

1
0
0 / 0

gatein SVN: r112 - components/common/trunk.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2009-08-28 19:35:23 -0400 (Fri, 28 Aug 2009) New Revision: 112 Removed: components/common/trunk/build/ components/common/trunk/common/ components/common/trunk/mc/ components/common/trunk/pom.xml Log: remove Deleted: components/common/trunk/pom.xml =================================================================== --- components/common/trunk/pom.xml 2009-08-28 21:24:29 UTC (rev 111) +++ components/common/trunk/pom.xml 2009-08-28 23:35:23 UTC (rev 112) @@ -1,45 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.gatein.common</groupId> - <artifactId>module-aggregator</artifactId> - <packaging>pom</packaging> - <name>GateIn - Common component (aggregator)</name> - <version>trunk-SNAPSHOT</version> - - <distributionManagement> - <repository> -  - <id>repository.jboss.org</id> - <url>file://${jboss.repository.root}</url> - </repository> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - <uniqueVersion>true</uniqueVersion> - </snapshotRepository> - </distributionManagement> - - <modules> - <module>build</module> - <module>common</module> - <module>mc</module> - </modules> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <aggregate>true</aggregate> - </configuration> - </plugin> - </plugins> - </reporting> - - - -</project>

15 years, 4 months

1
0
0 / 0

gatein SVN: r111 - in components/mop/trunk: api and 2 other directories.

by do-not-reply＠jboss.org

Author: aheritier Date: 2009-08-28 17:24:29 -0400 (Fri, 28 Aug 2009) New Revision: 111 Modified: components/mop/trunk/api/pom.xml components/mop/trunk/core/pom.xml components/mop/trunk/pom.xml components/mop/trunk/spi/pom.xml Log: GTNMOP-4 : Fix artifactIds Modified: components/mop/trunk/api/pom.xml =================================================================== --- components/mop/trunk/api/pom.xml 2009-08-28 05:18:06 UTC (rev 110) +++ components/mop/trunk/api/pom.xml 2009-08-28 21:24:29 UTC (rev 111) @@ -24,7 +24,7 @@ <parent> <groupId>org.gatein.mop</groupId> - <artifactId>mop.parent</artifactId> + <artifactId>mop-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> @@ -32,7 +32,7 @@   - <artifactId>mop.api</artifactId> + <artifactId>mop-api</artifactId> <name>MOP API</name> <description>API of the Object Model for Portal</description> Modified: components/mop/trunk/core/pom.xml =================================================================== --- components/mop/trunk/core/pom.xml 2009-08-28 05:18:06 UTC (rev 110) +++ components/mop/trunk/core/pom.xml 2009-08-28 21:24:29 UTC (rev 111) @@ -24,7 +24,7 @@ <parent> <groupId>org.gatein.mop</groupId> - <artifactId>mop.parent</artifactId> + <artifactId>mop-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> @@ -32,7 +32,7 @@   - <artifactId>mop.core</artifactId> + <artifactId>mop-core</artifactId> <name>MOP Core</name> <description>Model Object for Portal Core</description> @@ -50,13 +50,13 @@ <dependency> <groupId>org.gatein.mop</groupId> - <artifactId>mop.api</artifactId> + <artifactId>mop-api</artifactId> <version>1.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.gatein.mop</groupId> - <artifactId>mop.spi</artifactId> + <artifactId>mop-spi</artifactId> <version>1.0.0-SNAPSHOT</version> </dependency> Modified: components/mop/trunk/pom.xml =================================================================== --- components/mop/trunk/pom.xml 2009-08-28 05:18:06 UTC (rev 110) +++ components/mop/trunk/pom.xml 2009-08-28 21:24:29 UTC (rev 111) @@ -33,7 +33,7 @@  <groupId>org.gatein.mop</groupId> - <artifactId>mop.parent</artifactId> + <artifactId>mop-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> Modified: components/mop/trunk/spi/pom.xml =================================================================== --- components/mop/trunk/spi/pom.xml 2009-08-28 05:18:06 UTC (rev 110) +++ components/mop/trunk/spi/pom.xml 2009-08-28 21:24:29 UTC (rev 111) @@ -24,7 +24,7 @@ <parent> <groupId>org.gatein.mop</groupId> - <artifactId>mop.parent</artifactId> + <artifactId>mop-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> @@ -32,7 +32,7 @@   - <artifactId>mop.spi</artifactId> + <artifactId>mop-spi</artifactId> <name>MOP SPI</name> <description>SPI of the Object Model for Portal</description> @@ -41,7 +41,7 @@ <dependency> <groupId>org.gatein.mop</groupId> - <artifactId>mop.api</artifactId> + <artifactId>mop-api</artifactId> <version>1.0.0-SNAPSHOT</version> </dependency>

15 years, 4 months

1
0
0 / 0

gatein SVN: r110 - components/pc/trunk/pc/src/main/java/org/gatein/pc/container.

by do-not-reply＠jboss.org

Author: mwringe Date: 2009-08-28 01:18:06 -0400 (Fri, 28 Aug 2009) New Revision: 110 Modified: components/pc/trunk/pc/src/main/java/org/gatein/pc/container/ContainerPortletInvoker.java Log: Change the portlet context id to match what is being used in the portal. 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-28 03:33:57 UTC (rev 109) +++ components/pc/trunk/pc/src/main/java/org/gatein/pc/container/ContainerPortletInvoker.java 2009-08-28 05:18:06 UTC (rev 110) @@ -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()

15 years, 4 months

1
0
0 / 0

gatein SVN: r109 - in components/pc/trunk: test/src/main/java/org/gatein/pc/test/controller and 1 other directories.

by do-not-reply＠jboss.org

Author: mwringe Date: 2009-08-27 23:33:57 -0400 (Thu, 27 Aug 2009) New Revision: 109 Modified: components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/jsp/ControllerFilter.java components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java components/pc/trunk/test/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java Log: Minor code clean up. 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-28 03:30:29 UTC (rev 108) +++ components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/jsp/ControllerFilter.java 2009-08-28 03:33:57 UTC (rev 109) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.gatein.pc.portal.jsp; -import org.exoplatform.container.ExoContainer; -import org.exoplatform.container.ExoContainerContext; import org.gatein.pc.controller.impl.PortletURLRenderer; import org.gatein.pc.controller.impl.URLParameterConstants; import org.gatein.pc.controller.impl.ControllerRequestFactory; Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java =================================================================== --- components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java 2009-08-28 03:30:29 UTC (rev 108) +++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java 2009-08-28 03:33:57 UTC (rev 109) @@ -23,8 +23,6 @@ package org.gatein.pc.test.controller; -import org.exoplatform.container.ExoContainer; -import org.exoplatform.container.ExoContainerContext; import org.gatein.pc.api.Portlet; import org.gatein.pc.api.PortletContext; import org.gatein.pc.api.PortletInvoker; @@ -75,12 +73,7 @@ // this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker"); - - //ExoContainer exoContainer = ExoContainerContext.getCurrentContainer(); - //this.portletInvoker = (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class); - //System.out.println("PORTLET INVOKER PCCI2: " + (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class)); - - + this.eventControllerContext = new EventControllerContextImpl(portletInvoker); this.stateControllerContext = new StateControllerContextImpl(this); this.serialization = new PortletPageNavigationalStateSerialization(stateControllerContext); Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java =================================================================== --- components/pc/trunk/test/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java 2009-08-28 03:30:29 UTC (rev 108) +++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java 2009-08-28 03:33:57 UTC (rev 109) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.gatein.pc.test.tck; -import org.exoplatform.container.ExoContainer; -import org.exoplatform.container.ExoContainerContext; import org.gatein.pc.controller.impl.AbstractPortletControllerContext; import org.gatein.pc.api.Portlet; import org.gatein.pc.api.PortletInvokerException; @@ -76,11 +74,6 @@ // this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker"); - //ExoContainer exoContainer = ExoContainerContext.getCurrentContainer(); - //this.portletInvoker = (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class); - //System.out.println("PORTLET INVOKER TCKPCC2: " + (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class)); - - this.stateControllerContext = new TCKStateControllerContext(new StateControllerContextImpl(this)); this.eventControllerContext = new EventControllerContextImpl(portletInvoker); this.serialization = new TCKPageNavigationalStateSerialization(stateControllerContext);

15 years, 4 months

1
0
0 / 0

gatein SVN: r108 - in components/wci/trunk/wci/src/main: resources/conf and 1 other directory.

by do-not-reply＠jboss.org

Author: mwringe Date: 2009-08-27 23:30:29 -0400 (Thu, 27 Aug 2009) New Revision: 108 Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainerFactory.java components/wci/trunk/wci/src/main/resources/conf/configuration.xml Log: Update the factory to return a servletcontainer from the exo kernel. Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainerFactory.java =================================================================== --- components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainerFactory.java 2009-08-27 22:44:34 UTC (rev 107) +++ components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainerFactory.java 2009-08-28 03:30:29 UTC (rev 108) @@ -22,6 +22,8 @@ ******************************************************************************/ package org.gatein.wci.impl; +import org.exoplatform.container.ExoContainer; +import org.exoplatform.container.ExoContainerContext; import org.gatein.wci.ServletContainer; import org.gatein.wci.ServletContainerFactory; import org.gatein.wci.spi.ServletContainerContext; @@ -51,7 +53,9 @@ */ public ServletContainer getServletContainer() { - return container; + //return container; + ExoContainer exoContainer = ExoContainerContext.getCurrentContainer(); + return (ServletContainer)exoContainer.getComponentInstance(ServletContainer.class); } /** Modified: components/wci/trunk/wci/src/main/resources/conf/configuration.xml =================================================================== --- components/wci/trunk/wci/src/main/resources/conf/configuration.xml 2009-08-27 22:44:34 UTC (rev 107) +++ components/wci/trunk/wci/src/main/resources/conf/configuration.xml 2009-08-28 03:30:29 UTC (rev 108) @@ -7,14 +7,6 @@ <component> <key>org.gatein.wci.ServletContainer</key> <type>org.gatein.wci.impl.generic.DefaultServletContainerWrapper</type> - </component> <component> @@ -22,9 +14,4 @@ <type>org.gatein.wci.impl.generic.GenericServletContainerContext</type> </component> - - </configuration>

15 years, 4 months

1
0
0 / 0

gatein SVN: r107 - in components/pc/trunk/test: src/main/java/org/gatein/pc/test/controller and 3 other directories.

by do-not-reply＠jboss.org

Author: mwringe Date: 2009-08-27 18:44:34 -0400 (Thu, 27 Aug 2009) New Revision: 107 Modified: components/pc/trunk/test/pom.xml components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java components/pc/trunk/test/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml Log: Attempt to get the remote tests working. Modified: components/pc/trunk/test/pom.xml =================================================================== --- components/pc/trunk/test/pom.xml 2009-08-27 21:12:44 UTC (rev 106) +++ components/pc/trunk/test/pom.xml 2009-08-27 22:44:34 UTC (rev 107) @@ -287,8 +287,12 @@ <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.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}"/> Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java =================================================================== --- components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java 2009-08-27 21:12:44 UTC (rev 106) +++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java 2009-08-27 22:44:34 UTC (rev 107) @@ -41,6 +41,8 @@ import org.gatein.wci.IllegalRequestException; import org.gatein.common.io.Serialization; +import org.gatein.common.mc.bootstrap.WebBootstrap; + import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -72,12 +74,13 @@ super(req, resp); // - //this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker"); + this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker"); - ExoContainer exoContainer = ExoContainerContext.getCurrentContainer(); - this.portletInvoker = (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class); - + //ExoContainer exoContainer = ExoContainerContext.getCurrentContainer(); + //this.portletInvoker = (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class); + //System.out.println("PORTLET INVOKER PCCI2: " + (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class)); + this.eventControllerContext = new EventControllerContextImpl(portletInvoker); this.stateControllerContext = new StateControllerContextImpl(this); this.serialization = new PortletPageNavigationalStateSerialization(stateControllerContext); Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java =================================================================== --- components/pc/trunk/test/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java 2009-08-27 21:12:44 UTC (rev 106) +++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java 2009-08-27 22:44:34 UTC (rev 107) @@ -39,6 +39,8 @@ import org.gatein.wci.IllegalRequestException; import org.gatein.common.io.Serialization; +import org.gatein.common.mc.bootstrap.WebBootstrap; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletContext; @@ -72,9 +74,11 @@ super(req, resp); // - //this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker"); - ExoContainer exoContainer = ExoContainerContext.getCurrentContainer(); - this.portletInvoker = (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class); + this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker"); + + //ExoContainer exoContainer = ExoContainerContext.getCurrentContainer(); + //this.portletInvoker = (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class); + //System.out.println("PORTLET INVOKER TCKPCC2: " + (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class)); this.stateControllerContext = new TCKStateControllerContext(new StateControllerContextImpl(this)); Modified: components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml =================================================================== --- components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2009-08-27 21:12:44 UTC (rev 106) +++ components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2009-08-27 22:44:34 UTC (rev 107) @@ -22,92 +22,22 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <deployment xmlns="urn:jboss:bean-deployer:2.0"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <bean name="PortletApplicationDeployer" class="org.gatein.pc.mc.PortletApplicationDeployer"> + <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/> + + <bean name="TestDriverServerExporter" + class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter"> + <constructor> + <parameter>socket://localhost:5400</parameter> + <parameter><inject bean="TestDriverServer"/></parameter> + <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter> + </constructor> + </bean> + + <bean name="PortletApplicationDeployer" class="org.gatein.pc.test.TestPortletApplicationDeployer"> <alias>PortletApplicationRegistry</alias> <property name="servletContainer"><inject bean="ServletContainer"/></property> + <property name="driver"><inject bean="TestDriverServer"/></property> <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property> </bean> Modified: components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml =================================================================== --- components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2009-08-27 21:12:44 UTC (rev 106) +++ components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2009-08-27 22:44:34 UTC (rev 107) @@ -22,92 +22,22 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <deployment xmlns="urn:jboss:bean-deployer:2.0"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <bean name="PortletApplicationDeployer" class="org.gatein.pc.mc.PortletApplicationDeployer"> + <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/> + + <bean name="TestDriverServerExporter" + class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter"> + <constructor> + <parameter>socket://localhost:5400</parameter> + <parameter><inject bean="TestDriverServer"/></parameter> + <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter> + </constructor> + </bean> + + <bean name="PortletApplicationDeployer" class="org.gatein.pc.test.TestPortletApplicationDeployer"> <alias>PortletApplicationRegistry</alias> <property name="servletContainer"><inject bean="ServletContainer"/></property> + <property name="driver"><inject bean="TestDriverServer"/></property> <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property> </bean>

15 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits August 2009