svn commit: r666087 - in /servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms: AbstractJmsProcessor.java jca/JcaConsumerProcessor.java

[gnodet]

Author: gnodet
Date: Tue Jun 10 05:29:22 2008
New Revision: 666087

URL: http://svn.apache.org/viewvc?rev=666087&view=rev
Log:
Avoid references to deprecated BaseLifeCycle

Modified:
    
servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java
    
servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java

Modified: 
servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java?rev=666087&r1=666086&r2=666087&view=diff
==============================================================================
--- 
servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java
 (original)
+++ 
servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java
 Tue Jun 10 05:29:22 2008
@@ -35,7 +35,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.JbiConstants;
-import org.apache.servicemix.common.BaseLifeCycle;
 import org.apache.servicemix.common.EndpointComponentContext;
 import org.apache.servicemix.common.ExchangeProcessor;
 import org.apache.servicemix.soap.Context;
@@ -127,8 +126,7 @@
             props.put(InitialContext.PROVIDER_URL, 
endpoint.getConfiguration().getJndiProviderUrl());
             return new InitialContext(props);
         } else {
-            BaseLifeCycle lf = (BaseLifeCycle) 
endpoint.getServiceUnit().getComponent().getLifeCycle();
-            return lf.getContext().getNamingContext();
+            return 
endpoint.getServiceUnit().getComponent().getComponentContext().getNamingContext();
         }
     }
 

Modified: 
servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java?rev=666087&r1=666086&r2=666087&view=diff
==============================================================================
--- 
servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java
 (original)
+++ 
servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java
 Tue Jun 10 05:29:22 2008
@@ -37,7 +37,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.common.BaseLifeCycle;
 import org.apache.servicemix.jms.AbstractJmsProcessor;
 import org.apache.servicemix.jms.JmsEndpoint;
 import org.apache.servicemix.soap.Context;
@@ -112,8 +111,8 @@
                 channel.sendSync(exchange);
                 process(exchange);
             } else {
-                BaseLifeCycle lf = (BaseLifeCycle) 
endpoint.getServiceUnit().getComponent().getLifeCycle();
-                lf.sendConsumerExchange(exchange, 
JcaConsumerProcessor.this.endpoint);
+                
endpoint.getServiceUnit().getComponent().prepareExchange(exchange, endpoint);
+                channel.send(exchange);
             }
         } catch (Throwable e) {
             LOG.error("Error while handling jms message", e);