gatein SVN: r5695 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2011-01-06 23:33:55 -0500 (Thu, 06 Jan 2011)
New Revision: 5695
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_29_AddNewpageForPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_30_EditPageForPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_33_EditNodePageProperties.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html
Log:
TESTVN-2313 - Daily tests on GateIn - Clean and improve scripts
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_29_AddNewpageForPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_29_AddNewpageForPortal.html 2011-01-07 02:59:38 UTC (rev 5694)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_29_AddNewpageForPortal.html 2011-01-07 04:33:55 UTC (rev 5695)
@@ -147,11 +147,21 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Site</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>link=Edit Navigation</td>
<td></td>
@@ -301,7 +311,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_30_EditPageForPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_30_EditPageForPortal.html 2011-01-07 02:59:38 UTC (rev 5694)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_30_EditPageForPortal.html 2011-01-07 04:33:55 UTC (rev 5695)
@@ -517,6 +517,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Site</td>
<td></td>
@@ -577,6 +582,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>link=Save</td>
<td></td>
@@ -587,6 +597,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Page Management</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Page Management</td>
<td></td>
@@ -594,7 +609,7 @@
<tr>
<td>waitForElementPresent</td>
<td>searchTerm</td>
- <td>Test_SNF_PRL_30</td>
+ <td></td>
</tr>
<tr>
<td>type</td>
@@ -676,7 +691,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_33_EditNodePageProperties.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_33_EditNodePageProperties.html 2011-01-07 02:59:38 UTC (rev 5694)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_33_EditNodePageProperties.html 2011-01-07 04:33:55 UTC (rev 5695)
@@ -107,6 +107,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
<td></td>
@@ -217,6 +222,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Site</td>
<td></td>
@@ -347,6 +357,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Site</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-01-07 02:59:38 UTC (rev 5694)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-01-07 04:33:55 UTC (rev 5695)
@@ -512,6 +512,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td>
<td></td>
@@ -522,6 +527,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Site</td>
<td></td>
15 years, 3 months
- 1
- 0
gatein SVN: r5694 - components/sso/branches/1.0.1-GA-00399567/1.0.1-GA/agent/src/main/java/org/gatein/sso/agent/cas.
by do-not-reply＠jboss.org
Author: sohil.shah(a)jboss.com
Date: 2011-01-06 21:59:38 -0500 (Thu, 06 Jan 2011)
New Revision: 5694
Modified:
components/sso/branches/1.0.1-GA-00399567/1.0.1-GA/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java
Log:
patched code
Modified: components/sso/branches/1.0.1-GA-00399567/1.0.1-GA/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java
===================================================================
--- components/sso/branches/1.0.1-GA-00399567/1.0.1-GA/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java 2011-01-06 21:32:07 UTC (rev 5693)
+++ components/sso/branches/1.0.1-GA-00399567/1.0.1-GA/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java 2011-01-07 02:59:38 UTC (rev 5694)
@@ -79,7 +79,7 @@
Cas20ProxyTicketValidator ticketValidator = new Cas20ProxyTicketValidator(casServerUrl);
ticketValidator.setRenew(this.renewTicket);
- String serviceUrl = "http://"+ httpRequest.getServerName() +":" + httpRequest.getServerPort() +
+ String serviceUrl = httpRequest.getScheme()+"://"+ httpRequest.getServerName() +":" + httpRequest.getServerPort() +
httpRequest.getContextPath() +"/private/classic";
Assertion assertion = ticketValidator.validate(ticket, serviceUrl);
15 years, 3 months
- 1
- 0
gatein SVN: r5693 - components/sso/branches/1.0.1-GA-00399567.
by do-not-reply＠jboss.org
Author: sohil.shah(a)jboss.com
Date: 2011-01-06 16:32:07 -0500 (Thu, 06 Jan 2011)
New Revision: 5693
Added:
components/sso/branches/1.0.1-GA-00399567/1.0.1-GA/
Log:
patch branch
Copied: components/sso/branches/1.0.1-GA-00399567/1.0.1-GA (from rev 5692, components/sso/tags/1.0.1-GA)
15 years, 3 months
- 1
- 0
gatein SVN: r5692 - components/sso/branches.
by do-not-reply＠jboss.org
Author: sohil.shah(a)jboss.com
Date: 2011-01-06 16:30:24 -0500 (Thu, 06 Jan 2011)
New Revision: 5692
Added:
components/sso/branches/1.0.1-GA-00399567/
Log:
patch branch
15 years, 3 months
- 1
- 0
gatein SVN: r5691 - in components/pc/trunk/test: servers/jboss42 and 3 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-01-06 14:15:51 -0500 (Thu, 06 Jan 2011)
New Revision: 5691
Modified:
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/servers/jboss42/pom.xml
components/pc/trunk/test/servers/jboss51/pom.xml
components/pc/trunk/test/servers/jetty6/pom.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
Log:
GTNPC-45 : remove unnecessary dependencies
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2011-01-06 18:52:17 UTC (rev 5690)
+++ components/pc/trunk/test/core/pom.xml 2011-01-06 19:15:51 UTC (rev 5691)
@@ -99,16 +99,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-serialization</artifactId>
<scope>test</scope>
Modified: components/pc/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/pom.xml 2011-01-06 18:52:17 UTC (rev 5690)
+++ components/pc/trunk/test/servers/jboss42/pom.xml 2011-01-06 19:15:51 UTC (rev 5691)
@@ -96,16 +96,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-serialization</artifactId>
<scope>test</scope>
Modified: components/pc/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/pom.xml 2011-01-06 18:52:17 UTC (rev 5690)
+++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-01-06 19:15:51 UTC (rev 5691)
@@ -96,16 +96,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-serialization</artifactId>
<scope>test</scope>
Modified: components/pc/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/pom.xml 2011-01-06 18:52:17 UTC (rev 5690)
+++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-01-06 19:15:51 UTC (rev 5691)
@@ -97,16 +97,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-serialization</artifactId>
<scope>test</scope>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-06 18:52:17 UTC (rev 5690)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-06 19:15:51 UTC (rev 5691)
@@ -97,16 +97,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-serialization</artifactId>
<scope>test</scope>
15 years, 3 months
- 1
- 0
gatein SVN: r5690 - in components/pc/trunk/test/servers: jboss51 and 4 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-01-06 13:52:17 -0500 (Thu, 06 Jan 2011)
New Revision: 5690
Modified:
components/pc/trunk/test/servers/jboss42/pom.xml
components/pc/trunk/test/servers/jboss51/pom.xml
components/pc/trunk/test/servers/jetty6/pom.xml
components/pc/trunk/test/servers/src/common/resources/common.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat7/pom.xml
Log:
GTNPC-45 : remove unecessary dependencies
Modified: components/pc/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/pom.xml 2011-01-06 18:21:20 UTC (rev 5689)
+++ components/pc/trunk/test/servers/jboss42/pom.xml 2011-01-06 18:52:17 UTC (rev 5690)
@@ -386,12 +386,7 @@
<property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
<property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
<property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
<property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/>
<property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
<property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
<property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
Modified: components/pc/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/pom.xml 2011-01-06 18:21:20 UTC (rev 5689)
+++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-01-06 18:52:17 UTC (rev 5690)
@@ -393,12 +393,7 @@
<property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
<property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
<property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
<property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/>
<property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
<property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
<property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
Modified: components/pc/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/pom.xml 2011-01-06 18:21:20 UTC (rev 5689)
+++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-01-06 18:52:17 UTC (rev 5690)
@@ -394,12 +394,7 @@
<property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
<property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
<property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
<property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/>
<property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
<property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
<property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
Modified: components/pc/trunk/test/servers/src/common/resources/common.xml
===================================================================
--- components/pc/trunk/test/servers/src/common/resources/common.xml 2011-01-06 18:21:20 UTC (rev 5689)
+++ components/pc/trunk/test/servers/src/common/resources/common.xml 2011-01-06 18:52:17 UTC (rev 5690)
@@ -43,10 +43,6 @@
</path>
<path id="jboss-microcontainer">
- <pathelement path="${dependency.jboss-kernel.jar}"/>
- <pathelement path="${dependency.jboss-dependency.jar}"/>
- <pathelement path="${dependency.jboss-reflect.jar}"/>
- <pathelement path="${dependency.jboss-mdr.jar}"/>
<pathelement path="${dependency.jbossxb.jar}"/>
</path>
@@ -136,7 +132,6 @@
<path refid="portal-portlet"/>
<path refid="jboss-unit"/>
<path refid="jboss-microcontainer"/>
- <pathelement path="${dependency.javassist.jar}"/>
<pathelement path="${dependency.xercesImpl.jar}"/>
<pathelement path="${dependency.resolver.jar}"/>
<pathelement path="${dependency.xml-apis.jar}"/>
@@ -165,7 +160,6 @@
<path refid="portal-portlet"/>
<path refid="jboss-unit"/>
<path refid="jboss-microcontainer"/>
- <pathelement path="${dependency.javassist.jar}"/>
<pathelement path="${dependency.xercesImpl.jar}"/>
<pathelement path="${dependency.resolver.jar}"/>
<pathelement path="${dependency.xml-apis.jar}"/>
@@ -194,7 +188,6 @@
<path refid="portal-portlet"/>
<path refid="jboss-unit"/>
<path refid="jboss-microcontainer"/>
- <pathelement path="${dependency.javassist.jar}"/>
<pathelement path="${dependency.xercesImpl.jar}"/>
<pathelement path="${dependency.resolver.jar}"/>
<pathelement path="${dependency.xml-apis.jar}"/>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-06 18:21:20 UTC (rev 5689)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-06 18:52:17 UTC (rev 5690)
@@ -388,12 +388,7 @@
<property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
<property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
<property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
<property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/>
<property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
<property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
<property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-01-06 18:21:20 UTC (rev 5689)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-01-06 18:52:17 UTC (rev 5690)
@@ -107,17 +107,8 @@
<artifactId>concurrent</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-serialization</artifactId>
<scope>test</scope>
@@ -399,12 +390,7 @@
<property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
<property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
<property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
<property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/>
<property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
<property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
<property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
15 years, 3 months
- 1
- 0
gatein SVN: r5689 - components/wsrp/trunk/wsrp-producer-war.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-01-06 13:21:20 -0500 (Thu, 06 Jan 2011)
New Revision: 5689
Modified:
components/wsrp/trunk/wsrp-producer-war/pom.xml
Log:
- Added timeout configuration to cargo.
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-01-06 17:09:15 UTC (rev 5688)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-01-06 18:21:20 UTC (rev 5689)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2010, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2011, 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.
@@ -461,6 +461,7 @@
<jboss.deploy.url.prefix>http://localhost:8080/jmx-console/HtmlAdaptor?action=invokeOpByName&n...</jboss.deploy.url.prefix>
<jboss.undeploy.url.prefix>http://localhost:8080//jmx-console/HtmlAdaptor?action=invokeOpByName&...</jboss.undeploy.url.prefix>
</systemProperties>
+ <timeout>180000</timeout>
</container>
<wait>false</wait>
<configuration>
15 years, 3 months
- 1
- 0
gatein SVN: r5688 - in components/pc/trunk/test: servers/jboss42 and 5 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-01-06 12:09:15 -0500 (Thu, 06 Jan 2011)
New Revision: 5688
Modified:
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/servers/jboss42/pom.xml
components/pc/trunk/test/servers/jboss51/pom.xml
components/pc/trunk/test/servers/jetty6/pom.xml
components/pc/trunk/test/servers/src/common/resources/common.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat7/pom.xml
Log:
GTNPC-45 : emove JBoss MC usage from pc test suite execution
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2011-01-06 16:49:21 UTC (rev 5687)
+++ components/pc/trunk/test/core/pom.xml 2011-01-06 17:09:15 UTC (rev 5688)
@@ -71,10 +71,6 @@
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-mc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-tooling-ant</artifactId>
</dependency>
<dependency>
Modified: components/pc/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/pom.xml 2011-01-06 16:49:21 UTC (rev 5687)
+++ components/pc/trunk/test/servers/jboss42/pom.xml 2011-01-06 17:09:15 UTC (rev 5688)
@@ -69,10 +69,6 @@
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-mc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-tooling-ant</artifactId>
</dependency>
<dependency>
@@ -380,7 +376,6 @@
<property name="dependency.portal-portlet-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}"/>
- <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
<property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
<property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
<property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
Modified: components/pc/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/pom.xml 2011-01-06 16:49:21 UTC (rev 5687)
+++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-01-06 17:09:15 UTC (rev 5688)
@@ -69,10 +69,6 @@
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-mc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-tooling-ant</artifactId>
</dependency>
<dependency>
@@ -387,7 +383,6 @@
<property name="dependency.portal-portlet-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}"/>
- <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
<property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
<property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
<property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
Modified: components/pc/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/pom.xml 2011-01-06 16:49:21 UTC (rev 5687)
+++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-01-06 17:09:15 UTC (rev 5688)
@@ -70,10 +70,6 @@
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-mc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-tooling-ant</artifactId>
</dependency>
<dependency>
@@ -388,7 +384,6 @@
<property name="dependency.portal-portlet-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}"/>
- <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
<property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
<property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
<property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
Modified: components/pc/trunk/test/servers/src/common/resources/common.xml
===================================================================
--- components/pc/trunk/test/servers/src/common/resources/common.xml 2011-01-06 16:49:21 UTC (rev 5687)
+++ components/pc/trunk/test/servers/src/common/resources/common.xml 2011-01-06 17:09:15 UTC (rev 5688)
@@ -85,7 +85,6 @@
<path id="jboss-unit-shared">
<pathelement path="${dependency.jboss-unit.jar}"/>
- <pathelement path="${dependency.jboss-unit-mc.jar}"/>
<pathelement path="${dependency.jboss-unit-remote.jar}"/>
<pathelement path="${dependency.portal-test-generic.jar}"/>
<pathelement path="${dependency.portal-test.jar}"/>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-06 16:49:21 UTC (rev 5687)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-06 17:09:15 UTC (rev 5688)
@@ -70,10 +70,6 @@
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-mc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-tooling-ant</artifactId>
</dependency>
<dependency>
@@ -382,7 +378,6 @@
<property name="dependency.portal-portlet-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}"/>
- <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
<property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
<property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
<property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-01-06 16:49:21 UTC (rev 5687)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-01-06 17:09:15 UTC (rev 5688)
@@ -66,11 +66,6 @@
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-mc</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-tooling-ant</artifactId>
<scope>test</scope>
</dependency>
@@ -394,7 +389,6 @@
<property name="dependency.portal-portlet-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}"/>
- <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
<property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
<property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
<property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
15 years, 3 months
- 1
- 0
gatein SVN: r5687 - in components/pc/trunk: test/core/src/main/java/org/gatein/pc/test and 13 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-01-06 11:49:21 -0500 (Thu, 06 Jan 2011)
New Revision: 5687
Added:
components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/bootstrap/
components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/bootstrap/ServletContextBootstrap.java
Removed:
components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
Modified:
components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java
components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java
components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-tck-war/WEB-INF/web.xml
components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-test-war/WEB-INF/web.xml
components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/web.xml
components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/web.xml
components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-tck-war/WEB-INF/web.xml
components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-test-war/WEB-INF/web.xml
components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-tck-war/WEB-INF/web.xml
components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-test-war/WEB-INF/web.xml
components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-tck-war/WEB-INF/web.xml
components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-test-war/WEB-INF/web.xml
Log:
GTNPC-45 : Remove JBoss MC usage from pc test suite execution
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 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -47,7 +47,7 @@
<url-pattern>*.jsp</url-pattern>
</filter-mapping>
<listener>
- <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
Added: components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/bootstrap/ServletContextBootstrap.java
===================================================================
--- components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/bootstrap/ServletContextBootstrap.java (rev 0)
+++ components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/bootstrap/ServletContextBootstrap.java 2011-01-06 16:49:21 UTC (rev 5687)
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * 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.bootstrap;
+
+import org.gatein.pc.portlet.PortletInvokerInterceptor;
+import org.gatein.pc.portlet.aspects.CCPPInterceptor;
+import org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor;
+import org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor;
+import org.gatein.pc.portlet.aspects.EventPayloadInterceptor;
+import org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor;
+import org.gatein.pc.portlet.aspects.ProducerCacheInterceptor;
+import org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor;
+import org.gatein.pc.portlet.aspects.SecureTransportInterceptor;
+import org.gatein.pc.portlet.aspects.ValveInterceptor;
+import org.gatein.pc.portlet.container.ContainerPortletDispatcher;
+import org.gatein.pc.portlet.container.ContainerPortletInvoker;
+import org.gatein.pc.portlet.impl.state.StateConverterV0;
+import org.gatein.pc.portlet.impl.state.StateManagementPolicyService;
+import org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService;
+import org.gatein.pc.portlet.state.producer.ProducerPortletInvoker;
+import org.gatein.pc.test.TestPortletApplicationDeployer;
+import org.gatein.wci.ServletContainer;
+import org.gatein.wci.ServletContainerFactory;
+import org.gatein.wci.impl.DefaultServletContainerFactory;
+import org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter;
+import org.jboss.unit.remote.driver.RemoteTestDriverServer;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class ServletContextBootstrap implements ServletContextListener
+{
+
+ /** . */
+ private TestPortletApplicationDeployer portletApplicationDeployer;
+
+ /** . */
+ private GenericServiceExporter testDriverServerExporter;
+
+ /** . */
+ private PortletInvokerInterceptor consumerPortletInvoker;
+
+ public void contextInitialized(ServletContextEvent sce)
+ {
+ try
+ {
+ boostrap();
+
+ //
+ sce.getServletContext().setAttribute("ConsumerPortletInvoker", consumerPortletInvoker);
+ }
+ catch (Exception e)
+ {
+ System.err.println("Could not boostrap test server");
+ e.printStackTrace(System.err);
+ throw new RuntimeException(e);
+ }
+ }
+
+ public void boostrap() throws Exception
+ {
+
+ // **************
+ // * WIRE PHASE *
+ // **************
+
+ // The producer persistence manager
+ PortletStatePersistenceManagerService producerPersistenceManager = new PortletStatePersistenceManagerService();
+
+ // The producer state management policy
+ StateManagementPolicyService producerStateManagementPolicy = new StateManagementPolicyService();
+ producerStateManagementPolicy.setPersistLocally(true);
+
+ // The producer state converter
+ StateConverterV0 producerStateConverter = new StateConverterV0();
+
+ // The servlet container factory
+ ServletContainerFactory servletContainerFactory = DefaultServletContainerFactory.getInstance();
+
+ // 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.setServletContainerFactory(servletContainerFactory);
+ contextDispatcherInterceptor.setNext(producerCacheInterceptor);
+ SecureTransportInterceptor secureTransportInterceptor = new SecureTransportInterceptor();
+ secureTransportInterceptor.setNext(contextDispatcherInterceptor);
+ ValveInterceptor valveInterceptor = new ValveInterceptor();
+ valveInterceptor.setNext(secureTransportInterceptor);
+
+ // The portlet container invoker
+ ContainerPortletInvoker containerPortletInvoker = new ContainerPortletInvoker();
+ containerPortletInvoker.setNext(valveInterceptor);
+
+ // The producer portlet invoker
+ ProducerPortletInvoker producerPortletInvoker = new ProducerPortletInvoker();
+ producerPortletInvoker.setNext(containerPortletInvoker);
+ producerPortletInvoker.setPersistenceManager(producerPersistenceManager);
+ producerPortletInvoker.setStateManagementPolicy(producerStateManagementPolicy);
+ producerPortletInvoker.setStateConverter(producerStateConverter);
+
+ // 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);
+
+ // The servlet container obtained from the servlet container factory
+ ServletContainer servletContainer = servletContainerFactory.getServletContainer();
+
+ // Remote test driver server
+ RemoteTestDriverServer testDriverServer = new RemoteTestDriverServer();
+
+ // Generic service exporter
+ GenericServiceExporter testDriverServerExporter = new GenericServiceExporter(
+ "socket://localhost:5400",
+ testDriverServer,
+ "org.jboss.unit.remote.driver.RemoteTestDriver");
+
+ //
+ TestPortletApplicationDeployer portletApplicationDeployer = new TestPortletApplicationDeployer();
+ portletApplicationDeployer.setServletContainerFactory(servletContainerFactory);
+ portletApplicationDeployer.setDriver(testDriverServer);
+ portletApplicationDeployer.setContainerPortletInvoker(containerPortletInvoker);
+
+ // Instantiated
+ valveInterceptor.setPortletApplicationRegistry(portletApplicationDeployer);
+
+ //
+ this.consumerPortletInvoker = consumerPortletInvoker;
+
+ // ***************
+ // * START PHASE *
+ // ***************
+
+ //
+ portletApplicationDeployer.start();
+ this.portletApplicationDeployer = portletApplicationDeployer;
+
+ //
+ testDriverServerExporter.start();
+ this.testDriverServerExporter = testDriverServerExporter;
+ }
+
+ public void contextDestroyed(ServletContextEvent sce)
+ {
+ sce.getServletContext().setAttribute("ConsumerPortletInvoker", null);
+
+ //
+ if (testDriverServerExporter != null)
+ {
+ testDriverServerExporter.stop();
+ }
+
+ //
+ if (portletApplicationDeployer != null)
+ {
+ portletApplicationDeployer.stop();
+ }
+ }
+}
Modified: components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java
===================================================================
--- components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java 2011-01-06 16:49:21 UTC (rev 5687)
@@ -38,7 +38,6 @@
import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
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;
@@ -71,7 +70,7 @@
super(req, resp);
//
- this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker");
+ this.portletInvoker = (PortletInvoker)servletContext.getAttribute("ConsumerPortletInvoker");
this.eventControllerContext = new EventControllerContextImpl(portletInvoker);
this.stateControllerContext = new StateControllerContextImpl(this);
this.serialization = new PortletPageNavigationalStateSerialization(stateControllerContext);
Modified: components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java
===================================================================
--- components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/core/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java 2011-01-06 16:49:21 UTC (rev 5687)
@@ -36,7 +36,6 @@
import org.gatein.pc.api.invocation.PortletInvocation;
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;
@@ -71,7 +70,7 @@
super(req, resp);
//
- this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker");
+ this.portletInvoker = (PortletInvoker)servletContext.getAttribute("ConsumerPortletInvoker");
this.stateControllerContext = new TCKStateControllerContext(new StateControllerContextImpl(this));
this.eventControllerContext = new EventControllerContextImpl(portletInvoker);
this.serialization = new TCKPageNavigationalStateSerialization(stateControllerContext);
Deleted: components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <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="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.gatein.wci.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor">
- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
- </bean>
- <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.gatein.pc.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.gatein.pc.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Modified: components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
- <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
Deleted: components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <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="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.gatein.wci.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor">
- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
- </bean>
- <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.gatein.pc.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.gatein.pc.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Modified: components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-test-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/jboss42/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
- <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
Deleted: components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <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="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.gatein.wci.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor">
- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
- </bean>
- <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.gatein.pc.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.gatein.pc.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Modified: components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
- <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
Deleted: components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <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="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.gatein.wci.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor">
- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
- </bean>
- <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.gatein.pc.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.gatein.pc.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Modified: components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/jboss51/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
- <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
Deleted: components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <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="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.gatein.wci.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor">
- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
- </bean>
- <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.gatein.pc.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.gatein.pc.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Modified: components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
- <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>PortalServlet</servlet-name>
Deleted: components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <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="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.gatein.wci.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor">
- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
- </bean>
- <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.gatein.pc.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.gatein.pc.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Modified: components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-test-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/jetty6/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
- <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>PortalServlet</servlet-name>
Deleted: components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <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="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.gatein.wci.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor">
- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
- </bean>
- <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.gatein.pc.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.gatein.pc.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Modified: components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
- <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
Deleted: components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <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="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.gatein.wci.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor">
- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
- </bean>
- <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.gatein.pc.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.gatein.pc.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Modified: components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-test-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/tomcat6/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
- <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
Deleted: components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <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="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.gatein.wci.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor">
- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
- </bean>
- <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.gatein.pc.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.gatein.pc.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Modified: components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
- <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
Deleted: components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <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="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.gatein.wci.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.gatein.pc.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.gatein.pc.portlet.PortletInvokerInterceptor">
- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
- </bean>
- <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.portlet.aspects.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.gatein.pc.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.gatein.pc.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.gatein.pc.portlet.aspects.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.gatein.pc.portlet.aspects.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.portlet.aspects.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.gatein.pc.portlet.aspects.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.gatein.pc.portlet.aspects.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.portlet.aspects.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.gatein.pc.portlet.aspects.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.gatein.pc.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Modified: components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-test-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 15:09:04 UTC (rev 5686)
+++ components/pc/trunk/test/servers/tomcat7/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-06 16:49:21 UTC (rev 5687)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
- <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
15 years, 3 months
- 1
- 0
gatein SVN: r5686 - in components/pc/trunk/test: servers and 4 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-01-06 10:09:04 -0500 (Thu, 06 Jan 2011)
New Revision: 5686
Modified:
components/pc/trunk/test/core/
components/pc/trunk/test/servers/
components/pc/trunk/test/servers/jboss42/
components/pc/trunk/test/servers/jboss51/
components/pc/trunk/test/servers/tomcat6/
components/pc/trunk/test/servers/tomcat7/
Log:
svn ignore on build files
Property changes on: components/pc/trunk/test/core
___________________________________________________________________
Name: svn:ignore
+ *.iml
target
Property changes on: components/pc/trunk/test/servers
___________________________________________________________________
Name: svn:ignore
+ *.iml
target
Property changes on: components/pc/trunk/test/servers/jboss42
___________________________________________________________________
Name: svn:ignore
+ *.iml
target
Property changes on: components/pc/trunk/test/servers/jboss51
___________________________________________________________________
Name: svn:ignore
+ *.iml
target
Property changes on: components/pc/trunk/test/servers/tomcat6
___________________________________________________________________
Name: svn:ignore
+ *.iml
target
Property changes on: components/pc/trunk/test/servers/tomcat7
___________________________________________________________________
Name: svn:ignore
+ *.iml
target
15 years, 3 months
- 1
- 0