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 2008/01/18 14:12:26 UTC
svn commit: r613152 - in /servicemix/smx4/nmr/trunk: ./ jbi/commands/
jbi/commands/src/main/resources/META-INF/spring/ jbi/deployer/
jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/handler/
jbi/deployer/src/main/java/org/apache/servicemix...
Author: gnodet
Date: Fri Jan 18 05:12:25 2008
New Revision: 613152
URL: http://svn.apache.org/viewvc?rev=613152&view=rev
Log:
Update NMR with the kernel modules
Modified:
servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/META-INF/spring/servicemix-jbi-commands.xml
servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/handler/JBIDeploymentListener.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AbstractBundleWatcher.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/META-INF/spring/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/IntegrationTest.java
servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml
servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/META-INF/spring/servicemix-nmr.xml
servicemix/smx4/nmr/trunk/nmr/spring/src/test/resources/bundle.xml
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/pom.xml?rev=613152&r1=613151&r2=613152&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/pom.xml Fri Jan 18 05:12:25 2008
@@ -40,9 +40,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.runtime.gshell</groupId>
- <artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
- <version>${smx.runtime.version}</version>
+ <groupId>org.apache.servicemix.kernel.gshell</groupId>
+ <artifactId>org.apache.servicemix.kernel.gshell.core</artifactId>
+ <version>${smx.kernel.version}</version>
</dependency>
</dependencies>
Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/META-INF/spring/servicemix-jbi-commands.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/META-INF/spring/servicemix-jbi-commands.xml?rev=613152&r1=613151&r2=613152&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/META-INF/spring/servicemix-jbi-commands.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/META-INF/spring/servicemix-jbi-commands.xml Fri Jan 18 05:12:25 2008
@@ -63,4 +63,4 @@
</osgi:service>
-</beans>
\ No newline at end of file
+</beans>
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml?rev=613152&r1=613151&r2=613152&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml Fri Jan 18 05:12:25 2008
@@ -41,9 +41,9 @@
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.runtime</groupId>
- <artifactId>org.apache.servicemix.runtime.filemonitor</artifactId>
- <version>${smx.runtime.version}</version>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>org.apache.servicemix.kernel.filemonitor</artifactId>
+ <version>${smx.kernel.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.felix</groupId>
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/handler/JBIDeploymentListener.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/handler/JBIDeploymentListener.java?rev=613152&r1=613151&r2=613152&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/handler/JBIDeploymentListener.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/handler/JBIDeploymentListener.java Fri Jan 18 05:12:25 2008
@@ -25,7 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.deployer.impl.FileUtil;
-import org.apache.servicemix.runtime.filemonitor.DeploymentListener;
+import org.apache.servicemix.kernel.filemonitor.DeploymentListener;
public class JBIDeploymentListener implements DeploymentListener {
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AbstractBundleWatcher.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AbstractBundleWatcher.java?rev=613152&r1=613151&r2=613152&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AbstractBundleWatcher.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AbstractBundleWatcher.java Fri Jan 18 05:12:25 2008
@@ -19,7 +19,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.servicemix.runtime.filemonitor.DeploymentListener;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml?rev=613152&r1=613151&r2=613152&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml Fri Jan 18 05:12:25 2008
@@ -51,6 +51,6 @@
</osgi:service-properties>
</osgi:service>
- <osgi:service ref="listener" interface="org.apache.servicemix.runtime.filemonitor.DeploymentListener" />
+ <osgi:service ref="listener" interface="org.apache.servicemix.kernel.filemonitor.DeploymentListener" />
-</beans>
\ No newline at end of file
+</beans>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=613152&r1=613151&r2=613152&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Fri Jan 18 05:12:25 2008
@@ -39,9 +39,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.runtime</groupId>
- <artifactId>org.apache.servicemix.runtime.main</artifactId>
- <version>${smx.runtime.version}</version>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>org.apache.servicemix.kernel.main</artifactId>
+ <version>${smx.kernel.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -51,9 +51,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.runtime.testing</groupId>
- <artifactId>org.apache.servicemix.runtime.testing.support</artifactId>
- <version>${smx.runtime.version}</version>
+ <groupId>org.apache.servicemix.kernel.testing</groupId>
+ <artifactId>org.apache.servicemix.kernel.testing.support</artifactId>
+ <version>${smx.kernel.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -63,9 +63,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.runtime</groupId>
- <artifactId>org.apache.servicemix.runtime.filemonitor</artifactId>
- <version>${smx.runtime.version}</version>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>org.apache.servicemix.kernel.filemonitor</artifactId>
+ <version>${smx.kernel.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -77,7 +77,13 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.ant-${ant.version}</artifactId>
- <version>${smx.runtime.version}</version>
+ <version>${smx.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.nmr</groupId>
+ <artifactId>org.apache.servicemix.preferences</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.nmr</groupId>
@@ -189,9 +195,9 @@
<plugins>
<!-- generate dependencies versions -->
<plugin>
- <groupId>org.apache.servicemix.runtime.testing</groupId>
+ <groupId>org.apache.servicemix.kernel.testing</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <version>${smx.runtime.version}</version>
+ <version>${smx.kernel.version}</version>
<executions>
<execution>
<id>generate-depends-file</id>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java?rev=613152&r1=613151&r2=613152&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java Fri Jan 18 05:12:25 2008
@@ -22,7 +22,7 @@
import javax.jbi.component.Component;
import org.apache.servicemix.nmr.api.NMR;
-import org.apache.servicemix.runtime.testing.support.AbstractIntegrationTest;
+import org.apache.servicemix.kernel.testing.support.AbstractIntegrationTest;
public class IntegrationTest extends AbstractIntegrationTest {
@@ -68,6 +68,7 @@
return new String[] {
getBundle("org.apache.geronimo.specs", "geronimo-stax-api_1.0_spec"),
getBundle("org.apache.geronimo.specs", "geronimo-activation_1.1_spec"),
+ getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.preferences"),
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"),
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.core"),
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.spring"),
@@ -77,7 +78,7 @@
getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.deployer"),
getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.offline"),
getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.osgi"),
- getBundle("org.apache.servicemix.runtime", "org.apache.servicemix.runtime.filemonitor"),
+ getBundle("org.apache.servicemix.kernel", "org.apache.servicemix.kernel.filemonitor"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.ant-1.7.0"),
};
}
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=613152&r1=613151&r2=613152&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 Jan 18 05:12:25 2008
@@ -28,6 +28,6 @@
org.apache.servicemix.nmr.core,
org.apache.servicemix.jbi.offline,
org.apache.servicemix.jbi.deployer,
- org.apache.servicemix.runtime.testing.support,
+ org.apache.servicemix.kernel.testing.support,
org.springframework.osgi.util,
javax.jbi.component
Modified: servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml?rev=613152&r1=613151&r2=613152&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml Fri Jan 18 05:12:25 2008
@@ -68,4 +68,4 @@
</osgi:service-properties>
</osgi:service>
-</beans>
\ No newline at end of file
+</beans>
Modified: servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/pom.xml?rev=613152&r1=613151&r2=613152&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/commands/pom.xml Fri Jan 18 05:12:25 2008
@@ -40,9 +40,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.runtime.gshell</groupId>
- <artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
- <version>${smx.runtime.version}</version>
+ <groupId>org.apache.servicemix.kernel.gshell</groupId>
+ <artifactId>org.apache.servicemix.kernel.gshell.core</artifactId>
+ <version>${smx.kernel.version}</version>
</dependency>
</dependencies>
Modified: servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml?rev=613152&r1=613151&r2=613152&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml Fri Jan 18 05:12:25 2008
@@ -30,4 +30,4 @@
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-</beans>
\ No newline at end of file
+</beans>
Modified: servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/META-INF/spring/servicemix-nmr.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/META-INF/spring/servicemix-nmr.xml?rev=613152&r1=613151&r2=613152&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/META-INF/spring/servicemix-nmr.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/META-INF/spring/servicemix-nmr.xml Fri Jan 18 05:12:25 2008
@@ -75,4 +75,4 @@
</osgi:interfaces>
</osgi:service>
-</beans>
\ No newline at end of file
+</beans>
Modified: servicemix/smx4/nmr/trunk/nmr/spring/src/test/resources/bundle.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/spring/src/test/resources/bundle.xml?rev=613152&r1=613151&r2=613152&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/spring/src/test/resources/bundle.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/spring/src/test/resources/bundle.xml Fri Jan 18 05:12:25 2008
@@ -24,4 +24,4 @@
<constructor-arg value="bundle-ext://schema.xsd" />
</bean>
-</beans>
\ No newline at end of file
+</beans>
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=613152&r1=613151&r2=613152&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Fri Jan 18 05:12:25 2008
@@ -80,7 +80,7 @@
<mina.version>1.1.6-r602102</mina.version>
<pax.logging.version>1.0-RC2</pax.logging.version>
<smx3.version>3.2.1</smx3.version>
- <smx.runtime.version>1.0-m2-SNAPSHOT</smx.runtime.version>
+ <smx.kernel.version>1.0-m1-SNAPSHOT</smx.kernel.version>
<spring.osgi.version>1.0-rc1</spring.osgi.version>
<spring.version>2.5</spring.version>
<woodstox.version>3.2.3</woodstox.version>