brett 2005/03/18 01:16:50
Modified: m2 ejb-builder.pom ejb-group.pom ejb-test-jar.pom
maven2.sh
Log:
reorg
Revision Changes Path
1.2 +2 -2 openejb/m2/ejb-builder.pom
Index: ejb-builder.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/ejb-builder.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- ejb-builder.pom 12 Mar 2005 21:50:38 -0000 1.1
+++ ejb-builder.pom 18 Mar 2005 06:16:50 -0000 1.2
@@ -32,7 +32,7 @@
<includes>*.xsd,*.dtd</includes>
</resource>
<resource>
- <directory>src/java</directory>
+ <directory>src/main/java</directory>
<includes>**/*.xml,**/*.properties</includes>
</resource>
<resource>
1.7 +1 -3 openejb/m2/ejb-group.pom
Index: ejb-group.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/ejb-group.pom,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- ejb-group.pom 18 Mar 2005 05:29:02 -0000 1.6
+++ ejb-group.pom 18 Mar 2005 06:16:50 -0000 1.7
@@ -542,8 +542,6 @@
</ciManagement>
<build>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
<pluginManagement>
<plugins>
<plugin>
1.3 +2 -1 openejb/m2/ejb-test-jar.pom
Index: ejb-test-jar.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/ejb-test-jar.pom,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- ejb-test-jar.pom 12 Mar 2005 05:50:43 -0000 1.2
+++ ejb-test-jar.pom 18 Mar 2005 06:16:50 -0000 1.3
@@ -12,6 +12,7 @@
<groupId>openejb</groupId>
<artifactId>ejb-test-jar</artifactId>
<name>OpenEJB Test Jar</name>
+ <packaging>ejb</packaging>
<dependencies>
<dependency>
<groupId>geronimo-spec</groupId>
1.6 +23 -6 openejb/m2/maven2.sh
Index: maven2.sh
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/maven2.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- maven2.sh 18 Mar 2005 05:29:02 -0000 1.5
+++ maven2.sh 18 Mar 2005 06:16:50 -0000 1.6
@@ -6,29 +6,35 @@
modules_dir=$dir/modules
echo "Backing up IntelliJ files"
-rm -rf intellij
mkdir -p intellij
find openejb -name '*.iml' -exec cp --parents {} intellij \;
cp openejb/*.iws intellij/openejb
cp openejb/*.ipr intellij/openejb
echo "Removing old version"
-rm -rf $dir > /dev/null 2>&1
+rm -rf $dir
echo "Setting up base"
-mkdir -p $dir > /dev/null 2>&1
-
-cp -r intellij/openejb/* openejb
+mkdir -p $dir
cp $poms/ejb-group.pom $dir/pom.xml
echo "Setting up modules"
-mkdir $dir/modules
+mkdir -p $modules_dir
echo "... core"
# TODO: should be ./openejb-core not ./modules/core
cp -r $src/modules/core $modules_dir
cp $poms/ejb-core.pom $modules_dir/core/pom.xml
+(
+ cd $modules_dir/core
+ mkdir -p src/main
+ mkdir -p src/test/java
+ mv src/conf src/main/resources
+ mv src/test/org src/test/java
+ mv src/test-resources src/test/resources
+ mv src/java src/main
+)
echo "... test-ejb-jar"
mv $dir/modules/core/src/test-ejb-jar $modules_dir
@@ -46,6 +52,14 @@
cp -r $src/modules/openejb-builder $modules_dir
cp $poms/ejb-builder.pom $modules_dir/openejb-builder/pom.xml
rm -rf $modules_dir/openejb-builder/src/test-ejb-jar
+(
+ cd $modules_dir/openejb-builder
+ mkdir -p src/main
+ mkdir -p src/test/java
+ mv src/java src/main
+ mv src/test/org src/test/java
+ mv src/test-resources src/test/resources
+)
echo "... test-ear"
mv $dir/modules/openejb-builder/src/test-ear $modules_dir
@@ -65,4 +79,7 @@
echo "Removing CVS directories"
find $dir -name 'CVS*' -exec rm -rf {} \; > /dev/null 2>&1
+
+echo "Restoring IntelliJ Files"
+cp -r intellij/openejb/* openejb
