jtolentino 2005/09/26 04:33:30
Modified: m2 README.txt ejb-test-ear.pom ejb-test-jar.pom
maven2.sh openejb-builder.pom test-ant-ear.pom
Log:
Made openejb-builder to refer to target folders of test modules instead.
Previous configuration removes the resources folder of openejb-builder if you
do a clean:clean.
Revision Changes Path
1.5 +1 -4 openejb/m2/README.txt
Index: README.txt
===================================================================
RCS file: /scm/openejb/openejb/m2/README.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README.txt 23 Sep 2005 07:44:09 -0000 1.4
+++ README.txt 26 Sep 2005 08:33:30 -0000 1.5
@@ -1,8 +1,6 @@
Usage instructions
------------------
-Requires m1 version to be built using m1 first.
-
Requires m2 to be installed. Check out from:
:pserver:[EMAIL PROTECTED]:/home/cvspublic:maven-components
@@ -19,8 +17,7 @@
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.4 +1 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ejb-test-ear.pom 26 Sep 2005 06:35:32 -0000 1.3
+++ ejb-test-ear.pom 26 Sep 2005 08:33:30 -0000 1.4
@@ -20,8 +20,6 @@
</dependency>
</dependencies>
<build>
- <outputDirectory>target</outputDirectory>
- <directory>../openejb-builder/src/test/resources</directory>
<finalName>test-ear</finalName>
<plugins>
<plugin>
1.6 +1 -3 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ejb-test-jar.pom 26 Sep 2005 03:12:42 -0000 1.5
+++ ejb-test-jar.pom 26 Sep 2005 08:33:30 -0000 1.6
@@ -24,8 +24,6 @@
</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.18 +4 -4 openejb/m2/maven2.sh
Index: maven2.sh
===================================================================
RCS file: /scm/openejb/openejb/m2/maven2.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- maven2.sh 26 Sep 2005 06:35:32 -0000 1.17
+++ maven2.sh 26 Sep 2005 08:33:30 -0000 1.18
@@ -140,7 +140,7 @@
{
cp $m1Dir $m2Dir
mkdir -p $m2Dir/src/main/resources/META-INF
- cp -r $m1Dir/META-INF $m2Dir/src/main/resources/META-INF
+ cp -r $m1Dir/META-INF $m2Dir/src/main/resources
}
echo "Setting up test-ant-ear..."
@@ -151,7 +151,7 @@
{
cp $m1Dir $m2Dir
mkdir -p $m2Dir/src/main/resources/META-INF
- cp -r $m1Dir/META-INF $m2Dir/src/main/resources/META-INF
+ cp -r $m1Dir/META-INF $m2Dir/src/main/resources
}
echo "Setting up test-ejb-jar..."
@@ -162,9 +162,9 @@
{
cp $m1Dir $m2Dir
mkdir -p $m2Dir/src/main/resources/META-INF
- cp -r $m1Dir/META-INF $m2Dir/src/main/resources/META-INF
+ cp -r $m1Dir/META-INF $m2Dir/src/main/resources
mkdir -p $m2Dir/src/main/java/org
- cp -r $m1Dir/org $m2Dir/src/main/java/org
+ cp -r $m1Dir/org $m2Dir/src/main/java
}
echo "Cleaning up copied CVS folders"
1.6 +11 -1 openejb/m2/openejb-builder.pom
Index: openejb-builder.pom
===================================================================
RCS file: /scm/openejb/openejb/m2/openejb-builder.pom,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openejb-builder.pom 26 Sep 2005 03:12:42 -0000 1.5
+++ openejb-builder.pom 26 Sep 2005 08:33:30 -0000 1.6
@@ -450,7 +450,17 @@
<testResource>
<targetPath>..</targetPath>
- <directory>src/test/resources</directory>
+ <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.3 +1 -3 openejb/m2/test-ant-ear.pom
Index: test-ant-ear.pom
===================================================================
RCS file: /scm/openejb/openejb/m2/test-ant-ear.pom,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- test-ant-ear.pom 26 Sep 2005 06:35:32 -0000 1.2
+++ test-ant-ear.pom 26 Sep 2005 08:33:30 -0000 1.3
@@ -20,8 +20,6 @@
</dependency>
</dependencies>
<build>
- <outputDirectory>target</outputDirectory>
- <directory>../openejb-builder/src/test/resources</directory>
<finalName>test-ant</finalName>
<plugins>
<plugin>
