svn commit: r690193 - in /servicemix/components/engines/servicemix-cxf-se/trunk: pom.xml src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java

[ge...@apache.org]

Author: gertv
Date: Fri Aug 29 04:25:32 2008
New Revision: 690193

URL: http://svn.apache.org/viewvc?rev=690193&view=rev
Log:
SM-1455: servicemix-cxf-se can now be built using servicemix-core only as a test dependency

Modified:
    servicemix/components/engines/servicemix-cxf-se/trunk/pom.xml
    servicemix/components/engines/servicemix-cxf-se/trunk/src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/pom.xml?rev=690193&r1=690192&r2=690193&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/pom.xml Fri Aug 29 04:25:32 2008
@@ -251,6 +251,25 @@
       <version>${cxf-version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
+      <version>1.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- for unit/integration testing -->
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-core</artifactId>
+      <version>${servicemix-version}</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-jmx</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
   
   <repositories>

Modified: servicemix/components/engines/servicemix-cxf-se/trunk/src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-cxf-se/trunk/src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java?rev=690193&r1=690192&r2=690193&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-cxf-se/trunk/src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java (original)
+++ servicemix/components/engines/servicemix-cxf-se/trunk/src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java Fri Aug 29 04:25:32 2008
@@ -26,10 +26,10 @@
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 import org.apache.cxf.transport.ConduitInitiatorManager;
 import org.apache.cxf.transport.jbi.JBITransportFactory;
-import org.apache.servicemix.client.ClientFactory;
-import org.apache.servicemix.client.ServiceMixClient;
 import org.apache.servicemix.id.IdGenerator;
-import org.apache.servicemix.jbi.container.JBIContainer;
+import org.apache.servicemix.jbi.api.ClientFactory;
+import org.apache.servicemix.jbi.api.Container;
+import org.apache.servicemix.jbi.api.ServiceMixClient;
 
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
@@ -46,7 +46,7 @@
 
     private String name = ClientFactory.DEFAULT_JNDI_NAME;
 
-    private JBIContainer container;
+    private Container container;
 
     private ClientFactory factory;
 
@@ -172,7 +172,7 @@
     /**
      * @return the container
      */
-    public JBIContainer getContainer() {
+    public Container getContainer() {
         return container;
     }
 
@@ -180,7 +180,7 @@
      * @param container
      *            the container to set
      */
-    public void setContainer(JBIContainer container) {
+    public void setContainer(Container container) {
         this.container = container;
     }