servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r588634 [1/2] - in /incubator/servicemix/branches/servicemix-4.0: ./ apache-servicemix/ apache-servicemix/src/main/descriptors/ camel/ camel/src/main/java/org/apache/servicemix/camel/ examples/intermediary/ examples/intermediary/src/main/re...
Date Fri, 26 Oct 2007 13:18:14 GMT
Author: gnodet
Date: Fri Oct 26 06:18:09 2007
New Revision: 588634

URL: http://svn.apache.org/viewvc?rev=588634&view=rev
Log:
Refactor the NMR into a 'feature'

Added:
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/
      - copied from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/api/
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/nmr/
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/nmr/api/
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/nmr/api/OsgiExample.java
      - copied, changed from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/api/OsgiExample.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/nmr/api/PipelineEndpoint.java
      - copied, changed from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/api/PipelineEndpoint.java
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/
      - copied from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/core/
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/ExchangeImplTest.java
      - copied, changed from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/core/ExchangeImplTest.java
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/IntegrationTest.java
      - copied, changed from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/core/IntegrationTest.java
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/MessageImplTest.java
      - copied, changed from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/core/MessageImplTest.java
    incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/nmr/
    incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/nmr/spring/
    incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/nmr/spring/BundleExtUrlPostProcessor.java
      - copied, changed from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/spring/BundleExtUrlPostProcessor.java
    incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/nmr/spring/ReferenceFactory.java
      - copied, changed from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/spring/ReferenceFactory.java
    incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/test/java/org/apache/servicemix/nmr/
    incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/test/java/org/apache/servicemix/nmr/spring/
    incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/test/java/org/apache/servicemix/nmr/spring/BundleExtTest.java
      - copied, changed from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/test/java/org/apache/servicemix/spring/BundleExtTest.java
Removed:
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/api/
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/api/
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/core/
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/core/
    incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/spring/
    incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/test/java/org/apache/servicemix/spring/
Modified:
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
    incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
    incubator/servicemix/branches/servicemix-4.0/camel/pom.xml
    incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java
    incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java
    incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java
    incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java
    incubator/servicemix/branches/servicemix-4.0/examples/intermediary/pom.xml
    incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/resources/META-INF/spring/intermediary.xml
    incubator/servicemix/branches/servicemix-4.0/itests/pom.xml
    incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
    incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
    incubator/servicemix/branches/servicemix-4.0/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/ComponentRegistry.java
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/ComponentContextImpl.java
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/ComponentRegistryImpl.java
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/DeliveryChannelImpl.java
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/EndpointImpl.java
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/FaultImpl.java
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/InOnlyImpl.java
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/InOptionalOutImpl.java
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/InOutImpl.java
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/MessageExchangeFactoryImpl.java
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/MessageExchangeImpl.java
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/NormalizedMessageImpl.java
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/RobustInOnlyImpl.java
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/test/java/org/apache/servicemix/jbi/runtime/IntegrationTest.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/pom.xml
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Channel.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Endpoint.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/EndpointRegistry.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Exchange.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Message.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/NMR.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Pattern.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Reference.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Role.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/ServiceMixException.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Status.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Type.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/EndpointListener.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/ExchangeListener.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/Listener.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/ListenerRegistry.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/Flow.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/FlowRegistry.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalChannel.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalEndpoint.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalExchange.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalReference.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/service/ServiceHelper.java
    incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/service/ServiceRegistry.java
    incubator/servicemix/branches/servicemix-4.0/nmr/core/pom.xml
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ChannelImpl.java
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ClientChannel.java
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/EndpointRegistryImpl.java
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ExchangeImpl.java
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/FlowRegistryImpl.java
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/InternalEndpointWrapper.java
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ListenerRegistryImpl.java
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/MessageImpl.java
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ReferenceImpl.java
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ServiceMix.java
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ServiceRegistryImpl.java
    incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/StraightThroughFlow.java
    incubator/servicemix/branches/servicemix-4.0/nmr/osgi/   (props changed)
    incubator/servicemix/branches/servicemix-4.0/nmr/osgi/pom.xml
    incubator/servicemix/branches/servicemix-4.0/nmr/osgi/src/main/resources/META-INF/spring/servicemix-nmr.xml
    incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml
    incubator/servicemix/branches/servicemix-4.0/nmr/spring/pom.xml
    incubator/servicemix/branches/servicemix-4.0/pom.xml

Modified: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml Fri Oct 26 06:18:09 2007
@@ -99,63 +99,51 @@
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.nmr</groupId>
-      <artifactId>org.apache.servicemix.api</artifactId>
-      <version>${project.version}</version>
+      <artifactId>org.apache.servicemix.nmr.api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.nmr</groupId>
-      <artifactId>org.apache.servicemix.core</artifactId>
-      <version>${project.version}</version>
+      <artifactId>org.apache.servicemix.nmr.core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.nmr</groupId>
-      <artifactId>org.apache.servicemix.spring</artifactId>
-      <version>${project.version}</version>
+      <artifactId>org.apache.servicemix.nmr.spring</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.nmr</groupId>
-      <artifactId>org.apache.servicemix.osgi</artifactId>
-      <version>${project.version}</version>
+      <artifactId>org.apache.servicemix.nmr.osgi</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>org.apache.servicemix.transaction</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.gshell</groupId>
       <artifactId>org.apache.servicemix.gshell.core</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.gshell</groupId>
       <artifactId>org.apache.servicemix.gshell.osgi</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.management</groupId>
       <artifactId>org.apache.servicemix.management.core</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.management</groupId>
       <artifactId>org.apache.servicemix.management.acegi</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.jbi</groupId>
       <artifactId>org.apache.servicemix.jbi.api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.jbi</groupId>
       <artifactId>org.apache.servicemix.jbi.runtime</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.jbi</groupId>
       <artifactId>org.apache.servicemix.jbi.osgi</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>

