Return-Path: 
 <commits-return-15837-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 8AA0C87A2
	for <apmail-cxf-commits-archive@www.apache.org>;
 Thu,  1 Sep 2011 19:34:52 +0000 (UTC)
Received: (qmail 56566 invoked by uid 500); 1 Sep 2011 19:34:52 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 56501 invoked by uid 500); 1 Sep 2011 19:34:51 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 56494 invoked by uid 99); 1 Sep 2011 19:34:51 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Sep 2011 19:34:51 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Sep 2011 19:34:47 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 51DC123889EB
	for <commits@cxf.apache.org>; Thu,  1 Sep 2011 19:34:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1164223 - in /cxf/trunk:
 distribution/karaf/features/src/main/resources/features.xml
 distribution/karaf/pom.xml
 rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Date: Thu, 01 Sep 2011 19:34:26 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110901193426.51DC123889EB@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dkulp
Date: Thu Sep  1 19:34:25 2011
New Revision: 1164223

URL: http://svn.apache.org/viewvc?rev=1164223&view=rev
Log:
[CXF-3765, CXF-3766] Update karaf version and the features
Patch from Jean-Baptiste Onofre applied

Modified:
    cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
    cxf/trunk/distribution/karaf/pom.xml
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java

Modified: cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/karaf/features/src/main/resources/features.xml?rev=1164223&r1=1164222&r2=1164223&view=diff
==============================================================================
--- cxf/trunk/distribution/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/distribution/karaf/features/src/main/resources/features.xml Thu Sep  1 19:34:25 2011
@@ -17,10 +17,13 @@
       limitations under the License.
 -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="cxf-${project.version}">
-
+    <feature name="jaxp-ri" version="1.4.4_2"  resolver='(obr)'>
+        <!-- just needed on IBM JDK for SAAJ to work, but not needed otherwise -->
+        <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxp-ri/1.4.4_2</bundle>    
+    </feature>
     <feature name="saaj-impl" version="${cxf.saaj.impl.version}"  resolver='(obr)'>
+        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}</bundle>
         <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
-        <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxpri/1.4.4_2</bundle>    
     </feature>
 
     <feature name="cxf-specs" version="${project.version}" resolver='(obr)'>
@@ -29,7 +32,6 @@
         <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${cxf.geronimo.ws.metadata.version}</bundle>
         <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${cxf.servicemix.specs.version}</bundle>
         <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${cxf.servicemix.specs.version}</bundle>
-        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}</bundle>
         <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${cxf.servicemix.specs.version}</bundle>
         <bundle>mvn:http://download.java.net/maven/2!javax.mail/mail/${cxf.javax.mail.version}</bundle>
         <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1/${cxf.servicemix.specs.version}</bundle>
@@ -40,14 +42,6 @@
         <bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${cxf.jaxb.bundle.version}</bundle>
         <bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle.version}</bundle>
     </feature>
-    <feature name="spring-jms" version="${cxf.spring.version}" resolver='(obr)'>
-        <feature version="${cxf.spring.version}">spring</feature>
-        <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}</bundle>
-        <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}</bundle>
-        <bundle>mvn:org.springframework/spring-jms/${cxf.spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-tx/${cxf.spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-web/${cxf.spring.version}</bundle>
-    </feature>
     <!-- Current the abdera bundle is not working as we expect -->
     <feature name='abdera' version='${cxf.abdera.version}' resolver='(obr)'>
         <bundle>mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
@@ -88,12 +82,13 @@
         <feature version='${cxf.jaxb.bundle.version}'>cxf-jaxb</feature>
         <feature version="[2,3)">http</feature>
         <feature version="[2,3)">war</feature>
-        <feature version="${cxf.spring.version}">spring</feature>
-        <feature version="${cxf.spring.osgi.version}">spring-dm</feature>
-        <feature version="${cxf.spring.version}">spring-jms</feature>
+        <feature version="[3,4)">spring</feature>
+        <feature version="[1.2,2)">spring-dm</feature>
+        <feature version="[3,4)">spring-jms</feature>
         <feature version="${cxf.wss4j.version}">wss4j</feature>
         <feature version="[7.2,8)">jetty</feature>
         <feature version='${cxf.abdera.version}'>abdera</feature>
+        <feature version="${cxf.saaj.impl.version}">saaj-impl</feature>
 
         <bundle>mvn:org.apache.neethi/neethi/${cxf.neethi.version}</bundle>
         <bundle>mvn:org.apache.ws.xmlschema/xmlschema-core/${cxf.xmlschema.version}</bundle>
@@ -114,5 +109,4 @@
         <bundle>mvn:org.apache.cxf/cxf-bundle/${project.version}</bundle>
     </feature>
 
-
 </features>

Modified: cxf/trunk/distribution/karaf/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/karaf/pom.xml?rev=1164223&r1=1164222&r2=1164223&view=diff
==============================================================================
--- cxf/trunk/distribution/karaf/pom.xml (original)
+++ cxf/trunk/distribution/karaf/pom.xml Thu Sep  1 19:34:25 2011
@@ -34,7 +34,7 @@
     <name>CXF :: Apache Karaf</name>
 
     <properties>
-      <karaf-version>2.1.4</karaf-version>
+      <karaf-version>2.2.3</karaf-version>
     </properties>
 
     <modules>

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1164223&r1=1164222&r2=1164223&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Thu Sep  1 19:34:25 2011
@@ -198,6 +198,9 @@ public class ClientImpl
     }
 
     public void destroy() {
+        if (bus == null) {
+            return;
+        }
         ClientLifeCycleManager mgr = bus.getExtension(ClientLifeCycleManager.class);
         if (null != mgr) {
             mgr.clientDestroyed(this);
@@ -214,6 +217,19 @@ public class ClientImpl
                 getConduit().close();
             }
         }
+        
+        bus = null;
+        conduitSelector = null;
+        outFaultObserver = null;
+        outboundChainCache = null;
+        inboundChainCache = null;
+
+        currentRequestContext = null;
+        requestContext.clear();
+        requestContext = null;
+        responseContext.clear();
+        responseContext = null;
+        executor = null;            
     }
 
     private void notifyLifecycleManager() {