geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r912456 - in /geronimo/server/trunk: framework/configs/client-system/src/main/history/ framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/ framework/configs/geronimo-gbean-deployer/src/main/history/ framework/configs/gshel...
Date Mon, 22 Feb 2010 01:18:29 GMT
Author: djencks
Date: Mon Feb 22 01:18:28 2010
New Revision: 912456

URL: http://svn.apache.org/viewvc?rev=912456&view=rev
Log:
GERONIMO-4931 prepare for amq under blueprint by moving to latest karaf using aries blueprint

Modified:
    geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml?rev=912456&r1=912455&r2=912456&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
Mon Feb 22 01:18:28 2010
@@ -32,11 +32,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.service.obr</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>asm</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=912456&r1=912455&r2=912456&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
Mon Feb 22 01:18:28 2010
@@ -22,11 +22,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.service.obr</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>asm</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml?rev=912456&r1=912455&r2=912456&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
Mon Feb 22 01:18:28 2010
@@ -17,11 +17,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.service.obr</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>asm-commons</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml?rev=912456&r1=912455&r2=912456&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
Mon Feb 22 01:18:28 2010
@@ -37,11 +37,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.service.obr</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>asm</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=912456&r1=912455&r2=912456&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
Mon Feb 22 01:18:28 2010
@@ -32,11 +32,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.service.obr</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>asm</artifactId>
         <type>jar</type>

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=912456&r1=912455&r2=912456&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 Mon
Feb 22 01:18:28 2010
@@ -27,11 +27,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.service.obr</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>asm</artifactId>
         <type>jar</type>

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=912456&r1=912455&r2=912456&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
Mon Feb 22 01:18:28 2010
@@ -22,11 +22,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.service.obr</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>asm</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=912456&r1=912455&r2=912456&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Mon Feb 22 01:18:28 2010
@@ -31,18 +31,57 @@
     <name>Geronimo Assemblies :: Karaf Boilerplate Framework</name>
 
     <properties>
-        <felix.karaf.version>1.1.0-SNAPSHOT</felix.karaf.version>
+        <felix.karaf.version>1.5.0-SNAPSHOT</felix.karaf.version>
 
         <!-- from karaf root pom -->
+        <aopalliance.version>1.0_3</aopalliance.version>
+        <cglib.version>2.1_3_4</cglib.version>
+        <commons.logging.version>1.1.1</commons.logging.version>
+        <depends.maven.plugin.version>1.0</depends.maven.plugin.version>
+        <easymock.version>2.4</easymock.version>
+        <equinox.version>3.5.1.v20090827</equinox.version>
+        <felix.bundlerepository.version>1.4.0</felix.bundlerepository.version>
+        <felix.compendium.version>1.2.0</felix.compendium.version>
+        <felix.configadmin.version>1.2.4</felix.configadmin.version>
+        <felix.fileinstall.version>2.0.8</felix.fileinstall.version>
+        <felix.framework.version>2.1.0-SNAPSHOT</felix.framework.version>
+        <felix.gogo.version>0.3.0-SNAPSHOT</felix.gogo.version>
+        <felix.osgi.version>1.4.0</felix.osgi.version>
+        <felix.plugin.version>2.0.1</felix.plugin.version>
+        <felix.prefs.version>1.0.4</felix.prefs.version>
+        <felix.webconsole.version>2.0.0</felix.webconsole.version>
+        <felix.metatype.version>1.0.2</felix.metatype.version>
+        <aries.blueprint.version>1.0.0-incubating-SNAPSHOT</aries.blueprint.version>
+        <aries.jmx.version>1.0.0-incubating-SNAPSHOT</aries.jmx.version>
+        <geronimo.servlet.version>1.1.2</geronimo.servlet.version>
+        <jansi.version>1.1</jansi.version>
+        <jetty.bundle.version>6.1.14_1</jetty.bundle.version>
+        <junit.version>3.8.2_1</junit.version>
+        <jline.version>0.9.95-20091026.080844</jline.version>
+        <log4j.version>1.2.14</log4j.version>
+        <maven.version>2.0.9</maven.version>
+        <mina.version>2.0.0-RC1</mina.version>
+        <pax.exam.version>1.1.0</pax.exam.version>
+        <pax.logging.version>1.4.1-SNAPSHOT</pax.logging.version>
+        <pax.runner.version>1.2.1</pax.runner.version>
+        <pax.url.version>1.1.2</pax.url.version>
+        <pax.web.version>0.7.1</pax.web.version>
+        <servlet.api.version>2.5</servlet.api.version>
+        <!--<spring.osgi.version>1.2.0</spring.osgi.version>-->
+        <!--<spring.version>2.5.6.SEC01</spring.version>-->
+        <sshd.version>0.3.0</sshd.version>
+<!--
         <aopalliance.version>1.0_1</aopalliance.version>
