servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r959656 - in /servicemix/smx4/nmr/trunk: ./ document/ examples/nmr/client/ jbi/cluster/config/src/main/resources/OSGI-INF/blueprint/ jbi/cluster/engine/ jbi/deployer/ jbi/deployer/src/main/resources/OSGI-INF/blueprint/ jbi/itests/ jbi/itest...
Date Thu, 01 Jul 2010 13:41:22 GMT
Author: ffang
Date: Thu Jul  1 13:41:21 2010
New Revision: 959656

URL: http://svn.apache.org/viewvc?rev=959656&view=rev
Log:
[SMX4NMR-198]Update nmr to use aries version of blueprint and latest Felix/Karaf stuff that
also uses aries

Modified:
    servicemix/smx4/nmr/trunk/document/pom.xml
    servicemix/smx4/nmr/trunk/examples/nmr/client/pom.xml
    servicemix/smx4/nmr/trunk/jbi/cluster/config/src/main/resources/OSGI-INF/blueprint/jbi-cluster.xml
    servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml
    servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
    servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml
    servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
    servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/AbstractIntegrationTest.java
    servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
    servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
    servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
    servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-jbi.xml
    servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml
    servicemix/smx4/nmr/trunk/naming/pom.xml
    servicemix/smx4/nmr/trunk/nmr/api/pom.xml
    servicemix/smx4/nmr/trunk/nmr/core/pom.xml
    servicemix/smx4/nmr/trunk/nmr/management/pom.xml
    servicemix/smx4/nmr/trunk/nmr/management/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-management.xml
    servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
    servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
    servicemix/smx4/nmr/trunk/nmr/spring/pom.xml
    servicemix/smx4/nmr/trunk/pom.xml
    servicemix/smx4/nmr/trunk/testing/support/pom.xml
    servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
    servicemix/smx4/nmr/trunk/transaction/pom.xml

