You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/12/21 14:50:35 UTC
svn commit: r606198 - in /servicemix/smx4/nmr/trunk: ./ jbi/api/
jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/
jbi/itests/ jbi/itests/src/test/resources/org/apache/servicemix/
nmr/spring/src/main/java/org/apache/servicemix/nmr/spr...
Author: gnodet
Date: Fri Dec 21 05:50:34 2007
New Revision: 606198
URL: http://svn.apache.org/viewvc?rev=606198&view=rev
Log:
Use timestamped versions of felix, upgrade to spring-osgi rc1 and latest smx runtime
Modified:
servicemix/smx4/nmr/trunk/ (props changed)
servicemix/smx4/nmr/trunk/jbi/api/pom.xml
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/SharedLibraryImpl.java
servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
servicemix/smx4/nmr/trunk/nmr/spring/src/main/java/org/apache/servicemix/nmr/spring/ReferenceFactory.java
servicemix/smx4/nmr/trunk/pom.xml
Propchange: servicemix/smx4/nmr/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec 21 05:50:34 2007
@@ -0,0 +1,8 @@
+target
+*.iml
+*.ipr
+*.iws
+eclipse_config
+.classpath
+.project
+.settings
Modified: servicemix/smx4/nmr/trunk/jbi/api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/api/pom.xml?rev=606198&r1=606197&r2=606198&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/api/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/api/pom.xml Fri Dec 21 05:50:34 2007
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>${geronimo.activation.version}</version>
</dependency>
</dependencies>
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java?rev=606198&r1=606197&r2=606198&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java Fri Dec 21 05:50:34 2007
@@ -49,7 +49,7 @@
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.osgi.context.BundleContextAware;
-import org.springframework.osgi.internal.context.support.BundleDelegatingClassLoader;
+import org.springframework.osgi.util.BundleDelegatingClassLoader;
import org.springframework.osgi.util.OsgiServiceReferenceUtils;
import org.springframework.osgi.util.OsgiServiceUtils;
import org.springframework.osgi.util.OsgiStringUtils;
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/SharedLibraryImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/SharedLibraryImpl.java?rev=606198&r1=606197&r2=606198&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/SharedLibraryImpl.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/SharedLibraryImpl.java Fri Dec 21 05:50:34 2007
@@ -23,7 +23,7 @@
import org.apache.servicemix.jbi.deployer.descriptor.SharedLibraryDesc;
import org.apache.xbean.classloader.MultiParentClassLoader;
import org.osgi.framework.Bundle;
-import org.springframework.osgi.internal.context.support.BundleDelegatingClassLoader;
+import org.springframework.osgi.util.BundleDelegatingClassLoader;
/**
* SharedLibrary object
Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=606198&r1=606197&r2=606198&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Fri Dec 21 05:50:34 2007
@@ -34,20 +34,33 @@
<name>ServiceMix JBI Integration Tests</name>
<properties>
- <osgi.test.platform>org.springframework.osgi.internal.test.platform.FelixPlatform</osgi.test.platform>
+ <osgi.test.platform>org.springframework.osgi.test.platform.FelixPlatform</osgi.test.platform>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${felix.osgi.version}</version>
+ <groupId>org.apache.servicemix.runtime</groupId>
+ <artifactId>org.apache.servicemix.runtime.main</artifactId>
+ <version>${smx.runtime.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.servicemix.runtime.testing</groupId>
<artifactId>org.apache.servicemix.runtime.testing.support</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>${smx.runtime.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.servicemix.nmr</groupId>
@@ -151,7 +164,7 @@
<plugin>
<groupId>org.apache.servicemix.runtime.testing</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>${smx.runtime.version}</version>
<executions>
<execution>
<id>generate-depends-file</id>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF?rev=606198&r1=606197&r2=606198&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF Fri Dec 21 05:50:34 2007
@@ -24,7 +24,6 @@
org.apache.commons.logging,
org.springframework.core.io,
org.springframework.osgi.test,
- org.springframework.osgi.internal.util.concurrent,
org.apache.servicemix.nmr.api,
org.apache.servicemix.nmr.core,
org.apache.servicemix.jbi.offline,
Modified: servicemix/smx4/nmr/trunk/nmr/spring/src/main/java/org/apache/servicemix/nmr/spring/ReferenceFactory.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/spring/src/main/java/org/apache/servicemix/nmr/spring/ReferenceFactory.java?rev=606198&r1=606197&r2=606198&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/spring/src/main/java/org/apache/servicemix/nmr/spring/ReferenceFactory.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/spring/src/main/java/org/apache/servicemix/nmr/spring/ReferenceFactory.java Fri Dec 21 05:50:34 2007
@@ -16,6 +16,11 @@
*/
package org.apache.servicemix.nmr.spring;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
import org.apache.servicemix.nmr.api.Endpoint;
import org.apache.servicemix.nmr.api.NMR;
import org.apache.servicemix.nmr.api.Reference;
@@ -23,11 +28,7 @@
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.osgi.context.BundleContextAware;
-import org.springframework.osgi.service.importer.OsgiSingleServiceProxyFactoryBean;
-
-import javax.xml.namespace.QName;
-import java.util.HashMap;
-import java.util.Map;
+import org.springframework.osgi.service.importer.support.OsgiServiceProxyFactoryBean;
/**
* Created by IntelliJ IDEA.
@@ -127,7 +128,7 @@
if (bundleContext == null) {
throw new IllegalArgumentException("nmr not set while bundleContext is null");
}
- OsgiSingleServiceProxyFactoryBean factory = new OsgiSingleServiceProxyFactoryBean();
+ OsgiServiceProxyFactoryBean factory = new OsgiServiceProxyFactoryBean();
factory.setInterface(new Class[] { NMR.class });
factory.setBundleContext(getBundleContext());
nmr = (NMR) factory.getObject();
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=606198&r1=606197&r2=606198&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Fri Dec 21 05:50:34 2007
@@ -29,7 +29,7 @@
</parent>
<groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>parent</artifactId>
+ <artifactId>nmr-parent</artifactId>
<packaging>pom</packaging>
<version>4.0-SNAPSHOT</version>
<name>Apache ServiceMix NMR</name>
@@ -59,15 +59,16 @@
<aopalliance.version>1.0</aopalliance.version>
<asm.version>2.2.3</asm.version>
<cglib.version>2.1_3</cglib.version>
- <camel.version>1.3-SNAPSHOT</camel.version>
<commons.io.version>1.3.1</commons.io.version>
<commons.logging.version>1.1</commons.logging.version>
- <felix.configadmin.version>0.9.0-SNAPSHOT</felix.configadmin.version>
- <felix.plugin.version>1.1.0-SNAPSHOT</felix.plugin.version>
- <felix.framework.version>1.1.0-SNAPSHOT</felix.framework.version>
+ <felix.configadmin.version>0.9.0-r605854</felix.configadmin.version>
+ <felix.main.version>1.1.0-r605854</felix.main.version>
+ <felix.plugin.version>1.1.0-r605854</felix.plugin.version>
+ <felix.framework.version>1.1.0-r605854-patched</felix.framework.version>
<felix.osgi.version>1.0.0</felix.osgi.version>
- <felix.compendium.version>0.9.0-SNAPSHOT</felix.compendium.version>
- <felix.bundlerepository.version>1.1.0-SNAPSHOT</felix.bundlerepository.version>
+ <felix.compendium.version>0.9.0-r605854</felix.compendium.version>
+ <felix.bundlerepository.version>1.1.0-r605854</felix.bundlerepository.version>
+ <geronimo.activation.version>1.0.1</geronimo.activation.version>
<geronimo.servlet.version>1.1.1-SNAPSHOT</geronimo.servlet.version>
<geronimo.stax.version>1.0.1-SNAPSHOT</geronimo.stax.version>
<gshell.version>1.0-alpha-1-SNAPSHOT</gshell.version>
@@ -75,9 +76,10 @@
<jline.version>0.9.93</jline.version>
<log4j.version>1.2.14</log4j.version>
<mina.version>1.1.6-r602102</mina.version>
- <pax.logging.version>0.9.8</pax.logging.version>
+ <pax.logging.version>1.0-RC2</pax.logging.version>
<smx3.version>3.2.1</smx3.version>
- <spring.osgi.version>1.0-m3</spring.osgi.version>
+ <smx.runtime.version>1.0-m1-SNAPSHOT</smx.runtime.version>
+ <spring.osgi.version>1.0-rc1</spring.osgi.version>
<spring.version>2.5</spring.version>
<xbean.version>3.3-SNAPSHOT</xbean.version>
<xstream.version>1.2.2</xstream.version>