dblevins 2005/09/29 04:02:22
Modified: m2 Tag: v2_0_G1M5 README.txt ejb-assembly.pom
ejb-core.pom ejb-group.pom ejb-test-ear.pom
ejb-test-jar.pom maven2.bat maven2.sh
openejb-builder.pom openejb-core.pom
openejb-root.pom openejb-webadmin-clienttools.pom
openejb-webadmin-commons.pom
openejb-webadmin-ejbgen.pom
openejb-webadmin-main.pom openejb-webadmin.pom
pkgen-builder.pom
Log:
Merging head back into v2_0_G1M5 branch
Revision Changes Path
No revision
No revision
1.2.6.1 +5 -3 openejb/m2/README.txt
Index: README.txt
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/README.txt,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -r1.2 -r1.2.6.1
--- README.txt 13 Mar 2005 00:28:34 -0000 1.2
+++ README.txt 29 Sep 2005 08:02:21 -0000 1.2.6.1
@@ -4,18 +4,20 @@
Requires m2 to be installed. Check out from:
:pserver:[EMAIL PROTECTED]:/home/cvspublic:maven-components
+If running under windows, requires m2 local repo path not to contain spaces.
Refer to http://maven.apache.org/maven2/maven-settings/settings.html on how to
change the location of m2 local repo.
+
Run m2-bootstrap-all.[sh|bat] as per the instructions in that directory.
Create the M2_HOME environment variable, set to the installation directory
and add $M2_HOME/bin to the path.
From this directory, run
- maven2.sh
+ maven2.sh For Unix
+ maven2.bat For Windows
This will create an openejb subdirectory (sources will be copied from the
parent structures into that subdirectory).
From the openejb subdirectory, run:
- m2 install
-
+ m2 install -Dmaven.itest.skip=true
This project depends on the XMLBeans plugin. The current version is at:
http://cvs.mojo.codehaus.org/mojo/maven-xmlbeans-plugin/
1.2.2.1 +11 -10 openejb/m2/ejb-assembly.pom
Index: ejb-assembly.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/ejb-assembly.pom,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- ejb-assembly.pom 15 Aug 2005 22:48:05 -0000 1.2
+++ ejb-assembly.pom 29 Sep 2005 08:02:21 -0000 1.2.2.1
@@ -88,6 +88,16 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-util</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <server>true</server>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-deployment</artifactId>
<version>${geronimo_version}</version>
<properties>
@@ -636,15 +646,6 @@
<groupId>avalon</groupId>
<artifactId>avalon-logkit</artifactId>
<version>${avalon_logkit_version}</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov</artifactId>
- <version>${bouncycastle_version}</version>
<properties>
<repository>true</repository>
</properties>
1.3.6.1 +6 -6 openejb/m2/ejb-core.pom
Index: ejb-core.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/ejb-core.pom,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- ejb-core.pom 12 Mar 2005 21:50:38 -0000 1.3
+++ ejb-core.pom 29 Sep 2005 08:02:21 -0000 1.3.6.1
@@ -29,6 +29,11 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-util</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-client</artifactId>
</dependency>
@@ -303,11 +308,6 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- </dependency>
-
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov</artifactId>
</dependency>
<dependency>
1.7.6.1 +7 -7 openejb/m2/ejb-group.pom
Index: ejb-group.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/ejb-group.pom,v
retrieving revision 1.7
retrieving revision 1.7.6.1
diff -u -r1.7 -r1.7.6.1
--- ejb-group.pom 18 Mar 2005 06:16:50 -0000 1.7
+++ ejb-group.pom 29 Sep 2005 08:02:21 -0000 1.7.6.1
@@ -153,6 +153,12 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-util</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-client</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
@@ -466,12 +472,6 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov</artifactId>
- <version>jdk14-124</version>
</dependency>
<dependency>
1.1.6.1 +19 -2 openejb/m2/ejb-test-ear.pom
Index: ejb-test-ear.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/ejb-test-ear.pom,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -r1.1 -r1.1.6.1
--- ejb-test-ear.pom 18 Mar 2005 05:29:02 -0000 1.1
+++ ejb-test-ear.pom 29 Sep 2005 08:02:21 -0000 1.1.6.1
@@ -17,7 +17,24 @@
<dependency>
<groupId>openejb</groupId>
<artifactId>test-ejb-jar</artifactId>
- <version>${version}</version>
</dependency>
</dependencies>
+ <build>
+ <finalName>test-ear</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <modules>
+ <javaModule>
+ <groupId>openejb</groupId>
+ <artifactId>test-ejb-jar</artifactId>
+ <bundleFileName>test-ejb-jar.jar</bundleFileName>
+ </javaModule>
+ </modules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
1.3.6.1 +6 -3 openejb/m2/ejb-test-jar.pom
Index: ejb-test-jar.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/ejb-test-jar.pom,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- ejb-test-jar.pom 18 Mar 2005 06:16:50 -0000 1.3
+++ ejb-test-jar.pom 29 Sep 2005 08:02:21 -0000 1.3.6.1
@@ -10,9 +10,9 @@
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>openejb</groupId>
- <artifactId>ejb-test-jar</artifactId>
+ <artifactId>test-ejb-jar</artifactId>
<name>OpenEJB Test Jar</name>
- <packaging>ejb</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>geronimo-spec</groupId>
@@ -23,4 +23,7 @@
<artifactId>geronimo-spec-jms</artifactId>
</dependency>
</dependencies>
+ <build>
+ <finalName>test-ejb-jar</finalName>
+ </build>
</project>
1.1.2.1 +111 -36 openejb/m2/maven2.bat
Index: maven2.bat
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/maven2.bat,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- maven2.bat 16 Sep 2005 06:36:04 -0000 1.1
+++ maven2.bat 29 Sep 2005 08:02:21 -0000 1.1.2.1
@@ -3,73 +3,148 @@
set root=%CD%\openejb
set poms=%CD%
set modules=%CD%\..\modules
-echo \CVS\ > excludes.txt
+echo \CVS\ > cvs.exclude
+echo *.java > java.exclude
-echo "Removing old version"
+echo Removing old version
if exist %root% rmdir /s /q %root%
-echo "Setting up base"
+echo Setting up base
mkdir %root%
-copy %poms%\ejb-group.pom %root%\pom.xml
+copy %poms%\openejb-root.pom %root%\pom.xml
-echo "Setting up core..."
+echo Setting up core...
set m1Dir=%modules%\core
set m2Dir=%root%\openejb-core
mkdir %m2dir%
-copy %poms%\ejb-core.pom %m2Dir%\pom.xml
+copy %poms%\openejb-core.pom %m2Dir%\pom.xml
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\bin %m2Dir%\src\main\bin
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\conf %m2Dir%\src\main\conf
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\etc %m2Dir%\src\main\etc
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\test %m2Dir%\src\test\java
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\test-resources
%m2Dir%\src\test\resources
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\test-ejb-jar
%m2Dir%\src\test\test-ejb-jar
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\java %m2Dir%\src\main\java
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\bin %m2Dir%\src\main\bin
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\conf %m2Dir%\src\main\conf
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\etc %m2Dir%\src\main\etc
+ xcopy /EXCLUDE:cvs.exclude+java.exclude /Q /I %m1Dir%\src\java
%m2Dir%\src\main\resources
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\test %m2Dir%\src\test\java
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\test-resources
%m2Dir%\src\test\resources
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\test-ejb-jar
%m2Dir%\src\test\test-ejb-jar
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\java\*.java
%m2Dir%\src\main\java
-echo "Setting up openejb-builder..."
+echo Setting up openejb-builder...
set m1Dir=%modules%\openejb-builder
set m2Dir=%root%\openejb-builder
mkdir %m2Dir%
-copy %poms%\ejb-builder.pom %m2Dir%\pom.xml
+copy %poms%\openejb-builder.pom %m2Dir%\pom.xml
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\test %m2Dir%\src\test\java
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\schema
%m2Dir%\src\main\schema
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\test-cmp
%m2Dir%\src\test\test-cmp
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\test-ear
%m2Dir%\src\test\test-ear
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\test-ejb-jar
%m2Dir%\src\test\test-ejb-jar
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\test-resources
%m2Dir%\src\test\resources
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\java %m2Dir%\src\main\java
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\test %m2Dir%\src\test\java
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\test-cmp
%m2Dir%\src\test\test-cmp
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\test-ant
%m2Dir%\src\test\test-ant
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\test-ear
%m2Dir%\src\test\test-ear
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\test-ejb-jar
%m2Dir%\src\test\test-ejb-jar
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\test-resources
%m2Dir%\src\test\resources
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\schema
%m2Dir%\src\main\schema
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\java %m2Dir%\src\main\java
-
-
-echo "Setting up pkgen-builder..."
+echo Setting up pkgen-builder...
set m1Dir=%modules%\pkgen-builder
set m2Dir=%root%\pkgen-builder
mkdir %m2Dir%
copy %poms%\pkgen-builder.pom %m2Dir%\pom.xml
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\java %m2Dir%\src\main\java
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\schema
%m2Dir%\src\main\schema
-
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\java %m2Dir%\src\main\java
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\schema
%m2Dir%\src\main\schema
-echo "Setting up webadmin..."
+echo Setting up openejb-webadmin...
set m1Dir=%modules%\webadmin
-set m2Dir=%root%\webadmin
+set m2Dir=%root%\openejb-webadmin
+mkdir %m2Dir%
+copy %poms%\openejb-webadmin.pom %m2Dir%\pom.xml
+
+
+echo Setting up openejb-webadmin-commons...
+set m2Dir=%root%\openejb-webadmin\openejb-webadmin-commons
+mkdir %m2Dir%
+copy %poms%\openejb-webadmin-commons.pom %m2Dir%\pom.xml
+
+ xcopy /EXCLUDE:cvs.exclude /S /Q /I
%m1Dir%\src\java\org\openejb\webadmin\*.java
%m2Dir%\src\main\java\org\openejb\webadmin
+
+echo Setting up openejb-webadmin-clienttools...
+set m2Dir=%root%\openejb-webadmin\openejb-webadmin-clienttools
+mkdir %m2Dir%
+copy %poms%\openejb-webadmin-clienttools.pom %m2Dir%\pom.xml
+
+ xcopy /EXCLUDE:cvs.exclude /S /Q /I
%m1Dir%\src\java\org\openejb\webadmin\clienttools\*.java
%m2Dir%\src\main\java\org\openejb\webadmin\clienttools
+ xcopy /EXCLUDE:cvs.exclude /S /Q /I
%m1Dir%\src\java\org\openejb\webadmin\clienttools\*.xml
%m2Dir%\src\main\resources\META-INF
+
+echo Setting up openejb-webadmin-ejbgen...
+set m2Dir=%root%\openejb-webadmin\openejb-webadmin-ejbgen
+mkdir %m2Dir%
+copy %poms%\openejb-webadmin-ejbgen.pom %m2Dir%\pom.xml
+
+ xcopy /EXCLUDE:cvs.exclude /S /Q /I
%m1Dir%\src\java\org\openejb\webadmin\ejbgen\*.java
%m2Dir%\src\main\java\org\openejb\webadmin\ejbgen
+ xcopy /EXCLUDE:cvs.exclude /S /Q /I
%m1Dir%\src\java\org\openejb\webadmin\ejbgen\*.xml
%m2Dir%\src\main\resources\META-INF
+
+echo Setting up openejb-webadmin-main...
+set m2Dir=%root%\openejb-webadmin\openejb-webadmin-main
+mkdir %m2Dir%
+copy %poms%\openejb-webadmin-main.pom %m2Dir%\pom.xml
+
+ xcopy /EXCLUDE:cvs.exclude /S /Q /I
%m1Dir%\src\java\org\openejb\webadmin\main\*.java
%m2Dir%\src\main\java\org\openejb\webadmin\main
+ xcopy /EXCLUDE:cvs.exclude /S /Q /I
%m1Dir%\src\java\org\openejb\webadmin\httpd\*.*
%m2Dir%\src\main\java\org\openejb\webadmin\httpd
+ xcopy /EXCLUDE:cvs.exclude /S /Q /I
%m1Dir%\src\java\org\openejb\webadmin\main\*.xml
%m2Dir%\src\main\resources\META-INF
+
+echo Setting up test-ear...
+set m2Dir=%root%\test-ear
+set m1Dir=%modules%\openejb-builder\src\test-ear
+mkdir %m2Dir%
+copy %poms%\ejb-test-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-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...
+set m2Dir=%root%\test-ejb-jar
+set m1Dir=%modules%\openejb-builder\src\test-ejb-jar
mkdir %m2Dir%
-copy %poms%\webadmin.pom %m2Dir%\pom.xml
+copy %poms%\ejb-test-jar.pom %m2Dir%\pom.xml
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\java %m2Dir%\src\main\java
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\etc %m2Dir%\src\main\etc
- xcopy /EXCLUDE:excludes.txt /E /Q /I %m1Dir%\src\htdocs
%m2Dir%\src\main\htdocs
+ 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
+
+echo Copying edited unit test files...
+ xcopy /E /Q /I /Y unit-tests\*.* openejb
+
+echo Installing needed jar files into m2 local repository...
+call %M2_HOME%\bin\m2 install:install-file -DgroupId=axis
-DartifactId=commons-discovery -Dpackaging=jar -Dversion=SNAPSHOT
-Dfile=repository\commons-discovery-SNAPSHOT.jar
+call %M2_HOME%\bin\m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-deployment -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository\geronimo-deployment-1.0-SNAPSHOT.jar
+call %M2_HOME%\bin\m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-j2ee -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository\geronimo-j2ee-1.0-SNAPSHOT.jar
+call %M2_HOME%\bin\m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-j2ee-builder -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository\geronimo-j2ee-builder-1.0-SNAPSHOT.jar
+call %M2_HOME%\bin\m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-kernel -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository\geronimo-kernel-1.0-SNAPSHOT.jar
+call %M2_HOME%\bin\m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-service-builder -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository\geronimo-service-builder-1.0-SNAPSHOT.jar
+call %M2_HOME%\bin\m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-system -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository\geronimo-system-1.0-SNAPSHOT.jar
+call %M2_HOME%\bin\m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-transaction -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository\geronimo-transaction-1.0-SNAPSHOT.jar
+call %M2_HOME%\bin\m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-util -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository\geronimo-util-1.0-SNAPSHOT.jar
+call %M2_HOME%\bin\m2 install:install-file -DgroupId=tranql
-DartifactId=tranql -Dpackaging=jar -Dversion=1.1-SNAPSHOT
-Dfile=repository\tranql-1.1-SNAPSHOT.jar
+call %M2_HOME%\bin\m2 install:install-file -DgroupId=org.codehaus.mojo
-DartifactId=maven-xmlbeans-plugin -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository\maven-xmlbeans-plugin-1.0-SNAPSHOT.jar
+call %M2_HOME%\bin\m2 install:install-file -DgroupId=org.codehaus.mojo
-DartifactId=maven-xmlbeans-plugin -Dpackaging=pom -Dversion=1.0-SNAPSHOT
-Dfile=repository\maven-xmlbeans-plugin-1.0-SNAPSHOT.pom
-del excludes.txt
+del cvs.exclude
+del java.exclude
set root=
set poms=
set modules=
set m1Dir=
-set m2Dir=
\ No newline at end of file
+set m2Dir=
1.8.2.1 +63 -9 openejb/m2/maven2.sh
Index: maven2.sh
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/maven2.sh,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- maven2.sh 16 Sep 2005 06:36:04 -0000 1.8
+++ maven2.sh 29 Sep 2005 08:02:21 -0000 1.8.2.1
@@ -25,17 +25,18 @@
cp -r $m1Dir/src/conf $m2Dir/src/main
cp -r $m1Dir/src/etc $m2Dir/src/main
cd $m1Dir/src/java
- cp -r **/*.properties $m2Dir/src/main/resources --parent
- cp -r **/*.xml $m2Dir/src/main/resources --parent
+ find . -name '*.properties' -exec cp {} $m2Dir/src/main/resources --parent
\;
+ find . -name '*.xml' -exec cp {} $m2Dir/src/main/resources --parent \;
cd $runDir
mkdir -p $m2Dir/src/test/java
cp -r $m1Dir/src/test/* $m2Dir/src/test/java
mkdir -p $m2Dir/src/test/resources
cp -r $m1Dir/src/test-resources/* $m2Dir/src/test/resources
- cp -r $m1Dir/src/test-ejb-jar $m2Dir/src/test
mkdir -p $m2Dir/src/main/java
cd $m1Dir/src/java
- cp -r **/*.java $m2Dir/src/main/java --parent
+ find . -name '*.java' -exec cp {} $m2Dir/src/main/java --parent \;
+ cd $m2Dir
+ cp -r ../../unit-tests/openejb-core/* .
cd $runDir
}
@@ -44,21 +45,23 @@
m1Dir=$modules/openejb-builder
m2Dir=$root/openejb-builder
mkdir -p $m2Dir
-cp $poms/ejb-builder.pom $m2Dir/pom.xml
+cp $poms/openejb-builder.pom $m2Dir/pom.xml
{
mkdir -p $m2Dir/src/test/java
cp -r $m1Dir/src/test/* $m2Dir/src/test/java
mkdir -p $m2Dir/src/test/resources
cp -r $m1Dir/src/test-resources/* $m2Dir/src/test/resources
cp -r $m1Dir/src/test-cmp $m2Dir/src/test
- cp -r $m1Dir/src/test-ear $m2Dir/src/test
- cp -r $m1Dir/src/test-ejb-jar $m2Dir/src/test
mkdir -p $m2Dir/src/main
cp -r $m1Dir/src/schema $m2Dir/src/main
- cp -r $m1Dir/src/java/**/*.java $m2Dir/src/main/java
+ mkdir -p $m2Dir/src/main/java
+ cd $m1Dir/src/java
+ find . -name '*.java' -exec cp {} $m2Dir/src/main/java --parent \;
+ cd $m2Dir
+ cp -r ../../unit-tests/openejb-builder/* .
+ cd $runDir
}
-
echo "Setting up pkgen-builder..."
m1Dir=$modules/pkgen-builder
m2Dir=$root/pkgen-builder
@@ -124,3 +127,54 @@
mkdir -p $m2Dir/src/main/resources/META-INF
cp $m1Dir/src/java/org/openejb/webadmin/main/*.xml
$m2Dir/src/main/resources/META-INF
}
+
+echo "Setting up test-ear..."
+m2Dir=$root/test-ear
+m1Dir=$modules/openejb-builder/src/test-ear
+{
+ cp -r $m1Dir $m2Dir
+ cp $poms/ejb-test-ear.pom $m2Dir/pom.xml
+ mkdir -p $m2Dir/src/main/resources
+ cp -r $m1Dir/META-INF $m2Dir/src/main/resources
+}
+
+echo "Setting up test-ant-ear..."
+m2Dir=$root/test-ant-ear
+m1Dir=$modules/openejb-builder/src/test-ant
+{
+ cp -r $m1Dir $m2Dir
+ cp $poms/test-ant-ear.pom $m2Dir/pom.xml
+ mkdir -p $m2Dir/src/main/resources
+ cp -r $m1Dir/META-INF $m2Dir/src/main/resources
+}
+
+echo "Setting up test-ejb-jar..."
+m2Dir=$root/test-ejb-jar
+m1Dir=$modules/openejb-builder/src/test-ejb-jar
+{
+ cp -r $m1Dir $m2Dir
+ cp $poms/ejb-test-jar.pom $m2Dir/pom.xml
+ mkdir -p $m2Dir/src/main/resources
+ cp -r $m1Dir/META-INF $m2Dir/src/main/resources
+ mkdir -p $m2Dir/src/main/java
+ cp -r $m1Dir/org $m2Dir/src/main/java
+}
+
+echo "Cleaning up copied CVS folders"
+cd openejb
+find . -name 'CVS' -type d -exec rm -rf {} \;
+cd ..
+
+echo "Installing needed jar files into m2 local repository..."
+$M2_HOME/bin/m2 install:install-file -DgroupId=axis
-DartifactId=commons-discovery -Dpackaging=jar -Dversion=SNAPSHOT
-Dfile=repository/commons-discovery-SNAPSHOT.jar
+$M2_HOME/bin/m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-deployment -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository/geronimo-deployment-1.0-SNAPSHOT.jar
+$M2_HOME/bin/m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-j2ee -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository/geronimo-j2ee-1.0-SNAPSHOT.jar
+$M2_HOME/bin/m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-j2ee-builder -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository/geronimo-j2ee-builder-1.0-SNAPSHOT.jar
+$M2_HOME/bin/m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-kernel -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository/geronimo-kernel-1.0-SNAPSHOT.jar
+$M2_HOME/bin/m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-service-builder -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository/geronimo-service-builder-1.0-SNAPSHOT.jar
+$M2_HOME/bin/m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-system -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository/geronimo-system-1.0-SNAPSHOT.jar
+$M2_HOME/bin/m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-transaction -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository/geronimo-transaction-1.0-SNAPSHOT.jar
+$M2_HOME/bin/m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-util -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository/geronimo-util-1.0-SNAPSHOT.jar
+$M2_HOME/bin/m2 install:install-file -DgroupId=tranql -DartifactId=tranql
-Dpackaging=jar -Dversion=1.0-SNAPSHOT -Dfile=repository/tranql-1.0-SNAPSHOT.jar
+$M2_HOME/bin/m2 install:install-file -DgroupId=org.codehaus.mojo
-DartifactId=maven-xmlbeans-plugin -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository/maven-xmlbeans-plugin-1.0-SNAPSHOT.jar
+$M2_HOME/bin/m2 install:install-file -DgroupId=org.codehaus.mojo
-DartifactId=maven-xmlbeans-plugin -Dpackaging=pom -Dversion=1.0-SNAPSHOT
-Dfile=repository/maven-xmlbeans-plugin-1.0-SNAPSHOT.pom
1.1.2.1 +21 -10 openejb/m2/openejb-builder.pom
Index: openejb-builder.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-builder.pom,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openejb-builder.pom 16 Sep 2005 06:36:04 -0000 1.1
+++ openejb-builder.pom 29 Sep 2005 08:02:21 -0000 1.1.2.1
@@ -362,18 +362,25 @@
</dependency>
<dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.5</version>
+ </dependency>
+
+ <dependency>
<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>
@@ -383,7 +390,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0-beta-1-SNAPSHOT</version>
+ <version>2.0-beta-1</version>
<configuration>
<source>1.4</source>
<target>1.4</target>
@@ -441,15 +448,19 @@
</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>
- </includes>
+ <directory>../../test-ant-ear/src/test/resources</directory>
+ </testResource>
+
+ <testResource>
+ <targetPath>..</targetPath>
+ <directory>../../test-ant-ear/src/test/resources</directory>
+ </testResource>
+
+ <testResource>
+ <targetPath>..</targetPath>
+ <directory>../../test-ant-ear/src/test/resources</directory>
</testResource>
</testResources>
</build>
1.1.2.1 +9 -4 openejb/m2/openejb-core.pom
Index: openejb-core.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-core.pom,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openejb-core.pom 16 Sep 2005 06:36:04 -0000 1.1
+++ openejb-core.pom 29 Sep 2005 08:02:21 -0000 1.1.2.1
@@ -17,6 +17,11 @@
<dependencies>
<dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-util</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-ejb</artifactId>
</dependency>
@@ -187,7 +192,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0-beta-1-SNAPSHOT</version>
+ <version>2.0-beta-1</version>
<configuration>
<source>1.4</source>
<target>1.4</target>
@@ -196,12 +201,12 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.0-beta-1-SNAPSHOT</version>
+ <version>2.0-beta-1</version>
<configuration>
<systemProperties>
<property>
<name>maven.junit.jvmargs</name>
-
<value>-Djava.security.auth.login.config=src/test-resources/login.config</value>
+
<value>-Djava.security.auth.login.config=src/test/resources/login.config</value>
</property>
</systemProperties>
</configuration>
1.1.2.1 +28 -9 openejb/m2/openejb-root.pom
Index: openejb-root.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-root.pom,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openejb-root.pom 16 Sep 2005 06:36:04 -0000 1.1
+++ openejb-root.pom 29 Sep 2005 08:02:21 -0000 1.1.2.1
@@ -14,6 +14,9 @@
<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>
@@ -339,9 +342,15 @@
</dependency>
<dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-util</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>tranql</groupId>
<artifactId>tranql</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -546,20 +555,30 @@
<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>
- <groupId>axis</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
--->
</dependencies>
</dependencyManagement>
1.1.2.1 +1 -1 openejb/m2/openejb-webadmin-clienttools.pom
Index: openejb-webadmin-clienttools.pom
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/m2/openejb-webadmin-clienttools.pom,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openejb-webadmin-clienttools.pom 16 Sep 2005 06:36:04 -0000 1.1
+++ openejb-webadmin-clienttools.pom 29 Sep 2005 08:02:21 -0000 1.1.2.1
@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <name>openejb-webadmin-clienttools</name>
+ <name>OpenEJB :: WebAdmin :: Client Tools</name>
<artifactId>openejb-webadmin-clienttools</artifactId>
<description>OpenEJB Web-based Administration Console Client
Tools</description>
<packaging>jar</packaging>
1.1.2.1 +1 -1 openejb/m2/openejb-webadmin-commons.pom
Index: openejb-webadmin-commons.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-webadmin-commons.pom,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openejb-webadmin-commons.pom 16 Sep 2005 06:36:04 -0000 1.1
+++ openejb-webadmin-commons.pom 29 Sep 2005 08:02:21 -0000 1.1.2.1
@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <name>openejb-webadmin-commons</name>
+ <name>OpenEJB :: WebAdmin :: Commons</name>
<artifactId>openejb-webadmin-commons</artifactId>
<description>OpenEJB Web-based Administration Console Commons</description>
<packaging>jar</packaging>
1.1.2.1 +1 -1 openejb/m2/openejb-webadmin-ejbgen.pom
Index: openejb-webadmin-ejbgen.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-webadmin-ejbgen.pom,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openejb-webadmin-ejbgen.pom 16 Sep 2005 06:36:04 -0000 1.1
+++ openejb-webadmin-ejbgen.pom 29 Sep 2005 08:02:21 -0000 1.1.2.1
@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <name>openejb-webadmin-ejbgen</name>
+ <name>OpenEJB :: WebAdmin :: EJB Generator</name>
<artifactId>openejb-webadmin-ejbgen</artifactId>
<description>OpenEJB Web-based Administration Console EJB
Generator</description>
<packaging>jar</packaging>
1.1.2.1 +1 -1 openejb/m2/openejb-webadmin-main.pom
Index: openejb-webadmin-main.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-webadmin-main.pom,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openejb-webadmin-main.pom 16 Sep 2005 06:36:04 -0000 1.1
+++ openejb-webadmin-main.pom 29 Sep 2005 08:02:21 -0000 1.1.2.1
@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <name>openejb-webadmin-main</name>
+ <name>OpenEJB :: WebAdmin :: Main</name>
<artifactId>openejb-webadmin-main</artifactId>
<description>OpenEJB Web-based Administration Console Main</description>
<packaging>jar</packaging>
1.1.2.1 +1 -1 openejb/m2/openejb-webadmin.pom
Index: openejb-webadmin.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-webadmin.pom,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openejb-webadmin.pom 16 Sep 2005 06:36:04 -0000 1.1
+++ openejb-webadmin.pom 29 Sep 2005 08:02:21 -0000 1.1.2.1
@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <name>openejb-webadmin</name>
+ <name>OpenEJB :: WebAdmin</name>
<artifactId>openejb-webadmin</artifactId>
<packaging>pom</packaging>
<description>OpenEJB Web-based Administration Console Parent
POM</description>
1.1.2.1 +1 -1 openejb/m2/pkgen-builder.pom
Index: pkgen-builder.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/pkgen-builder.pom,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- pkgen-builder.pom 16 Sep 2005 06:36:04 -0000 1.1
+++ pkgen-builder.pom 29 Sep 2005 08:02:21 -0000 1.1.2.1
@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <name>pkgen-builder</name>
+ <name>OpenEJB :: PK Generation :: Builder</name>
<artifactId>pkgen-builder</artifactId>
<version>2.0-SNAPSHOT</version>
<packaging>jar</packaging>
