Author: alain_defrance Date: 2010-12-06 11:32:38 -0500 (Mon, 06 Dec 2010) New Revision: 5493 Added: components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat70.xml components/pc/branches/adf/test/servers/ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/META-INF/ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/META-INF/context.xml components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/WEB-INF/ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/WEB-INF/web.xml components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/META-INF/ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/META-INF/context.xml components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/log4j.properties components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/logging.properties components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/web.xml Modified: components/pc/branches/adf/distrib/distrib.xml components/pc/branches/adf/pom.xml components/pc/branches/adf/portal/pom.xml components/pc/branches/adf/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml components/pc/branches/adf/test/pom.xml components/pc/branches/adf/test/src/test/build.xml components/pc/branches/adf/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/jetty-web.xml components/pc/branches/adf/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/jetty-web.xml components/pc/branches/adf/test/src/test/resources/test/servers.xml Log: Jetty integration test run Tomcat7 preparation Modified: components/pc/branches/adf/distrib/distrib.xml =================================================================== --- components/pc/branches/adf/distrib/distrib.xml 2010-12-06 14:05:01 UTC (rev 5492) +++ components/pc/branches/adf/distrib/distrib.xml 2010-12-06 16:32:38 UTC (rev 5493) @@ -13,12 +13,14 @@ <property name="demo.release.name.jboss42" value="${demo.release.name}-jbossas42"/> <property name="demo.release.name.jboss51" value="${demo.release.name}-jbossas51"/> <property name="demo.release.name.tomcat60" value="${demo.release.name}-tomcat6"/> + <property name="demo.release.name.tomcat70" value="${demo.release.name}-tomcat7"/> <!-- --> <property name="pc.build.src" value="output/${pc.release.name.src}"/> <property name="pc.build.bin.as42" value="output/${demo.release.name.jboss42}"/> <property name="pc.build.bin.as51" value="output/${demo.release.name.jboss51}"/> <property name="pc.build.bin.tomcat6" value="output/${demo.release.name.tomcat60}"/> + <property name="pc.build.bin.tomcat7" value="output/${demo.release.name.tomcat70}"/> <!-- Clean --> <target name="clean"> @@ -50,6 +52,7 @@ <antcall target="package-jboss42"/> <antcall target="package-jboss51"/> <antcall target="package-tomcat60"/> + <antcall target="package-tomcat70"/> </target> <!-- @@ -183,6 +186,42 @@ </target> <!-- + | JBoss Portlet Container binary distribution for Tomcat 7.x + --> + <target name="package-tomcat70" description="package Tomcat binary" if="TOMCAT_7_0_PATH" unless="no-tomcat"> + + <!-- --> + <unzip src="${TOMCAT_7_0_PATH}" dest="${pc.build.bin.tomcat7}"> + <mapper type="regexp" from="^[^\/]*\/(.*)$$" to="\1"/> + </unzip> + <chmod dir="${pc.build.bin.tomcat6}/bin" perm="ugo+rx" includes="**/*.sh"/> + + <!-- --> + <antcall target="__package-binary"> + <param name="bin.dir" value="${pc.build.bin.tomcat7}"/> + <param name="deploy.dir" value="${pc.build.bin.tomcat7}/webapps"/> + <param name="samples.dir" value="${pc.build.bin.tomcat7}/webapps"/> + </antcall> + + <!-- --> + <copy todir="${pc.build.bin.tomcat7}/lib"> + <fileset + dir="${source.dir}/portal/target/simple-portal-tomcat60/simple-portal/lib" + includes="**/*.jar"/> + </copy> + <jar file="${pc.build.bin.tomcat7}/webapps/simple-portal.war"> + <fileset + dir="${source.dir}/portal/target/simple-portal-tomcat70/simple-portal/simple-portal.war" + includes="**"/> + </jar> + + <!-- --> + <antcall target="__zip"> + <param name="release.name" value="${demo.release.name.tomcat70}"/> + </antcall> + </target> + + <!-- | Internal tasks --> Modified: components/pc/branches/adf/pom.xml =================================================================== --- components/pc/branches/adf/pom.xml 2010-12-06 14:05:01 UTC (rev 5492) +++ components/pc/branches/adf/pom.xml 2010-12-06 16:32:38 UTC (rev 5493) @@ -53,7 +53,8 @@ <!-- used in test module by maven-antrun-extended-plugin --> <version.jboss.unit>1.2.3</version.jboss.unit> - <version.cargo>1.0.2</version.cargo> + <version.cargo>1.0.3</version.cargo> + <version.cargo.jetty.deployer>1.0.1</version.cargo.jetty.deployer> <preparationGoals>clean install</preparationGoals> </properties> @@ -133,6 +134,16 @@ <artifactId>wci-tomcat6</artifactId> <version>${version.gatein.wci}</version> </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat7</artifactId> + <version>${version.gatein.wci}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-jetty</artifactId> + <version>${version.gatein.wci}</version> + </dependency> <dependency> <groupId>apache-taglibs</groupId> @@ -145,6 +156,13 @@ <version>${version.apache.taglibs}</version> </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-jetty-deployer</artifactId> + <type>war</type> + <version>${version.cargo.jetty.deployer}</version> + </dependency> + </dependencies> </dependencyManagement> Modified: components/pc/branches/adf/portal/pom.xml =================================================================== --- components/pc/branches/adf/portal/pom.xml 2010-12-06 14:05:01 UTC (rev 5492) +++ components/pc/branches/adf/portal/pom.xml 2010-12-06 16:32:38 UTC (rev 5493) @@ -32,6 +32,16 @@ </dependency> <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat7</artifactId> + </dependency> + + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-jetty</artifactId> + </dependency> + + <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> </dependency> @@ -118,6 +128,7 @@ <descriptors> <descriptor>src/assemble/simple-portal-jboss42.xml</descriptor> <descriptor>src/assemble/simple-portal-tomcat60.xml</descriptor> + <descriptor>src/assemble/simple-portal-tomcat70.xml</descriptor> <descriptor>src/assemble/simple-portal-jboss51.xml</descriptor> </descriptors> </configuration> Added: components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat70.xml =================================================================== --- components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat70.xml (rev 0) +++ components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat70.xml 2010-12-06 16:32:38 UTC (rev 5493) @@ -0,0 +1,66 @@ +<assembly> + <id>tomcat70</id> + <formats> + <format>dir</format> + </formats> + <baseDirectory>simple-portal</baseDirectory> + + <componentDescriptors> + <componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor> + </componentDescriptors> + + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <includes> + + <include>org.gatein.common:common-common</include> + <include>org.gatein.common:common-logging</include> + <include>org.gatein.wci:wci-wci</include> + <include>org.gatein.wci:wci-tomcat7</include> + <include>org.gatein.pc:pc-portlet</include> + <include>org.gatein.pc:pc-api</include> + + <include>org.slf4j:slf4j-api</include> + <include>org.slf4j:slf4j-log4j12</include> + + <include>apache-log4j:log4j</include> + <include>javax.ccpp:ccpp</include> + <include>javax.activation:activation</include> + <include>javax.portlet:portlet-api</include> + <include>sun-jaxb:jaxb-api</include> + + <include>apache-xerces:xercesImpl</include> + <include>apache-xerces:resolver</include> + <include>apache-xerces:xml-apis</include> + + <include>apache-taglibs:jstl</include> + <include>apache-taglibs:standard</include> + + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory> + <includes> + + <include>org.gatein.common:common-mc</include> + <include>org.gatein.pc:pc-controller</include> + <include>org.gatein.pc:pc-mc</include> + + <include>jboss:jboss-common-logging-spi</include> + <include>jboss:jboss-common-logging-log4j</include> + <include>jboss:jboss-common-logging-jdk</include> + <include>org.jboss:jboss-common-core</include> + <include>org.jboss.microcontainer:jboss-kernel</include> + <include>org.jboss.microcontainer:jboss-dependency</include> + <include>org.jboss:jboss-reflect</include> + <include>org.jboss:jboss-mdr</include> + <include>org.jboss:jbossxb</include> + + <include>concurrent:concurrent</include> + + </includes> + </dependencySet> + </dependencySets> + +</assembly> Modified: components/pc/branches/adf/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml =================================================================== --- components/pc/branches/adf/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2010-12-06 14:05:01 UTC (rev 5492) +++ components/pc/branches/adf/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2010-12-06 16:32:38 UTC (rev 5493) @@ -51,7 +51,7 @@ </listener> <servlet> <servlet-name>ContainerServlet</servlet-name> - <servlet-class>org.gatein.wci.tomcat.TC6ContainerServlet</servlet-class> + <servlet-class>org.gatein.wci.tomcat.TC7ContainerServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> </web-app> Modified: components/pc/branches/adf/test/pom.xml =================================================================== --- components/pc/branches/adf/test/pom.xml 2010-12-06 14:05:01 UTC (rev 5492) +++ components/pc/branches/adf/test/pom.xml 2010-12-06 16:32:38 UTC (rev 5493) @@ -30,6 +30,14 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-tomcat6</artifactId> </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat7</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-jetty</artifactId> + </dependency> <dependency> <groupId>org.gatein.pc</groupId> @@ -376,6 +384,8 @@ <property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" /> <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}" /> + <property name="dependency.portal-wci-tomcat7.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat7.jar.path}" /> + <property name="dependency.portal-wci-jetty.jar" value="${maven.dependency.org.gatein.wci.wci-jetty.jar.path}" /> <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}" /> <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}" /> Modified: components/pc/branches/adf/test/src/test/build.xml =================================================================== --- components/pc/branches/adf/test/src/test/build.xml 2010-12-06 14:05:01 UTC (rev 5492) +++ components/pc/branches/adf/test/src/test/build.xml 2010-12-06 16:32:38 UTC (rev 5493) @@ -27,7 +27,7 @@ <antcall target="__evaluate_properties.all"/> <antcall target="tests.jboss"/> <antcall target="tests.tomcat"/> - <!--<antcall target="tests.jetty"/>--> + <antcall target="tests.jetty"/> </target> <target name="tests.call.single" if="tests"> @@ -168,6 +168,35 @@ <path location="${dependency.portal-wci-tomcat.jar}"/> </path> + <path id="tomcat-7.0"> + <path refid="portal-common"/> + <path refid="portal-web"/> + <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}"/> + <pathelement path="${dependency.trove.jar}"/> + </path> + + <path id="tomcat-7.0-shared"> + <path refid="portal-common-shared"/> + <path refid="portal-web-shared"/> + <path refid="portal-portlet-shared"/> + <path refid="jboss-unit-shared"/> + <path refid="jboss-logging"/> + <path location="${dependency.jboss-common-core.jar}"/> + <path location="${dependency.log4j.jar}"/> + <path location="${dependency.concurrent.jar}"/> + <path location="${dependency.activation.jar}"/> + <path location="${dependency.jaxb.jar}"/> + <path location="${dependency.ccpp.jar}"/> + <path location="${dependency.jboss-serialization.jar}"/> + <path location="${dependency.portal-wci-tomcat7.jar}"/> + </path> + <path id="jetty-6.1"> <path refid="portal-common"/> <path refid="portal-web"/> @@ -193,6 +222,8 @@ <path location="${dependency.activation.jar}"/> <path location="${dependency.jaxb.jar}"/> <path location="${dependency.ccpp.jar}"/> + <path location="${dependency.jboss-serialization.jar}"/> + <path location="${dependency.portal-wci-jetty.jar}"/> </path> </target> @@ -251,6 +282,14 @@ </not> </and> </condition> + <condition property="TOMCAT_7_0_HOME" value="${env.TOMCAT_7_0_HOME}"> + <and> + <isset property="env.TOMCAT_7_0_HOME"/> + <not> + <isset property="TOMCAT_7_0_HOME"/> + </not> + </and> + </condition> <condition property="JETTY_6_1_HOME" value="${env.JETTY_6_1_HOME}"> <and> <isset property="env.JETTY_6_1_HOME"/> @@ -266,6 +305,7 @@ <echo message="JBOSS_4_2_3_HOME: ${JBOSS_4_2_3_HOME}"/> <echo message="JBOSS_5_1_0_HOME: ${JBOSS_5_1_0_HOME}"/> <echo message="TOMCAT_6_0_HOME: ${TOMCAT_6_0_HOME}"/> + <echo message="TOMCAT_7_0_HOME: ${TOMCAT_7_0_HOME}"/> <echo message="JETTY_6_1_HOME: ${JETTY_6_1_HOME}"/> </target> @@ -329,7 +369,7 @@ <target name="__evaluate_properties.all"> <antcall target="__evaluate_properties.jboss"/> - <!-- <antcall target="__evaluate_properties.jetty"/> --> + <antcall target="__evaluate_properties.jetty"/> <antcall target="__evaluate_properties.tomcat"/> </target> @@ -554,6 +594,21 @@ <jar jarfile="${test.temp.lib}/tomcat-6.0/portlet-test.war"> <fileset dir="${test.temp.dir}/tomcat-6.0/portlet-test-war"/> </jar> + + <!-- Tomcat 7.0 portlet-test.war --> + <copy todir="${test.temp.dir}/tomcat-7.0/portlet-test-war"> + <fileset dir="${target}/test-classes/portlet-test-war"/> + <fileset dir="${target}/test-classes/tomcat-7.0/portlet-test-war"/> + </copy> + <copy todir="${test.temp.dir}/tomcat-7.0/portlet-test-war/WEB-INF/lib" flatten="true"> + <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/> + <path refid="tomcat-7.0"/> + </copy> + <mkdir dir="${test.temp.lib}/tomcat-7.0"/> + <jar jarfile="${test.temp.lib}/tomcat-7.0/portlet-test.war"> + <fileset dir="${test.temp.dir}/tomcat-7.0/portlet-test-war"/> + </jar> + <!-- Jetty 6.1 portlet-test.war --> <copy todir="${test.temp.dir}/jetty-6.1/portlet-test-war"> <fileset dir="${target}/test-classes/portlet-test-war"/> @@ -867,8 +922,71 @@ </antcall> </target> + <target name="__cargo.tomcat-7.start" depends="__cargo.setup"> + + <taskdef resource="cargo.tasks"> + <classpath> + <pathelement path="${plugin_classpath}"/> + </classpath> + </taskdef> + + <cargo + containerId="tomcat7x" + home="${test.tomcat-7.home}" + output="${cargo.log.dir}/cargo.${test.id}.server.log" + log="${cargo.log.dir}/cargo.${test.id}.start.log" + action="start" + wait="${cargo.wait}"> + <sharedClasspath> + + <path refid="tomcat-7.0-shared"/> + + </sharedClasspath> + <configuration> + <property name="cargo.servlet.port" value="8080"/> + <property name="cargo.logging" value="high"/> + <!--<property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9000"/> --> + <property name="cargo.jvmargs" value="-Duser.language=en"/> + <!--<deployable type="war" file="${test.temp.lib}/manager.war"/>--> + <!--<file file="${test.temp.lib}/manager" todir="webapps/manager"/>--> + <deployable type="war" file="${test.temp.lib}/tomcat-7.0/portlet-test.war"/> + </configuration> + </cargo> + </target> + + <target name="__cargo.tomcat-7.stop" depends="__cargo.setup"> + <cargo + containerId="tomcat7x" + home="${test.tomcat-7.home}" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" + action="stop"> + <configuration/> + </cargo> + </target> + + <target name="__tests.tomcat-7.container-servlet" if="${test.tomcat-7.home.variable-name}"> + <echo message="Starting Tomcat 7 container-servlet tests with ${test.tomcat-7.home}"/> + <antcall target="__cargo.tomcat-7.start"> + <param name="cargo.wait" value="false"/> + </antcall> + <antcall target="__tests.remote"> + <param name="test.server.name" value="RemoteTomcat_7_0"/> + </antcall> + <antcall target="__cargo.tomcat-7.stop"/> + </target> + + <target name="tests.tomcat-7"> + <antcall target="__tests.tomcat-7.container-servlet"> + <param name="test.id" value="Tomcat-7_0-container-servlet"/> + <param name="test.tomcat-7.name" value="RemoteTomcat_7_0"/> + <param name="test.tomcat-7.home" value="${TOMCAT_7_0_HOME}"/> + <param name="test.tomcat-7.home.variable-name" value="TOMCAT_7_0_HOME"/> + </antcall> + </target> + <target name="tests.tomcat"> - <antcall target="tests.tomcat-6"/> + <!--<antcall target="tests.tomcat-6"/>--> + <antcall target="tests.tomcat-7"/> </target> <target name="__cargo.jetty-6.start" depends="__cargo.setup"> @@ -892,7 +1010,8 @@ <configuration> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> - <property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787"/> + <!--<property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787"/>--> + <property name="cargo.jvmargs" value="-Duser.language=en"/> <configfile file="${basedir}/src/test/resources/config/jetty/jetty.xml" todir="etc"/> <configfile file="${basedir}/src/test/resources/config/jetty/realm.properties" todir="etc"/> <deployable type="war" file="${dependency.cargo.jetty-deployer}"> @@ -971,12 +1090,14 @@ <property name="tck-jboss" value="${tck}/jboss42"/> <property name="tck-jboss5" value="${tck}/jboss50"/> <property name="tck-tomcat" value="${tck}/tomcat6"/> + <property name="tck-tomcat7" value="${tck}/tomcat7"/> <property name="tck-jetty" value="${tck}/jetty6"/> <mkdir dir="${tck}"/> <mkdir dir="${tck-jboss}"/> <mkdir dir="${tck-jboss5}"/> <mkdir dir="${tck-tomcat}"/> + <mkdir dir="${tck-tomcat7}"/> <mkdir dir="${tck-jetty}"/> <jar jarfile="${target}/portlet-test-lib.jar"> @@ -1054,6 +1175,30 @@ <path refid="tomcat-6.0-shared"/> </copy> + <!--TOMCAT 7--> + + <copy todir="${tck-tomcat7}/portlet-tck-war"> + <fileset dir="${target}/test-classes/portlet-tck-war"/> + </copy> + <copy todir="${tck-tomcat7}/portlet-tck-war"> + <fileset dir="${target}/test-classes/tomcat-7.0/portlet-tck-war"/> + </copy> + + <copy todir="${tck-tomcat7}/portlet-tck-war/WEB-INF/lib" flatten="true"> + <fileset dir="${target}" includes="portlet-test-lib.jar"/> + <path refid="tomcat-7.0"/> + </copy> + + <mkdir dir="${tck-tomcat7}/tck-portal"/> + + <jar jarfile="${tck-tomcat7}/tck-portal/portlet-tck.war"> + <fileset dir="${tck-tomcat7}/portlet-tck-war"/> + </jar> + + <copy todir="${tck-tomcat7}/tck-portal" flatten="true"> + <path refid="tomcat-7.0-shared"/> + </copy> + <!--JETTY--> <copy todir="${tck-jetty}/portlet-tck-war"> <fileset dir="${target}/test-classes/portlet-tck-war"/> Modified: components/pc/branches/adf/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/jetty-web.xml =================================================================== --- components/pc/branches/adf/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/jetty-web.xml 2010-12-06 14:05:01 UTC (rev 5492) +++ components/pc/branches/adf/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/jetty-web.xml 2010-12-06 16:32:38 UTC (rev 5493) @@ -4,7 +4,7 @@ <Get id="serverObject" name="server"/> - <New id="jettySetup" class="org.gatein.wci.impl.jetty.Jetty6Handler"> + <New id="jettySetup" class="org.gatein.wci.jetty.Jetty6Handler"> <Arg><Ref id="serverObject"/></Arg> </New> Modified: components/pc/branches/adf/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/jetty-web.xml =================================================================== --- components/pc/branches/adf/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/jetty-web.xml 2010-12-06 14:05:01 UTC (rev 5492) +++ components/pc/branches/adf/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/jetty-web.xml 2010-12-06 16:32:38 UTC (rev 5493) @@ -4,7 +4,7 @@ <Get id="serverObject" name="server"/> - <New id="jettySetup" class="org.gatein.wci.impl.jetty.Jetty6Handler"> + <New id="jettySetup" class="org.gatein.wci.jetty.Jetty6Handler"> <Arg><Ref id="serverObject"/></Arg> </New> Modified: components/pc/branches/adf/test/src/test/resources/test/servers.xml =================================================================== --- components/pc/branches/adf/test/src/test/resources/test/servers.xml 2010-12-06 14:05:01 UTC (rev 5492) +++ components/pc/branches/adf/test/src/test/resources/test/servers.xml 2010-12-06 16:32:38 UTC (rev 5493) @@ -22,6 +22,28 @@ </node> </server> <server> + <server-name>RemoteTomcat_7_0</server-name> + <node> + <node-id>default</node-id> + <service> + <service-name>TestDriverServer</service-name> + <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface> + <uri>socket://localhost:5400</uri> + </service> + <deployer> + <remote> + <name>tomcat7x</name> + <host>localhost</host> + <port>8080</port> + </remote> + <authentication> + <username>admin</username> + <password>admin</password> + </authentication> + </deployer> + </node> + </server> + <server> <server-name>RemoteJetty_6_1</server-name> <node> <node-id>default</node-id> Added: components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/META-INF/context.xml =================================================================== --- components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/META-INF/context.xml (rev 0) +++ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/META-INF/context.xml 2010-12-06 16:32:38 UTC (rev 5493) @@ -0,0 +1,2 @@ +<Context privileged="true"> +</Context> Added: components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/WEB-INF/web.xml =================================================================== --- components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/WEB-INF/web.xml (rev 0) +++ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/WEB-INF/web.xml 2010-12-06 16:32:38 UTC (rev 5493) @@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>/WEB-INF/jboss-portal-beans.xml</param-value> + </context-param> + <listener> + <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>ContainerServlet</servlet-name> + <servlet-class>org.gatein.wci.tomcat.TC7ContainerServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet> + <servlet-name>PortalServlet</servlet-name> + <servlet-class>org.gatein.pc.test.tck.TCKServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Added: components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/META-INF/context.xml =================================================================== --- components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/META-INF/context.xml (rev 0) +++ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/META-INF/context.xml 2010-12-06 16:32:38 UTC (rev 5493) @@ -0,0 +1,2 @@ +<Context privileged="true"> +</Context> \ No newline at end of file Added: components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/log4j.properties =================================================================== --- components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/log4j.properties (rev 0) +++ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/log4j.properties 2010-12-06 16:32:38 UTC (rev 5493) @@ -0,0 +1,13 @@ +### ====================================================================== ### +## ## +## JBoss Bootstrap Log4j Configuration ## +## ## +### ====================================================================== ### + +log4j.rootCategory=ALL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Added: components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/logging.properties =================================================================== --- components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/logging.properties (rev 0) +++ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/logging.properties 2010-12-06 16:32:38 UTC (rev 5493) @@ -0,0 +1,13 @@ +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +org.apache.juli.FileHandler.level = FINE +org.apache.juli.FileHandler.directory = ${catalina.base}/logs +org.apache.juli.FileHandler.prefix = servlet-examples. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Added: components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/web.xml =================================================================== --- components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/web.xml (rev 0) +++ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/web.xml 2010-12-06 16:32:38 UTC (rev 5493) @@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>/WEB-INF/jboss-portal-beans.xml</param-value> + </context-param> + <listener> + <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>ContainerServlet</servlet-name> + <servlet-class>org.gatein.wci.tomcat.TC7ContainerServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet> + <servlet-name>PortalServlet</servlet-name> + <servlet-class>org.gatein.pc.test.PortalServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app>