jtolentino 2005/09/23 03:44:09
Modified: m2 README.txt maven2.bat maven2.sh openejb-builder.pom
openejb-core.pom
Log:
Synched unit tests and new dependencies.
Revision Changes Path
1.4 +2 -0 openejb/m2/README.txt
Index: README.txt
===================================================================
RCS file: /scm/openejb/openejb/m2/README.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README.txt 22 Sep 2005 07:22:27 -0000 1.3
+++ README.txt 23 Sep 2005 07:44:09 -0000 1.4
@@ -6,6 +6,8 @@
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.
1.4 +3 -0 openejb/m2/maven2.bat
Index: maven2.bat
===================================================================
RCS file: /scm/openejb/openejb/m2/maven2.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven2.bat 22 Sep 2005 10:38:28 -0000 1.3
+++ maven2.bat 23 Sep 2005 07:44:09 -0000 1.4
@@ -40,6 +40,7 @@
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-ear
%m2Dir%\src\test\test-ear
+ 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-ejb-jar
%m2Dir%\src\test\test-ejb-jar
xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\test-resources
%m2Dir%\src\test\test-resources
xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\schema
%m2Dir%\src\main\schema
@@ -100,10 +101,12 @@
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=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
1.11 +12 -9 openejb/m2/maven2.sh
Index: maven2.sh
===================================================================
RCS file: /scm/openejb/openejb/m2/maven2.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maven2.sh 22 Sep 2005 10:55:41 -0000 1.10
+++ maven2.sh 23 Sep 2005 07:44:09 -0000 1.11
@@ -52,6 +52,7 @@
cp -r $m1Dir/src/test-resources/* $m2Dir/src/test/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-ant $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
@@ -126,12 +127,14 @@
}
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-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=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
+$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=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.4 +1 -0 openejb/m2/openejb-builder.pom
Index: openejb-builder.pom
===================================================================
RCS file: /scm/openejb/openejb/m2/openejb-builder.pom,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openejb-builder.pom 22 Sep 2005 10:38:28 -0000 1.3
+++ openejb-builder.pom 23 Sep 2005 07:44:09 -0000 1.4
@@ -455,6 +455,7 @@
<include>test-ejb-jar.jar</include>
<include>test-ear.ear</include>
<include>test-ejb-jar/**/*.*</include>
+ <include>test-ant.ear</include>
</includes>
</testResource>
</testResources>
1.4 +0 -0 openejb/m2/openejb-core.pom
Index: openejb-core.pom
===================================================================
RCS file: /scm/openejb/openejb/m2/openejb-core.pom,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