+        <aries.blueprint.version>1.0.0-incubating-SNAPSHOT</aries.blueprint.version>
         <cglib.version>2.1_3_2</cglib.version>
         <commons.logging.version>1.1.1</commons.logging.version>
         <depends.maven.plugin.version>1.0</depends.maven.plugin.version>
         <easymock.version>2.4</easymock.version>
         <equinox.version>3.5.1.v20090827</equinox.version>
         <felix.bundlerepository.version>1.4.0</felix.bundlerepository.version>
-        <felix.compendium.version>1.2.0</felix.compendium.version>
+        <felix.compendium.version>1.4.0</felix.compendium.version>
         <felix.configadmin.version>1.2.4</felix.configadmin.version>
+        <felix.eventadmin.version>1.0.0</felix.eventadmin.version>
         <felix.fileinstall.version>2.0.4</felix.fileinstall.version>
         <felix.framework.version>2.1.0-SNAPSHOT</felix.framework.version>
         <felix.gogo.version>0.3.0-SNAPSHOT</felix.gogo.version>
@@ -51,7 +90,6 @@
         <felix.prefs.version>1.0.2</felix.prefs.version>
         <felix.webconsole.version>1.2.10</felix.webconsole.version>
         <felix.metatype.version>1.0.2</felix.metatype.version>
-        <geronimo.blueprint.version>1.0.0</geronimo.blueprint.version>
         <geronimo.servlet.version>1.0-EA-SNAPSHOT</geronimo.servlet.version>
         <jansi.version>1.0</jansi.version>
         <jetty.bundle.version>6.1.14_1</jetty.bundle.version>
@@ -66,10 +104,9 @@
         <pax.url.version>1.1.2</pax.url.version>
         <pax.web.version>0.6.0</pax.web.version>
         <servlet.api.version>3.0</servlet.api.version>
-        <!--<spring.osgi.version>1.2.0</spring.osgi.version>-->
-        <!--<spring.version>2.5.6.SEC01</spring.version>-->
         <sshd.version>0.4.0-SNAPSHOT</sshd.version>
         <osgi.jmx.version>4.2.0.200907080519</osgi.jmx.version>
+        -->
     </properties>
 
     <repositories>
