servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r567101 - in /incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel: JbiBinding.java MEPConstants.java
Date Fri, 17 Aug 2007 18:17:07 GMT
Author: jstrachan
Date: Fri Aug 17 11:17:06 2007
New Revision: 567101

URL: http://svn.apache.org/viewvc?view=rev&rev=567101
Log:
tidied up the MEP Constants somewhat to a simpler class; along with using the full WSDL URIs
for completeness

Added:
    incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/MEPConstants.java
  (contents, props changed)
      - copied, changed from r567097, incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelConstants.java
Modified:
    incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java

Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java?view=diff&rev=567101&r1=567100&r2=567101
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java
(original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java
Fri Aug 17 11:17:06 2007
@@ -30,7 +30,7 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
-import static org.apache.servicemix.camel.CamelConstants.MessageExchangePattern.*;
+import static org.apache.servicemix.camel.MEPConstants.*;
 
 /**
  * The binding of how Camel messages get mapped to JBI and back again
@@ -81,7 +81,7 @@
     protected MessageExchange createJbiMessageExchange(Exchange camelExchange, MessageExchangeFactory
exchangeFactory)
         throws MessagingException, URISyntaxException {
 
-        String mep = camelExchange.getProperty(CamelConstants.Property.MESSAGE_EXCHANGE_PATTERN,
String.class);
+        String mep = camelExchange.getProperty(PROPERTY, String.class);
         if (mep == null) {
             mep = getMessageExchangePattern();
         }

Copied: incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/MEPConstants.java
(from r567097, incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelConstants.java)
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/MEPConstants.java?view=diff&rev=567101&p1=incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelConstants.java&r1=567097&p2=incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/MEPConstants.java&r2=567101
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelConstants.java
(original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/MEPConstants.java
Fri Aug 17 11:17:06 2007
@@ -22,22 +22,15 @@
  * 
  * @version $Revision: 1.1 $
  */
-public class CamelConstants {
+public class MEPConstants {
+    public static final String PROPERTY = "org.apache.camel.MessageExchangePattern";
 
-    // TODO we should probably move this to camel-core
-
-    public class Property {
-        public static final String MESSAGE_EXCHANGE_PATTERN = "org.apache.camel.MessageExchangePattern";
-    }
-
-    public class MessageExchangePattern {
-        public static final String IN_ONLY = "in-only";
-        public static final String ROBUST_IN_ONLY = "robust-in-only";
-        public static final String IN_OUT = "in-out";
-        public static final String IN_OPTIONAL_OUT = "in-optional-out";
-        public static final String OUT_ONLY = "out-only";
-        public static final String ROBUST_OUT_ONLY = "robust-out-only";
-        public static final String OUT_IN = "out-in";
-        public static final String OUT_OPTIONAL_IN = "out-optional_in";
-    }
+    public static final String IN_ONLY = "http://www.w3.org/ns/wsdl/in-only";
+    public static final String ROBUST_IN_ONLY = "http://www.w3.org/ns/wsdl/robust-in-only";
+    public static final String IN_OUT = "http://www.w3.org/ns/wsdl/in-out";
+    public static final String IN_OPTIONAL_OUT = "http://www.w3.org/ns/wsdl/in-optional-out";
+    public static final String OUT_ONLY = "http://www.w3.org/ns/wsdl/out-only";
+    public static final String ROBUST_OUT_ONLY = "http://www.w3.org/ns/wsdl/robust-out-only";
+    public static final String OUT_IN = "http://www.w3.org/ns/wsdl/out-in";
+    public static final String OUT_OPTIONAL_IN = "http://www.w3.org/ns/wsdl/out-optional_in";
 }

Propchange: incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/MEPConstants.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message