Title: [2578] trunk/openejb3/assembly/openejb-tomcat/maven.xml: Builds with 'mvn clean assembly:assembly && maven itest'
- Revision
- 2578
- Author
- dblevins
- Date
- 2006-03-23 20:47:30 -0500 (Thu, 23 Mar 2006)
Log Message
Builds with 'mvn clean assembly:assembly && maven itest'
Modified Paths
Diff
Modified: trunk/openejb3/assembly/openejb-tomcat/maven.xml (2577 => 2578)
--- trunk/openejb3/assembly/openejb-tomcat/maven.xml 2006-03-24 01:46:58 UTC (rev 2577)
+++ trunk/openejb3/assembly/openejb-tomcat/maven.xml 2006-03-24 01:47:30 UTC (rev 2578)
@@ -147,23 +147,6 @@
</j:if>
</goal>
- <goal name="setup:itests-webapp">
- <!-- Unzip webapp and set openejb.home -->
- <mkdir dir="${tomcat.home}/webapps/itests"/>
- <unjar src="" dest="${tomcat.home}/webapps/itests"/>
- <replace file="${tomcat.home}/webapps/itests/WEB-INF/web.xml" token="@OPENEJB_HOME@" value="${openejb.home}"/>
- </goal>
-
- <goal name="setup:webapp-example">
- <j:set var="targetDir" value="${basedir}/target/"/>
- <j:set var="tomcat.home" value="${targetDir}/${tomcat.prefix}-tomcat-${tomcat.version}"/>
- <j:set var="openejb.home" value="${targetDir}/openejb-${openejb.version}" />
- <!-- Unzip webapp and set openejb.home -->
- <mkdir dir="${tomcat.home}/webapps/openejb"/>
- <unjar src="" dest="${tomcat.home}/webapps/movies"/>
- <replace file="${tomcat.home}/webapps/movies/WEB-INF/web.xml" token="@OPENEJB_HOME@" value="${openejb.home}"/>
- </goal>
-
<goal name="setup:itests">
<j:set var="targetDir" value="${basedir}/target/"/>
<j:set var="itests.jar" value="openejb-tomcat-${openejb.version}-test.jar"/>
@@ -180,33 +163,6 @@
<!-- Testing profiles -->
<!--======================-->
- <goal name="test:local" prereqs="setup:openejb">
- <java classname="org.openejb.test.Main" fork="yes">
- <classpath>
- <pathelement location="${basedir}/target/openejb-tomcat-${openejb.version}-test.jar"/>
- <fileset dir="${basedir}/target/openejb-${openejb.version}/lib">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
- <sysproperty key="openejb.home" value="target/openejb-${openejb.version}"/>
- <arg value="local"/>
- </java>
- </goal>
-
- <goal name="test:remote" prereqs="setup:openejb">
- <java jar="target/openejb-tomcat-${openejb.version}-test.jar" fork="yes">
- <sysproperty key="openejb.home" value="${basedir}/target/openejb-${openejb.version}"/>
- <arg value="remote"/>
- </java>
- </goal>
-
- <goal name="test:http" prereqs="setup:openejb">
- <java jar="target/openejb-tomcat-${openejb.version}-test.jar" fork="yes">
- <sysproperty key="openejb.home" value="target/openejb-${openejb.version}"/>
- <arg value="http"/>
- </java>
- </goal>
-
<goal name="test:tomcat">
<attainGoal name="setup:tomcat"/>
<attainGoal name="setup:loader-webapp"/>
@@ -221,46 +177,24 @@
<!--<attainGoal name="stop:tomcat"/>-->
</goal>
- <goal name="test:tomcat-webapp" prereqs="setup:openejb">
- <attainGoal name="setup:tomcat"/>
- <attainGoal name="setup:itests-webapp"/>
- <!--<attainGoal name="start:tomcat"/>-->
- <java jar="target/openejb-tomcat-${openejb.version}-test.jar" fork="yes">
- <sysproperty key="openejb.home" value="target/openejb-${openejb.version}"/>
- <sysproperty key="tomcat.home" value="${tomcat.home}"/>
- <sysproperty key="remote.serlvet.url" value="http://127.0.0.1:8080/itests/remote"/>
- <arg value="tomcat"/>
- </java>
- <!--<attainGoal name="stop:tomcat"/>-->
- </goal>
-
- <goal name="test:tomcat-all">
+ <goal name="itest:all">
<attainGoal name="tomcat4"/>
<attainGoal name="test:tomcat"/>
- <attainGoal name="delete:tomcat"/>
- <attainGoal name="test:tomcat-webapp"/>
- <attainGoal name="delete:tomcat"/>
<attainGoal name="tomcat50"/>
<attainGoal name="test:tomcat"/>
- <attainGoal name="delete:tomcat"/>
- <attainGoal name="test:tomcat-webapp"/>
- <attainGoal name="delete:tomcat"/>
+
<j:if test="${systemScope['java.version'].startsWith('1.5')}">
<attainGoal name="tomcat55"/>
<attainGoal name="test:tomcat"/>
- <attainGoal name="delete:tomcat"/>
- <attainGoal name="test:tomcat-webapp"/>
- <attainGoal name="delete:tomcat"/>
</j:if>
</goal>
- <goal name="test:all">
- <attainGoal name="test:local"/>
- <attainGoal name="test:remote"/>
- <attainGoal name="test:http"/>
- <attainGoal name="test:tomcat-all"/>
+ <goal name="itest">
+ <attainGoal name="tomcat55"/>
+ <attainGoal name="test:tomcat"/>
</goal>
+
<!-- Try this if things get rough
java -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -jar target/openejb-1.0-SNAPSHOT/lib/openejb-core-1.0-SNAPSHOT.jar start
-->
