dain 2004/09/08 13:08:30
Modified: modules/itests maven.xml project.properties project.xml
Log:
Move itest-ejb back into itest since we now have itest goals
We are now ready to start looking into creating an itest maven plugin
Revision Changes Path
1.9 +5 -7 openejb/modules/itests/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/maven.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- maven.xml 8 Sep 2004 07:24:41 -0000 1.8
+++ maven.xml 8 Sep 2004 17:08:30 -0000 1.9
@@ -15,9 +15,7 @@
<attainGoal name="html2xdoc"/>
</preGoal>
- <goal name="default">
- <attainGoal name="itest"/>
- </goal>
+ <goal name="default" prereqs="ejb:install,itest"/>
<goal name="itest"
description="Run Application Integration Tests"
@@ -165,7 +163,7 @@
<!-- call our teardown code -->
<attainGoal name="itest:teardown"/>
- <j:if test="${exception != null or itest.failure}">
+ <j:if test="${exception != null or itest.failure == 'false'}">
<j:if test="${context.getVariable('itest.failure.ignore') !=
'true'}">
<fail message="There were test failures."/>
</j:if>
@@ -196,7 +194,7 @@
username="system"
password="manager"
home="${basedir}"
-
module="${maven.repo.local}/openejb/ejbs/openejb-itests-ejb-${pom.currentVersion}.jar"
+ module="${basedir}/target/openejb-itests-${pom.currentVersion}.jar"
/>
<echo message="distributed ejbs"/>
<deploy:start
@@ -229,7 +227,7 @@
description="Copy any resources that must be present for the integration
tests to run"
prereqs="itest:prepare-filesystem">
- <j:if test="${itest.skip != 'true'}">
+ <j:if test="${itest.skip != 'true' and itest.resources != null}">
<ant:copy todir="${itest.dest}">
<u:tokenize var="resources" delim=",
">${itest.resources}</u:tokenize>
<j:forEach var="resource" items="${resources}">
1.6 +2 -6 openejb/modules/itests/project.properties
Index: project.properties
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/project.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.properties 8 Sep 2004 07:24:41 -0000 1.5
+++ project.properties 8 Sep 2004 17:08:30 -0000 1.6
@@ -28,8 +28,4 @@
openejb.test.server=org.openejb.test.RemoteTestServer
openejb.test.database=org.openejb.test.AxionTestDatabase
-itest.resources=bin etc
-bin.dir=${basedir}/src/bin
-bin.includes=openejb*
-bin.excludes=*.bat
-etc.dir=${basedir}/src/etc
+itest.resources=
\ No newline at end of file
1.15 +1 -35 openejb/modules/itests/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 8 Sep 2004 07:24:41 -0000 1.14
+++ project.xml 8 Sep 2004 17:08:30 -0000 1.15
@@ -114,38 +114,4 @@
</properties>
</dependency>
</dependencies>
-
-
- <!-- =================== -->
- <!-- Build Specification -->
- <!-- =================== -->
-
- <build>
- <resources>
- <resource>
- <directory>${basedir}/src/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src/etc</directory>
- <includes>
- <include>*.properties</include>
- </includes>
- </resource>
- </resources>
- <unitTest>
- <resources>
- <resource>
- <directory>${basedir}/src/schema</directory>
- <includes>
- <include>*.xsd</include>
- <include>*.dtd</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
- </build>
</project>
