dain 2004/09/08 01:53:37
Modified: modules/itests maven.xml project.properties project.xml
Log:
Don't need the local:aggregate name space anymore
Revision Changes Path
1.6 +136 -48 openejb/modules/itests/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 4 Sep 2004 20:48:02 -0000 1.5
+++ maven.xml 8 Sep 2004 05:53:37 -0000 1.6
@@ -7,60 +7,148 @@
xmlns:ant="jelly:ant"
xmlns:deploy="geronimo:deploy"
xmlns:maven="jelly:maven"
+ xmlns:u="jelly:util"
+ xmlns:define="jelly:define"
>
<preGoal name="xdoc:jelly-transform">
<attainGoal name="html2xdoc"/>
</preGoal>
+ <goal name="default">
+ <attainGoal name="itest"/>
+ </goal>
- <preGoal name="test:test">
- <ant:delete dir="${maven.build.dir}/openejb"/>
- <deploy:unpackServer
- geronimoVersion="2.0-SNAPSHOT"
- geronimoName="openejb"
- targetDir="${maven.build.dir}/openejb"/>
- <deploy:startRemoteServer
- geronimoTarget="${maven.build.dir}/openejb"
-
vmArgs="-Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.rmi.RMIClassLoaderSpiImpl"
- configs="org/apache/geronimo/DefaultDatabase"/>
- <deploy:waitForStarted
- uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
- username="system"
- password="manager"
- id="org/apache/geronimo/DefaultDatabase"/>
- <echo message="server has started"/>
- <deploy:distribute
- uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
- username="system"
- password="manager"
- home="${basedir}"
-
module="${maven.repo.local}/openejb/ejbs/openejb-itests-ejb-${pom.currentVersion}.jar"
- />
- <echo message="distributed ejbs"/>
- <deploy:start
- uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
- username="system"
- password="manager"
- id="org/openejb/Itests"/>
- <j:set var="maven.test.failure.ignore" value="true"/>
- </preGoal>
+ <goal name="itest"
+ description="Run Application Integration Tests"
+ prereqs="itest:itest"/>
+
+ <goal name="itest:prepare-filesystem"
+ description="Create the needed directory structure">
+ <mkdir dir="${itest.dest}"/>
+ <mkdir dir="${itest.reportsDirectory}"/>
+ </goal>
+
+ <goal name="itest:itest"
+ description="Run Application Integration Tests"
+ prereqs="test:compile,itest:prepare-filesystem">
+
+ <j:if test="${itest.skip != 'true'}">
+
+ <!-- call our setup code -->
+ <attainGoal name="itest:setup"/>
+
+ <taskdef
+ name="junit"
+ classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
+
+ <j:catch var="exception">
+ <junit printSummary="${itest.printSummary}"
+ failureProperty="itest.failure"
+ fork="${itest.fork}">
+
+ <j:if test="${context.getVariable('itest.jvm') != null}">
+ <setProperty name="jvm" value="${itest.jvm}"/>
+ </j:if>
+ <j:if
test="${!context.getVariable('itest.fork').toString().trim().equalsIgnoreCase('no')}">
+ <setProperty name="dir" value="${itest.dir}"/>
+ </j:if>
+ <sysproperty key="basedir" value="${basedir}"/>
+ <u:tokenize var="listOfProperties" delim="
">${itest.sysproperties}</u:tokenize>
+ <j:forEach var="someProperty" items="${listOfProperties}">
+ <sysproperty key="${someProperty}"
value="${context.getVariable(someProperty)}"/>
+ </j:forEach>
+ <u:tokenize var="listOfEnv" delim="
">${itest.envvars}</u:tokenize>
+ <j:forEach var="someEnv" items="${listOfEnv}">
+ <env key="${someEnv}"
value="${context.getVariable(someEnv)}"/>
+ </j:forEach>
+ <u:tokenize var="listOfJvmArgs" delim="
">${itest.jvmargs}</u:tokenize>
+ <j:forEach var="somejvmarg" items="${listOfJvmArgs}">
+ <jvmarg value="${somejvmarg}"/>
+ </j:forEach>
+ <formatter type="xml"/>
+ <formatter type="${itest.format}" usefile="${itest.usefile}"/>
+ <classpath>
+ <pathelement location="${itest.dest}"/>
+ <pathelement location="${maven.build.dest}"/>
+ <path refid="maven.dependency.classpath"/>
+ <pathelement path="${plugin.getDependencyPath('junit')}"/>
+ <j:if
test="${!context.getVariable('itest.fork').toString().trim().equalsIgnoreCase('no')}">
+ <pathelement
path="${plugin.getDependencyPath('xml-apis')}"/>
+ <pathelement
path="${plugin.getDependencyPath('xerces')}"/>
+ </j:if>
+ </classpath>
+ <batchtest todir="${itest.reportsDirectory}">
+ <fileset dir="${basedir}/src/test"
includes="${itest.includes}" excludes="{itest.excludes}"/>
+ </batchtest>
+ </junit>
+ </j:catch>
+ <j:if test="${exception != null}">
+ ${exception.printStackTrace()}
+ </j:if>
+
+ <!-- call our teardown code -->
+ <attainGoal name="itest:teardown"/>
+
+ <j:if test="${exception != null or itest.failure}">
+ <j:if test="${context.getVariable('itest.failure.ignore') !=
'true'}">
+ <fail message="There were test failures."/>
+ </j:if>
+ </j:if>
+
+ </j:if>
+
+</goal>
+
+<goal name="itest:setup">
+ <ant:delete dir="${maven.build.dir}/openejb"/>
+ <deploy:unpackServer
+ geronimoVersion="2.0-SNAPSHOT"
+ geronimoName="openejb"
+ targetDir="${maven.build.dir}/openejb"/>
+ <deploy:startRemoteServer
+ geronimoTarget="${maven.build.dir}/openejb"
+
vmArgs="-Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.rmi.RMIClassLoaderSpiImpl"
+ configs="org/apache/geronimo/DefaultDatabase"/>
+ <deploy:waitForStarted
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ id="org/apache/geronimo/DefaultDatabase"/>
+ <echo message="server has started"/>
+ <deploy:distribute
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ home="${basedir}"
+
module="${maven.repo.local}/openejb/ejbs/openejb-itests-ejb-${pom.currentVersion}.jar"
+ />
+ <echo message="distributed ejbs"/>
+ <deploy:start
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ id="org/openejb/Itests"/>
+ <!-- <j:set var="itest.failure.ignore" value="true"/>-->
+</goal>
- <postGoal name="test:test">
- <deploy:stop
- uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
- username="system"
- password="manager"
- id="org/openejb/Itests"/>
- <deploy:undeploy
- uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
- username="system"
- password="manager"
- id="org/openejb/Itests"/>
- <deploy:stopRemoteServer
- uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
- username="system"
- password="manager"/>
- </postGoal>
+<goal name="itest:teardown">
+ <deploy:stop
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ id="org/openejb/Itests"/>
+ <deploy:undeploy
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ id="org/openejb/Itests"/>
+ <echo message="undeployed ejbs"/>
+ <deploy:stopRemoteServer
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"/>
+ <echo message="server has stopped"/>
+</goal>
</project>
1.4 +18 -3 openejb/modules/itests/project.properties
Index: project.properties
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/project.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.properties 4 Sep 2004 20:48:02 -0000 1.3
+++ project.properties 8 Sep 2004 05:53:37 -0000 1.4
@@ -4,8 +4,23 @@
maven.repo.remote=http://www.openejb.org/maven, http://www.ibiblio.org/maven
-maven.junit.jvmargs=-Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.rmi.RMIClassLoaderSpiImpl
+itest.dir=${basedir}
+itest.fork=no
+itest.format=brief
+itest.jvmargs=-Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.rmi.RMIClassLoaderSpiImpl
+itest.envvars=
+itest.jvm=
+itest.printSummary=true
+itest.usefile = true
-maven.junit.sysproperties=openejb.test.server openejb.test.database
+itest.dest=${maven.build.dir}/test-classes
+itest.reportsDirectory = ${maven.build.dir}/itest-reports
+itest.skip=false
+
+itest.src.dir=${basedir}/src/test
+itest.includes=**/CmpTestSuite.java,**/BmpTestSuite.java,**/StatefulTestSuite.java,**/StatelessTestSuite.java
+itest.excludes=**/Abstract*.java
+
+itest.sysproperties=openejb.test.server openejb.test.database
openejb.test.server=org.openejb.test.RemoteTestServer
openejb.test.database=org.openejb.test.AxionTestDatabase
1.13 +1 -10 openejb/modules/itests/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 8 Sep 2004 04:00:18 -0000 1.12
+++ project.xml 8 Sep 2004 05:53:37 -0000 1.13
@@ -129,15 +129,6 @@
</resource>
</resources>
<unitTest>
- <includes>
- <include>**/StatelessTestSuite.java</include>
- <include>**/StatefulTestSuite.java</include>
- <include>**/BmpTestSuite.java</include>
- <include>**/CmpTestSuite.java</include>
- </includes>
- <excludes>
- <exclude>**/Abstract*.java</exclude>
- </excludes>
<resources>
<resource>
<directory>${basedir}/src/schema</directory>