Modified: incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml Fri Oct 26 06:18:09 2007
@@ -133,10 +133,10 @@
             <unpack>false</unpack>
             <scope>runtime</scope>
             <includes>
-                <include>org.apache.servicemix.nmr:org.apache.servicemix.api</include>
-                <include>org.apache.servicemix.nmr:org.apache.servicemix.core</include>
-                <include>org.apache.servicemix.nmr:org.apache.servicemix.spring</include>
-                <include>org.apache.servicemix.nmr:org.apache.servicemix.osgi</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.osgi</include>
             </includes>
         </dependencySet>
 

Modified: incubator/servicemix/branches/servicemix-4.0/camel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/camel/pom.xml?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/camel/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/camel/pom.xml Fri Oct 26 06:18:09 2007
@@ -36,7 +36,7 @@
   <dependencies>
 	<dependency>
 	  <groupId>org.apache.servicemix.nmr</groupId>
-	  <artifactId>org.apache.servicemix.api</artifactId>
+	  <artifactId>org.apache.servicemix.nmr.api</artifactId>
       <version>${project.version}</version>
 	</dependency>
 	<dependency>

Modified: incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java Fri Oct 26 06:18:09 2007
@@ -18,7 +18,7 @@
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.impl.DefaultComponent;
-import org.apache.servicemix.api.NMR;
+import org.apache.servicemix.nmr.api.NMR;
 
 import java.util.Map;
 
@@ -45,11 +45,11 @@
         return new ServiceMixEndpoint(this, uri);
     }
 
