You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2011/09/23 09:38:45 UTC
svn commit: r1174568 - in /geronimo/server/trunk: ./
framework/configs/karaf-framework/src/main/filtered-resources/etc/
framework/configs/rmi-naming/ framework/modules/geronimo-blueprint/
framework/modules/geronimo-shell-base/ framework/modules/geronim...
Author: rwonly
Date: Fri Sep 23 07:38:44 2011
New Revision: 1174568
URL: http://svn.apache.org/viewvc?rev=1174568&view=rev
Log:
GERONIMO-5987 use our fork of Aries blueprint 0.3 in ext, with the patch in ARIES 727
Modified:
geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml
geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml
geronimo/server/trunk/plugins/aries/aries/pom.xml
geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml
geronimo/server/trunk/plugins/wab/web-extender/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=1174568&r1=1174567&r2=1174568&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties Fri Sep 23 07:38:44 2011
@@ -35,7 +35,7 @@ org/apache/felix/org.apache.felix.filein
#
org/apache/aries/org.apache.aries.util/${aries.util.version}/org.apache.aries.util-${aries.util.version}.jar=20
org/apache/aries/proxy/org.apache.aries.proxy/${aries.proxy.version}/org.apache.aries.proxy-${aries.proxy.version}.jar=20
-org/apache/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar=20
+org/apache/geronimo/ext/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar=20
org/apache/geronimo/framework/geronimo-shell/${pom.version}/geronimo-shell-${pom.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.console/${karaf.version}/org.apache.karaf.shell.console-${karaf.version}.jar=30
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=1174568&r1=1174567&r2=1174568&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/pom.xml Fri Sep 23 07:38:44 2011
@@ -93,7 +93,7 @@
</dependency>
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
+ <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
</dependency>
Modified: geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml?rev=1174568&r1=1174567&r2=1174568&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml Fri Sep 23 07:38:44 2011
@@ -33,7 +33,7 @@
<description>Classes to adapt blueprint to geronimo</description>
<dependencies>
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
+ <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
</dependency>
Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml?rev=1174568&r1=1174567&r2=1174568&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml Fri Sep 23 07:38:44 2011
@@ -61,7 +61,7 @@
</dependency>
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
+ <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml?rev=1174568&r1=1174567&r2=1174568&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml Fri Sep 23 07:38:44 2011
@@ -49,7 +49,7 @@
</dependency>
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
+ <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml?rev=1174568&r1=1174567&r2=1174568&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml Fri Sep 23 07:38:44 2011
@@ -88,7 +88,7 @@
</dependency>
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
+ <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml?rev=1174568&r1=1174567&r2=1174568&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml Fri Sep 23 07:38:44 2011
@@ -55,7 +55,7 @@
</dependency>
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
+ <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/aries/aries/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries/pom.xml?rev=1174568&r1=1174567&r2=1174568&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries/pom.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries/pom.xml Fri Sep 23 07:38:44 2011
@@ -42,7 +42,7 @@
</dependency>
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
+ <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml?rev=1174568&r1=1174567&r2=1174568&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml Fri Sep 23 07:38:44 2011
@@ -98,7 +98,7 @@
</dependency>
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
+ <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/wab/web-extender/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-extender/pom.xml?rev=1174568&r1=1174567&r2=1174568&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-extender/pom.xml (original)
+++ geronimo/server/trunk/plugins/wab/web-extender/pom.xml Fri Sep 23 07:38:44 2011
@@ -43,7 +43,7 @@
</dependency>
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
+ <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
</dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1174568&r1=1174567&r2=1174568&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Sep 23 07:38:44 2011
@@ -150,8 +150,8 @@
<!-- OSGI properties -->
<felix.bundlerepository.version>1.6.6</felix.bundlerepository.version>
<karaf.version>2.2.1</karaf.version>
- <karaf.osgi.version>2.2.1</karaf.osgi.version>
- <aries.blueprint.version>0.3</aries.blueprint.version>
+ <karaf.osgi.version>2.2.1</karaf.osgi.version>
+ <aries.blueprint.version>0.3.0.1-SNAPSHOT</aries.blueprint.version>
<aries.jmx.version>0.3</aries.jmx.version>
<aries.util.version>0.3</aries.util.version>
<aries.jndi.version>0.3</aries.jndi.version>
@@ -1826,7 +1826,7 @@ only found in cxf
</dependency>
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
+ <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<version>${aries.blueprint.version}</version>
<exclusions>