You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/09/01 08:30:48 UTC
svn commit: r690859 [2/6] - in /geronimo/server/trunk: ./
assemblies/geronimo-jetty6-javaee5/ buildsupport/car-maven-plugin/
buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/
buildsupport/car-maven-plugin/src/test/java/o...
Modified: geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -12,18 +12,38 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-tool</artifactId>
+ <artifactId>geronimo-plugin</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-common</artifactId>
+ <artifactId>geronimo-deploy-tool</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-common</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -37,53 +57,123 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-crypto</artifactId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <type>car</type>
+ <artifactId>geronimo-deploy-config</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
+ <artifactId>geronimo-kernel</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-config</artifactId>
+ <artifactId>geronimo-crypto</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-system</artifactId>
+ <artifactId>geronimo-deployment</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-system</artifactId>
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+ <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Sun Aug 31 23:30:25 2008
@@ -98,7 +98,7 @@
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</dependency>
@@ -164,7 +164,7 @@
</element>
<element>
<groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
+ <artifactId>xpp3_min</artifactId>
</element>
<element>
<groupId>org.apache.xbean</groupId>
@@ -177,10 +177,6 @@
</classpath>
<classpathPrefix>../lib</classpathPrefix>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
<category>Deployment</category>
<instance>
<plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -7,43 +7,98 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-config</artifactId>
+ <artifactId>geronimo-plugin</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
+ <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-jexl</groupId>
- <artifactId>commons-jexl</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
+ <artifactId>geronimo-common</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-system</artifactId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-config</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -52,13 +107,18 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-common</artifactId>
+ <artifactId>geronimo-kernel</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -66,4 +126,34 @@
<artifactId>geronimo-crypto</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-system</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-cli</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/offline-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/offline-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/offline-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/offline-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -57,10 +57,6 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
<category>Deployment</category>
<instance>
<plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -109,7 +109,7 @@
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</dependency>
@@ -183,7 +183,7 @@
</element>
<element>
<groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
+ <artifactId>xpp3_min</artifactId>
</element>
<element>
<groupId>org.apache.xbean</groupId>
@@ -199,10 +199,6 @@
</element>
</classpath>
<classpathPrefix>../lib</classpathPrefix>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
<category>Deployment</category>
<instance>
<plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -22,13 +22,18 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-common</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-common</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -42,28 +47,83 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-crypto</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
+ <artifactId>plexus-container-default</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-crypto</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
+ <artifactId>plexus-archiver</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -72,8 +132,8 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-cli</artifactId>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/plugin/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/plugin/pom.xml Sun Aug 31 23:30:25 2008
@@ -70,8 +70,10 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
+ <groupId>org.apache.geronimo.plugins.classloaders</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ <version>${version}</version>
+ <type>car</type>
</dependency>
<!-- needed by geronimo-deploy-config -->
@@ -114,10 +116,6 @@
</deploymentConfigs>
<deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
<instance>
<plugin-artifact>
<config-xml-content>
@@ -126,6 +124,8 @@
<attribute name="userRepositories">~/.m2/repository</attribute>
</gbean>
</config-xml-content>
+ <!--<artifact-alias key="org.apache.geronimo.framework/jsr88-cli//car">org.apache.geronimo.framework/plugin/${version}/car</artifact-alias>-->
+ <!--<artifact-alias key="org.apache.geronimo.framework/jsr88-cli/${version}/car">org.apache.geronimo.framework/plugin/${version}/car</artifact-alias>-->
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/framework/configs/plugin/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/plugin/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/plugin/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/plugin/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -37,9 +37,9 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
+ <groupId>org.apache.geronimo.plugins.classloaders</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
- <type>jar</type>
+ <type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
Modified: geronimo/server/trunk/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/pom.xml Sun Aug 31 23:30:25 2008
@@ -70,13 +70,12 @@
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
<osiApproved>true</osiApproved>
- <!--
<useMavenDependencies>
<value>true</value>
<includeVersion>true</includeVersion>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
</useMavenDependencies>
- -->
- <commonInstance>
+ <commonInstance>
<plugin-artifact>
<geronimo-version>${geronimoVersion}</geronimo-version>
<jvm-version>1.5</jvm-version>
Modified: geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/pom.xml Sun Aug 31 23:30:25 2008
@@ -105,10 +105,6 @@
</deploymentConfigs>
<deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
<instance>
<plugin-artifact>
<config-xml-content>
Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -37,11 +37,6 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-crypto</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-naming</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/framework/configs/server-security-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/server-security-config/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/server-security-config/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/server-security-config/pom.xml Sun Aug 31 23:30:25 2008
@@ -62,10 +62,6 @@
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
</deploymentConfigs>
<category>Security</category>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
<instance>
<plugin-artifact>
<copy-file relative-to="server" dest-dir="var">security</copy-file>
Modified: geronimo/server/trunk/framework/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/pom.xml Sun Aug 31 23:30:25 2008
@@ -128,11 +128,7 @@
</classpath>
<classpathPrefix>../lib</classpathPrefix>
<category>Geronimo Core</category>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
- <instance>
+\ <instance>
<plugin-artifact>
<config-xml-content load="false"/>
</plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -7,13 +7,33 @@
<type>car</type>
</module-id>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-tool</artifactId>
+ <artifactId>geronimo-plugin</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-system</artifactId>
+ <artifactId>geronimo-deploy-tool</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -22,13 +42,78 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-config</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -36,4 +121,44 @@
<artifactId>geronimo-crypto</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deployment</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-system</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-cli</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/transformer-agent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/transformer-agent/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/transformer-agent/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/transformer-agent/pom.xml Sun Aug 31 23:30:25 2008
@@ -71,10 +71,6 @@
<classpathPrefix>../lib</classpathPrefix>
<category>Geronimo Core</category>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml Sun Aug 31 23:30:25 2008
@@ -56,11 +56,6 @@
</dependency>
<dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-upgrade</artifactId>
<version>${version}</version>
@@ -79,10 +74,7 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
+
<category>Deployment</category>
<instance>
<plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/upgrade-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/upgrade-cli/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/upgrade-cli/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/upgrade-cli/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -7,31 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-upgrade</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/framework/configs/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/upgrade/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/upgrade/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/upgrade/pom.xml Sun Aug 31 23:30:25 2008
@@ -54,11 +54,7 @@
<artifactId>car-maven-plugin</artifactId>
<configuration>
<category>Deployment</category>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
- </configuration>
+\ </configuration>
</plugin>
</plugins>
</build>
Modified: geronimo/server/trunk/framework/configs/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/xmlbeans/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/xmlbeans/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/xmlbeans/pom.xml Sun Aug 31 23:30:25 2008
@@ -69,9 +69,7 @@
<deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
</deploymentConfigs>
<deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
- <useMavenDependencies>
- <value>false</value>
- </useMavenDependencies>
+
<category>Geronimo Core</category>
<dependencies>
<dependency>
Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml Sun Aug 31 23:30:25 2008
@@ -43,10 +43,11 @@
<artifactId>xmlbeans</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.specs</groupId>-->
+ <!--<artifactId>geronimo-stax-api_1.0_spec</artifactId>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
<dependency>
<groupId>xml-resolver</groupId>
Modified: geronimo/server/trunk/framework/modules/geronimo-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-j2ee/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-j2ee/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-j2ee/pom.xml Sun Aug 31 23:30:25 2008
@@ -44,20 +44,17 @@
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- </dependency>
-
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.specs</groupId>-->
+ <!--<artifactId>geronimo-ejb_3.0_spec</artifactId>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+<!--
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-reflect</artifactId>
</dependency>
+-->
</dependencies>
</project>
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml Sun Aug 31 23:30:25 2008
@@ -48,11 +48,6 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-reflect</artifactId>
</dependency>
@@ -62,10 +57,10 @@
<artifactId>xstream</artifactId>
</dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>xpp3</groupId>-->
+ <!--<artifactId>xpp3_min</artifactId>-->
+ <!--</dependency>-->
</dependencies>
<build>
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanOperation.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanOperation.java?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanOperation.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanOperation.java Sun Aug 31 23:30:25 2008
@@ -95,11 +95,17 @@
methodInvoker = new FastMethodInvoker(javaMethod);
}
} catch (Exception e) {
- throw new InvalidConfigurationException("Target does not have specified method (declared in a GBeanInfo operation):" +
- " name=" + operationInfo.getName() +
- " methodName=" + operationInfo.getMethodName() +
- " returnType=" + operationInfo.getReturnType() +
- " targetClass=" + gbeanInstance.getType().getName(), e);
+ StringBuilder b = new StringBuilder().append("Target does not have specified method (declared in a GBeanInfo operation): name=")
+ .append(operationInfo.getName())
+ .append(" methodName=").append(operationInfo.getMethodName())
+ .append(" returnType=").append(operationInfo.getReturnType())
+ .append(" targetClass=").append(gbeanInstance.getType().getName());
+ b.append("\ntargetClassClassLoader=").append(gbeanInstance.getType().getClassLoader());
+ for (Class aType: types) {
+ b.append("\n parameter type=").append(aType.getName()).append(" in classloader: ").append(aType.getClassLoader());
+ }
+
+ throw new InvalidConfigurationException(b.toString(), e);
}
}
}
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java Sun Aug 31 23:30:25 2008
@@ -647,7 +647,27 @@
}
public String toString() {
- return "[" + getClass().getName() + " id=" + id + "]";
+ StringBuilder b = new StringBuilder();
+ toBuilder(b, "");
+ return b.toString();
+ }
+
+ private void toBuilder(StringBuilder b, String indent) {
+ b.append(indent).append("[").append(getClass().getName()).append(" id=").append(id).append("]\n");
+ b.append(indent).append("urls:\n");
+ String newIndent = indent + " ";
+ for (URL url: getURLs()) {
+ b.append(newIndent).append(url).append("\n");
+ }
+ b.append(indent).append("parents:\n");
+
+ for (ClassLoader cl: parents) {
+ if (cl instanceof MultiParentClassLoader) {
+ ((MultiParentClassLoader)cl).toBuilder(b, newIndent);
+ } else {
+ b.append(newIndent).append(cl.toString()).append("\n");
+ }
+ }
}
public synchronized boolean isDestroyed() {
Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml Sun Aug 31 23:30:25 2008
@@ -46,6 +46,24 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- archiver seems to need to be same version as maven uses ??? -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/pom.xml Sun Aug 31 23:30:25 2008
@@ -32,24 +32,13 @@
<name>Geronimo Framework, Modules :: Security</name>
<dependencies>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-core</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-interceptor</artifactId>
- <version>${version}</version>
- </dependency>
- <!-- g-system and g-management come from this -->
+ <!-- for GERONIMO_SERVICE constant string -->
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>${version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Sun Aug 31 23:30:25 2008
@@ -76,31 +76,34 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
+ <scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
-
<!--
Some dependencies require JCL, so use this adapter to force them into SLF4J.
-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml Sun Aug 31 23:30:25 2008
@@ -115,6 +115,12 @@
<artifactId>geronimo-activemq-ra</artifactId>
<version>${version}</version>
<type>rar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -160,10 +166,6 @@
</module>
<category>JMS</category>
<osiApproved>true</osiApproved>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -23,16 +23,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-management</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>plugin</artifactId>
<type>car</type>
</dependency>
@@ -56,9 +46,4 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<type>car</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-core</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml Sun Aug 31 23:30:25 2008
@@ -115,6 +115,12 @@
<artifactId>geronimo-activemq-ra</artifactId>
<version>${version}</version>
<type>rar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -152,10 +158,6 @@
</module>
<category>JMS</category>
<osiApproved>true</osiApproved>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -18,16 +18,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-management</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>plugin</artifactId>
<type>car</type>
</dependency>
@@ -51,9 +41,4 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<type>car</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-core</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -65,11 +65,6 @@
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices-builder</artifactId>
- <version>${version}</version>
- </dependency>
</dependencies>
<build>
@@ -78,37 +73,14 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <useMavenDependencies>
- <value>false</value>
- </useMavenDependencies>
<category>Web Services</category>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>axis</artifactId>
<type>car</type>
<import>classes</import>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices-builder</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis-builder</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-deployer</artifactId>
- <type>car</type>
- </dependency>
</dependencies>
<instance>
<plugin-artifact>
Modified: geronimo/server/trunk/plugins/axis/axis-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis-deployer/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis-deployer/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -22,11 +22,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices-builder</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
<type>car</type>
Modified: geronimo/server/trunk/plugins/axis/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis/pom.xml Sun Aug 31 23:30:25 2008
@@ -64,7 +64,6 @@
<artifactId>openejb</artifactId>
<version>${version}</version>
<type>car</type>
- <scope>runtime</scope>
</dependency>
<dependency>
@@ -101,54 +100,9 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <useMavenDependencies>
- <value>false</value>
- </useMavenDependencies>
<category>Web Services</category>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>server-security-config</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>webservices-common</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis</artifactId>
- <version>${version}</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- <version>1.4</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-axis</artifactId>
- <version>${openejbVersion}</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>0.4</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.scout</groupId>
- <artifactId>scout</artifactId>
- <version>1.0rc1</version>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb</artifactId>
<version>${version}</version>
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml Sun Aug 31 23:30:25 2008
@@ -53,15 +53,17 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>webservices-common</artifactId>
<version>${version}</version>
+ <type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openejb</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb</artifactId>
<version>${version}</version>
+ <type>car</type>
</dependency>
<dependency>
@@ -72,26 +74,25 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-saaj_1.3_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -54,7 +54,6 @@
<artifactId>axis2</artifactId>
<type>car</type>
<version>${version}</version>
- <scope>runtime</scope>
</dependency>
</dependencies>
@@ -64,28 +63,14 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <useMavenDependencies>
- <value>false</value>
- </useMavenDependencies>
<category>Web Services</category>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jaxws-deployer</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>axis2</artifactId>
<type>car</type>
<import>classes</import>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis2-builder</artifactId>
- <type>jar</type>
- <import>classes</import>
- </dependency>
</dependencies>
<instance>
<plugin-artifact>
Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -73,20 +73,13 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <useMavenDependencies>
- <value>false</value>
- </useMavenDependencies>
<category>Web Services</category>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jaxws-ejb-deployer</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>axis2-deployer</artifactId>
<type>car</type>
+ <!--TODO really????? this is unlikely. Please explain -->
<import>classes</import>
</dependency>
<dependency>
@@ -95,12 +88,6 @@
<type>car</type>
<import>classes</import>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis2-ejb-builder</artifactId>
- <type>jar</type>
- <import>classes</import>
- </dependency>
</dependencies>
<instance>
<plugin-artifact>
Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml Sun Aug 31 23:30:25 2008
@@ -73,10 +73,6 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
<category>Web Services</category>
</configuration>
</plugin>
Modified: geronimo/server/trunk/plugins/axis2/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/pom.xml Sun Aug 31 23:30:25 2008
@@ -75,6 +75,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-axis2</artifactId>
<version>${version}</version>
@@ -146,11 +153,6 @@
</dependency>
<dependency>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- </dependency>
-
- <dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
</dependency>
@@ -197,10 +199,6 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
<category>Web Services</category>
</configuration>
</plugin>
Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -7,9 +7,9 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>org.apache.xmlbeans</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>xmlbeans</artifactId>
- <type>jar</type>
+ <type>car</type>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml Sun Aug 31 23:30:25 2008
@@ -34,29 +34,42 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jaxws-builder</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jaxws-deployer</artifactId>
<version>${version}</version>
+ <type>car</type>
</dependency>
-
- <!-- xbean-finder, g-service-builder comes transitively from this -->
+
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>axis2</artifactId>
+ <type>car</type>
<version>${version}</version>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-jaxws-builder</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis2</artifactId>
- <version>${version}</version>
- </dependency>
+ <!-- xbean-finder, g-service-builder comes transitively from this -->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-j2ee-builder</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
+ <!---->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-naming-builder</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-axis2</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml Sun Aug 31 23:30:25 2008
@@ -34,15 +34,30 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>webservices-common</artifactId>
<version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-jaxws</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>transaction</artifactId>
+ <version>${version}</version>
+ <type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jaxws</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>xmlbeans</artifactId>
<version>${version}</version>
+ <type>car</type>
</dependency>
<dependency>
@@ -56,12 +71,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
</dependency>
@@ -87,12 +96,6 @@
</dependency>
<dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
</dependency>
@@ -117,15 +120,10 @@
<artifactId>commons-codec</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.specs</groupId>-->
+ <!--<artifactId>geronimo-stax-api_1.0_spec</artifactId>-->
+ <!--</dependency>-->
<dependency>
<groupId>jaxen</groupId>
@@ -137,10 +135,17 @@
<artifactId>annogen</artifactId>
</dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>javax.xml.bind</groupId>-->
+ <!--<artifactId>jaxb-api</artifactId>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.codehaus.woodstox</groupId>-->
+ <!--<artifactId>wstx-asl</artifactId>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+
</dependencies>
</project>
Modified: geronimo/server/trunk/plugins/client/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -46,14 +46,13 @@
<artifactId>client</artifactId>
<version>${version}</version>
<type>car</type>
- <scope>runtime</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client-transaction</artifactId>
<version>${version}</version>
<type>car</type>
- <scope>runtime</scope>
</dependency>
<dependency>
@@ -62,11 +61,11 @@
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-connector-builder</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
</dependencies>
<build>
@@ -82,34 +81,14 @@
</deploymentConfigs>
-->
<category>Geronimo Core</category>
- <useMavenDependencies>
- <value>false</value>
- </useMavenDependencies>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-deployer</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>client</artifactId>
<type>car</type>
<import>classes</import>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client-builder</artifactId>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client-transaction</artifactId>
<type>car</type>
Modified: geronimo/server/trunk/plugins/client/client-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-deployer/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client-deployer/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -6,11 +6,11 @@
<version>2.2-SNAPSHOT</version>
<type>car</type>
</module-id>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <type>jar</type>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-connector-builder</artifactId>-->
+ <!--<type>jar</type>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client-transaction</artifactId>
Modified: geronimo/server/trunk/plugins/client/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client/pom.xml Sun Aug 31 23:30:25 2008
@@ -88,17 +88,17 @@
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>geronimo-security</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-crypto</artifactId>
- <version>${version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework</groupId>-->
+ <!--<artifactId>geronimo-crypto</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -116,12 +116,18 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-openejb</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>transaction</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.xbean</groupId>-->
+ <!--<artifactId>xbean-reflect</artifactId>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.xbean</groupId>
@@ -136,10 +142,6 @@
<artifactId>car-maven-plugin</artifactId>
<configuration>
<category>Geronimo Core</category>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
<instance>
<plugin-artifact>
<config-xml-content load="false"/>