-    public void registerEndpoint(org.apache.servicemix.api.Endpoint endpoint, Map<String, ?> properties) {
+    public void registerEndpoint(org.apache.servicemix.nmr.api.Endpoint endpoint, Map<String, ?> properties) {
         nmr.getEndpointRegistry().register(endpoint, properties);
     }
 
-    public void unregisterEndpoint(org.apache.servicemix.api.Endpoint endpoint, Map<String, ?> properties) {
+    public void unregisterEndpoint(org.apache.servicemix.nmr.api.Endpoint endpoint, Map<String, ?> properties) {
         nmr.getEndpointRegistry().unregister(endpoint, properties);
     }
 }

Modified: incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java Fri Oct 26 06:18:09 2007
@@ -18,9 +18,9 @@
 
 import org.apache.camel.Processor;
 import org.apache.camel.impl.DefaultConsumer;
-import org.apache.servicemix.api.Channel;
-import org.apache.servicemix.api.Exchange;
-import org.apache.servicemix.api.Status;
+import org.apache.servicemix.nmr.api.Channel;
+import org.apache.servicemix.nmr.api.Exchange;
+import org.apache.servicemix.nmr.api.Status;
 
 /**
  * Created by IntelliJ IDEA.
@@ -29,7 +29,7 @@
  * Time: 8:59:46 AM
  * To change this template use File | Settings | File Templates.
  */
-public class ServiceMixConsumer extends DefaultConsumer implements org.apache.servicemix.api.Endpoint {
+public class ServiceMixConsumer extends DefaultConsumer implements org.apache.servicemix.nmr.api.Endpoint {
 
     private Channel channel;
 

Modified: incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java Fri Oct 26 06:18:09 2007
@@ -33,12 +33,12 @@
  */
 public class ServiceMixExchange implements Exchange {
 
-    private org.apache.servicemix.api.Exchange exchange;
+    private org.apache.servicemix.nmr.api.Exchange exchange;
     private ServiceMixMessage in;
     private ServiceMixMessage out;
     private ServiceMixMessage fault;
 
-    public ServiceMixExchange(org.apache.servicemix.api.Exchange exchange) {
+    public ServiceMixExchange(org.apache.servicemix.nmr.api.Exchange exchange) {
         this.exchange = exchange;
     }
 

Modified: incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java Fri Oct 26 06:18:09 2007
@@ -34,10 +34,10 @@
     private static final UuidGenerator DEFALT_ID_GENERATOR = new UuidGenerator();
 
     private ServiceMixExchange exchange;
-    private org.apache.servicemix.api.Message message;
+    private org.apache.servicemix.nmr.api.Message message;
     private String messageId = DEFALT_ID_GENERATOR.generateId();
 
-    public ServiceMixMessage(ServiceMixExchange exchange, org.apache.servicemix.api.Message message) {
+    public ServiceMixMessage(ServiceMixExchange exchange, org.apache.servicemix.nmr.api.Message message) {
         this.message = message;
     }
 

Modified: incubator/servicemix/branches/servicemix-4.0/examples/intermediary/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/examples/intermediary/pom.xml?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/examples/intermediary/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/examples/intermediary/pom.xml Fri Oct 26 06:18:09 2007
@@ -36,7 +36,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix.nmr</groupId>
-      <artifactId>org.apache.servicemix.api</artifactId>
+      <artifactId>org.apache.servicemix.nmr.api</artifactId>
       <version>4.0-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/resources/META-INF/spring/intermediary.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/resources/META-INF/spring/intermediary.xml?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/resources/META-INF/spring/intermediary.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/resources/META-INF/spring/intermediary.xml Fri Oct 26 06:18:09 2007
@@ -70,6 +70,6 @@
         <property name="nmr" ref="nmr" />
     </bean>
 
-    <osgi:reference id="nmr" interface="org.apache.servicemix.api.NMR" mandatory="true" />
+    <osgi:reference id="nmr" interface="org.apache.servicemix.nmr.api.NMR" mandatory="true" />
 
 </beans>

Modified: incubator/servicemix/branches/servicemix-4.0/itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/itests/pom.xml?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/itests/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/itests/pom.xml Fri Oct 26 06:18:09 2007
@@ -40,7 +40,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix.nmr</groupId>
-      <artifactId>org.apache.servicemix.osgi</artifactId>
+      <artifactId>org.apache.servicemix.nmr.osgi</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java Fri Oct 26 06:18:09 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.servicemix;
 
-import org.apache.servicemix.api.NMR;
+import org.apache.servicemix.nmr.api.NMR;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.springframework.core.io.InputStreamResource;
@@ -72,10 +72,10 @@
             "org.apache.camel,camel-osgi," + camelVersion,
             "org.apache.camel,camel-jms," + camelVersion,
             "org.apache.camel,camel-jhc," + camelVersion,
-            "org.apache.servicemix.nmr,org.apache.servicemix.api," + servicemixVersion,
-            "org.apache.servicemix.nmr,org.apache.servicemix.core," + servicemixVersion,
-			"org.apache.servicemix.nmr,org.apache.servicemix.spring," + servicemixVersion,
-            "org.apache.servicemix.nmr,org.apache.servicemix.osgi," + servicemixVersion,
+            "org.apache.servicemix.nmr,org.apache.servicemix.nmr.api," + servicemixVersion,
+            "org.apache.servicemix.nmr,org.apache.servicemix.nmr.core," + servicemixVersion,
+			"org.apache.servicemix.nmr,org.apache.servicemix.nmr.spring," + servicemixVersion,
+            "org.apache.servicemix.nmr,org.apache.servicemix.nmr.osgi," + servicemixVersion,
             "org.apache.servicemix,org.apache.servicemix.camel," + servicemixVersion,
             "org.apache.servicemix.examples,org.apache.servicemix.examples.intermediary," + servicemixVersion,
 		};

Modified: incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF (original)
+++ incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF Fri Oct 26 06:18:09 2007
@@ -23,5 +23,5 @@
  org.osgi.framework;specification-version="1.3.0",
  org.springframework.core.io,
  org.springframework.osgi.test,
- org.apache.servicemix.api,
- org.apache.servicemix.core
+ org.apache.servicemix.nmr.api,
+ org.apache.servicemix.nmr.core

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml Fri Oct 26 06:18:09 2007
@@ -43,7 +43,7 @@
 
     <!-- Reference to the ServiceMix NMR -->
     <osgi:reference id="nmr"
-                    interface="org.apache.servicemix.api.NMR" />
+                    interface="org.apache.servicemix.nmr.api.NMR" />
 
     <!-- Expose the JBI components registry in OSGi -->
     <osgi:service ref="componentRegistry">

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/pom.xml Fri Oct 26 06:18:09 2007
@@ -36,7 +36,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix.nmr</groupId>
-      <artifactId>org.apache.servicemix.core</artifactId>
+      <artifactId>org.apache.servicemix.nmr.core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.jbi</groupId>
@@ -85,7 +85,6 @@
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Export-Package>${pom.artifactId}*</Export-Package>
             <DynamicImport-Package>*</DynamicImport-Package>
-            <Spring-Context>*;publish-context:=false</Spring-Context>
           </instructions>
         </configuration>
       </plugin>

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/ComponentRegistry.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/ComponentRegistry.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/ComponentRegistry.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/ComponentRegistry.java Fri Oct 26 06:18:09 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.servicemix.jbi.runtime;
 
-import org.apache.servicemix.api.service.ServiceRegistry;
+import org.apache.servicemix.nmr.api.service.ServiceRegistry;
 
 import javax.jbi.component.Component;
 

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/ComponentContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/ComponentContextImpl.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/ComponentContextImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/ComponentContextImpl.java Fri Oct 26 06:18:09 2007
@@ -39,10 +39,9 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentFragment;
 
-import org.apache.servicemix.api.Channel;
-import org.apache.servicemix.api.Endpoint;
-import org.apache.servicemix.api.Exchange;
-import org.apache.servicemix.api.NMR;
+import org.apache.servicemix.nmr.api.Endpoint;
+import org.apache.servicemix.nmr.api.Exchange;
+import org.apache.servicemix.nmr.api.NMR;
 
 /**
  * Created by IntelliJ IDEA.

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/ComponentRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/ComponentRegistryImpl.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/ComponentRegistryImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/ComponentRegistryImpl.java Fri Oct 26 06:18:09 2007
@@ -16,9 +16,9 @@
  */
 package org.apache.servicemix.jbi.runtime.impl;
 
-import org.apache.servicemix.api.NMR;
-import org.apache.servicemix.api.ServiceMixException;
-import org.apache.servicemix.core.ServiceRegistryImpl;
+import org.apache.servicemix.nmr.api.NMR;
+import org.apache.servicemix.nmr.api.ServiceMixException;
+import org.apache.servicemix.nmr.core.ServiceRegistryImpl;
 import org.apache.servicemix.jbi.runtime.ComponentRegistry;
 
 import javax.jbi.JBIException;

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/DeliveryChannelImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/DeliveryChannelImpl.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/DeliveryChannelImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/DeliveryChannelImpl.java Fri Oct 26 06:18:09 2007
@@ -29,12 +29,12 @@
 import javax.jbi.servicedesc.ServiceEndpoint;
 import javax.xml.namespace.QName;
 
-import org.apache.servicemix.api.Channel;
-import org.apache.servicemix.api.Endpoint;
-import org.apache.servicemix.api.Exchange;
-import org.apache.servicemix.api.Pattern;
-import org.apache.servicemix.api.Reference;
-import org.apache.servicemix.api.internal.InternalExchange;
+import org.apache.servicemix.nmr.api.Channel;
+import org.apache.servicemix.nmr.api.Endpoint;
+import org.apache.servicemix.nmr.api.Exchange;
+import org.apache.servicemix.nmr.api.Pattern;
+import org.apache.servicemix.nmr.api.Reference;
+import org.apache.servicemix.nmr.api.internal.InternalExchange;
 
 /**
  * Implementation of the DeliveryChannel.

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/EndpointImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/EndpointImpl.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/EndpointImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/EndpointImpl.java Fri Oct 26 06:18:09 2007
@@ -16,9 +16,9 @@
  */
 package org.apache.servicemix.jbi.runtime.impl;
 
-import org.apache.servicemix.api.Channel;
-import org.apache.servicemix.api.Endpoint;
-import org.apache.servicemix.api.Exchange;
+import org.apache.servicemix.nmr.api.Channel;
+import org.apache.servicemix.nmr.api.Endpoint;
+import org.apache.servicemix.nmr.api.Exchange;
 import org.w3c.dom.DocumentFragment;
 
 import javax.jbi.servicedesc.ServiceEndpoint;

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/FaultImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/FaultImpl.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/FaultImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/FaultImpl.java Fri Oct 26 06:18:09 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.servicemix.jbi.runtime.impl;
 
-import org.apache.servicemix.api.Message;
+import org.apache.servicemix.nmr.api.Message;
 
 import javax.jbi.messaging.Fault;
 

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/InOnlyImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/InOnlyImpl.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/InOnlyImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/InOnlyImpl.java Fri Oct 26 06:18:09 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.servicemix.jbi.runtime.impl;
 
-import org.apache.servicemix.api.Exchange;
+import org.apache.servicemix.nmr.api.Exchange;
 
 import javax.jbi.messaging.InOnly;
 

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/InOptionalOutImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/InOptionalOutImpl.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/InOptionalOutImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/InOptionalOutImpl.java Fri Oct 26 06:18:09 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.servicemix.jbi.runtime.impl;
 
-import org.apache.servicemix.api.Exchange;
+import org.apache.servicemix.nmr.api.Exchange;
 
 import javax.jbi.messaging.InOptionalOut;
 

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/InOutImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/InOutImpl.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/InOutImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/InOutImpl.java Fri Oct 26 06:18:09 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.servicemix.jbi.runtime.impl;
 
-import org.apache.servicemix.api.Exchange;
+import org.apache.servicemix.nmr.api.Exchange;
 
 import javax.jbi.messaging.InOut;
 

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/MessageExchangeFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/MessageExchangeFactoryImpl.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/MessageExchangeFactoryImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/MessageExchangeFactoryImpl.java Fri Oct 26 06:18:09 2007
@@ -29,8 +29,8 @@
 import javax.jbi.servicedesc.ServiceEndpoint;
 import javax.xml.namespace.QName;
 
-import org.apache.servicemix.api.Pattern;
-import org.apache.servicemix.core.ExchangeImpl;
+import org.apache.servicemix.nmr.api.Pattern;
+import org.apache.servicemix.nmr.core.ExchangeImpl;
 
 /**
  * Resolver for URI patterns

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/MessageExchangeImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/MessageExchangeImpl.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/MessageExchangeImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/MessageExchangeImpl.java Fri Oct 26 06:18:09 2007
@@ -27,10 +27,10 @@
 import javax.jbi.servicedesc.ServiceEndpoint;
 import javax.xml.namespace.QName;
 
-import org.apache.servicemix.api.Exchange;
-import org.apache.servicemix.api.Message;
-import org.apache.servicemix.api.Status;
-import org.apache.servicemix.core.MessageImpl;
+import org.apache.servicemix.nmr.api.Exchange;
+import org.apache.servicemix.nmr.api.Message;
+import org.apache.servicemix.nmr.api.Status;
+import org.apache.servicemix.nmr.core.MessageImpl;
 
 /**
  * MessageExchange wrapper on top of an Exchange.
@@ -66,7 +66,7 @@
     }
 
     public MessageExchange.Role getRole() {
-        return exchange.getRole() == org.apache.servicemix.api.Role.Consumer ? MessageExchange.Role.CONSUMER : MessageExchange.Role.PROVIDER;
+        return exchange.getRole() == org.apache.servicemix.nmr.api.Role.Consumer ? MessageExchange.Role.CONSUMER : MessageExchange.Role.PROVIDER;
     }
 
     public ExchangeStatus getStatus() {

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/NormalizedMessageImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/NormalizedMessageImpl.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/NormalizedMessageImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/NormalizedMessageImpl.java Fri Oct 26 06:18:09 2007
@@ -16,8 +16,7 @@
  */
 package org.apache.servicemix.jbi.runtime.impl;
 
-import org.apache.servicemix.api.Message;
-import org.apache.servicemix.core.MessageImpl;
+import org.apache.servicemix.nmr.api.Message;
 
 import javax.jbi.messaging.NormalizedMessage;
 import javax.jbi.messaging.MessagingException;

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/RobustInOnlyImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/RobustInOnlyImpl.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/RobustInOnlyImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/RobustInOnlyImpl.java Fri Oct 26 06:18:09 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.servicemix.jbi.runtime.impl;
 
-import org.apache.servicemix.api.Exchange;
+import org.apache.servicemix.nmr.api.Exchange;
 
 import javax.jbi.messaging.RobustInOnly;
 

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/test/java/org/apache/servicemix/jbi/runtime/IntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/test/java/org/apache/servicemix/jbi/runtime/IntegrationTest.java?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/test/java/org/apache/servicemix/jbi/runtime/IntegrationTest.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/test/java/org/apache/servicemix/jbi/runtime/IntegrationTest.java Fri Oct 26 06:18:09 2007
@@ -21,13 +21,13 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.servicemix.api.Channel;
-import org.apache.servicemix.api.Endpoint;
-import org.apache.servicemix.api.Exchange;
-import org.apache.servicemix.api.Pattern;
-import org.apache.servicemix.api.Status;
-import org.apache.servicemix.api.service.ServiceHelper;
-import org.apache.servicemix.core.ServiceMix;
+import org.apache.servicemix.nmr.api.Channel;
+import org.apache.servicemix.nmr.api.Endpoint;
+import org.apache.servicemix.nmr.api.Exchange;
+import org.apache.servicemix.nmr.api.Pattern;
+import org.apache.servicemix.nmr.api.Status;
+import org.apache.servicemix.nmr.api.service.ServiceHelper;
+import org.apache.servicemix.nmr.core.ServiceMix;
 import org.apache.servicemix.eip.EIPComponent;
 import org.apache.servicemix.eip.EIPEndpoint;
 import org.apache.servicemix.eip.patterns.WireTap;

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/pom.xml?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/pom.xml Fri Oct 26 06:18:09 2007
@@ -23,12 +23,12 @@
 
   <parent>
     <groupId>org.apache.servicemix.nmr</groupId>
-    <artifactId>org.apache.servicemix.nmr</artifactId>
+    <artifactId>nmr</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.servicemix.nmr</groupId>
-  <artifactId>org.apache.servicemix.api</artifactId>
+  <artifactId>org.apache.servicemix.nmr.api</artifactId>
   <packaging>bundle</packaging>
   <version>4.0-SNAPSHOT</version>
   <name>org.apache.servicemix.api</name>

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Channel.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Channel.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Channel.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Channel.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api;
+package org.apache.servicemix.nmr.api;
 
 /**
  * Creates a channel to perform invocations through the NMR.
@@ -24,7 +24,7 @@
  * Channel must be closed using the {@link #close()} method
  * after use.
  *
- * @see org.apache.servicemix.api.NMR#createChannel()
+ * @see org.apache.servicemix.nmr.api.NMR#createChannel()
  * @version $Revision: $
  * @since 4.0
  */

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Endpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Endpoint.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Endpoint.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Endpoint.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api;
+package org.apache.servicemix.nmr.api;
 
 /**
  * Represents an endpoint to expose in the NMR.

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/EndpointRegistry.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/EndpointRegistry.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/EndpointRegistry.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/EndpointRegistry.java Fri Oct 26 06:18:09 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api;
+package org.apache.servicemix.nmr.api;
 
-import org.apache.servicemix.api.service.ServiceRegistry;
+import org.apache.servicemix.nmr.api.service.ServiceRegistry;
 
 import org.w3c.dom.Document;
 

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Exchange.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Exchange.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Exchange.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Exchange.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api;
+package org.apache.servicemix.nmr.api;
 
 import javax.xml.namespace.QName;
 import java.io.Serializable;

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Message.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Message.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Message.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Message.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api;
+package org.apache.servicemix.nmr.api;
 
 import java.io.Serializable;
 import java.util.Map;

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/NMR.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/NMR.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/NMR.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/NMR.java Fri Oct 26 06:18:09 2007
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api;
+package org.apache.servicemix.nmr.api;
 
-import org.apache.servicemix.api.internal.FlowRegistry;
-import org.apache.servicemix.api.event.ListenerRegistry;
+import org.apache.servicemix.nmr.api.internal.FlowRegistry;
+import org.apache.servicemix.nmr.api.event.ListenerRegistry;
 
 /**
  * The NMR interface is the primary interface to communicate with the Bus.

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Pattern.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Pattern.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Pattern.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Pattern.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api;
+package org.apache.servicemix.nmr.api;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Reference.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Reference.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Reference.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Reference.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api;
+package org.apache.servicemix.nmr.api;
 
 import org.w3c.dom.Document;
 

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Role.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Role.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Role.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Role.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api;
+package org.apache.servicemix.nmr.api;
 
 /**
  * The role of the component processing this exchange.

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/ServiceMixException.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/ServiceMixException.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/ServiceMixException.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/ServiceMixException.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api;
+package org.apache.servicemix.nmr.api;
 
 /**
  * Base class for ServiceMix exception

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Status.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Status.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Status.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Status.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api;
+package org.apache.servicemix.nmr.api;
 
 /**
  * `The status of the exchange can be Active, Done or Error.

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Type.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Type.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Type.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Type.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api;
+package org.apache.servicemix.nmr.api;
 
 /**
  * The type of a message, which can be In, Out or Fault.

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/EndpointListener.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/EndpointListener.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/EndpointListener.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/EndpointListener.java Fri Oct 26 06:18:09 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api.event;
+package org.apache.servicemix.nmr.api.event;
 
-import org.apache.servicemix.api.Endpoint;
+import org.apache.servicemix.nmr.api.Endpoint;
 
 
 /**

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/ExchangeListener.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/ExchangeListener.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/ExchangeListener.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/ExchangeListener.java Fri Oct 26 06:18:09 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api.event;
+package org.apache.servicemix.nmr.api.event;
 
-import org.apache.servicemix.api.Exchange;
+import org.apache.servicemix.nmr.api.Exchange;
 
 
 /**

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/Listener.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/Listener.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/Listener.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/Listener.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api.event;
+package org.apache.servicemix.nmr.api.event;
 
 /**
  *

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/ListenerRegistry.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/ListenerRegistry.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/ListenerRegistry.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/event/ListenerRegistry.java Fri Oct 26 06:18:09 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api.event;
+package org.apache.servicemix.nmr.api.event;
 
-import org.apache.servicemix.api.service.ServiceRegistry;
+import org.apache.servicemix.nmr.api.service.ServiceRegistry;
 
 import java.util.Map;
 

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/Flow.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/Flow.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/Flow.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/Flow.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api.internal;
+package org.apache.servicemix.nmr.api.internal;
 
 /**
  * @version $Revision: $

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/FlowRegistry.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/FlowRegistry.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/FlowRegistry.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/FlowRegistry.java Fri Oct 26 06:18:09 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api.internal;
+package org.apache.servicemix.nmr.api.internal;
 
-import org.apache.servicemix.api.service.ServiceRegistry;
+import org.apache.servicemix.nmr.api.service.ServiceRegistry;
 
 /**
  * @version $Revision: $

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalChannel.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalChannel.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalChannel.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalChannel.java Fri Oct 26 06:18:09 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api.internal;
+package org.apache.servicemix.nmr.api.internal;
 
-import org.apache.servicemix.api.Channel;
+import org.apache.servicemix.nmr.api.Channel;
 
 /**
  * InternalChannel is the private contract for channels.

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalEndpoint.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalEndpoint.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalEndpoint.java Fri Oct 26 06:18:09 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api.internal;
+package org.apache.servicemix.nmr.api.internal;
 
-import org.apache.servicemix.api.Endpoint;
+import org.apache.servicemix.nmr.api.Endpoint;
 
 /**
  * @version $Revision: $

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalExchange.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalExchange.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalExchange.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalExchange.java Fri Oct 26 06:18:09 2007
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api.internal;
+package org.apache.servicemix.nmr.api.internal;
 
-import org.apache.servicemix.api.Exchange;
-import org.apache.servicemix.api.Role;
+import org.apache.servicemix.nmr.api.Exchange;
+import org.apache.servicemix.nmr.api.Role;
 
 import java.util.concurrent.Semaphore;
 
@@ -41,9 +41,9 @@
     /**
      * Retrieve the source endpoint. I.e. the one that created the exchange.
      * This information will be set by the NMR when the exchange is sent
-     * using one of {@link org.apache.servicemix.api.Channel#send(Exchange)},
-     * {@link org.apache.servicemix.api.Channel#sendSync(Exchange)} or
-     * {@link org.apache.servicemix.api.Channel#sendSync(Exchange, long)}
+     * using one of {@link org.apache.servicemix.nmr.api.Channel#send(Exchange)},
+     * {@link org.apache.servicemix.nmr.api.Channel#sendSync(Exchange)} or
+     * {@link org.apache.servicemix.nmr.api.Channel#sendSync(Exchange, long)}
      *
      * @return the endpoint that sent the exchange
      */
@@ -51,7 +51,7 @@
 
     /**
      * Set the source endpoint.  This method should be called by the
-     * {@link org.apache.servicemix.api.Channel}
+     * {@link org.apache.servicemix.nmr.api.Channel}
      *
      * @param source the source endpoint
      */

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalReference.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalReference.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalReference.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/internal/InternalReference.java Fri Oct 26 06:18:09 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api.internal;
+package org.apache.servicemix.nmr.api.internal;
 
-import org.apache.servicemix.api.Reference;
+import org.apache.servicemix.nmr.api.Reference;
 
 /**
  * @version $Revision: $

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/service/ServiceHelper.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/service/ServiceHelper.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/service/ServiceHelper.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/service/ServiceHelper.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api.service;
+package org.apache.servicemix.nmr.api.service;
 
 import java.util.Map;
 import java.util.HashMap;

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/service/ServiceRegistry.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/service/ServiceRegistry.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/service/ServiceRegistry.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/main/java/org/apache/servicemix/nmr/api/service/ServiceRegistry.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api.service;
+package org.apache.servicemix.nmr.api.service;
 
 import java.util.Map;
 import java.util.Set;

Copied: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/nmr/api/OsgiExample.java (from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/api/OsgiExample.java)
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/nmr/api/OsgiExample.java?p2=incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/nmr/api/OsgiExample.java&p1=incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/api/OsgiExample.java&r1=588594&r2=588634&rev=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/api/OsgiExample.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/nmr/api/OsgiExample.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api;
+package org.apache.servicemix.nmr.api;
 
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;

Copied: incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/nmr/api/PipelineEndpoint.java (from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/api/PipelineEndpoint.java)
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/nmr/api/PipelineEndpoint.java?p2=incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/nmr/api/PipelineEndpoint.java&p1=incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/api/PipelineEndpoint.java&r1=588594&r2=588634&rev=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/api/PipelineEndpoint.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/api/src/test/java/org/apache/servicemix/nmr/api/PipelineEndpoint.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.api;
+package org.apache.servicemix.nmr.api;
 
 /**
  * @version $Revision: $

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/pom.xml?rev=588634&r1=588633&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/core/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/core/pom.xml Fri Oct 26 06:18:09 2007
@@ -23,12 +23,12 @@
 
   <parent>
     <groupId>org.apache.servicemix.nmr</groupId>
-    <artifactId>org.apache.servicemix.nmr</artifactId>
+    <artifactId>nmr</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.servicemix.nmr</groupId>
-  <artifactId>org.apache.servicemix.core</artifactId>
+  <artifactId>org.apache.servicemix.nmr.core</artifactId>
   <packaging>bundle</packaging>
   <version>4.0-SNAPSHOT</version>
   <name>org.apache.servicemix.core</name>
@@ -36,7 +36,7 @@
   <dependencies>
 	<dependency>
 	  <groupId>org.apache.servicemix.nmr</groupId>
-	  <artifactId>org.apache.servicemix.api</artifactId>
+	  <artifactId>org.apache.servicemix.nmr.api</artifactId>
 	</dependency>
 	<dependency>
 	  <groupId>junit</groupId>

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ChannelImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ChannelImpl.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ChannelImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ChannelImpl.java Fri Oct 26 06:18:09 2007
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.core;
+package org.apache.servicemix.nmr.core;
 
-import org.apache.servicemix.api.*;
-import org.apache.servicemix.api.event.ExchangeListener;
-import org.apache.servicemix.api.internal.InternalChannel;
-import org.apache.servicemix.api.internal.InternalEndpoint;
-import org.apache.servicemix.api.internal.InternalExchange;
+import org.apache.servicemix.nmr.api.*;
+import org.apache.servicemix.nmr.api.event.ExchangeListener;
+import org.apache.servicemix.nmr.api.internal.InternalChannel;
+import org.apache.servicemix.nmr.api.internal.InternalEndpoint;
+import org.apache.servicemix.nmr.api.internal.InternalExchange;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.Semaphore;

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ClientChannel.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ClientChannel.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ClientChannel.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ClientChannel.java Fri Oct 26 06:18:09 2007
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.core;
+package org.apache.servicemix.nmr.core;
 
-import org.apache.servicemix.api.Channel;
-import org.apache.servicemix.api.Exchange;
-import org.apache.servicemix.api.NMR;
-import org.apache.servicemix.api.internal.InternalChannel;
-import org.apache.servicemix.api.internal.InternalEndpoint;
+import org.apache.servicemix.nmr.api.Channel;
+import org.apache.servicemix.nmr.api.Exchange;
+import org.apache.servicemix.nmr.api.NMR;
+import org.apache.servicemix.nmr.api.internal.InternalChannel;
+import org.apache.servicemix.nmr.api.internal.InternalEndpoint;
 
 import java.util.concurrent.Executors;
 

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/EndpointRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/EndpointRegistryImpl.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/EndpointRegistryImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/EndpointRegistryImpl.java Fri Oct 26 06:18:09 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.core;
+package org.apache.servicemix.nmr.core;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,13 +26,13 @@
 
 import org.w3c.dom.Document;
 
-import org.apache.servicemix.api.Endpoint;
-import org.apache.servicemix.api.EndpointRegistry;
-import org.apache.servicemix.api.NMR;
-import org.apache.servicemix.api.Reference;
-import org.apache.servicemix.api.ServiceMixException;
-import org.apache.servicemix.api.internal.InternalEndpoint;
-import org.apache.servicemix.api.service.ServiceRegistry;
+import org.apache.servicemix.nmr.api.Endpoint;
+import org.apache.servicemix.nmr.api.EndpointRegistry;
+import org.apache.servicemix.nmr.api.NMR;
+import org.apache.servicemix.nmr.api.Reference;
+import org.apache.servicemix.nmr.api.ServiceMixException;
+import org.apache.servicemix.nmr.api.internal.InternalEndpoint;
+import org.apache.servicemix.nmr.api.service.ServiceRegistry;
 
 /**
  * @version $Revision: $
@@ -66,12 +66,12 @@
     /**
      * Register the given endpoint in the registry.
      * In an OSGi world, this would be performed automatically by a ServiceTracker.
-     * Upon registration, a {@link org.apache.servicemix.api.Channel} will be injected onto the Endpoint using
-     * the {@link org.apache.servicemix.api.Endpoint#setChannel(org.apache.servicemix.api.Channel)} method.
+     * Upon registration, a {@link org.apache.servicemix.nmr.api.Channel} will be injected onto the Endpoint using
+     * the {@link org.apache.servicemix.nmr.api.Endpoint#setChannel(org.apache.servicemix.nmr.api.Channel)} method.
      *
      * @param endpoint   the endpoint to register
      * @param properties the metadata associated with this endpoint
-     * @see org.apache.servicemix.api.Endpoint
+     * @see org.apache.servicemix.nmr.api.Endpoint
      */
     public void register(Endpoint endpoint, Map<String, ?> properties) {
         Executor executor = Executors.newCachedThreadPool();
@@ -150,7 +150,7 @@
      *
      * @param xml the xml document describing this reference
      * @return a new Reference
-     * @see org.apache.servicemix.api.Reference#toXml()
+     * @see org.apache.servicemix.nmr.api.Reference#toXml()
      */
     public synchronized Reference lookup(Document xml) {
         // TODO: implement

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ExchangeImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ExchangeImpl.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ExchangeImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ExchangeImpl.java Fri Oct 26 06:18:09 2007
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.core;
+package org.apache.servicemix.nmr.core;
 
-import org.apache.servicemix.api.*;
-import org.apache.servicemix.api.internal.InternalExchange;
-import org.apache.servicemix.api.internal.InternalEndpoint;
+import org.apache.servicemix.nmr.api.*;
+import org.apache.servicemix.nmr.api.internal.InternalExchange;
+import org.apache.servicemix.nmr.api.internal.InternalEndpoint;
 
 import javax.xml.namespace.QName;
 import java.io.IOException;

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/FlowRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/FlowRegistryImpl.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/FlowRegistryImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/FlowRegistryImpl.java Fri Oct 26 06:18:09 2007
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.core;
+package org.apache.servicemix.nmr.core;
 
-import org.apache.servicemix.api.ServiceMixException;
-import org.apache.servicemix.api.Role;
-import org.apache.servicemix.api.internal.*;
+import org.apache.servicemix.nmr.api.ServiceMixException;
+import org.apache.servicemix.nmr.api.Role;
+import org.apache.servicemix.nmr.api.internal.*;
 
 /**
  * The default implementation of FlowRegistry.

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/InternalEndpointWrapper.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/InternalEndpointWrapper.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/InternalEndpointWrapper.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/InternalEndpointWrapper.java Fri Oct 26 06:18:09 2007
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.core;
+package org.apache.servicemix.nmr.core;
 
-import org.apache.servicemix.api.Endpoint;
-import org.apache.servicemix.api.Channel;
-import org.apache.servicemix.api.Exchange;
-import org.apache.servicemix.api.internal.InternalEndpoint;
-import org.apache.servicemix.api.internal.InternalChannel;
+import org.apache.servicemix.nmr.api.Endpoint;
+import org.apache.servicemix.nmr.api.Channel;
+import org.apache.servicemix.nmr.api.Exchange;
+import org.apache.servicemix.nmr.api.internal.InternalEndpoint;
+import org.apache.servicemix.nmr.api.internal.InternalChannel;
 
 /**
  *
@@ -46,7 +46,7 @@
      * automatically when the endpoint is unregistered.
      *
      * @param channel the channel that this endpoint can use
-     * @see org.apache.servicemix.api.EndpointRegistry#register(org.apache.servicemix.api.Endpoint,java.util.Map)
+     * @see org.apache.servicemix.nmr.api.EndpointRegistry#register(org.apache.servicemix.nmr.api.Endpoint,java.util.Map)
      */
     public void setChannel(Channel channel) {
         this.channel = (InternalChannel) channel;

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ListenerRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ListenerRegistryImpl.java?rev=588634&r1=588594&r2=588634&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ListenerRegistryImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ListenerRegistryImpl.java Fri Oct 26 06:18:09 2007
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.core;
+package org.apache.servicemix.nmr.core;
 
-import org.apache.servicemix.api.event.Listener;
-import org.apache.servicemix.api.event.ListenerRegistry;
+import org.apache.servicemix.nmr.api.event.Listener;
+import org.apache.servicemix.nmr.api.event.ListenerRegistry;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;



Mime
View raw message