[portal-commits] JBoss Portal SVN: r8279 - in modules/web/trunk: tools/etc/buildfragments and 3 other directories.

Author: julien(a)jboss.com Date: 2007-09-14 17:38:23 -0400 (Fri, 14 Sep 2007) New Revision: 8279 Removed: modules/web/trunk/tools/lib/cargo-core-uberjar-0.8.jar Modified: modules/web/trunk/build/build-thirdparty.xml modules/web/trunk/tools/etc/buildfragments/buildmagic.ent modules/web/trunk/web/build.xml modules/web/trunk/web/src/resources/portal-web-test-jar/org/jboss/portal/test/web/spi/server-beans.xml Log: update to use cargo 0.9 Modified: modules/web/trunk/build/build-thirdparty.xml =================================================================== --- modules/web/trunk/build/build-thirdparty.xml 2007-09-14 21:16:09 UTC (rev 8278) +++ modules/web/trunk/build/build-thirdparty.xml 2007-09-14 21:38:23 UTC (rev 8279) @@ -51,6 +51,7 @@ <componentref name="jboss-portal/modules/test" version="1.0.0-SNAPSHOT"/> <componentref name="sun-servlet" version="2.4"/> <componentref name="apache-tomcat" version="5.0.30"/> + <componentref name="sun-jaf" version="1.0.2"/> <componentref name="jboss/remoting" version="2.2.0.SP4"/> @@ -65,6 +66,8 @@ <componentref name="jboss/jbossxb" version="1.0.0.GA-brew"/> <componentref name="junit" version="3.8.1"/> + <componentref name="codehaus/cargo" version="0.9"/> + <!-- Based on http://anonsvn.jboss.org/repos/jbossas/tags/EMBEDDED_JBOSS_BETA_2/build/b... --> <!-- <componentref name="jboss/microcontainer" version="2.0.0.Beta3"/> Modified: modules/web/trunk/tools/etc/buildfragments/buildmagic.ent =================================================================== --- modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-14 21:16:09 UTC (rev 8278) +++ modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-14 21:38:23 UTC (rev 8279) @@ -1105,20 +1105,3 @@ </fileset> </copy> </target> - -<!-- Configure deployment tasks --> -<target name="_buildmagic:configure:deployment"> - <path id="portal.task.classpath"> - <pathelement location="${project.tools}/lib/ant.jar"/> - <pathelement location="${project.tools}/lib/explode.jar"/> - <pathelement location="${project.tools}/lib/cargo-core-uberjar-0.8.jar"/> - </path> - <taskdef - name="deploy" - classname="org.jboss.portal.common.ant.Deploy" - classpathref="portal.task.classpath"/> - <taskdef - name="undeploy" - classname="org.jboss.portal.common.ant.Undeploy" - classpathref="portal.task.classpath"/> -</target> Deleted: modules/web/trunk/tools/lib/cargo-core-uberjar-0.8.jar =================================================================== (Binary files differ) Modified: modules/web/trunk/web/build.xml =================================================================== --- modules/web/trunk/web/build.xml 2007-09-14 21:16:09 UTC (rev 8278) +++ modules/web/trunk/web/build.xml 2007-09-14 21:38:23 UTC (rev 8279) @@ -215,7 +215,6 @@ <!-- --> <copy todir="${build.resources}/test/spi/jboss-container-servlet-4.2/server-war/WEB-INF/lib"> - <fileset dir="${build.lib}" includes="portal-web-lib.jar"/> <fileset dir="${build.lib}" includes="portal-web-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar,portal-common-mc-lib.jar"/> <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-generic-lib.jar"/> @@ -243,20 +242,160 @@ </target> + <target name="cargo.setup" depends="init"> + <taskdef resource="cargo.tasks"> + <classpath> + <path refid="codehaus.cargo.classpath"/> + </classpath> + </taskdef> + </target> + + <target name="cargo.jboss.start" depends="cargo.setup"> + <property name="cargo.jboss.home" value="/Users/julien/java/jboss-4.2.0.GA"/> + <cargo + containerId="jboss42x" + home="${cargo.jboss.home}" + output="jboss.log" + log="cargo.log" + action="start" + wait="${cargo.wait}"> + <sharedClasspath> + <path location="${jboss.portal/modules/common.lib}/portal-common-lib.jar"/> + <path location="${jboss.portal/modules/test.lib}/portal-test-lib.jar"/> + <path location="${junit.junit.lib}/junit.jar"/> + <path location="${build.lib}/portal-web-lib.jar"/> + </sharedClasspath> + <configuration> + <property name="cargo.servlet.port" value="8080"/> + <property name="cargo.logging" value="high"/> + <deployable type="war" file="${build.lib}/jboss-container-servlet-4.2/test-spi-server.war"/> + </configuration> + </cargo> + </target> + + <target name="cargo.jboss.stop" depends="cargo.setup"> + <property name="cargo.jboss.home" value="/Users/julien/java/jboss-4.2.0.GA"/> + <cargo + containerId="jboss42x" + home="${cargo.jboss.home}" + action="stop"> + <configuration> + <property name="cargo.rmi.port" value="1099"/> + </configuration> + </cargo> + </target> + + <target name="cargo.tomcat.start" depends="cargo.setup"> + <property name="tomcat.home" value="/Users/julien/java/apache-tomcat-6.0.14"/> + <cargo + containerId="tomcat5x" + home="${tomcat.home}" + output="tomcat.log" + log="cargo.log" + action="start" + wait="${cargo.wait}"> + <sharedClasspath> + <path location="${apache.log4j.lib}/log4j.jar"/> + <path location="${oswego.concurrent.lib}/concurrent.jar"/> + <path location="${jboss.portal/modules/common.lib}/portal-common-lib.jar"/> + <path location="${jboss.portal/modules/test.lib}/portal-test-lib.jar"/> + <path location="${sun.jaf.lib}/activation.jar"/> + <path location="${junit.junit.lib}/junit.jar"/> + <path location="${build.lib}/portal-web-lib.jar"/> + </sharedClasspath> + <configuration> + <property name="cargo.servlet.port" value="8080"/> + <property name="cargo.logging" value="high"/> + <deployable type="war" file="manager.war"/> + <deployable type="war" file="${build.lib}/tomcat-container-servlet-6.0/test-spi-server.war"/> + </configuration> + </cargo> + </target> + + <target name="cargo.tomcat.stop" depends="cargo.setup"> + <property name="tomcat.home" value="/Users/julien/java/apache-tomcat-6.0.14"/> + <cargo + containerId="tomcat5x" + home="${cargo.jboss.home}" + action="stop"> + <configuration> + </configuration> + </cargo> + </target> + + <target name="tests.jboss" depends="init"> + <antcall target="cargo.jboss.start"> + <param name="wait" value="false"/> + </antcall> + <antcall target="blah"> + <param name="server.name" value="RemoteJBoss-4.2"/> + </antcall> + <antcall target="cargo.jboss.stop"> + </antcall> + </target> + + <target name="tests.tomcat" depends="init"> + <antcall target="cargo.tomcat.start"> + <param name="wait" value="false"/> + </antcall> + <antcall target="tests.remote"> + <param name="server.name" value="RemoteTomcat-6.0"/> + </antcall> + <antcall target="cargo.tomcat.stop"> + </antcall> + </target> + <target name="tests" depends="init"> + <antcall target="tests.local"/> + <antcall target="tests.jboss"/> + <antcall target="tests.tomcat"/> + </target> - <!--<property name="ServerName" value="RemoteJBoss-4.2"/>--> - <property name="ServerName" value="RemoteTomcat-6.0"/> + <target name="tests.local" depends="init"> + <execute-tests> + <x-test> + <test todir="${test.reports}" name="org.jboss.portal.test.web.container.ServletContainerTestCase"/> + </x-test> + <x-sysproperty> + <sysproperty key="test.root" value="${build.lib}"/> +<!-- + <jvmarg value="-Xdebug"/> + <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/> +--> + </x-sysproperty> + <x-classpath> + <pathelement location="${build.lib}/portal-web-lib.jar"/> + <pathelement location="${build.lib}/portal-web-test-lib.jar"/> + <pathelement location="${build.resources}/test/config"/> + <path refid="oswego.concurrent.classpath"/> + <path refid="jboss.remoting.classpath"/> + <path refid="jboss.microcontainer.classpath"/> + <path refid="jboss.jbossxb.classpath"/> + <path refid="apache.xerces.classpath"/> + <path refid="jboss.common.classpath"/> + + <path refid="apache.httpclient.classpath"/> + <path refid="apache.logging.classpath"/> + <path refid="apache.codec.classpath"/> + <pathelement location="${build.resources}/test"/> + <pathelement location="${source.java}"/> + <pathelement location="${jboss.portal-portlet.root}/classes"/> + <pathelement location="${jboss.portal/modules/test.lib}/portal-test-generic-lib.jar"/> + <path refid="codehaus.cargo.classpath"/> + <path refid="library.classpath"/> + <path refid="dependentmodule.classpath"/> + </x-classpath> + </execute-tests> + </target> + + <target name="tests.remote" depends="init"> + <execute-tests> <x-test> - - <!--<test todir="${test.reports}" name="org.jboss.portal.test.web.container.ServletContainerTestCase"/>--> <zest todir="${test.reports}" name="org.jboss.portal.test.web.spi.SPITestCase"> - <!--<parameter name="archive" value="test-jsr168-dispatcher.war"/>--> - <parameter name="serverName" value="${ServerName}"/> + <parameter name="serverName" value="${server.name}"/> </zest> - </x-test> <x-sysproperty> <sysproperty key="test.root" value="${build.lib}"/> @@ -271,12 +410,6 @@ <pathelement location="${build.resources}/test/config"/> <path refid="oswego.concurrent.classpath"/> - <!--<path refid="jboss/common.logging.spi.classpath"/>--> - <!--<path refid="jboss/common.core.classpath"/>--> - <!--<path refid="jboss.aop.classpath"/>--> - <!--<path refid="javassist.javassist.classpath"/>--> - <!--<path refid="trove.trove.classpath"/>--> - <path refid="jboss.remoting.classpath"/> <path refid="jboss.microcontainer.classpath"/> <path refid="jboss.jbossxb.classpath"/> @@ -288,10 +421,10 @@ <path refid="apache.logging.classpath"/> <path refid="apache.codec.classpath"/> <pathelement location="${build.resources}/test"/> - <pathelement location="../tools/lib/cargo-core-uberjar-0.8.jar"/> <pathelement location="${source.java}"/> <pathelement location="${jboss.portal-portlet.root}/classes"/> <pathelement location="${jboss.portal/modules/test.lib}/portal-test-generic-lib.jar"/> + <path refid="codehaus.cargo.classpath"/> <path refid="library.classpath"/> <path refid="dependentmodule.classpath"/> </x-classpath> Modified: modules/web/trunk/web/src/resources/portal-web-test-jar/org/jboss/portal/test/web/spi/server-beans.xml =================================================================== --- modules/web/trunk/web/src/resources/portal-web-test-jar/org/jboss/portal/test/web/spi/server-beans.xml 2007-09-14 21:16:09 UTC (rev 8278) +++ modules/web/trunk/web/src/resources/portal-web-test-jar/org/jboss/portal/test/web/spi/server-beans.xml 2007-09-14 21:38:23 UTC (rev 8279) @@ -38,8 +38,14 @@ </constructor> </bean> + <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory"> + <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/> + </bean> + <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer"> - <constructor factoryClass="org.jboss.portal.web.ServletContainer" factoryMethod="getInstance"/> + <constructor factoryMethod="getServletContainer"> + <factory bean="ServletContainerFactory"/> + </constructor> </bean> </deployment>