brett 2005/09/24 00:56:09
Modified: m2 maven2.bat maven2.sh
Removed: m2 PortableStubCompilerTest.java.diff
Log:
more test-resources fixes
Revision Changes Path
1.5 +3 -3 openejb/m2/maven2.bat
Index: maven2.bat
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/maven2.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- maven2.bat 23 Sep 2005 07:44:09 -0000 1.4
+++ maven2.bat 24 Sep 2005 04:56:09 -0000 1.5
@@ -25,7 +25,7 @@
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\test-resources
+ 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
@@ -42,7 +42,7 @@
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\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
@@ -118,4 +118,4 @@
set poms=
set modules=
set m1Dir=
-set m2Dir=
\ No newline at end of file
+set m2Dir=
1.15 +3 -2 openejb/m2/maven2.sh
Index: maven2.sh
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/maven2.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -u -r1.14 -r1.15
--- maven2.sh 24 Sep 2005 04:32:39 -0000 1.14
+++ maven2.sh 24 Sep 2005 04:56:09 -0000 1.15
@@ -37,7 +37,7 @@
cd $m1Dir/src/java
find . -name '*.java' -exec cp {} $m2Dir/src/main/java --parent \;
cd $m2Dir
- patch -p0
src/test/java/org/openejb/corba/compiler/PortableStubCompilerTest.java
<../../PortableStubCompilerTest.java.diff
+ cp -r ../../unit-tests/openejb-core/* .
cd $runDir
}
@@ -61,9 +61,10 @@
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
