djencks 2004/08/04 18:40:08
Modified: modules/itests maven.xml project.xml
Log:
Make itests run automatically. Right now they all fail, presumably due to a
configuration problem
Revision Changes Path
1.3 +53 -39 openejb/modules/itests/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 6 Apr 2004 18:41:47 -0000 1.2
+++ maven.xml 4 Aug 2004 22:40:08 -0000 1.3
@@ -5,51 +5,65 @@
<project default="default"
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
+ xmlns:deploy="geronimo:deploy"
xmlns:maven="jelly:maven"
- xmlns:xdoclet="common:xdoclet">
+ >
+
+ <!-- Determine what the top-level project root is -->
+ <j:set var="project.root"
value="${pom.parentBasedir().getParentFile().getCanonicalFile()}"/>
+
+ <!-- Determine where geronimo is installed (from assembly module) -->
+ <j:set var="geronimoTarget"
value="${project.root}/target/${pom.groupId}-${pom.currentVersion}"/>
+ <!--j:set var="geronimoTarget" value="${project.root}/target/assembly"/-->
+ <!--j:set var="geronimoTarget"
value="/Users/david/geronimo/geronimo/1geronimo/target/geronimo-1.0-SNAPSHOT"/-->
<preGoal name="xdoc:jelly-transform">
<attainGoal name="html2xdoc"/>
</preGoal>
- <postGoal name="jar:jar">
- <ant:jar destfile="${basedir}/target/openejb-itests-beans.jar">
- <ant:fileset dir="${basedir}/target/classes"
- includes="org/openejb/test/beans/**,
- org/openejb/test/entity/bmp/**,
- org/openejb/test/entity/cmp/**,
- org/openejb/test/object/**,
- org/openejb/test/stateful/**,
- org/openejb/test/stateless/**,
- org/openejb/test/ApplicationException.class,
- org/openejb/test/TestFailureException.class,
- META-INF/*.xml"
- excludes="org/openejb/test/entity/bmp/*Test*.class,
- org/openejb/test/entity/cmp/*Test*.class,
- org/openejb/test/stateful/*Test*.class,
- org/openejb/test/stateless/*Test*.class"/>
-
- <zipfileset dir="${basedir}/src/etc" prefix="META-INF"/>
- </ant:jar>
-
- <ant:jar destfile="${basedir}/target/openejb-itests-beans2.jar">
- <ant:fileset dir="${basedir}/target/classes"
- includes="org/openejb/test/beans/**,
- org/openejb/test/entity/bmp/**,
- org/openejb/test/entity/cmp/**,
- org/openejb/test/object/**,
- org/openejb/test/stateful/**,
- org/openejb/test/stateless/**,
- org/openejb/test/ApplicationException.class,
- org/openejb/test/TestFailureException.class,
- META-INF/*.xml"
- excludes="org/openejb/test/entity/bmp/*Test*.class,
- org/openejb/test/entity/cmp/*Test*.class,
- org/openejb/test/stateful/*Test*.class,
- org/openejb/test/stateless/*Test*.class"/>
- <zipfileset dir="${basedir}/src/etc2" prefix="META-INF"/>
- </ant:jar>
+ <preGoal name="test:test">
+ <ant:echo message="Trying to start server at: ${geronimoTarget}"/>
+ <deploy:startRemoteServer
+ geronimoTarget="${geronimoTarget}"
+ 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>
+ <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>
+
</project>
1.9 +16 -30 openejb/modules/itests/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 24 Jun 2004 20:58:05 -0000 1.8
+++ project.xml 4 Aug 2004 22:40:08 -0000 1.9
@@ -30,65 +30,51 @@
<groupId>openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <module>true</module>
- </properties>
</dependency>
- <!-- Thirdparty -->
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-itests-ejb</artifactId>
+ <version>${pom.currentVersion}</version>
+ <type>ejb</type>
+ </dependency>
+
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-assembly</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <!-- Thirdparty -->
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jta</artifactId>
<version>1.0.1B-rc2</version>
- <properties>
- <runtime>true</runtime>
- </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-ejb</artifactId>
<version>2.1-rc2</version>
- <properties>
- <runtime>true</runtime>
- </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-servlet</artifactId>
<version>2.4-rc2</version>
- <properties>
- <runtime>true</runtime>
- </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-connector</artifactId>
<version>1.5-rc2</version>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>idb</groupId>
- <artifactId>idb</artifactId>
- <version>3.26</version>
- <properties>
- <runtime>true</runtime>
- </properties>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8</version>
- <properties>
- <runtime>true</runtime>
- </properties>
</dependency>
</dependencies>
@@ -115,7 +101,7 @@
</resources>
<unitTest>
<includes>
- <include>**/*Test.java</include>
+ <include>**/*Tests.java</include>
</includes>
<excludes>
<exclude>**/Abstract*.java</exclude>