@@ -106,9 +143,25 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
+                <artifactId>org.osgi.compendium</artifactId>
+                <version>${felix.compendium.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>javax.servlet</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.configadmin</artifactId>
                 <version>${felix.configadmin.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.eventadmin</artifactId>
+                <version>${felix.eventadmin.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
@@ -205,7 +258,7 @@
                         <groupId>org.springframework.osgi</groupId>
                         <artifactId>spring-osgi-core</artifactId>
                     </exclusion>
-               </exclusions>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -237,15 +290,79 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.geronimo.blueprint</groupId>
-                <artifactId>geronimo-blueprint</artifactId>
-                <version>${geronimo.blueprint.version}</version>
+                <groupId>org.apache.aries.blueprint</groupId>
+                <artifactId>org.apache.aries.blueprint.api</artifactId>
+                <version>${aries.blueprint.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.slf4j</groupId>
                         <artifactId>slf4j-api</artifactId>
                     </exclusion>
-               </exclusions>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.blueprint</groupId>
+                <artifactId>org.apache.aries.blueprint.core</artifactId>
+                <version>${aries.blueprint.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.blueprint</groupId>
+                <artifactId>org.apache.aries.blueprint.cm</artifactId>
+                <version>${aries.blueprint.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries</groupId>
+                <artifactId>org.apache.aries.util</artifactId>
+                <version>${aries.blueprint.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.jmx</groupId>
+                <artifactId>org.apache.aries.jmx.blueprint</artifactId>
+                <version>${aries.blueprint.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix.gogo</groupId>
+                <artifactId>org.apache.felix.gogo.runtime</artifactId>
+                <version>${felix.gogo.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix.gogo</groupId>
+                <artifactId>org.apache.felix.gogo.commands</artifactId>
+                <version>${felix.gogo.version}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.fileinstall</artifactId>
+                <version>${felix.fileinstall.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.osgi</groupId>
+                        <artifactId>org.osgi.core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.osgi</groupId>
+                        <artifactId>org.osgi.compendium</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
         </dependencies>
@@ -427,10 +544,6 @@
             <artifactId>sshd-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.impl.bundle.jmx</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
         </dependency>
@@ -438,9 +551,25 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
         </dependency>
+      <dependency>
+          <groupId>org.apache.aries.blueprint</groupId>
+          <artifactId>org.apache.aries.blueprint.core</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>org.apache.aries.blueprint</groupId>
+          <artifactId>org.apache.aries.blueprint.cm</artifactId>
+      </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jmx</groupId>
+            <artifactId>org.apache.aries.jmx</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jmx</groupId>
+            <artifactId>org.apache.aries.jmx.blueprint</artifactId>
+        </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.blueprint</groupId>
-            <artifactId>geronimo-blueprint</artifactId>
+            <groupId>org.apache.aries</groupId>
+            <artifactId>org.apache.aries.util</artifactId>
         </dependency>
 
         <dependency>

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=912456&r1=912455&r2=912456&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
Mon Feb 22 01:18:28 2010
@@ -26,19 +26,22 @@
 org/ops4j/pax/url/pax-url-mvn/${pax.url.version}/pax-url-mvn-${pax.url.version}.jar=5
 org/ops4j/pax/url/pax-url-wrap/${pax.url.version}/pax-url-wrap-${pax.url.version}.jar=5
 org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar=8
-org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=8
 org/apache/geronimo/framework/geronimo-pax-logging/${pom.version}/geronimo-pax-logging-${pom.version}.jar=9
 #org/ops4j/pax/logging/pax-logging-service/${pax.logging.version}/pax-logging-service-${pax.logging.version}.jar=9
+org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=8
 org/apache/felix/org.apache.felix.prefs/${felix.prefs.version}/org.apache.felix.prefs-${felix.prefs.version}.jar=10
-org/apache/felix/org.apache.felix.fileinstall/${felix.fileinstall.version}/org.apache.felix.fileinstall-${felix.fileinstall.version}.jar=10
-
+org/apache/felix/org.apache.felix.fileinstall/${felix.fileinstall.version}/org.apache.felix.fileinstall-${felix.fileinstall.version}.jar=11
 
 #
 # The rest of the services..
 #
-org/apache/geronimo/blueprint/geronimo-blueprint/${geronimo.blueprint.version}/geronimo-blueprint-${geronimo.blueprint.version}.jar=20
+org/apache/aries/org.apache.aries.util/${aries.blueprint.version}/org.apache.aries.util-${aries.blueprint.version}.jar=20
+org/apache/aries/blueprint/org.apache.aries.blueprint.api/${aries.blueprint.version}/org.apache.aries.blueprint.api-${aries.blueprint.version}.jar=20
+org/apache/aries/blueprint/org.apache.aries.blueprint.core/${aries.blueprint.version}/org.apache.aries.blueprint.core-${aries.blueprint.version}.jar=20
+org/apache/aries/blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.version}/org.apache.aries.blueprint.cm-${aries.blueprint.version}.jar=20
 
 org/apache/felix/gogo/org.apache.felix.gogo.runtime/${felix.gogo.version}/org.apache.felix.gogo.runtime-${felix.gogo.version}.jar=30
+org/apache/felix/gogo/org.apache.felix.gogo.commands/${felix.gogo.version}/org.apache.felix.gogo.commands-${felix.gogo.version}.jar=30
 org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.console/${felix.karaf.version}/org.apache.felix.karaf.shell.console-${felix.karaf.version}.jar=30
 #org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.spring/${felix.karaf.version}/org.apache.felix.karaf.deployer.spring-${felix.karaf.version}.jar=30
 org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.blueprint/${felix.karaf.version}/org.apache.felix.karaf.deployer.blueprint-${felix.karaf.version}.jar=30
@@ -58,7 +61,8 @@
 #org/apache/felix/karaf/features/org.apache.felix.karaf.features.management/${felix.karaf.version}/org.apache.felix.karaf.features.management-${felix.karaf.version}.jar=30
 
 #org/apache/felix/karaf/org.apache.felix.karaf.management/${felix.karaf.version}/org.apache.felix.karaf.management-${felix.karaf.version}.jar=30
-org/osgi/org.osgi.impl.bundle.jmx/${osgi.jmx.version}/org.osgi.impl.bundle.jmx-${osgi.jmx.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx/${aries.jmx.version}/org.apache.aries.jmx-${aries.jmx.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30
 
 org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar=30
 org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar=30
@@ -89,6 +93,8 @@
 org/apache/geronimo/framework/geronimo-kernel/${pom.version}/geronimo-kernel-${pom.version}.jar=40
 org/apache/geronimo/framework/geronimo-transformer/${pom.version}/geronimo-transformer-${pom.version}.jar=40
 org/apache/geronimo/framework/geronimo-system/${pom.version}/geronimo-system-${pom.version}.jar=40
+org/apache/felix/org.osgi.service.obr/1.0.2/org.osgi.service.obr-1.0.2.jar=40
+org/apache/felix/org.apache.felix.bundlerepository/1.5.0-SNAPSHOT/org.apache.felix.bundlerepository-1.5.0-SNAPSHOT.jar=40
 
 org/apache/servicemix/bundles/org.apache.servicemix.bundles.ant/1.7.0_1/org.apache.servicemix.bundles.ant-1.7.0_1.jar=40
 org/apache/geronimo/framework/geronimo-plugin/${pom.version}/geronimo-plugin-${pom.version}.jar=40

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=912456&r1=912455&r2=912456&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
Mon Feb 22 01:18:28 2010
@@ -27,6 +27,41 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>org.apache.aries.util</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.aries.blueprint</groupId>
+        <artifactId>org.apache.aries.blueprint</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.aries.blueprint</groupId>
+        <artifactId>org.apache.aries.blueprint.api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.aries.blueprint</groupId>
+        <artifactId>org.apache.aries.blueprint.cm</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.aries.blueprint</groupId>
+        <artifactId>org.apache.aries.blueprint.core</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.aries.jmx</groupId>
+        <artifactId>org.apache.aries.jmx</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.aries.jmx</groupId>
+        <artifactId>org.apache.aries.jmx.blueprint</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.bundlerepository</artifactId>
         <type>jar</type>
@@ -68,7 +103,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.service.obr</artifactId>
+        <artifactId>org.osgi.foundation</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -182,11 +217,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.blueprint</groupId>
-        <artifactId>geronimo-blueprint</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>asm</artifactId>
         <type>jar</type>
@@ -407,11 +437,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.impl.bundle.jmx</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>xmlpull</groupId>
         <artifactId>xmlpull</artifactId>
         <type>jar</type>

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=912456&r1=912455&r2=912456&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
Mon Feb 22 01:18:28 2010
@@ -27,11 +27,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.service.obr</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>asm</artifactId>
         <type>jar</type>

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=912456&r1=912455&r2=912456&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 Mon
Feb 22 01:18:28 2010
@@ -27,11 +27,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.service.obr</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>asm</artifactId>
         <type>jar</type>

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=912456&r1=912455&r2=912456&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 Mon Feb 22
01:18:28 2010
@@ -57,11 +57,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.service.obr</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>asm-commons</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml?rev=912456&r1=912455&r2=912456&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml Mon
Feb 22 01:18:28 2010
@@ -32,11 +32,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.service.obr</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>transaction-1_6</artifactId>
         <type>car</type>



Mime
View raw message