Title: [2576] trunk/openejb3/assembly/openejb-standalone: Standalone works with 'mvn clean assembly:assembly && maven itest'
- Revision
- 2576
- Author
- dblevins
- Date
- 2006-03-23 16:47:29 -0500 (Thu, 23 Mar 2006)
Log Message
Standalone works with 'mvn clean assembly:assembly && maven itest'
Modified Paths
Diff
Modified: trunk/openejb3/assembly/openejb-standalone/maven.xml (2575 => 2576)
--- trunk/openejb3/assembly/openejb-standalone/maven.xml 2006-03-23 21:46:39 UTC (rev 2575)
+++ trunk/openejb3/assembly/openejb-standalone/maven.xml 2006-03-23 21:47:29 UTC (rev 2576)
@@ -7,37 +7,6 @@
xmlns:u="jelly:util">
<!--======================-->
- <!-- Tomcat profiles -->
- <!--======================-->
-
- <goal name="tomcat55">
- <j:set var="tomcat.branch" value="5"/>
- <j:set var="tomcat.version" value="5.5.15"/>
- <j:set var="tomcat.prefix" value="apache"/>
- <attainGoal name="tomcat.env"/>
- </goal>
-
- <goal name="tomcat50">
- <j:set var="tomcat.branch" value="5"/>
- <j:set var="tomcat.version" value="5.0.30"/>
- <j:set var="tomcat.prefix" value="jakarta"/>
- <attainGoal name="tomcat.env"/>
- </goal>
-
- <goal name="tomcat4">
- <j:set var="tomcat.branch" value="4"/>
- <j:set var="tomcat.version" value="4.1.31"/>
- <j:set var="tomcat.prefix" value="jakarta"/>
- <attainGoal name="tomcat.env"/>
- </goal>
-
- <goal name="tomcat.env">
- <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}" />
- </goal>
-
- <!--======================-->
<!-- Setup/cleanup -->
<!--======================-->
@@ -53,129 +22,7 @@
</j:if>
</goal>
- <goal name="setup:tomcat">
- <j:set var="targetDir" value="${basedir}/target/"/>
-
- <j:set var="tomcat.download" value="http://www.ibiblio.org/pub/mirrors/apache/tomcat/tomcat-${tomcat.branch}/v${tomcat.version}/bin/${tomcat.prefix}-tomcat-${tomcat.version}.zip"/>
-
- <j:set var="tomcat.src" value="${maven.repo.local}/tomcat/distributions/${tomcat.prefix}-tomcat-${tomcat.version}.zip"/>
- <j:set var="tomcat.dist" value="${maven.repo.local}/tomcat/distributions/${tomcat.prefix}-tomcat-${tomcat.version}.zip"/>
- <j:set var="tomcat.home" value="${targetDir}/${tomcat.prefix}-tomcat-${tomcat.version}"/>
- <j:set var="openejb.home" value="${targetDir}/openejb-${openejb.version}" />
-
- <!-- Download tomcat if it isn't in the repo -->
- <u:file var="fileAsFile" name="${tomcat.dist}"/>
- <j:if test="${!(fileAsFile.exists())}">
- <mkdir dir="${maven.repo.local}/tomcat/distributions"/>
- <get src="" dest="${tomcat.dist}"/>
- </j:if>
-
- <!-- Unzip if not unzipped -->
- <u:file var="fileAsFile" name="${tomcat.home}"/>
- <j:if test="${!(fileAsFile.exists())}">
- <unjar src="" dest="${targetDir}"/>
- <chmod dir="${tomcat.home}/bin" perm="u+x" includes="**/*.sh"/>
- </j:if>
- </goal>
-
- <goal name="setup:tomcat-src">
- <j:set var="targetDir" value="${basedir}/src/"/>
-
- <j:set var="tomcat.download" value="http://www.ibiblio.org/pub/mirrors/apache/tomcat/tomcat-${tomcat.branch}/v${tomcat.version}/src/${tomcat.prefix}-tomcat-${tomcat.version}-src.zip"/>
- <j:set var="tomcat.dist" value="${maven.repo.local}/tomcat/distributions/${tomcat.prefix}-tomcat-${tomcat.version}-src.zip"/>
-
- <!-- Download tomcat if it isn't in the repo -->
- <u:file var="fileAsFile" name="${tomcat.dist}"/>
- <j:if test="${!(fileAsFile.exists())}">
- <mkdir dir="${maven.repo.local}/tomcat/distributions"/>
- <get src="" dest="${tomcat.dist}"/>
- </j:if>
-
- <unjar src="" dest="${basedir}"/>
- </goal>
-
- <goal name="delete:tomcat">
- <delete dir="${tomcat.home}"/>
- </goal>
-
<!--======================-->
- <!-- Start/stop -->
- <!--======================-->
-
- <goal name="start:tomcat">
- <j:choose>
- <j:when test="${systemScope['os.name'].startsWith('Windows')}">
- <exec executable="${tomcat.home}/bin/startup.bat" os="Windows NT,Windows 2000,Windows XP">
- <env key="CATALINA_HOME" value="${tomcat.home}"/>
- </exec>
- </j:when>
- <j:otherwise>
- <exec executable="${tomcat.home}/bin/startup.sh"/>
- </j:otherwise>
- </j:choose>
- </goal>
-
- <goal name="start:tomcat-debug">
- <j:choose>
- <j:when test="${systemScope['os.name'].startsWith('Windows')}">
- <exec executable="${tomcat.home}/bin/startup.bat" os="Windows NT,Windows 2000,Windows XP">
- <env key="JAVA_OPTS" value="-Dopenejb.home=${openejb.home} -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
- <env key="CATALINA_HOME" value="${tomcat.home}"/>
- </exec>
- </j:when>
- <j:otherwise>
- <exec executable="${tomcat.home}/bin/startup.sh">
- <env key="JAVA_OPTS" value="-Dopenejb.home=${openejb.home} -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
- </exec>
- </j:otherwise>
- </j:choose>
- </goal>
-
- <goal name="stop:tomcat">
- <j:choose>
- <j:when test="${systemScope['os.name'].startsWith('Windows')}">
- <exec executable="${tomcat.home}/bin/shutdown.bat"
- os="Windows NT,Windows 2000,Windows XP">
- <env key="CATALINA_HOME" value="${tomcat.home}"/>
- </exec>
- </j:when>
- <j:otherwise>
- <exec executable="${tomcat.home}/bin/shutdown.sh" />
- </j:otherwise>
- </j:choose>
- </goal>
-
-
- <!--======================-->
- <!-- Deploy -->
- <!--======================-->
-
- <goal name="setup:loader-webapp">
- <!-- Unzip webapp and set openejb.home -->
- <mkdir dir="${tomcat.home}/webapps/openejb"/>
- <unjar src="" dest="${tomcat.home}/webapps/openejb"/>
- <replace file="${tomcat.home}/webapps/openejb/WEB-INF/web.xml" token="@OPENEJB_HOME@" value="${openejb.home}"/>
- </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>
-
-
- <!--======================-->
<!-- Testing profiles -->
<!--======================-->
@@ -206,58 +53,10 @@
</java>
</goal>
- <goal name="test:tomcat" prereqs="setup:openejb">
- <attainGoal name="setup:tomcat"/>
- <attainGoal name="setup:loader-webapp"/>
- <!--<attainGoal name="start:tomcat"/>-->
- <java jar="target/openejb-${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.servlet.url" value="http://127.0.0.1:8080/openejb/remote"/>
- <arg value="tomcat"/>
- </java>
- <!--<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-${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">
- <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">
+ <goal name="itest">
<attainGoal name="test:local"/>
<attainGoal name="test:remote"/>
<attainGoal name="test:http"/>
- <attainGoal name="test:tomcat-all"/>
</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
Modified: trunk/openejb3/assembly/openejb-standalone/pom.xml (2575 => 2576)
--- trunk/openejb3/assembly/openejb-standalone/pom.xml 2006-03-23 21:46:39 UTC (rev 2575)
+++ trunk/openejb3/assembly/openejb-standalone/pom.xml 2006-03-23 21:47:29 UTC (rev 2576)
@@ -57,6 +57,11 @@
<dependencies>
<dependency>
<groupId>org.openejb</groupId>
+ <artifactId>openejb-loader</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>3.0-SNAPSHOT</version>
</dependency>
@@ -86,6 +91,10 @@
<version>3.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>idb</groupId>
+ <artifactId>idb</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
