brett 2005/09/30 09:50:22
Modified: m2 ejb-test-ear.pom ejb-test-jar.pom maven2.bat
maven2.sh openejb-builder.pom openejb-root.pom
pkgen-builder.pom test-ant-ear.pom
Log:
get the build working
Revision Changes Path
1.5 +7 -3 openejb/m2/ejb-test-ear.pom
Index: ejb-test-ear.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/ejb-test-ear.pom,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- ejb-test-ear.pom 26 Sep 2005 08:33:30 -0000 1.4
+++ ejb-test-ear.pom 30 Sep 2005 13:50:21 -0000 1.5
@@ -17,6 +17,7 @@
<dependency>
<groupId>openejb</groupId>
<artifactId>test-ejb-jar</artifactId>
+ <type>ejb</type>
</dependency>
</dependencies>
<build>
@@ -26,12 +27,15 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<configuration>
+ <!-- TODO: use regular resources -->
+ <resourcesDir>src/main/resources</resourcesDir>
+ <version>1.4</version>
<modules>
- <javaModule>
+ <ejbModule>
<groupId>openejb</groupId>
<artifactId>test-ejb-jar</artifactId>
<bundleFileName>test-ejb-jar.jar</bundleFileName>
- </javaModule>
+ </ejbModule>
</modules>
</configuration>
</plugin>
1.7 +2 -2 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.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- ejb-test-jar.pom 26 Sep 2005 08:33:30 -0000 1.6
+++ ejb-test-jar.pom 30 Sep 2005 13:50:21 -0000 1.7
@@ -12,7 +12,7 @@
<groupId>openejb</groupId>
<artifactId>test-ejb-jar</artifactId>
<name>OpenEJB Test Jar</name>
- <packaging>jar</packaging>
+ <packaging>ejb</packaging>
<dependencies>
<dependency>
<groupId>geronimo-spec</groupId>
1.11 +5 -14 openejb/m2/maven2.bat
Index: maven2.bat
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/maven2.bat,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- maven2.bat 30 Sep 2005 06:43:55 -0000 1.10
+++ maven2.bat 30 Sep 2005 13:50:21 -0000 1.11
@@ -12,7 +12,7 @@
echo Setting up base
mkdir %root%
copy %poms%\openejb-root.pom %root%\pom.xml
-
+maven -q process-root-pom
echo Setting up core...
set m1Dir=%modules%\core
@@ -101,8 +101,7 @@
mkdir %m2Dir%
copy %poms%\ejb-test-ear.pom %m2Dir%\pom.xml
- xcopy /EXCLUDE:cvs.exclude /Q /I %m1Dir% %m2Dir%
- xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\META-INF
%m2Dir%\src\main\resources\META-INF
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I
%m1Dir%\META-INF\geronimo-application.xml %m2Dir%\src\main\resources\META-INF
echo Setting up test-ant-ear...
set m2Dir=%root%\test-ant-ear
@@ -110,8 +109,8 @@
mkdir %m2Dir%
copy %poms%\test-ant-ear.pom %m2Dir%\pom.xml
- xcopy /EXCLUDE:cvs.exclude /Q /I %m1Dir% %m2Dir%
- xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\META-INF
%m2Dir%\src\main\resources\META-INF
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I
%m1Dir%\META-INF\geronimo-application.xml %m2Dir%\src\main\resources\META-INF
+ xcopy /EXCLUDE:cvs.exclude /Q /I %m1Dir%
%root%\openejb-builder\src\test-ant
echo Setting up test-jar...
set m2Dir=%root%\test-ejb-jar
@@ -119,23 +118,15 @@
mkdir %m2Dir%
copy %poms%\ejb-test-jar.pom %m2Dir%\pom.xml
- xcopy /EXCLUDE:cvs.exclude /Q /I %m1Dir% %m2Dir%
xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\META-INF
%m2Dir%\src\main\resources\META-INF
xcopy /EXCLUDE:cvs.exclude /S /Q /I %m1Dir%\org %m2Dir%\src\main\java\org
+ xcopy /EXCLUDE:cvs.exclude /Q /I %m1Dir%
%root%\openejb-builder\src\test-ejb-jar
echo Copying edited unit test files...
xcopy /E /Q /I /Y unit-tests\*.* openejb
echo Installing needed jar files into m2 local repository...
call %M2_HOME%\bin\m2 install:install-file -DgroupId=axis
-DartifactId=commons-discovery -Dpackaging=jar -Dversion=SNAPSHOT
-Dfile=repository\commons-discovery-SNAPSHOT.jar
-call %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
-call %M2_HOME%\bin\m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-j2ee -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository\geronimo-j2ee-1.0-SNAPSHOT.jar
-call %M2_HOME%\bin\m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-j2ee-builder -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository\geronimo-j2ee-builder-1.0-SNAPSHOT.jar
-call %M2_HOME%\bin\m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-kernel -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository\geronimo-kernel-1.0-SNAPSHOT.jar
-call %M2_HOME%\bin\m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-service-builder -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository\geronimo-service-builder-1.0-SNAPSHOT.jar
-call %M2_HOME%\bin\m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-system -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository\geronimo-system-1.0-SNAPSHOT.jar
-call %M2_HOME%\bin\m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-transaction -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository\geronimo-transaction-1.0-SNAPSHOT.jar
-call %M2_HOME%\bin\m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-util -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository\geronimo-util-1.0-SNAPSHOT.jar
call %M2_HOME%\bin\m2 install:install-file -DgroupId=tranql
-DartifactId=tranql -Dpackaging=jar -Dversion=1.1-SNAPSHOT
-Dfile=repository\tranql-1.1-SNAPSHOT.jar
1.22 +12 -17 openejb/m2/maven2.sh
Index: maven2.sh
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/maven2.sh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -u -r1.21 -r1.22
--- maven2.sh 30 Sep 2005 06:43:55 -0000 1.21
+++ maven2.sh 30 Sep 2005 13:50:21 -0000 1.22
@@ -12,7 +12,7 @@
echo "Setting up base"
mkdir -p $root
cp $poms/openejb-root.pom $root/pom.xml
-
+maven -q process-root-pom
echo "Setting up core..."
m1Dir=$modules/core
@@ -132,32 +132,35 @@
m2Dir=$root/test-ear
m1Dir=$modules/openejb-builder/src/test-ear
{
- cp -r $m1Dir $m2Dir
+ mkdir -p $m2Dir/src/main/resources/META-INF
+ cp -r $m1Dir/META-INF/geronimo-application.xml
$m2Dir/src/main/resources/META-INF
cp $poms/ejb-test-ear.pom $m2Dir/pom.xml
- mkdir -p $m2Dir/src/main/resources
- cp -r $m1Dir/META-INF $m2Dir/src/main/resources
}
echo "Setting up test-ant-ear..."
m2Dir=$root/test-ant-ear
m1Dir=$modules/openejb-builder/src/test-ant
{
- cp -r $m1Dir $m2Dir
+ mkdir -p $m2Dir/src/main/resources/META-INF
+ cp $m1Dir/META-INF/geronimo-application.xml
$m2Dir/src/main/resources/META-INF
cp $poms/test-ant-ear.pom $m2Dir/pom.xml
- mkdir -p $m2Dir/src/main/resources
- cp -r $m1Dir/META-INF $m2Dir/src/main/resources
+
+ # This is what the ant tests want - could be improved
+ cp -r $m1Dir $root/openejb-builder/src
}
echo "Setting up test-ejb-jar..."
m2Dir=$root/test-ejb-jar
m1Dir=$modules/openejb-builder/src/test-ejb-jar
{
- cp -r $m1Dir $m2Dir
- cp $poms/ejb-test-jar.pom $m2Dir/pom.xml
mkdir -p $m2Dir/src/main/resources
cp -r $m1Dir/META-INF $m2Dir/src/main/resources
mkdir -p $m2Dir/src/main/java
cp -r $m1Dir/org $m2Dir/src/main/java
+ cp $poms/ejb-test-jar.pom $m2Dir/pom.xml
+
+ # This is what the ant tests want - could be improved
+ cp -r $m1Dir $root/openejb-builder/src
}
echo "Cleaning up copied CVS folders"
@@ -167,12 +170,4 @@
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
-$M2_HOME/bin/m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-j2ee -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository/geronimo-j2ee-1.0-SNAPSHOT.jar
-$M2_HOME/bin/m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-j2ee-builder -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository/geronimo-j2ee-builder-1.0-SNAPSHOT.jar
-$M2_HOME/bin/m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-kernel -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository/geronimo-kernel-1.0-SNAPSHOT.jar
-$M2_HOME/bin/m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-service-builder -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository/geronimo-service-builder-1.0-SNAPSHOT.jar
-$M2_HOME/bin/m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-system -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository/geronimo-system-1.0-SNAPSHOT.jar
-$M2_HOME/bin/m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-transaction -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository/geronimo-transaction-1.0-SNAPSHOT.jar
-$M2_HOME/bin/m2 install:install-file -DgroupId=geronimo
-DartifactId=geronimo-util -Dpackaging=jar -Dversion=1.0-SNAPSHOT
-Dfile=repository/geronimo-util-1.0-SNAPSHOT.jar
$M2_HOME/bin/m2 install:install-file -DgroupId=tranql -DartifactId=tranql
-Dpackaging=jar -Dversion=1.0-SNAPSHOT -Dfile=repository/tranql-1.0-SNAPSHOT.jar
1.9 +42 -40 openejb/m2/openejb-builder.pom
Index: openejb-builder.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-builder.pom,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- openejb-builder.pom 30 Sep 2005 06:43:55 -0000 1.8
+++ openejb-builder.pom 30 Sep 2005 13:50:21 -0000 1.9
@@ -381,6 +381,21 @@
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>test-ear</artifactId>
+ <version>${version}</version>
+ <type>ear</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>test-ejb-jar</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -397,6 +412,26 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.directory}"
file="../test-ejb-jar/target/test-ejb-jar.jar" />
+ <copy todir="${project.build.directory}"
file="../test-ear/target/test-ear.ear" />
+ <copy todir="${project.build.directory}"
file="../test-ant-ear/target/test-ant.ear" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xmlbeans-maven-plugin</artifactId>
<executions>
@@ -406,8 +441,10 @@
</goals>
<configuration>
<schemaDirectory>${basedir}/src/main/schema</schemaDirectory>
-
<sourceSchemas>corba-css-config_1_0.xsd,corba-tss-config_1_0.xsd,openejb-jar-2.0.xsd</sourceSchemas>
-
<xmlConfigs>${basedir}/src/main/schema/xmlconfig.xml</xmlConfigs>
+
<sourceSchemas>corba-css-config-2.0.xsd,corba-tss-config-2.0.xsd,openejb-jar-2.0.xsd</sourceSchemas>
+ <xmlConfigs>
+ <xmlConfig
implementation="java.io.File">${basedir}/src/main/schema/xmlconfig.xml</xmlConfig>
+ </xmlConfigs>
</configuration>
</execution>
</executions>
@@ -417,49 +454,14 @@
<resources>
<resource>
- <targetPath>../test-ejb-jar/META-INF</targetPath>
- <directory>${basedir}/src/test/test-ejb-jar/META-INF</directory>
- </resource>
- <resource>
- <directory>${basedir}/src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
<targetPath>META-INF/schema</targetPath>
- <directory>${basedir}/src/main/schema</directory>
+ <directory>src/main/schema</directory>
<includes>
- <include>corba-css-config_1_0.xsd</include>
- <include>corba-tss-config_1_0.xsd</include>
+ <include>corba-css-config-2.0.xsd</include>
+ <include>corba-tss-config-2.0.xsd</include>
<include>openejb-jar-2.0.xsd</include>
</includes>
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>${basedir}/src/main/schema</directory>
- <includes>
- <include>*.xsd</include>
- <include>*.dtd</include>
- </includes>
- </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>
-
- <testResource>
- <targetPath>..</targetPath>
- <directory>../../test-ant-ear/src/test/resources</directory>
- </testResource>
- </testResources>
</build>
</project>
1.7 +12 -0 openejb/m2/openejb-root.pom
Index: openejb-root.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-root.pom,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- openejb-root.pom 28 Sep 2005 09:12:21 -0000 1.6
+++ openejb-root.pom 30 Sep 2005 13:50:21 -0000 1.7
@@ -34,6 +34,17 @@
<url>http://cvs.apache.org/repository</url>
<layout>legacy</layout>
</repository>
+ <repository>
+ <id>localhost</id>
+ <url>file://localhost/@maven.repo.local@</url>
+ <layout>legacy</layout>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <updatePolicy>always</updatePolicy>
+ </snapshots>
+ </repository>
</repositories>
<organization>
@@ -564,6 +575,7 @@
<dependency>
<groupId>openejb</groupId>
<artifactId>test-ejb-jar</artifactId>
+ <type>ejb</type>
<version>2.0-SNAPSHOT</version>
</dependency>
1.5 +3 -1 openejb/m2/pkgen-builder.pom
Index: pkgen-builder.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/pkgen-builder.pom,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- pkgen-builder.pom 30 Sep 2005 06:43:55 -0000 1.4
+++ pkgen-builder.pom 30 Sep 2005 13:50:21 -0000 1.5
@@ -50,7 +50,9 @@
<configuration>
<schemaDirectory>${basedir}/src/main/schema</schemaDirectory>
<sourceSchemas>openejb-pkgen-2.0.xsd</sourceSchemas>
-
<xmlConfigs>${basedir}/src/main/schema/xmlconfig.xml</xmlConfigs>
+ <xmlConfigs>
+ <xmlConfig
implementation="java.io.File">${basedir}/src/main/schema/xmlconfig.xml</xmlConfig>
+ </xmlConfigs>
</configuration>
</execution>
</executions>
1.4 +7 -3 openejb/m2/test-ant-ear.pom
Index: test-ant-ear.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/test-ant-ear.pom,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- test-ant-ear.pom 26 Sep 2005 08:33:30 -0000 1.3
+++ test-ant-ear.pom 30 Sep 2005 13:50:21 -0000 1.4
@@ -17,6 +17,7 @@
<dependency>
<groupId>openejb</groupId>
<artifactId>test-ejb-jar</artifactId>
+ <type>ejb</type>
</dependency>
</dependencies>
<build>
@@ -26,12 +27,15 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<configuration>
+ <!-- TODO: use regular resources -->
+ <resourcesDir>src/main/resources</resourcesDir>
+ <version>1.4</version>
<modules>
- <javaModule>
+ <ejbModule>
<groupId>openejb</groupId>
<artifactId>test-ejb-jar</artifactId>
<bundleFileName>test-ejb-jar.jar</bundleFileName>
- </javaModule>
+ </ejbModule>
</modules>
</configuration>
</plugin>
