brett 2005/09/24 00:14:26
Modified: m2 maven2.sh openejb-core.pom
Log:
shell script fixes
Revision Changes Path
1.13 +10 -7 openejb/m2/maven2.sh
Index: maven2.sh
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/maven2.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -u -r1.12 -r1.13
--- maven2.sh 23 Sep 2005 23:08:38 -0000 1.12
+++ maven2.sh 24 Sep 2005 04:14:26 -0000 1.13
@@ -25,17 +25,17 @@
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/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 $runDir
}
@@ -48,15 +48,18 @@
{
mkdir -p $m2Dir/src/test/java
cp -r $m1Dir/src/test/* $m2Dir/src/test/java
- mkdir -p $m2Dir/src/test/test-resources
- cp -r $m1Dir/src/test-resources/* $m2Dir/src/test/test-resources
+ 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-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
- 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 $runDir
}
1.5 +2 -2 openejb/m2/openejb-core.pom
Index: openejb-core.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-core.pom,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- openejb-core.pom 23 Sep 2005 07:44:09 -0000 1.4
+++ openejb-core.pom 24 Sep 2005 04:14:26 -0000 1.5
@@ -201,7 +201,7 @@
<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>
