[gatein-commits] gatein SVN: r5614 - in components/pc/branches/adf: portal/src/assemble and 11 other directories.

Author: alain_defrance Date: 2010-12-20 07:48:44 -0500 (Mon, 20 Dec 2010) New Revision: 5614 Modified: components/pc/branches/adf/pom.xml components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat60.xml components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat70.xml components/pc/branches/adf/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml components/pc/branches/adf/test/servers/jboss42/pom.xml components/pc/branches/adf/test/servers/jboss42/src/test/build.xml components/pc/branches/adf/test/servers/jboss51/pom.xml components/pc/branches/adf/test/servers/jboss51/src/test/build.xml components/pc/branches/adf/test/servers/jetty6/pom.xml components/pc/branches/adf/test/servers/jetty6/src/test/build.xml components/pc/branches/adf/test/servers/tomcat6/pom.xml components/pc/branches/adf/test/servers/tomcat6/src/test/build.xml components/pc/branches/adf/test/servers/tomcat7/pom.xml components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml Log: Add cargo.debug profile management Modified: components/pc/branches/adf/pom.xml =================================================================== --- components/pc/branches/adf/pom.xml 2010-12-20 11:24:06 UTC (rev 5613) +++ components/pc/branches/adf/pom.xml 2010-12-20 12:48:44 UTC (rev 5614) @@ -47,13 +47,13 @@ <properties> <version.gatein.common>2.0.3-GA</version.gatein.common> <version.gatein.wci>2.1.0-Alpha01-SNAPSHOT</version.gatein.wci> - <version.apache.portals.bridges>1.0.4</version.apache.portals.bridges> + <version.apache.portals.bridges>1.0.3</version.apache.portals.bridges> <version.apache.taglibs>1.1.2</version.apache.taglibs> <version.apache.log4j>1.2.14</version.apache.log4j> <!-- 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> Modified: components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat60.xml =================================================================== --- components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat60.xml 2010-12-20 11:24:06 UTC (rev 5613) +++ components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat60.xml 2010-12-20 12:48:44 UTC (rev 5614) @@ -13,7 +13,6 @@ <dependencySet> <outputDirectory>lib</outputDirectory> <includes> - <include>org.gatein.pc:pc-test-core</include> <include>org.gatein.common:common-common</include> <include>org.gatein.common:common-logging</include> <include>org.gatein.wci:wci-wci</include> @@ -42,7 +41,6 @@ <dependencySet> <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory> <includes> - <include>org.gatein.pc:pc-test-core</include> <include>org.gatein.common:common-mc</include> <include>org.gatein.pc:pc-controller</include> <include>org.gatein.pc:pc-mc</include> Modified: components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat70.xml =================================================================== --- components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat70.xml 2010-12-20 11:24:06 UTC (rev 5613) +++ components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat70.xml 2010-12-20 12:48:44 UTC (rev 5614) @@ -13,7 +13,6 @@ <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> @@ -42,7 +41,6 @@ <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> 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-20 11:24:06 UTC (rev 5613) +++ components/pc/branches/adf/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2010-12-20 12:48:44 UTC (rev 5614) @@ -51,7 +51,7 @@ </listener> <servlet> <servlet-name>ContainerServlet</servlet-name> - <servlet-class>org.gatein.wci.tomcat.TC7ContainerServlet</servlet-class> + <servlet-class>org.gatein.wci.tomcat.TC6ContainerServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> </web-app> Modified: components/pc/branches/adf/test/servers/jboss42/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/jboss42/pom.xml 2010-12-20 11:24:06 UTC (rev 5613) +++ components/pc/branches/adf/test/servers/jboss42/pom.xml 2010-12-20 12:48:44 UTC (rev 5614) @@ -439,6 +439,14 @@ <condition property="test.jsr286-api.enable"> <istrue value="${test.jsr286-api}" /> </condition> + <condition property="cargo.debug" value="${test.cargo.debug}"> + <isset property="test.cargo.debug"/> + </condition> + <condition property="cargo.debug" value=""> + <not> + <isset property="test.cargo.debug"/> + </not> + </condition> <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/> <property name="dependency.commons-logging.jar" Modified: components/pc/branches/adf/test/servers/jboss42/src/test/build.xml =================================================================== --- components/pc/branches/adf/test/servers/jboss42/src/test/build.xml 2010-12-20 11:24:06 UTC (rev 5613) +++ components/pc/branches/adf/test/servers/jboss42/src/test/build.xml 2010-12-20 12:48:44 UTC (rev 5614) @@ -40,8 +40,7 @@ <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> <property name="cargo.rmi.port" value="1099"/> - <!--<property name="cargo.jvmargs" value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>--> - <property name="cargo.jvmargs" value="-Duser.language=en"/> + <property name="cargo.jvmargs" value="-Duser.language=en ${cargo.debug}"/> <deployable type="war" file="${test.temp.lib}/JBoss-4.2/portlet-test.war"/> </configuration> </cargo> @@ -53,7 +52,7 @@ home="${test.cargo.home}" log="${cargo.log.dir}/cargo.${test.server.name}-${test.server.version}.shutdown.log" action="stop"> - <configuration/> + <configuration home="${test.cargo.dir}"/> </cargo> </target> </project> Modified: components/pc/branches/adf/test/servers/jboss51/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-20 11:24:06 UTC (rev 5613) +++ components/pc/branches/adf/test/servers/jboss51/pom.xml 2010-12-20 12:48:44 UTC (rev 5614) @@ -446,6 +446,14 @@ <condition property="test.jsr286-api.enable"> <istrue value="${test.jsr286-api}" /> </condition> + <condition property="cargo.debug" value="${test.cargo.debug}"> + <isset property="test.cargo.debug"/> + </condition> + <condition property="cargo.debug" value=""> + <not> + <isset property="test.cargo.debug"/> + </not> + </condition> <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/> <property name="dependency.commons-logging.jar" Modified: components/pc/branches/adf/test/servers/jboss51/src/test/build.xml =================================================================== --- components/pc/branches/adf/test/servers/jboss51/src/test/build.xml 2010-12-20 11:24:06 UTC (rev 5613) +++ components/pc/branches/adf/test/servers/jboss51/src/test/build.xml 2010-12-20 12:48:44 UTC (rev 5614) @@ -38,10 +38,9 @@ </sharedClasspath> <configuration home="${test.cargo.dir}"> <property name="cargo.servlet.port" value="8080"/> - <property name="cargo.logging" value="medium"/> + <property name="cargo.logging" value="high"/> <property name="cargo.rmi.port" value="1099"/> - <!--<property name="cargo.jvmargs" value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>--> - <property name="cargo.jvmargs" value="-Duser.language=en"/> + <property name="cargo.jvmargs" value="-Duser.language=en ${cargo.debug}"/> <deployable type="war" file="${test.temp.lib}/JBoss-5.1/portlet-test.war"/> <file file="${target}/test-classes/config/context.xml" tofile="deploy/jbossweb.sar/context.xml" overwrite="true"/> </configuration> @@ -54,7 +53,7 @@ home="${test.cargo.home}" log="${cargo.log.dir}/cargo.${test.server.name}-${test.server.version}.shutdown.log" action="stop"> - <configuration/> + <configuration home="${test.cargo.dir}"/> </cargo> </target> </project> Modified: components/pc/branches/adf/test/servers/jetty6/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/jetty6/pom.xml 2010-12-20 11:24:06 UTC (rev 5613) +++ components/pc/branches/adf/test/servers/jetty6/pom.xml 2010-12-20 12:48:44 UTC (rev 5614) @@ -446,6 +446,14 @@ <condition property="test.jsr286-api.enable"> <istrue value="${test.jsr286-api}" /> </condition> + <condition property="cargo.debug" value="${test.cargo.debug}"> + <isset property="test.cargo.debug"/> + </condition> + <condition property="cargo.debug" value=""> + <not> + <isset property="test.cargo.debug"/> + </not> + </condition> <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/> <property name="dependency.commons-logging.jar" Modified: components/pc/branches/adf/test/servers/jetty6/src/test/build.xml =================================================================== --- components/pc/branches/adf/test/servers/jetty6/src/test/build.xml 2010-12-20 11:24:06 UTC (rev 5613) +++ components/pc/branches/adf/test/servers/jetty6/src/test/build.xml 2010-12-20 12:48:44 UTC (rev 5614) @@ -39,8 +39,7 @@ <configuration home="${test.cargo.dir}"> <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="-Duser.language=en"/> + <property name="cargo.jvmargs" value="-Duser.language=en ${cargo.debug}"/> <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}"> @@ -57,7 +56,7 @@ home="${test.cargo.home}" log="${cargo.log.dir}/cargo.${test.server.name}-${test.server.version}.shutdown.log" action="stop"> - <configuration/> + <configuration home="${test.cargo.dir}"/> </cargo> </target> </project> Modified: components/pc/branches/adf/test/servers/tomcat6/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat6/pom.xml 2010-12-20 11:24:06 UTC (rev 5613) +++ components/pc/branches/adf/test/servers/tomcat6/pom.xml 2010-12-20 12:48:44 UTC (rev 5614) @@ -440,6 +440,14 @@ <condition property="test.jsr286-api.enable"> <istrue value="${test.jsr286-api}" /> </condition> + <condition property="cargo.debug" value="${test.cargo.debug}"> + <isset property="test.cargo.debug"/> + </condition> + <condition property="cargo.debug" value=""> + <not> + <isset property="test.cargo.debug"/> + </not> + </condition> <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/> <property name="dependency.commons-logging.jar" Modified: components/pc/branches/adf/test/servers/tomcat6/src/test/build.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat6/src/test/build.xml 2010-12-20 11:24:06 UTC (rev 5613) +++ components/pc/branches/adf/test/servers/tomcat6/src/test/build.xml 2010-12-20 12:48:44 UTC (rev 5614) @@ -39,8 +39,7 @@ <configuration home="${test.cargo.dir}"> <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"/> + <property name="cargo.jvmargs" value="-Duser.language=en ${cargo.debug}"/> <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-6.0/portlet-test.war"/> @@ -54,7 +53,7 @@ home="${test.cargo.home}" log="${cargo.log.dir}/cargo.${test.server.name}-${test.server.version}.shutdown.log" action="stop"> - <configuration/> + <configuration home="${test.cargo.dir}"/> </cargo> </target> </project> Modified: components/pc/branches/adf/test/servers/tomcat7/pom.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-20 11:24:06 UTC (rev 5613) +++ components/pc/branches/adf/test/servers/tomcat7/pom.xml 2010-12-20 12:48:44 UTC (rev 5614) @@ -439,6 +439,14 @@ <condition property="test.jsr286-api.enable"> <istrue value="${test.jsr286-api}" /> </condition> + <condition property="cargo.debug" value="${test.cargo.debug}"> + <isset property="test.cargo.debug"/> + </condition> + <condition property="cargo.debug" value=""> + <not> + <isset property="test.cargo.debug"/> + </not> + </condition> <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/> <property name="dependency.commons-logging.jar" @@ -533,8 +541,6 @@ value="${maven.dependency.apache-taglibs.jstl.jar.path}"/> <property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/> - <property name="dependency.cargo.jetty-deployer" - value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"/> <!-- location of common.xml shared between the different server's build.xml --> <property name="common.xml.file" value="${test.common.xml}"/> Modified: components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml =================================================================== --- components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml 2010-12-20 11:24:06 UTC (rev 5613) +++ components/pc/branches/adf/test/servers/tomcat7/src/test/build.xml 2010-12-20 12:48:44 UTC (rev 5614) @@ -39,10 +39,7 @@ <configuration home="${test.cargo.dir}"> <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"/> + <property name="cargo.jvmargs" value="-Duser.language=en ${cargo.debug}"/> <deployable type="war" file="${test.temp.lib}/Tomcat-7.0/portlet-test.war"/> </configuration> </cargo>