svn commit: r673412 - in /servicemix/components/engines/servicemix-wsn2005/trunk: pom.xml src/main/java/org/apache/servicemix/wsn/component/WSNDeployer.java

[gnodet]

Author: gnodet
Date: Wed Jul  2 07:54:09 2008
New Revision: 673412

URL: http://svn.apache.org/viewvc?rev=673412&view=rev
Log:
SM-1387: Fix the osgi imports / exports, use servicemix id generator instead of 
activemq one

Modified:
    servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml
    
servicemix/components/engines/servicemix-wsn2005/trunk/src/main/java/org/apache/servicemix/wsn/component/WSNDeployer.java

Modified: servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml?rev=673412&r1=673411&r2=673412&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml Wed Jul  2 
07:54:09 2008
@@ -46,6 +46,18 @@
     <activemq-version>5.1.0</activemq-version>
     <xbean-version>3.4.1</xbean-version>
     <cxf-version>2.1.1-SNAPSHOT</cxf-version>
+
+    <servicemix.osgi.import>
+        org.apache.servicemix.client*;resolution:=optional,
+        org.apache.servicemix.common.osgi,
+        org.apache.xbean.spring.context.v2,
+        org.springframework.beans.factory.xml,
+        *
+    </servicemix.osgi.import>
+    <servicemix.osgi.export>
+        org.apache.servicemix*;version=${project.version},
+        
META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.wsn
+    </servicemix.osgi.export>
   </properties>
     
   <dependencies>

Modified: 
servicemix/components/engines/servicemix-wsn2005/trunk/src/main/java/org/apache/servicemix/wsn/component/WSNDeployer.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-wsn2005/trunk/src/main/java/org/apache/servicemix/wsn/component/WSNDeployer.java?rev=673412&r1=673411&r2=673412&view=diff
==============================================================================
--- 
servicemix/components/engines/servicemix-wsn2005/trunk/src/main/java/org/apache/servicemix/wsn/component/WSNDeployer.java
 (original)
+++ 
servicemix/components/engines/servicemix-wsn2005/trunk/src/main/java/org/apache/servicemix/wsn/component/WSNDeployer.java
 Wed Jul  2 07:54:09 2008
@@ -31,13 +31,13 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 
-import org.apache.activemq.util.IdGenerator;
 import org.apache.servicemix.common.AbstractDeployer;
 import org.apache.servicemix.common.Deployer;
 import org.apache.servicemix.common.Endpoint;
 import org.apache.servicemix.common.ExchangeProcessor;
 import org.apache.servicemix.common.ServiceMixComponent;
 import org.apache.servicemix.common.ServiceUnit;
+import org.apache.servicemix.id.IdGenerator;
 import org.apache.servicemix.wsn.EndpointManager;
 import org.apache.servicemix.wsn.EndpointRegistrationException;
 import org.apache.servicemix.wsn.client.AbstractWSAClient;