Return-Path: 
 <cxf-commits-return-2149-apmail-incubator-cxf-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org
Received: (qmail 63314 invoked from network); 1 Jun 2007 06:55:39 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 1 Jun 2007 06:55:39 -0000
Received: (qmail 12425 invoked by uid 500); 1 Jun 2007 06:55:42 -0000
Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org
Received: (qmail 12368 invoked by uid 500); 1 Jun 2007 06:55:42 -0000
Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:cxf-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cxf-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cxf-commits@incubator.apache.org>
List-Id: <cxf-commits.incubator.apache.org>
Reply-To: cxf-dev@incubator.apache.org
Delivered-To: mailing list cxf-commits@incubator.apache.org
Received: (qmail 12359 invoked by uid 99); 1 Jun 2007 06:55:42 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 May 2007 23:55:42 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 May 2007 23:55:37 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 74BA11A981C; Thu, 31 May 2007 23:55:17 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r543407 - in /incubator/cxf/trunk: integration/jbi/
 integration/jbi/src/main/java/org/apache/cxf/jbi/se/
 integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/
 integration/jbi/src/main/java/org/apache/cxf/jbi/transport/
 integration/jbi/...
Date: Fri, 01 Jun 2007 06:55:16 -0000
To: cxf-commits@incubator.apache.org
From: ffang@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070601065517.74BA11A981C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ffang
Date: Thu May 31 23:55:15 2007
New Revision: 543407

URL: http://svn.apache.org/viewvc?view=rev&rev=543407
Log:
remove redundant JBI transport, update test with new JBI transport

Removed:
    incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/transport/
    incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/bus-extensions.xml
    incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/cxf/
Modified:
    incubator/cxf/trunk/integration/jbi/pom.xml
    incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceEngine.java
    incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java
    incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/AbstractServiceEngineStateMachine.java
    incubator/cxf/trunk/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitTest.java
    incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi-binding.xml
    incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java

Modified: incubator/cxf/trunk/integration/jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/pom.xml?view=diff&rev=543407&r1=543406&r2=543407
==============================================================================
--- incubator/cxf/trunk/integration/jbi/pom.xml (original)
+++ incubator/cxf/trunk/integration/jbi/pom.xml Thu May 31 23:55:15 2007
@@ -56,6 +56,18 @@
             <version>${project.version}</version>
         </dependency>
 
+	<dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-bindings-jbi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-jbi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -63,6 +75,8 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+ 
+        
 
 
         <dependency>

Modified: incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceEngine.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceEngine.java?view=diff&rev=543407&r1=543406&r2=543407
==============================================================================
--- incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceEngine.java (original)
+++ incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceEngine.java Thu May 31 23:55:15 2007
@@ -46,7 +46,8 @@
  */
 public class CXFServiceEngine implements ComponentLifeCycle, Component {
     
-    public static final String JBI_TRANSPORT_ID = "http://apache.org/transport/jbi";
+    public static final String JBI_TRANSPORT_ID = "http://cxf.apache.org/transports/jbi";
+    
     
     
     

Modified: incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java?view=diff&rev=543407&r1=543406&r2=543407
==============================================================================
--- incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java (original)
+++ incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java Thu May 31 23:55:15 2007
@@ -49,8 +49,9 @@
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.jaxws.EndpointUtils;
 import org.apache.cxf.jbi.ServiceConsumer;
-import org.apache.cxf.jbi.transport.JBITransportFactory;
 import org.apache.cxf.transport.ConduitInitiatorManager;
+import org.apache.cxf.transport.jbi.JBITransportFactory;
+
 
 /**
  * Wraps a CXF service or client.

Modified: incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/AbstractServiceEngineStateMachine.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/AbstractServiceEngineStateMachine.java?view=diff&rev=543407&r1=543406&r2=543407
==============================================================================
--- incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/AbstractServiceEngineStateMachine.java (original)
+++ incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/AbstractServiceEngineStateMachine.java Thu May 31 23:55:15 2007
@@ -33,8 +33,9 @@
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.jbi.se.CXFServiceEngine;
 import org.apache.cxf.jbi.se.CXFServiceUnitManager;
-import org.apache.cxf.jbi.transport.JBITransportFactory;
 import org.apache.cxf.transport.ConduitInitiatorManager;
+import org.apache.cxf.transport.jbi.JBITransportFactory;
+
 
 
 public abstract class AbstractServiceEngineStateMachine implements ServiceEngineStateMachine {
@@ -65,7 +66,7 @@
     void registerJBITransport(Bus argBus, CXFServiceUnitManager mgr) throws JBIException { 
         try { 
             getTransportFactory().setBus(argBus);
-            getTransportFactory().setServiceUnitManager(mgr);
+            //getTransportFactory().setServiceUnitManager(mgr);
         } catch (Exception ex) {
             LOG.severe(new Message("SE.FAILED.REGISTER.TRANSPORT.FACTORY", 
                                                LOG).toString());

Modified: incubator/cxf/trunk/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitTest.java?view=diff&rev=543407&r1=543406&r2=543407
==============================================================================
--- incubator/cxf/trunk/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitTest.java (original)
+++ incubator/cxf/trunk/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitTest.java Thu May 31 23:55:15 2007
@@ -34,8 +34,8 @@
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.configuration.Configurer;
-import org.apache.cxf.jbi.transport.JBITransportFactory;
 import org.apache.cxf.transport.ConduitInitiatorManager;
+import org.apache.cxf.transport.jbi.JBITransportFactory;
 import org.easymock.classextension.EasyMock;
 
 
@@ -109,7 +109,7 @@
     void registerJBITransport(Bus argBus, CXFServiceUnitManager mgr) throws JBIException { 
         try { 
             getTransportFactory().setBus(argBus);
-            getTransportFactory().setServiceUnitManager(mgr);
+            //getTransportFactory().setServiceUnitManager(mgr);
         } catch (Exception ex) {
             LOG.severe(new Message("SE.FAILED.REGISTER.TRANSPORT.FACTORY", 
                                                LOG).toString());

Modified: incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi-binding.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi-binding.xml?view=diff&rev=543407&r1=543406&r2=543407
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi-binding.xml (original)
+++ incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi-binding.xml Thu May 31 23:55:15 2007
@@ -17,7 +17,10 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans">
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
     
     <bean class="org.apache.cxf.binding.jbi.JBIBindingFactory" lazy-init="true">
       <property name="bus" ref="cxf"/>

Modified: incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java?view=diff&rev=543407&r1=543406&r2=543407
==============================================================================
--- incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java (original)
+++ incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java Thu May 31 23:55:15 2007
@@ -48,7 +48,7 @@
     DestinationFactory {
     
     public static final String TRANSPORT_ID = "http://cxf.apache.org/transports/jbi";
-
+    
     private static final Logger LOG = LogUtils.getL7dLogger(JBITransportFactory.class);
 
     private static final ThreadLocal<DeliveryChannel> DELIVERY_CHANNEL = new ThreadLocal<DeliveryChannel>();