Modified: incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/MessageImpl.java URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/MessageImpl.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/MessageImpl.java (original) +++ incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/MessageImpl.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.core; +package org.apache.servicemix.nmr.core; -import org.apache.servicemix.api.Message; +import org.apache.servicemix.nmr.api.Message; import java.io.IOException; import java.util.HashMap;
Modified: incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ReferenceImpl.java URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ReferenceImpl.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/ReferenceImpl.java (original) +++ incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ReferenceImpl.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.internal.InternalEndpoint; -import org.apache.servicemix.api.internal.InternalReference; +import org.apache.servicemix.nmr.api.internal.InternalEndpoint; +import org.apache.servicemix.nmr.api.internal.InternalReference; import org.w3c.dom.Document; import java.util.List; Modified: incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ServiceMix.java URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ServiceMix.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/ServiceMix.java (original) +++ incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ServiceMix.java Fri Oct 26 06:18:09 2007 @@ -14,15 +14,15 @@ * 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.EndpointRegistry; -import org.apache.servicemix.api.NMR; -import org.apache.servicemix.api.service.ServiceHelper; -import org.apache.servicemix.api.event.ListenerRegistry; -import org.apache.servicemix.api.internal.FlowRegistry; -import org.apache.servicemix.api.internal.Flow; +import org.apache.servicemix.nmr.api.Channel; +import org.apache.servicemix.nmr.api.EndpointRegistry; +import org.apache.servicemix.nmr.api.NMR; +import org.apache.servicemix.nmr.api.service.ServiceHelper; +import org.apache.servicemix.nmr.api.event.ListenerRegistry; +import org.apache.servicemix.nmr.api.internal.FlowRegistry; +import org.apache.servicemix.nmr.api.internal.Flow; /** * This class is the servicemix class implementing the NMR Modified: incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ServiceRegistryImpl.java URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ServiceRegistryImpl.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/ServiceRegistryImpl.java (original) +++ incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ServiceRegistryImpl.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.core; +package org.apache.servicemix.nmr.core; -import org.apache.servicemix.api.service.ServiceRegistry; +import org.apache.servicemix.nmr.api.service.ServiceRegistry; import java.util.Map; import java.util.Set; Modified: incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/StraightThroughFlow.java URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/StraightThroughFlow.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/StraightThroughFlow.java (original) +++ incubator/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/StraightThroughFlow.java Fri Oct 26 06:18:09 2007 @@ -14,12 +14,12 @@ * 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.internal.Flow; -import org.apache.servicemix.api.internal.InternalEndpoint; -import org.apache.servicemix.api.internal.InternalExchange; -import org.apache.servicemix.api.Role; +import org.apache.servicemix.nmr.api.internal.Flow; +import org.apache.servicemix.nmr.api.internal.InternalEndpoint; +import org.apache.servicemix.nmr.api.internal.InternalExchange; +import org.apache.servicemix.nmr.api.Role; /** Copied: incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/ExchangeImplTest.java (from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/core/ExchangeImplTest.java) URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/ExchangeImplTest.java?p2=incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/ExchangeImplTest.java&p1=incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/core/ExchangeImplTest.java&r1=588594&r2=588634&rev=588634&view=diff ============================================================================== --- incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/core/ExchangeImplTest.java (original) +++ incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/ExchangeImplTest.java Fri Oct 26 06:18:09 2007 @@ -14,12 +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 static org.junit.Assert.*; -import org.apache.servicemix.api.Exchange; -import org.apache.servicemix.api.Pattern; +import org.apache.servicemix.nmr.api.Exchange; +import org.apache.servicemix.nmr.api.Pattern; +import org.apache.servicemix.nmr.core.ExchangeImpl; import org.junit.Test; Copied: incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/IntegrationTest.java (from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/core/IntegrationTest.java) URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/IntegrationTest.java?p2=incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/IntegrationTest.java&p1=incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/core/IntegrationTest.java&r1=588594&r2=588634&rev=588634&view=diff ============================================================================== --- incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/core/IntegrationTest.java (original) +++ incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/IntegrationTest.java Fri Oct 26 06:18:09 2007 @@ -14,10 +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.service.ServiceHelper; +import org.apache.servicemix.nmr.api.*; +import org.apache.servicemix.nmr.api.service.ServiceHelper; +import org.apache.servicemix.nmr.core.ServiceMix; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; Copied: incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/MessageImplTest.java (from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/core/MessageImplTest.java) URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/MessageImplTest.java?p2=incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/MessageImplTest.java&p1=incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/core/MessageImplTest.java&r1=588594&r2=588634&rev=588634&view=diff ============================================================================== --- incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/core/MessageImplTest.java (original) +++ incubator/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/MessageImplTest.java Fri Oct 26 06:18:09 2007 @@ -14,11 +14,12 @@ * 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 static org.junit.Assert.*; -import org.apache.servicemix.api.Message; +import org.apache.servicemix.nmr.api.Message; +import org.apache.servicemix.nmr.core.MessageImpl; import org.junit.Test; public class MessageImplTest { Propchange: incubator/servicemix/branches/servicemix-4.0/nmr/osgi/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Oct 26 06:18:09 2007 @@ -0,0 +1,4 @@ +target +*.iml +*.ipr +*.iws Modified: incubator/servicemix/branches/servicemix-4.0/nmr/osgi/pom.xml URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/osgi/pom.xml?rev=588634&r1=588633&r2=588634&view=diff ============================================================================== --- incubator/servicemix/branches/servicemix-4.0/nmr/osgi/pom.xml (original) +++ incubator/servicemix/branches/servicemix-4.0/nmr/osgi/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.osgi</artifactId> + <artifactId>org.apache.servicemix.nmr.osgi</artifactId> <packaging>bundle</packaging> <version>4.0-SNAPSHOT</version> <name>org.apache.servicemix.osgi</name> @@ -36,17 +36,17 @@ <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> <groupId>org.apache.servicemix.nmr</groupId> - <artifactId>org.apache.servicemix.core</artifactId> + <artifactId>org.apache.servicemix.nmr.core</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicemix.nmr</groupId> - <artifactId>org.apache.servicemix.spring</artifactId> + <artifactId>org.apache.servicemix.nmr.spring</artifactId> <version>${project.version}</version> </dependency> <dependency> Modified: incubator/servicemix/branches/servicemix-4.0/nmr/osgi/src/main/resources/META-INF/spring/servicemix-nmr.xml URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/osgi/src/main/resources/META-INF/spring/servicemix-nmr.xml?rev=588634&r1=588633&r2=588634&view=diff ============================================================================== --- incubator/servicemix/branches/servicemix-4.0/nmr/osgi/src/main/resources/META-INF/spring/servicemix-nmr.xml (original) +++ incubator/servicemix/branches/servicemix-4.0/nmr/osgi/src/main/resources/META-INF/spring/servicemix-nmr.xml Fri Oct 26 06:18:09 2007 @@ -30,48 +30,48 @@ http://www.springframework.org/schema/osgi/spring-osgi.xsd";> <!-- ServiceMix NMR --> - <bean id="servicemix" class="org.apache.servicemix.core.ServiceMix"> + <bean id="servicemix" class="org.apache.servicemix.nmr.core.ServiceMix"> <property name="endpointRegistry" ref="endpointRegistry" /> <property name="listenerRegistry" ref="listenerRegistry" /> <property name="flowRegistry" ref="flowRegistry" /> </bean> <osgi:service ref="servicemix"> <osgi:interfaces> - <value>org.apache.servicemix.api.NMR</value> + <value>org.apache.servicemix.nmr.api.NMR</value> </osgi:interfaces> </osgi:service> <!-- Flow registry and service tracker --> - <bean id="flowRegistry" class="org.apache.servicemix.core.FlowRegistryImpl" /> + <bean id="flowRegistry" class="org.apache.servicemix.nmr.core.FlowRegistryImpl" /> <osgi:list id="flows" - interface="org.apache.servicemix.api.internal.Flow" + interface="org.apache.servicemix.nmr.api.internal.Flow" cardinality="0..N"> <osgi:listener ref="flowRegistry" bind-method="register" unbind-method="unregister" /> </osgi:list> <!-- Listener registry and service tracker --> - <bean id="listenerRegistry" class="org.apache.servicemix.core.ListenerRegistryImpl" /> + <bean id="listenerRegistry" class="org.apache.servicemix.nmr.core.ListenerRegistryImpl" /> <osgi:list id="listeners" - interface="org.apache.servicemix.api.event.Listener" + interface="org.apache.servicemix.nmr.api.event.Listener" cardinality="0..N"> <osgi:listener ref="listenerRegistry" bind-method="register" unbind-method="unregister" /> </osgi:list> <!-- Endpoint registry and service tracker --> - <bean id="endpointRegistry" class="org.apache.servicemix.core.EndpointRegistryImpl"> + <bean id="endpointRegistry" class="org.apache.servicemix.nmr.core.EndpointRegistryImpl"> <property name="nmr" ref="servicemix" /> </bean> <osgi:list id="endpoints" - interface="org.apache.servicemix.api.Endpoint" + interface="org.apache.servicemix.nmr.api.Endpoint" cardinality="0..N"> <osgi:listener ref="endpointRegistry" bind-method="register" unbind-method="unregister" /> </osgi:list> <!-- Register the Straight-Through flow --> - <bean id="staightThroughFlow" class="org.apache.servicemix.core.StraightThroughFlow" /> + <bean id="staightThroughFlow" class="org.apache.servicemix.nmr.core.StraightThroughFlow" /> <osgi:service ref="staightThroughFlow"> <osgi:interfaces> - <value>org.apache.servicemix.api.internal.Flow</value> + <value>org.apache.servicemix.nmr.api.internal.Flow</value> </osgi:interfaces> </osgi:service> Modified: incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml?rev=588634&r1=588633&r2=588634&view=diff ============================================================================== --- incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml (original) +++ incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml Fri Oct 26 06:18:09 2007 @@ -28,10 +28,10 @@ </parent> <groupId>org.apache.servicemix.nmr</groupId> - <artifactId>org.apache.servicemix.nmr</artifactId> + <artifactId>nmr</artifactId> <packaging>pom</packaging> <version>4.0-SNAPSHOT</version> - <name>org.apache.servicemix.nmr</name> + <name>ServiceMix NMR</name> <modules> <module>api</module> Modified: incubator/servicemix/branches/servicemix-4.0/nmr/spring/pom.xml URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/spring/pom.xml?rev=588634&r1=588633&r2=588634&view=diff ============================================================================== --- incubator/servicemix/branches/servicemix-4.0/nmr/spring/pom.xml (original) +++ incubator/servicemix/branches/servicemix-4.0/nmr/spring/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.spring</artifactId> + <artifactId>org.apache.servicemix.nmr.spring</artifactId> <packaging>bundle</packaging> <version>4.0-SNAPSHOT</version> <name>org.apache.servicemix.spring</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>org.springframework.osgi</groupId> Copied: incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/nmr/spring/BundleExtUrlPostProcessor.java (from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/spring/BundleExtUrlPostProcessor.java) URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/nmr/spring/BundleExtUrlPostProcessor.java?p2=incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/nmr/spring/BundleExtUrlPostProcessor.java&p1=incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/spring/BundleExtUrlPostProcessor.java&r1=588594&r2=588634&rev=588634&view=diff ============================================================================== --- incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/spring/BundleExtUrlPostProcessor.java (original) +++ incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/nmr/spring/BundleExtUrlPostProcessor.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.spring; +package org.apache.servicemix.nmr.spring; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; Copied: incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/nmr/spring/ReferenceFactory.java (from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/spring/ReferenceFactory.java) URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/nmr/spring/ReferenceFactory.java?p2=incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/nmr/spring/ReferenceFactory.java&p1=incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/spring/ReferenceFactory.java&r1=588594&r2=588634&rev=588634&view=diff ============================================================================== --- incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/spring/ReferenceFactory.java (original) +++ incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/main/java/org/apache/servicemix/nmr/spring/ReferenceFactory.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.spring; +package org.apache.servicemix.nmr.spring; -import org.apache.servicemix.api.Endpoint; -import org.apache.servicemix.api.NMR; -import org.apache.servicemix.api.Reference; +import org.apache.servicemix.nmr.api.Endpoint; +import org.apache.servicemix.nmr.api.NMR; +import org.apache.servicemix.nmr.api.Reference; import org.osgi.framework.BundleContext; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; Copied: incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/test/java/org/apache/servicemix/nmr/spring/BundleExtTest.java (from r588594, incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/test/java/org/apache/servicemix/spring/BundleExtTest.java) URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/test/java/org/apache/servicemix/nmr/spring/BundleExtTest.java?p2=incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/test/java/org/apache/servicemix/nmr/spring/BundleExtTest.java&p1=incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/test/java/org/apache/servicemix/spring/BundleExtTest.java&r1=588594&r2=588634&rev=588634&view=diff ============================================================================== --- incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/test/java/org/apache/servicemix/spring/BundleExtTest.java (original) +++ incubator/servicemix/branches/servicemix-4.0/nmr/spring/src/test/java/org/apache/servicemix/nmr/spring/BundleExtTest.java Fri Oct 26 06:18:09 2007 @@ -14,21 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.servicemix.spring; +package org.apache.servicemix.nmr.spring; import junit.framework.TestCase; import org.osgi.framework.*; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.apache.servicemix.nmr.spring.BundleExtUrlPostProcessor; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; import java.lang.reflect.Method; -import java.net.URL; -import java.util.Dictionary; -import java.util.Enumeration; public class BundleExtTest extends TestCase { Modified: incubator/servicemix/branches/servicemix-4.0/pom.xml URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/pom.xml?rev=588634&r1=588633&r2=588634&view=diff ============================================================================== --- incubator/servicemix/branches/servicemix-4.0/pom.xml (original) +++ incubator/servicemix/branches/servicemix-4.0/pom.xml Fri Oct 26 06:18:09 2007 @@ -161,24 +161,64 @@ <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> <groupId>org.apache.servicemix.nmr</groupId> - <artifactId>org.apache.servicemix.core</artifactId> + <artifactId>org.apache.servicemix.nmr.core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.servicemix.nmr</groupId> - <artifactId>org.apache.servicemix.osgi</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.nmr</groupId> + <artifactId>org.apache.servicemix.nmr.osgi</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.servicemix.nmr</groupId> + <artifactId>org.apache.servicemix.nmr.spring</artifactId> + <version>${project.version}</version> + </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> <artifactId>camel-spring</artifactId>
