jcscoobyrs 2005/10/11 13:18:59
Modified: modules/itests maven.xml project.xml
Log:
Updated for new launching concept. Removed all unused scripts, all
unecessary text files and all references to unused code, like Corba. All
scripts have been updated to use the new launch concept. Scripts could be
refactored a bit to utilize the new launcher a bit better but for flow control,
the scripts have been kept as-is in this respect.
Revision Changes Path
1.4 +2 -2 openejb1/modules/itests/maven.xml
Index: maven.xml
===================================================================
RCS file: /scm/openejb/openejb1/modules/itests/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 7 Aug 2005 22:50:17 -0000 1.3
+++ maven.xml 11 Oct 2005 17:18:59 -0000 1.4
@@ -34,7 +34,7 @@
<ant:jar destfile="${basedir}/target/openejb-itests-client.jar"
basedir="${basedir}/target/classes"
- includes="org/openejb/test/**"
+ includes="org/openejb/test/**,META-INF/org.openejb.cli/*"
excludes="**/*Bean.class,META-INF/*.xml"/>
</postGoal>
1.6 +8 -105 openejb1/modules/itests/project.xml
Index: project.xml
===================================================================
RCS file: /scm/openejb/openejb1/modules/itests/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 24 Feb 2005 12:07:10 -0000 1.5
+++ project.xml 11 Oct 2005 17:18:59 -0000 1.6
@@ -1,105 +1,8 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!-- $Revision$ $Date$ -->
-
-<project>
- <pomVersion>3</pomVersion>
- <extend>${basedir}/../../etc/project.xml</extend>
-
- <!-- ===================== -->
- <!-- Module Identification -->
- <!-- ===================== -->
-
- <name>OpenEJB :: Integration Tests</name>
- <id>openejb-itests</id>
- <shortDescription>Compliance and Integration Tests</shortDescription>
- <description>EJB Compliance and Server Integration Tests</description>
- <url>http://www.openejb.org</url>
- <siteDirectory>/www/openejb.org/core</siteDirectory>
-
<distributionDirectory>/www/openejb.org//builds/core</distributionDirectory>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
- <dependencies>
-
- <!-- Module Dependencies -->
-
- <dependency>
- <groupId>openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
-
- <!-- Thirdparty -->
-
- <dependency>
- <id>junit</id>
- <version>3.8.1</version>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
- <version>1.4-rc3</version>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>idb</id>
- <version>3.26</version>
- <properties>
- <runtime>true</runtime>
- </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>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>**/Abstract*.java</exclude>
- </excludes>
- <resources>
- <resource>
- <directory>${basedir}/src/schema</directory>
- <includes>
- <include>*.xsd</include>
- <include>*.dtd</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
- </build>
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- $Revision$ $Date$ -->
<project>
<pomVersion>3</pomVersion>
<extend>${basedir}/../../etc/project.xml</extend>
<!-- ===================== -->
<!-- Module Identification -->
<!-- ===================== -->
<name>OpenEJB :: Integration Tests</name>
<id>openejb-itests</id>
<shortDescription>Compliance and Integration Tests</shortDescription>
<description>EJB Compliance and Server Integration Tests</description>
<url>http://www.openejb.org</url>
<siteDirectory>/www/openejb.org/core</siteDirectory>
<distributionDirectory>/www/openejb.org//builds/core</distributionDirectory>
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
<dependencies>
<!-- Module Dependencies -->
<dependency>
<groupId>openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<module>true</module>
</properties>
</dependency>
<!-- Thirdparty -->
<dependency>
<id>junit</id>
<version>3.8.1</version>
<properties>
<runtime>true</runtime>
</properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee</artifactId>
<version>1.4-rc3</version>
<properties>
<runtime>true</runtime>
</properties>
</dependency>
<dependency>
<id>idb</id>
<version>3.26</version>
<properties>
<runtime>true</runtime>
</properties>
</dependency>
</dependencies>
<!-- =================== -->
<!-- Build Specification -->
<!-- =================== -->
<build>
<resources>
<resource>
+
<directory>${basedir}/src/META-INF/org.openejb.cli</directory>
+ <targetPath>META-INF/org.openejb.cli</targetPath>
+ <includes>
+ <include>*</include>
+ </includes>
+ </resource>
+ <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>
<includes>
<include>**/*Test.java</include>
</includes>
<excludes>
<exclude>**/Abstract*.java</exclude>
</excludes>
<resources>
<resource>
<directory>${basedir}/src/schema</directory>
<includes>
<include>*.xsd</include>
<include>*.dtd</include>
</includes>
</resource>
</resources>
</unitTest>
</build>
</project>
\ No newline at end of file
