brett 2005/10/01 00:45:04
Modified: m2 maven.xml maven2.bat maven2.sh openejb-builder.pom
openejb-core.pom openejb-root.pom
openejb-webadmin-clienttools.pom
openejb-webadmin-commons.pom
openejb-webadmin-ejbgen.pom
openejb-webadmin-main.pom openejb-webadmin.pom
pkgen-builder.pom
Added: m2 test-ear.pom test-ejb-jar.pom
Removed: m2 ejb-assembly.pom ejb-builder.pom ejb-core.pom
ejb-group.pom ejb-test-ear.pom ejb-test-jar.pom
Log:
trim the poms
Revision Changes Path
1.3 +1 -0 openejb/m2/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- maven.xml 1 Oct 2005 02:25:27 -0000 1.2
+++ maven.xml 1 Oct 2005 04:45:04 -0000 1.3
@@ -1,5 +1,6 @@
<project>
<goal name="process-root-pom">
<replace file="openejb/profiles.xml" token="@maven.repo.local@"
value="${maven.repo.local}" />
+ <replace file="openejb/pom.xml" token="@maven.repo.local@"
value="${maven.repo.local}" />
</goal>
</project>
1.13 +5 -9 openejb/m2/maven2.bat
Index: maven2.bat
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/maven2.bat,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -u -r1.12 -r1.13
--- maven2.bat 1 Oct 2005 02:25:27 -0000 1.12
+++ maven2.bat 1 Oct 2005 04:45:04 -0000 1.13
@@ -22,8 +22,9 @@
copy %poms%\openejb-core.pom %m2Dir%\pom.xml
xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\bin %m2Dir%\src\main\bin
- xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\conf %m2Dir%\src\main\conf
- xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\etc %m2Dir%\src\main\etc
+ REM xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\conf
%m2Dir%\src\main\conf
+ REM xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\etc
%m2Dir%\src\main\etc
+ xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\etc\META-INF
%m2Dir%\src\main\resources\META-INF
xcopy /EXCLUDE:cvs.exclude+java.exclude /Q /I %m1Dir%\src\java
%m2Dir%\src\main\resources
xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\test %m2Dir%\src\test\java
xcopy /EXCLUDE:cvs.exclude /E /Q /I %m1Dir%\src\test-resources
%m2Dir%\src\test\resources
@@ -100,7 +101,7 @@
set m2Dir=%root%\test-ear
set m1Dir=%modules%\openejb-builder\src\test-ear
mkdir %m2Dir%
-copy %poms%\ejb-test-ear.pom %m2Dir%\pom.xml
+copy %poms%\test-ear.pom %m2Dir%\pom.xml
xcopy /EXCLUDE:cvs.exclude /E /Q /I
%m1Dir%\META-INF\geronimo-application.xml %m2Dir%\src\main\resources\META-INF
@@ -117,7 +118,7 @@
set m2Dir=%root%\test-ejb-jar
set m1Dir=%modules%\openejb-builder\src\test-ejb-jar
mkdir %m2Dir%
-copy %poms%\ejb-test-jar.pom %m2Dir%\pom.xml
+copy %poms%\test-ejb-jar.pom %m2Dir%\pom.xml
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
@@ -125,11 +126,6 @@
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=tranql
-DartifactId=tranql -Dpackaging=jar -Dversion=1.1-SNAPSHOT
-Dfile=repository\tranql-1.1-SNAPSHOT.jar
-
del cvs.exclude
del java.exclude
1.24 +5 -8 openejb/m2/maven2.sh
Index: maven2.sh
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/maven2.sh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -u -r1.23 -r1.24
--- maven2.sh 1 Oct 2005 02:25:27 -0000 1.23
+++ maven2.sh 1 Oct 2005 04:45:04 -0000 1.24
@@ -23,8 +23,9 @@
{
mkdir -p $m2Dir/src/main/resources
cp -r $m1Dir/src/bin $m2Dir/src/main
- cp -r $m1Dir/src/conf $m2Dir/src/main
- cp -r $m1Dir/src/etc $m2Dir/src/main
+ #cp -r $m1Dir/src/conf $m2Dir/src/main
+ #cp -r $m1Dir/src/etc $m2Dir/src/main
+ cp -r $m1Dir/src/etc/META-INF $m2Dir/src/main/resources
cd $m1Dir/src/java
find . -name '*.properties' -exec cp {} $m2Dir/src/main/resources --parent
\;
find . -name '*.xml' -exec cp {} $m2Dir/src/main/resources --parent \;
@@ -135,7 +136,7 @@
{
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
+ cp $poms/test-ear.pom $m2Dir/pom.xml
}
echo "Setting up test-ant-ear..."
@@ -158,7 +159,7 @@
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
+ cp $poms/test-ejb-jar.pom $m2Dir/pom.xml
# This is what the ant tests want - could be improved
cp -r $m1Dir $root/openejb-builder/src
@@ -168,7 +169,3 @@
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=tranql -DartifactId=tranql
-Dpackaging=jar -Dversion=1.0-SNAPSHOT -Dfile=repository/tranql-1.0-SNAPSHOT.jar
1.10 +14 -280 openejb/m2/openejb-builder.pom
Index: openejb-builder.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-builder.pom,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- openejb-builder.pom 30 Sep 2005 13:50:21 -0000 1.9
+++ openejb-builder.pom 1 Oct 2005 04:45:04 -0000 1.10
@@ -14,117 +14,23 @@
<dependencies>
<dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>2.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-core</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-client</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-deployment</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deploy-config</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-interop</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>openejb</groupId>
<artifactId>pkgen-builder</artifactId>
- <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-axis-builder</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
- <version>2.0-r118</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security-builder</artifactId>
- <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -135,104 +41,18 @@
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-timer</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-naming</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-naming-builder</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-axis</artifactId>
- <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-deployment</artifactId>
- <version>1.1-rc4</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-corba</artifactId>
- <version>2.3-rc4</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- <version>1.0.1B-rc4</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-ejb</artifactId>
- <version>2.1-rc4</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-servlet</artifactId>
- <version>2.4-rc4</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-connector</artifactId>
- <version>1.5-rc4</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-jacc</artifactId>
- <version>1.0-rc5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jms</artifactId>
- <version>1.1-rc4</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jaxrpc</artifactId>
- <version>1.1-rc4</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-saaj</artifactId>
- <version>1.1-rc4</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-qname</artifactId>
- <version>1.1-rc4</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -242,131 +62,46 @@
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-management</artifactId>
- <version>1.0-rc4</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-webservices</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>tranql</groupId>
- <artifactId>tranql</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>axion</groupId>
<artifactId>axion</artifactId>
- <version>1.0-M3-dev</version>
- </dependency>
-
- <dependency>
- <groupId>castor</groupId>
- <artifactId>castor</artifactId>
- <version>0.9.5.3</version>
- </dependency>
-
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- </dependency>
-
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_2</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <scope>test</scope>
</dependency>
+ <!-- TODO: should come from axion transitively -->
<dependency>
<groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId>
<version>20041207.202534</version>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- </dependency>
-
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- <version>3.0.1</version>
- </dependency>
-
+ <!-- TODO: should come from axion transitively -->
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
<version>1.3</version>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.6.2</version>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.2.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- <version>124</version>
- </dependency>
-
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>1.4.3</version>
- </dependency>
-
+ <!-- TODO: should come from axis transitively -->
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
- <version>PATCH-1193602</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
- <version>1.5</version>
</dependency>
+ <!-- TODO: should come from axis transitively -->
<dependency>
<groupId>axis</groupId>
<artifactId>commons-discovery</artifactId>
@@ -374,6 +109,7 @@
<scope>runtime</scope>
</dependency>
+ <!-- TODO: should be transitive from tranql -->
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
@@ -382,20 +118,18 @@
</dependency>
<dependency>
- <groupId>${groupId}</groupId>
+ <groupId>openejb</groupId>
<artifactId>test-ear</artifactId>
- <version>${version}</version>
<type>ear</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${groupId}</groupId>
+ <groupId>openejb</groupId>
<artifactId>test-ejb-jar</artifactId>
- <version>${version}</version>
+ <type>ejb</type>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
1.8 +18 -42 openejb/m2/openejb-core.pom
Index: openejb-core.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-core.pom,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- openejb-core.pom 30 Sep 2005 01:20:26 -0000 1.7
+++ openejb-core.pom 1 Oct 2005 04:45:04 -0000 1.8
@@ -27,23 +27,18 @@
</dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-connector</artifactId>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-core</artifactId>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-qname</artifactId>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-client</artifactId>
+ <artifactId>geronimo-connector</artifactId>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-common</artifactId>
+ <artifactId>geronimo-core</artifactId>
</dependency>
<dependency>
@@ -93,10 +88,20 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-client</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
</dependency>
<dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-common</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-corba</artifactId>
</dependency>
@@ -137,11 +142,6 @@
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-qname</artifactId>
- </dependency>
-
- <dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-webservices</artifactId>
</dependency>
@@ -163,7 +163,7 @@
<dependency>
<groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <artifactId>commons-logging-api</artifactId>
</dependency>
<dependency>
@@ -177,15 +177,14 @@
</dependency>
<dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
</dependency>
-
</dependencies>
<build>
@@ -197,29 +196,6 @@
<target>1.4</target>
</configuration>
</plugin>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>maven.junit.jvmargs</name>
-
<value>-Djava.security.auth.login.config=src/test/resources/login.config</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
</plugins>
-
- <resources>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}/src/main/etc/META-INF</directory>
- </resource>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
-
</build>
</project>
1.9 +47 -165 openejb/m2/openejb-root.pom
Index: openejb-root.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-root.pom,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- openejb-root.pom 1 Oct 2005 02:25:27 -0000 1.8
+++ openejb-root.pom 1 Oct 2005 04:45:04 -0000 1.9
@@ -24,15 +24,17 @@
</modules>
<repositories>
+ <!-- TODO: use from profile when it works -->
<repository>
- <id>openejb</id>
- <url>http://www.openejb.org/maven</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache</id>
- <url>http://cvs.apache.org/repository</url>
+ <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>
@@ -129,14 +131,12 @@
</developers>
<dependencies>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
-
</dependencies>
<dependencyManagement>
@@ -185,6 +185,12 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-deploy-config</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
@@ -221,6 +227,12 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-security-builder</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-timer</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
@@ -253,14 +265,12 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-naming-builder</artifactId>
<version>1.0-SNAPSHOT</version>
- <!-- TODO: xmlbeans? -->
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
<version>1.0-SNAPSHOT</version>
- <!-- TODO: not runtime -->
</dependency>
<dependency>
@@ -308,7 +318,6 @@
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jaxrpc</artifactId>
- <!-- TODO: not runtime -->
<version>1.1-rc4</version>
</dependency>
@@ -321,7 +330,6 @@
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-qname</artifactId>
- <!-- TODO: not runtime -->
<version>1.1-rc4</version>
</dependency>
@@ -329,16 +337,12 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee-schema</artifactId>
<version>1.0-SNAPSHOT</version>
- <!-- TODO: not runtime -->
- <!-- TODO: xmlbeans -->
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-webservices</artifactId>
<version>1.0-SNAPSHOT</version>
- <!-- TODO: not runtime -->
- <!-- TODO: xmlbeans -->
</dependency>
<dependency>
@@ -350,7 +354,7 @@
<dependency>
<groupId>tranql</groupId>
<artifactId>tranql</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
</dependency>
<dependency>
@@ -366,12 +370,6 @@
</dependency>
<dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- </dependency>
-
- <dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_2</version>
@@ -379,14 +377,8 @@
<dependency>
<groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- </dependency>
-
- <dependency>
- <groupId>commons-primitives</groupId>
- <artifactId>commons-primitives</artifactId>
- <version>1.0</version>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.4</version>
</dependency>
<dependency>
@@ -404,7 +396,6 @@
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
- <!-- TODO: not runtime -->
<version>3.0.1</version>
</dependency>
@@ -415,170 +406,61 @@
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.6.2</version>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.6.2</version>
- <!-- TODO: not runtime -->
- <!-- TODO: lib, system -->
- </dependency>
-
- <!-- CORBA -->
- <dependency>
- <groupId>openorb</groupId>
- <artifactId>openorb-orb</artifactId>
- <version>1.4.0-GERONIMO</version>
- </dependency>
-
- <dependency>
- <groupId>openorb</groupId>
- <artifactId>openorb-ins</artifactId>
- <version>1.4.0-GERONIMO</version>
- </dependency>
-
- <dependency>
- <groupId>openorb</groupId>
- <artifactId>openorb-pss</artifactId>
- <version>1.4.0-GERONIMO</version>
- </dependency>
-
- <dependency>
- <groupId>openorb</groupId>
- <artifactId>openorb-ssl</artifactId>
- <version>1.4.0-GERONIMO</version>
- </dependency>
-
- <dependency>
- <groupId>openorb</groupId>
- <artifactId>openorb-orb-tools</artifactId>
- <version>1.4.0-GERONIMO</version>
- </dependency>
-
- <dependency>
- <groupId>openorb</groupId>
- <artifactId>openorb-orb-omg</artifactId>
- <version>1.4.0-GERONIMO</version>
- </dependency>
-
- <dependency>
- <groupId>openorb</groupId>
- <artifactId>openorb-tools</artifactId>
- <version>1.4.0-GERONIMO</version>
- </dependency>
-
- <dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
- <version>4.1.4</version>
- </dependency>
-
- <dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-logkit</artifactId>
- <version>1.2.2</version>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- <version>124</version>
- </dependency>
-
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.5</version>
- </dependency>
-
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>1.4.3</version>
- </dependency>
-
- <dependency>
- <groupId>xfire</groupId>
- <artifactId>xfire</artifactId>
- <version>20050202</version>
- </dependency>
-
- <dependency>
- <groupId>xfire</groupId>
- <artifactId>xfire-java</artifactId>
- <version>20050202</version>
- </dependency>
-
- <dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<version>PATCH-1193602</version>
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.1.1-dev</version>
- </dependency>
-
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
<version>1.3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>2.0.0</version>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
+ <groupId>openejb</groupId>
+ <artifactId>pkgen-builder</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
- <dependency>
+ <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.1-dev</version>
- </dependency>
+ </dependency>
- <dependency>
+ <dependency>
<groupId>openejb</groupId>
<artifactId>test-ejb-jar</artifactId>
<type>ejb</type>
<version>2.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
- <dependency>
+ <dependency>
<groupId>openejb</groupId>
<artifactId>test-ant-ear</artifactId>
<version>2.0-SNAPSHOT</version>
- </dependency>
+ <type>ear</type>
+ </dependency>
- <dependency>
+ <dependency>
<groupId>openejb</groupId>
<artifactId>test-ear</artifactId>
<version>2.0-SNAPSHOT</version>
- </dependency>
+ <type>ear</type>
+ </dependency>
+
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.5</version>
+ </dependency>
</dependencies>
</dependencyManagement>
1.3 +12 -1 openejb/m2/openejb-webadmin-clienttools.pom
Index: openejb-webadmin-clienttools.pom
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/m2/openejb-webadmin-clienttools.pom,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- openejb-webadmin-clienttools.pom 22 Sep 2005 07:22:27 -0000 1.2
+++ openejb-webadmin-clienttools.pom 1 Oct 2005 04:45:04 -0000 1.3
@@ -15,11 +15,22 @@
<packaging>jar</packaging>
<dependencies>
+
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ </dependency>
+
<dependency>
<groupId>openejb</groupId>
<artifactId>openejb-webadmin-commons</artifactId>
- <version>2.0-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-ejb</artifactId>
+ </dependency>
+
</dependencies>
</project>
1.3 +1 -40 openejb/m2/openejb-webadmin-commons.pom
Index: openejb-webadmin-commons.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-webadmin-commons.pom,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- openejb-webadmin-commons.pom 22 Sep 2005 07:22:27 -0000 1.2
+++ openejb-webadmin-commons.pom 1 Oct 2005 04:45:04 -0000 1.3
@@ -22,48 +22,9 @@
<dependency>
<groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-ejb</artifactId>
</dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-servlet</artifactId>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-connector</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>castor</groupId>
- <artifactId>castor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
-
- <dependency>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- </dependency>
-
- <dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
- </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
1.3 +0 -1 openejb/m2/openejb-webadmin-ejbgen.pom
Index: openejb-webadmin-ejbgen.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-webadmin-ejbgen.pom,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- openejb-webadmin-ejbgen.pom 22 Sep 2005 07:22:27 -0000 1.2
+++ openejb-webadmin-ejbgen.pom 1 Oct 2005 04:45:04 -0000 1.3
@@ -18,7 +18,6 @@
<dependency>
<groupId>openejb</groupId>
<artifactId>openejb-webadmin-commons</artifactId>
- <version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
1.3 +22 -2 openejb/m2/openejb-webadmin-main.pom
Index: openejb-webadmin-main.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-webadmin-main.pom,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- openejb-webadmin-main.pom 22 Sep 2005 07:22:27 -0000 1.2
+++ openejb-webadmin-main.pom 1 Oct 2005 04:45:04 -0000 1.3
@@ -16,10 +16,30 @@
<dependencies>
<dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-ejb</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>openejb</groupId>
<artifactId>openejb-webadmin-commons</artifactId>
- <version>2.0-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+
</dependencies>
-</project>
\ No newline at end of file
+</project>
1.3 +9 -0 openejb/m2/openejb-webadmin.pom
Index: openejb-webadmin.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/openejb-webadmin.pom,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- openejb-webadmin.pom 22 Sep 2005 07:22:27 -0000 1.2
+++ openejb-webadmin.pom 1 Oct 2005 04:45:04 -0000 1.3
@@ -21,4 +21,13 @@
<module>openejb-webadmin-ejbgen</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-webadmin-commons</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
1.6 +16 -12 openejb/m2/pkgen-builder.pom
Index: pkgen-builder.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/pkgen-builder.pom,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- pkgen-builder.pom 30 Sep 2005 13:50:21 -0000 1.5
+++ pkgen-builder.pom 1 Oct 2005 04:45:04 -0000 1.6
@@ -16,24 +16,28 @@
<dependencies>
<dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-core</artifactId>
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-common</artifactId>
</dependency>
<dependency>
- <groupId>openejb</groupId>
- <artifactId>openejb-core</artifactId>
- </dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee-builder</artifactId>
+ </dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-deployment</artifactId>
- </dependency>
+ <groupId>tranql</groupId>
+ <artifactId>tranql</artifactId>
+ </dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
</dependency>
</dependencies>
1.1 openejb/m2/test-ear.pom
Index: test-ear.pom
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Revision: 1.1 $ $Date: 2005/10/01 04:45:04 $ -->
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>openejb</groupId>
<artifactId>openejb</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>openejb</groupId>
<artifactId>test-ear</artifactId>
<packaging>ear</packaging>
<name>OpenEJB Test Ear</name>
<dependencies>
<dependency>
<groupId>openejb</groupId>
<artifactId>test-ejb-jar</artifactId>
<type>ejb</type>
</dependency>
</dependencies>
<build>
<finalName>test-ear</finalName>
<plugins>
<plugin>
<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>
<ejbModule>
<groupId>openejb</groupId>
<artifactId>test-ejb-jar</artifactId>
<bundleFileName>test-ejb-jar.jar</bundleFileName>
</ejbModule>
</modules>
</configuration>
</plugin>
</plugins>
</build>
</project>
1.1 openejb/m2/test-ejb-jar.pom
Index: test-ejb-jar.pom
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Revision: 1.1 $ $Date: 2005/10/01 04:45:04 $ -->
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>openejb</groupId>
<artifactId>openejb</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>openejb</groupId>
<artifactId>test-ejb-jar</artifactId>
<name>OpenEJB Test Jar</name>
<packaging>ejb</packaging>
<dependencies>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-ejb</artifactId>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jms</artifactId>
</dependency>
</dependencies>
<build>
<finalName>test-ejb-jar</finalName>
</build>
</project>
