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 2010/05/08 21:00:42 UTC
svn commit: r942447 - in
/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer: ./
src/it/j2ee-system-it1/ src/it/j2ee-system-it2/
src/it/j2ee-system-it2/src/main/plan/ src/it/metadatageneration-it3/
src/it/metadatageneration-it4/
Author: djencks
Date: Sat May 8 19:00:42 2010
New Revision: 942447
URL: http://svn.apache.org/viewvc?rev=942447&view=rev
Log:
fix its so they work w/g 3
Modified:
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/plan/plan.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml?rev=942447&r1=942446&r2=942447&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml Sat May 8 19:00:42 2010
@@ -45,26 +45,26 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deployment</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>plugin</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -87,7 +87,7 @@
<artifactItem>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</artifactItem>
</artifactItems>
<includes>**/*.xsd</includes>
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>plugin</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
<import>classes</import>
</dependency>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml?rev=942447&r1=942446&r2=942447&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml Sat May 8 19:00:42 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>buildsupport</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
@@ -36,39 +36,46 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${version}</version>
- <type>car</type>
- <scope>provided</scope>
+ <artifactId>geronimo-common</artifactId>
+ <version>${project.version}</version>
</dependency>
-
+<!--
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${version}</version>
+ <artifactId>geronimo-config-groovy-transformer</artifactId>
+ <version>${project.version}</version>
</dependency>
-
+-->
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-crypto</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
- <!-- Used by TemporaryClassLoader in kernel -->
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-obr</artifactId>
+ <version>${project.version}</version>
</dependency>
+ <!-- Used by TemporaryClassLoader in kernel -->
<dependency>
<groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
+ <artifactId>asm-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-jaxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-runtime</artifactId>
</dependency>
<dependency>
@@ -77,13 +84,25 @@
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jline</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
</dependency>
<dependency>
- <groupId>commons-jexl</groupId>
- <artifactId>commons-jexl</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
</dependency>
<!-- used by plugin installer -->
@@ -108,9 +127,45 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-jaxb</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-runtime</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-pax-logging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ </dependency>
+
+
+ <!-- build order hint -->
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -136,12 +191,12 @@
<element>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</element>
<element>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</element>
<!--
NOTE: geronimo-transformer needs to be on the system classpath to avoid a potential deadlock. See GERONIMO-3141.
@@ -149,7 +204,7 @@
<element>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-transformer</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</element>
<element>
<groupId>asm</groupId>
@@ -205,7 +260,7 @@
<category>Geronimo Core</category>
<osiApproved>true</osiApproved>
- <geronimoVersion>${version}</geronimoVersion>
+ <geronimoVersion>${project.version}</geronimoVersion>
</configuration>
</plugin>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml?rev=942447&r1=942446&r2=942447&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml Sat May 8 19:00:42 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>buildsupport</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
@@ -36,39 +36,46 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${version}</version>
- <type>car</type>
- <scope>provided</scope>
+ <artifactId>geronimo-common</artifactId>
+ <version>${project.version}</version>
</dependency>
-
+<!--
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${version}</version>
+ <artifactId>geronimo-config-groovy-transformer</artifactId>
+ <version>${project.version}</version>
</dependency>
-
+-->
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-crypto</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
- <!-- Used by TemporaryClassLoader in kernel -->
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-obr</artifactId>
+ <version>${project.version}</version>
</dependency>
+ <!-- Used by TemporaryClassLoader in kernel -->
<dependency>
<groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
+ <artifactId>asm-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-jaxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-runtime</artifactId>
</dependency>
<dependency>
@@ -77,13 +84,25 @@
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jline</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
</dependency>
<dependency>
- <groupId>commons-jexl</groupId>
- <artifactId>commons-jexl</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
</dependency>
<!-- used by plugin installer -->
@@ -103,14 +122,50 @@
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>woodstox</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-jaxb</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-pax-logging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ </dependency>
+
+
+ <!-- build order hint -->
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -136,12 +191,12 @@
<element>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</element>
<element>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</element>
<!--
NOTE: geronimo-transformer needs to be on the system classpath to avoid a potential deadlock. See GERONIMO-3141.
@@ -149,7 +204,7 @@
<element>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-transformer</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</element>
<element>
<groupId>asm</groupId>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/plan/plan.xml?rev=942447&r1=942446&r2=942447&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/plan/plan.xml Sat May 8 19:00:42 2010
@@ -98,13 +98,5 @@ specific services - those should be prov
</reference>
</gbean>
- <!-- Logging service -->
- <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
- <attribute name="configFileName">var/log/server-log4j.properties</attribute>
- <attribute name="refreshPeriodSeconds">60</attribute>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
</module>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml?rev=942447&r1=942446&r2=942447&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml Sat May 8 19:00:42 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>buildsupport</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
@@ -39,19 +39,19 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-tool</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<!-- exclude transitive deps -->
<exclusions>
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<start>false</start>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml?rev=942447&r1=942446&r2=942447&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml Sat May 8 19:00:42 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>buildsupport</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>