Title: [2539] trunk/openejb3/openejb-assembly/maven.xml: Added auto unpacking of openejb and installation of test beans
- Revision
- 2539
- Author
- dblevins
- Date
- 2006-03-10 04:45:12 -0500 (Fri, 10 Mar 2006)
Log Message
Added auto unpacking of openejb and installation of test beans
Modified Paths
Diff
Modified: trunk/openejb3/openejb-assembly/maven.xml (2538 => 2539)
--- trunk/openejb3/openejb-assembly/maven.xml 2006-03-10 08:53:20 UTC (rev 2538)
+++ trunk/openejb3/openejb-assembly/maven.xml 2006-03-10 09:45:12 UTC (rev 2539)
@@ -41,6 +41,19 @@
<!-- Setup/cleanup -->
<!--======================-->
+ <goal name="setup:openejb">
+ <j:set var="targetDir" value="${basedir}/target/"/>
+ <j:set var="openejb.home" value="${targetDir}/openejb-${openejb.version}" />
+ <j:set var="openejb.dist" value="${targetDir}/openejb-${openejb.version}-bin.zip" />
+
+ <!-- Download tomcat if it isn't in the repo -->
+ <u:file var="fileAsFile" name="${openejb.home}"/>
+ <j:if test="${!(fileAsFile.exists())}">
+ <unjar src="" dest="${targetDir}"/>
+ <copy file="${targetDir}/openejb-${openejb.version}-test.jar" todir="${openejb.home}/beans" />
+ </j:if>
+ </goal>
+
<goal name="setup:tomcat">
<j:set var="targetDir" value="${basedir}/target/"/>
@@ -167,28 +180,34 @@
<!-- Testing profiles -->
<!--======================-->
- <goal name="test:local">
- <java jar="target/openejb-${openejb.version}-test.jar" fork="yes">
+ <goal name="test:local" prereqs="setup:openejb">
+ <java classname="org.openejb.test.Main" fork="yes">
+ <classpath>
+ <pathelement location="${basedir}/target/openejb-${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">
+ <goal name="test:remote" prereqs="setup:openejb">
<java jar="target/openejb-${openejb.version}-test.jar" fork="yes">
- <sysproperty key="openejb.home" value="target/openejb-${openejb.version}"/>
+ <sysproperty key="openejb.home" value="${basedir}/target/openejb-${openejb.version}"/>
<arg value="remote"/>
</java>
</goal>
- <goal name="test:http">
+ <goal name="test:http" prereqs="setup:openejb">
<java jar="target/openejb-${openejb.version}-test.jar" fork="yes">
<sysproperty key="openejb.home" value="target/openejb-${openejb.version}"/>
<arg value="http"/>
</java>
</goal>
- <goal name="test:tomcat">
+ <goal name="test:tomcat" prereqs="setup:openejb">
<attainGoal name="setup:tomcat"/>
<attainGoal name="setup:loader-webapp"/>
<!--<attainGoal name="start:tomcat"/>-->
@@ -201,7 +220,7 @@
<!--<attainGoal name="stop:tomcat"/>-->
</goal>
- <goal name="test:tomcat-webapp">
+ <goal name="test:tomcat-webapp" prereqs="setup:openejb">
<attainGoal name="setup:tomcat"/>
<attainGoal name="setup:itests-webapp"/>
<!--<attainGoal name="start:tomcat"/>-->
