You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/10/15 17:34:36 UTC

svn commit: r704941 - in /servicemix/smx3/branches/servicemix-3.2: core/servicemix-core/src/main/java/org/apache/servicemix/ core/servicemix-core/src/main/java/org/apache/servicemix/jbi/listener/ deployables/serviceengines/servicemix-bean/src/main/java...

Author: gnodet
Date: Wed Oct 15 08:34:35 2008
New Revision: 704941

URL: http://svn.apache.org/viewvc?rev=704941&view=rev
Log:
SM-1632: Backport a change to Smx 3.2 branch to allow artifacts that use the servicemix-bean component to deploy on Smx4

Added:
    servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/listener/
    servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/listener/MessageExchangeListener.java   (with props)
Modified:
    servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/MessageExchangeListener.java
    servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java

Modified: servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/MessageExchangeListener.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/MessageExchangeListener.java?rev=704941&r1=704940&r2=704941&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/MessageExchangeListener.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/MessageExchangeListener.java Wed Oct 15 08:34:35 2008
@@ -16,9 +16,6 @@
  */
 package org.apache.servicemix;
 
-import javax.jbi.messaging.MessageExchange;
-import javax.jbi.messaging.MessagingException;
-
 /**
  * If a Component implements this interface, MessageExchange will be delivered directly to the listener
  * asynchronously rather than using the usual asynchronous delivery with a thread used up per consuming
@@ -26,14 +23,4 @@
  *
  * @version $Revision$
  */
-public interface MessageExchangeListener {
-
-    /**
-     * MessageExchange passed directly to the listener instead of being queued
-     *
-     * @param exchange
-     * @throws MessagingException
-     */
-    void onMessageExchange(MessageExchange exchange) throws MessagingException;
-
-}
+public interface MessageExchangeListener extends org.apache.servicemix.jbi.listener.MessageExchangeListener { }

Added: servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/listener/MessageExchangeListener.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/listener/MessageExchangeListener.java?rev=704941&view=auto
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/listener/MessageExchangeListener.java (added)
+++ servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/listener/MessageExchangeListener.java Wed Oct 15 08:34:35 2008
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicemix.jbi.listener;
+
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessagingException;
+
+/**
+ * If a Component implements this interface, MessageExchange will be delivered directly to the listener
+ * asynchronously rather than using the usual asynchronous delivery with a thread used up per consuming
+ * component.
+ *
+ * @version $Revision: 564607 $
+ */
+public interface MessageExchangeListener {
+
+    /**
+     * MessageExchange passed directly to the listener instead of being queued
+     *
+     * @param exchange
+     * @throws MessagingException
+     */
+    void onMessageExchange(MessageExchange exchange) throws MessagingException;
+
+}

Propchange: servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/listener/MessageExchangeListener.java
------------------------------------------------------------------------------
    svn:executable = *

Modified: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java?rev=704941&r1=704940&r2=704941&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java Wed Oct 15 08:34:35 2008
@@ -51,7 +51,6 @@
 import org.apache.commons.jexl.ExpressionFactory;
 import org.apache.commons.jexl.JexlContext;
 import org.apache.commons.jexl.JexlHelper;
-import org.apache.servicemix.MessageExchangeListener;
 import org.apache.servicemix.bean.support.BeanInfo;
 import org.apache.servicemix.bean.support.DefaultMethodInvocationStrategy;
 import org.apache.servicemix.bean.support.DestinationImpl;
@@ -63,6 +62,7 @@
 import org.apache.servicemix.common.endpoints.ProviderEndpoint;
 import org.apache.servicemix.expression.JAXPStringXPathExpression;
 import org.apache.servicemix.expression.PropertyExpression;
+import org.apache.servicemix.jbi.listener.MessageExchangeListener;
 import org.apache.servicemix.jbi.resolver.URIResolver;
 import org.apache.servicemix.jbi.util.MessageUtil;
 import org.springframework.beans.BeansException;