Modified: servicemix/smx4/nmr/trunk/document/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/document/pom.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/document/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/document/pom.xml Thu Jul  1 13:41:21 2010
@@ -63,7 +63,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: servicemix/smx4/nmr/trunk/examples/nmr/client/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/examples/nmr/client/pom.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/examples/nmr/client/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/examples/nmr/client/pom.xml Thu Jul  1 13:41:21 2010
@@ -42,7 +42,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: servicemix/smx4/nmr/trunk/jbi/cluster/config/src/main/resources/OSGI-INF/blueprint/jbi-cluster.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/config/src/main/resources/OSGI-INF/blueprint/jbi-cluster.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/config/src/main/resources/OSGI-INF/blueprint/jbi-cluster.xml
(original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/config/src/main/resources/OSGI-INF/blueprint/jbi-cluster.xml
Thu Jul  1 13:41:21 2010
@@ -18,8 +18,8 @@
 
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://geronimo.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
-           xmlns:ext="http://geronimo.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+           xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
 
     <bean id="clusterEngine" class="org.apache.servicemix.jbi.cluster.engine.ClusterEngine"
init-method="afterPropertiesSet" destroy-method="destroy">
         <property name="pool" ref="pool" />

Modified: servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml Thu Jul  1 13:41:21 2010
@@ -69,7 +69,7 @@
             <artifactId>spring-jms</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml Thu Jul  1 13:41:21 2010
@@ -57,7 +57,7 @@
             <artifactId>org.apache.felix.prefs</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml
(original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml
Thu Jul  1 13:41:21 2010
@@ -18,8 +18,8 @@
 
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://geronimo.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
-           xmlns:ext="http://geronimo.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+           xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
 
     <!-- JBI Deployer -->
     <bean id="deployer" class="org.apache.servicemix.jbi.deployer.impl.Deployer" init-method="init"
destroy-method="destroy">

Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Thu Jul  1 13:41:21 2010
@@ -64,9 +64,9 @@
             <scope>test</scope>
         </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</artifactId>
+            <version>${aries.blueprint.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
@@ -82,7 +82,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.fileinstall</artifactId>
-            <version>${felix.fileinstall.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -167,12 +166,6 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.prefs</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>

Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/AbstractIntegrationTest.java?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/AbstractIntegrationTest.java
(original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/AbstractIntegrationTest.java
Thu Jul  1 13:41:21 2010
@@ -126,7 +126,30 @@ public abstract class AbstractIntegratio
         if (version != null) {
             m.version(version);
         } else {
-            m.versionAsInProject();
+            try {
+                m.versionAsInProject();
+            } catch (RuntimeException t) {
+                //in eclipse, the dependencies.properties may not be avail since it's not
+                //generated into a source directory (directly into classes).
+                //thus, try and load it manually
+                
+                try {
+                    File file = new File("META-INF/maven/dependencies.properties");
+                    if (!file.exists()) {
+                        file = new File("target/classes/META-INF/maven/dependencies.properties");
+                    }
+                    if (file.exists()) {
+                        Properties dependencies = new Properties();
+                        dependencies.load(new FileInputStream(file));
+                        version = dependencies.getProperty( groupId + "/" + artifactId +
"/version" );
+                        m.version(version);
+                    } else {
+                        throw t;
+                    }
+                } catch (Throwable t2) {
+                    throw t;
+                }
+            }
         }
         if (classifier != null) {
             m.classifier(classifier);

Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
(original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
Thu Jul  1 13:41:21 2010
@@ -225,10 +225,14 @@ public class IntegrationTest extends Abs
 
     @Configuration
     public static Option[] configuration() {
+        String baseDir = System.getProperty("basedir");
+        if (baseDir == null) {
+            baseDir = new File(".").getAbsolutePath();
+        }
         Option[] options = options(
             // this is how you set the default log level when using pax logging (logProfile)
             systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
-            systemProperty("basedir").value(System.getProperty("basedir")),
+            systemProperty("basedir").value(baseDir),
             systemProperty("karaf.name").value("root"),
             systemProperty("karaf.home").value("target/karaf.home"),
             systemProperty("karaf.base").value("target/karaf.home"),
@@ -244,7 +248,7 @@ public class IntegrationTest extends Abs
             
 
             // hack system packages
-            systemPackages("org.apache.felix.karaf.main.spi;version=1.0.0", "org.apache.felix.karaf.jaas.boot;version=0.9.0"),
+            systemPackages("org.apache.felix.karaf.main.spi;version=1.6.0", "org.apache.felix.karaf.jaas.boot;version=1.6.0"),
             bootClasspathLibrary(mavenBundle("org.apache.felix.karaf.jaas", "org.apache.felix.karaf.jaas.boot")).afterFramework(),
             bootClasspathLibrary(mavenBundle("org.apache.felix.karaf", "org.apache.felix.karaf.main")).afterFramework(),
             bootClasspathLibrary(mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec")).beforeFramework(),
@@ -255,7 +259,7 @@ public class IntegrationTest extends Abs
             // Felix Config Admin
             mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
             // Blueprint
-            mavenBundle("org.apache.geronimo.blueprint", "geronimo-blueprint"),
+            mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
             // Pax mvn handler
             mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
 

Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
(original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
Thu Jul  1 13:41:21 2010
@@ -86,6 +86,7 @@ public class ManagementTest extends Abst
             // Expected
         }
 
+        System.err.println(admin.shutdownComponent("servicemix-jsr181"));
         System.err.println(admin.uninstallComponent("servicemix-jsr181"));
 
         System.err.println(admin.installComponent(smxJsr181, null, false));
@@ -245,10 +246,15 @@ public class ManagementTest extends Abst
 
     @Configuration
     public static Option[] configuration() {
+        String baseDir = System.getProperty("basedir");
+        if (baseDir == null) {
+            baseDir = new File(".").getAbsolutePath();
+        }
+
         Option[] options = options(
             // this is how you set the default log level when using pax logging (logProfile)
             systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
-            systemProperty("basedir").value(System.getProperty("basedir")),
+            systemProperty("basedir").value(baseDir),
             systemProperty("karaf.name").value("root"),
             systemProperty("karaf.home").value("target/karaf.home"),
             systemProperty("karaf.base").value("target/karaf.home"),
@@ -271,7 +277,7 @@ public class ManagementTest extends Abst
             // Felix Config Admin
             mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
             // Blueprint
-            mavenBundle("org.apache.geronimo.blueprint", "geronimo-blueprint"),
+            mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
             // Pax mvn handler
             mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
 

Modified: servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml Thu Jul  1 13:41:21 2010
@@ -49,7 +49,7 @@
             <artifactId>org.apache.servicemix.nmr.osgi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>
         <dependency>

Modified: servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-jbi.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-jbi.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-jbi.xml
(original)
+++ servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-jbi.xml
Thu Jul  1 13:41:21 2010
@@ -18,8 +18,8 @@
 
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://geronimo.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
-           xmlns:ext="http://geronimo.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+           xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
 
     <type-converters>
         <bean class="org.apache.servicemix.nmr.osgi.PassThroughConverter">

Modified: servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml Thu Jul  1 13:41:21 2010
@@ -58,7 +58,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: servicemix/smx4/nmr/trunk/naming/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/naming/pom.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/naming/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/naming/pom.xml Thu Jul  1 13:41:21 2010
@@ -37,15 +37,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>1.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
-            <version>1.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: servicemix/smx4/nmr/trunk/nmr/api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/api/pom.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/api/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/api/pom.xml Thu Jul  1 13:41:21 2010
@@ -38,7 +38,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: servicemix/smx4/nmr/trunk/nmr/core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/pom.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/core/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/core/pom.xml Thu Jul  1 13:41:21 2010
@@ -68,7 +68,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
             <optional>true</optional>

Modified: servicemix/smx4/nmr/trunk/nmr/management/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/management/pom.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/management/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/management/pom.xml Thu Jul  1 13:41:21 2010
@@ -49,11 +49,17 @@
             <artifactId>org.apache.servicemix.nmr.spring</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint</artifactId>
+            <version>${aries.blueprint.version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.springframework.osgi</groupId>
             <artifactId>spring-osgi-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: servicemix/smx4/nmr/trunk/nmr/management/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-management.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/management/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-management.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/management/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-management.xml
(original)
+++ servicemix/smx4/nmr/trunk/nmr/management/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-management.xml
Thu Jul  1 13:41:21 2010
@@ -18,8 +18,8 @@
 
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://geronimo.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
-           xmlns:ext="http://geronimo.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+           xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
 
     <!-- MBeanServer -->
     <reference id="mbeanServer"

Modified: servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml Thu Jul  1 13:41:21 2010
@@ -45,17 +45,17 @@
             <artifactId>org.apache.servicemix.nmr.spring</artifactId>
         </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</artifactId>
+            <version>${aries.blueprint.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
(original)
+++ servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
Thu Jul  1 13:41:21 2010
@@ -18,7 +18,7 @@
 
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://geronimo.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
 
     <type-converters>
         <bean class="org.apache.servicemix.nmr.osgi.PassThroughConverter">

Modified: servicemix/smx4/nmr/trunk/nmr/spring/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/spring/pom.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/spring/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/spring/pom.xml Thu Jul  1 13:41:21 2010
@@ -41,7 +41,7 @@
             <artifactId>spring-osgi-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Thu Jul  1 13:41:21 2010
@@ -90,16 +90,15 @@
       <easymock.version>2.4</easymock.version>
       <equinox.version>3.5.1.v20090827</equinox.version>
       <felix.configadmin.version>1.2.4</felix.configadmin.version>
-      <felix.plugin.version>2.0.1</felix.plugin.version>
-      <felix.framework.version>2.0.4</felix.framework.version>
-      <felix.osgi.version>1.4.0</felix.osgi.version>
-      <felix.compendium.version>1.4.0</felix.compendium.version>
-      <felix.bundlerepository.version>1.2.0</felix.bundlerepository.version>
-      <felix.prefs.version>1.0.2</felix.prefs.version>
-      <felix.karaf.version>1.4.0</felix.karaf.version>
-      <felix.fileinstall.version>2.0.8</felix.fileinstall.version>
-      <felix.gogo.version>0.2.2</felix.gogo.version>
-      <geronimo.blueprint.version>1.0.0</geronimo.blueprint.version>
+      <felix.plugin.version>2.1.0</felix.plugin.version>
+      <felix.framework.version>3.0.1</felix.framework.version>
+      <felix.bundlerepository.version>1.6.4</felix.bundlerepository.version>
+      <felix.prefs.version>1.0.4</felix.prefs.version>
+      <felix.karaf.version>1.6.0</felix.karaf.version>
+      <felix.fileinstall.version>3.0.0</felix.fileinstall.version>
+      <felix.gogo.version>0.4.0</felix.gogo.version>
+      <osgi.core.version>4.2.0</osgi.core.version>
+      <aries.blueprint.version>0.1-incubating</aries.blueprint.version>
       <geronimo.j2ee.connector.version>2.0.0</geronimo.j2ee.connector.version>
       <geronimo.jms.version>1.1.1</geronimo.jms.version>
       <geronimo.jta.version>1.1.1</geronimo.jta.version>
@@ -116,8 +115,8 @@
       <lucene.version>2.4.1</lucene.version>
       <mina.version>2.0.0-M6</mina.version>
       <pax.exam.version>1.2.0</pax.exam.version>
-      <pax.logging.version>1.4</pax.logging.version>
-      <pax.runner.version>1.2.1</pax.runner.version>
+      <pax.logging.version>1.5.2</pax.logging.version>
+      <pax.runner.version>1.4.0</pax.runner.version>
       <servicemix3.version>3.3.1</servicemix3.version>
       <servicemix.eip.version>2010.01</servicemix.eip.version>
       <servicemix.http.version>2010.01</servicemix.http.version>
@@ -254,6 +253,16 @@
           <version>${commons.logging.version}</version>
       </dependency>
       <dependency>
+          <groupId>org.osgi</groupId>
+          <artifactId>org.osgi.core</artifactId>
+          <version>${osgi.core.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>org.osgi</groupId>
+          <artifactId>org.osgi.compendium</artifactId>
+          <version>${osgi.core.version}</version>
+      </dependency>
+      <dependency>
           <groupId>org.apache.geronimo.specs</groupId>
           <artifactId>geronimo-servlet_2.5_spec</artifactId>
           <version>${geronimo.servlet.version}</version>
@@ -423,6 +432,21 @@
           <groupId>org.apache.felix</groupId>
           <artifactId>org.apache.felix.prefs</artifactId>
           <version>${felix.prefs.version}</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>org.apache.felix</groupId>
+                  <artifactId>org.osgi.core</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.apache.felix</groupId>
+                  <artifactId>org.osgi.compendium</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>
@@ -435,21 +459,6 @@
           <version>${felix.framework.version}</version>
       </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>org.osgi.foundation</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>org.apache.felix</groupId>
-                  <artifactId>javax.servlet</artifactId>
-              </exclusion>
-          </exclusions>
-      </dependency>
-      <dependency>
           <groupId>org.apache.servicemix.specs</groupId>
           <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
           <version>${servicemix.specs.version}</version>
@@ -501,11 +510,6 @@
           <version>${spring.osgi.version}</version>
       </dependency>
       <dependency>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.core</artifactId>
-          <version>${felix.osgi.version}</version>
-      </dependency>
-      <dependency>
           <groupId>org.apache.geronimo.specs</groupId>
           <artifactId>geronimo-jms_1.1_spec</artifactId>
           <version>${geronimo.jms.version}</version>

Modified: servicemix/smx4/nmr/trunk/testing/support/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/testing/support/pom.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/testing/support/pom.xml Thu Jul  1 13:41:21 2010
@@ -37,18 +37,17 @@
         <asm.version>2.2.3_1</asm.version>
         <jaxp.ri.version>1.4.2_1</jaxp.ri.version>
         <pax.url.version>1.1.0</pax.url.version>
-        <felix.configadmin.version>1.0.4</felix.configadmin.version>
     </properties>
 
     <dependencies>
         <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</artifactId>
+            <version>${aries.blueprint.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
         </dependency>
         <dependency>
@@ -65,7 +64,16 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>${felix.configadmin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.compendium</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>

Modified: servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
(original)
+++ servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
Thu Jul  1 13:41:21 2010
@@ -94,14 +94,15 @@ public class AbstractIntegrationTest ext
             getBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
             getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jaxp-api-1.4"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxp-ri"),
-            getBundle("org.apache.felix", "org.osgi.compendium"),
+            getBundle("org.osgi", "org.osgi.core"),
+            getBundle("org.osgi", "org.osgi.compendium"),
             getBundle("org.apache.felix", "org.apache.felix.configadmin"),
             getBundle("org.ops4j.pax.logging", "pax-logging-api"),
             getBundle("org.ops4j.pax.logging", "pax-logging-service"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.aopalliance"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.asm"),
             getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.junit"),
-            getBundle("org.apache.geronimo.blueprint", "geronimo-blueprint"),
+            getBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
             getBundle("org.springframework", "spring-beans"),
             getBundle("org.springframework", "spring-core"),
             getBundle("org.springframework", "spring-context"),

Modified: servicemix/smx4/nmr/trunk/transaction/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/transaction/pom.xml?rev=959656&r1=959655&r2=959656&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/transaction/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/transaction/pom.xml Thu Jul  1 13:41:21 2010
@@ -38,15 +38,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>1.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
-            <version>1.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>



Mime
View raw message