jtolentino 2005/09/26 02:35:32
Modified: m2 ejb-test-ear.pom maven2.bat maven2.sh
test-ant-ear.pom
Log:
Renamed the artifact packaged into the test ear files. Updates to the batch
file and shell script to cleanup copied cvs directories.
Revision Changes Path
1.3 +16 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ejb-test-ear.pom 26 Sep 2005 03:12:42 -0000 1.2
+++ ejb-test-ear.pom 26 Sep 2005 06:35:32 -0000 1.3
@@ -23,5 +23,20 @@
<outputDirectory>target</outputDirectory>
<directory>../openejb-builder/src/test/resources</directory>
<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.8 +1 -1 openejb/m2/maven2.bat
Index: maven2.bat
===================================================================
RCS file: /scm/openejb/openejb/m2/maven2.bat,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- maven2.bat 26 Sep 2005 03:12:42 -0000 1.7
+++ maven2.bat 26 Sep 2005 06:35:32 -0000 1.8
@@ -39,8 +39,8 @@
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-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
1.17 +5 -0 openejb/m2/maven2.sh
Index: maven2.sh
===================================================================
RCS file: /scm/openejb/openejb/m2/maven2.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- maven2.sh 26 Sep 2005 03:37:20 -0000 1.16
+++ maven2.sh 26 Sep 2005 06:35:32 -0000 1.17
@@ -167,6 +167,11 @@
cp -r $m1Dir/org $m2Dir/src/main/java/org
}
+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
1.2 +16 -1 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test-ant-ear.pom 26 Sep 2005 03:12:42 -0000 1.1
+++ test-ant-ear.pom 26 Sep 2005 06:35:32 -0000 1.2
@@ -23,5 +23,20 @@
<outputDirectory>target</outputDirectory>
<directory>../openejb-builder/src/test/resources</directory>
<finalName>test-ant</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>
