jtolentino 2005/09/25 23:12:42
Modified: m2 ejb-test-ear.pom ejb-test-jar.pom maven2.bat
openejb-builder.pom openejb-root.pom
Added: m2 test-ant-ear.pom
Log:
Removed requirement to build Maven 1 version of openejb prior to building
Maven 2 version. Done this by converting resource modules into Maven 2 builds.
Revision Changes Path
1.2 +6 -2 openejb/m2/ejb-test-ear.pom
Index: ejb-test-ear.pom
===================================================================
RCS file: /scm/openejb/openejb/m2/ejb-test-ear.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejb-test-ear.pom 18 Mar 2005 05:29:02 -0000 1.1
+++ ejb-test-ear.pom 26 Sep 2005 03:12:42 -0000 1.2
@@ -17,7 +17,11 @@
<dependency>
<groupId>openejb</groupId>
<artifactId>test-ejb-jar</artifactId>
- <version>${version}</version>
</dependency>
</dependencies>
+ <build>
+ <outputDirectory>target</outputDirectory>
+ <directory>../openejb-builder/src/test/resources</directory>
+ <finalName>test-ear</finalName>
+ </build>
</project>
1.5 +6 -1 openejb/m2/ejb-test-jar.pom
Index: ejb-test-jar.pom
===================================================================
RCS file: /scm/openejb/openejb/m2/ejb-test-jar.pom,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ejb-test-jar.pom 25 Sep 2005 20:10:32 -0000 1.4
+++ ejb-test-jar.pom 26 Sep 2005 03:12:42 -0000 1.5
@@ -23,4 +23,9 @@
<artifactId>geronimo-spec-jms</artifactId>
</dependency>
</dependencies>
+ <build>
+
<outputDirectory>../openejb-builder/src/test/resources/test-ejb-jar</outputDirectory>
+ <directory>../openejb-builder/src/test/resources</directory>
+ <finalName>test-ejb-jar</finalName>
+ </build>
</project>
1.7 +11 -2 openejb/m2/maven2.bat
Index: maven2.bat
===================================================================
RCS file: /scm/openejb/openejb/m2/maven2.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven2.bat 25 Sep 2005 20:10:32 -0000 1.6
+++ maven2.bat 26 Sep 2005 03:12:42 -0000 1.7
@@ -101,7 +101,16 @@
mkdir %m2Dir%
copy %poms%\ejb-test-ear.pom %m2Dir%\pom.xml
- xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir% %m2Dir%
+ xcopy /EXCLUDE:cvs.exclude /Q /I %m1Dir% %m2Dir%
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\META-INF
%m2Dir%\src\main\resources\META-INF
+
+echo Setting up test-ant-ear...
+set m2Dir=%root%\test-ant-ear
+set m1Dir=%modules%\openejb-builder\src\test-ant
+mkdir %m2Dir%
+copy %poms%\test-ant-ear.pom %m2Dir%\pom.xml
+
+ xcopy /EXCLUDE:cvs.exclude /Q /I %m1Dir% %m2Dir%
xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\META-INF
%m2Dir%\src\main\resources\META-INF
echo Setting up test-jar...
@@ -110,7 +119,7 @@
mkdir %m2Dir%
copy %poms%\ejb-test-jar.pom %m2Dir%\pom.xml
- xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\ %m2Dir%\
+ xcopy /EXCLUDE:cvs.exclude /Q /I %m1Dir% %m2Dir%
xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\META-INF
%m2Dir%\src\main\resources\META-INF
xcopy /EXCLUDE:cvs.exclude /S /Q /I %m1Dir%\org %m2Dir%\src\main\java\org
1.5 +4 -10 openejb/m2/openejb-builder.pom
Index: openejb-builder.pom
===================================================================
RCS file: /scm/openejb/openejb/m2/openejb-builder.pom,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openejb-builder.pom 23 Sep 2005 07:44:09 -0000 1.4
+++ openejb-builder.pom 26 Sep 2005 03:12:42 -0000 1.5
@@ -371,15 +371,16 @@
<groupId>axis</groupId>
<artifactId>commons-discovery</artifactId>
<version>SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>2.7.2</version>
- <scope>runtime</scope>
+ <scope>runtime</scope>
</dependency>
+
</dependencies>
<build>
@@ -447,16 +448,9 @@
</includes>
</testResource>
-<!-- temporarily copy required files built from m1 -->
<testResource>
<targetPath>..</targetPath>
- <directory>../../../modules/openejb-builder/target</directory>
- <includes>
- <include>test-ejb-jar.jar</include>
- <include>test-ear.ear</include>
- <include>test-ejb-jar/**/*.*</include>
- <include>test-ant.ear</include>
- </includes>
+ <directory>src/test/resources</directory>
</testResource>
</testResources>
</build>
1.4 +21 -3 openejb/m2/openejb-root.pom
Index: openejb-root.pom
===================================================================
RCS file: /scm/openejb/openejb/m2/openejb-root.pom,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openejb-root.pom 25 Sep 2005 20:10:32 -0000 1.3
+++ openejb-root.pom 26 Sep 2005 03:12:42 -0000 1.4
@@ -14,12 +14,13 @@
<url>http://www.openejb.org/</url>
<modules>
+ <module>test-ejb-jar</module>
+ <module>test-ear</module>
+ <module>test-ant-ear</module>
<module>pkgen-builder</module>
<module>openejb-core</module>
<module>openejb-builder</module>
<module>openejb-webadmin</module>
- <module>test-ejb-jar</module>
- <module>test-ear</module>
</modules>
<repositories>
@@ -548,12 +549,29 @@
<version>2.0-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.1-dev</version>
</dependency>
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>test-ejb-jar</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>test-ant-ear</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>test-ear</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
<!--
<dependency>
1.1 openejb/m2/test-ant-ear.pom
Index: test-ant-ear.pom
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Revision: 1.1 $ $Date: 2005/09/26 03:12:42 $ -->
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>openejb</groupId>
<artifactId>openejb</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>openejb</groupId>
<artifactId>test-ant-ear</artifactId>
<packaging>ear</packaging>
<name>OpenEJB Test Ant Ear</name>
<dependencies>
<dependency>
<groupId>openejb</groupId>
<artifactId>test-ejb-jar</artifactId>
</dependency>
</dependencies>
<build>
<outputDirectory>target</outputDirectory>
<directory>../openejb-builder/src/test/resources</directory>
<finalName>test-ant</finalName>
</build>
</project>
