servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r639547 - in /servicemix/smx3/branches/servicemix-3.2.2: core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/ deployables/ deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/intercep...
Date Fri, 21 Mar 2008 05:41:33 GMT
Author: ffang
Date: Thu Mar 20 22:41:21 2008
New Revision: 639547

URL: http://svn.apache.org/viewvc?rev=639547&view=rev
Log:
[SM-1275][SM-1276][SM-1283]apply patch on behalf of Ulhas Bhole with thanks

Modified:
    servicemix/smx3/branches/servicemix-3.2.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeSupport.java
    servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiConstants.java
    servicemix/smx3/branches/servicemix-3.2.2/deployables/pom.xml
    servicemix/smx3/branches/servicemix-3.2.2/deployables/serviceengines/pom.xml
    servicemix/smx3/branches/servicemix-3.2.2/platforms/geronimo/deployer-service/pom.xml

Modified: servicemix/smx3/branches/servicemix-3.2.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeSupport.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeSupport.java?rev=639547&r1=639546&r2=639547&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeSupport.java
(original)
+++ servicemix/smx3/branches/servicemix-3.2.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeSupport.java
Thu Mar 20 22:41:21 2008
@@ -23,12 +23,12 @@
  * 
  * @version $Revision$
  */
-public class MessageExchangeSupport {
+public final class MessageExchangeSupport {
+    
     /**
      * In Only MEP.
      */
     public static final URI IN_ONLY = URI.create("http://www.w3.org/2004/08/wsdl/in-only");
-
     /**
      * In Out MEP.
      */
@@ -40,11 +40,6 @@
     public static final URI IN_OPTIONAL_OUT = URI.create("http://www.w3.org/2004/08/wsdl/in-opt-out");
 
     /**
-     * Robust In Only MEP.
-     */
-    public static final URI ROBUST_IN_ONLY = URI.create("http://www.w3.org/2004/08/wsdl/robust-in-only");
-
-    /**
      * Out Only MEP.
      */
     public static final URI OUT_ONLY = URI.create("http://www.w3.org/2004/08/wsdl/out-only");
@@ -60,6 +55,11 @@
     public static final URI OUT_OPTIONAL_IN = URI.create("http://www.w3.org/2004/08/wsdl/out-opt-in");
 
     /**
+     * Robust In Only MEP.
+     */
+    public static final URI ROBUST_IN_ONLY = URI.create("http://www.w3.org/2004/08/wsdl/robust-in-only");
+
+    /**
      * Robust Out Only MEP.
      */
     public static final URI ROBUST_OUT_ONLY = URI.create("http://www.w3.org/2004/08/wsdl/robust-out-only");
@@ -70,14 +70,14 @@
     public static final URI WSDL2_IN_ONLY = URI.create("http://www.w3.org/2006/01/wsdl/in-only");
 
     /**
-     * In Out MEP.
+     * In Optional Out MEP.
      */
-    public static final URI WSDL2_IN_OUT = URI.create("http://www.w3.org/2006/01/wsdl/in-out");
+    public static final URI WSDL2_IN_OPTIONAL_OUT = URI.create("http://www.w3.org/2006/01/wsdl/in-opt-out");
 
     /**
-     * In Optional Out MEP.
+     * In Out MEP.
      */
-    public static final URI WSDL2_IN_OPTIONAL_OUT = URI.create("http://www.w3.org/2006/01/wsdl/in-opt-out");
+    public static final URI WSDL2_IN_OUT = URI.create("http://www.w3.org/2006/01/wsdl/in-out");
 
     /**
      * Robust In Only MEP.
@@ -103,4 +103,8 @@
      * Robust Out Only MEP.
      */
     public static final URI WSDL2_ROBUST_OUT_ONLY = URI.create("http://www.w3.org/2006/01/wsdl/robust-out-only");
-}
\ No newline at end of file
+
+    private MessageExchangeSupport() {
+      // Private constructor to keep checkstyle 4.3 happy.
+    }
+}

Modified: servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiConstants.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiConstants.java?rev=639547&r1=639546&r2=639547&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiConstants.java
(original)
+++ servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiConstants.java
Thu Mar 20 22:41:21 2008
@@ -76,5 +76,8 @@
     public static final QName WSDL11_WRAPPER_PART = new QName(
             WSDL11_WRAPPER_NAMESPACE, WSDL11_WRAPPER_PART_LOCALNAME,
             WSDL11_WRAPPER_PREFIX);
+    private JbiConstants() {
+        //Added to keep checkstyle 4.3 happy.
+    }
 
 }

Modified: servicemix/smx3/branches/servicemix-3.2.2/deployables/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/deployables/pom.xml?rev=639547&r1=639546&r2=639547&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2.2/deployables/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2.2/deployables/pom.xml Thu Mar 20 22:41:21 2008
@@ -35,8 +35,8 @@
 
     <modules>
         <module>sharedlibraries</module>
-        <module>bindingcomponents</module>
         <module>serviceengines</module>
+        <module>bindingcomponents</module>
     </modules>
 
     <build>

Modified: servicemix/smx3/branches/servicemix-3.2.2/deployables/serviceengines/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/deployables/serviceengines/pom.xml?rev=639547&r1=639546&r2=639547&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2.2/deployables/serviceengines/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2.2/deployables/serviceengines/pom.xml Thu Mar 20
22:41:21 2008
@@ -41,9 +41,9 @@
     <module>servicemix-drools</module>
     <module>servicemix-eip</module>
     <module>servicemix-jsr181</module>
+    <module>servicemix-quartz</module>
     <module>servicemix-lwcontainer</module>
     <module>servicemix-osworkflow</module>
-    <module>servicemix-quartz</module>
     <module>servicemix-saxon</module>
     <module>servicemix-script</module>
     <module>servicemix-wsn2005</module>

Modified: servicemix/smx3/branches/servicemix-3.2.2/platforms/geronimo/deployer-service/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/platforms/geronimo/deployer-service/pom.xml?rev=639547&r1=639546&r2=639547&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2.2/platforms/geronimo/deployer-service/pom.xml
(original)
+++ servicemix/smx3/branches/servicemix-3.2.2/platforms/geronimo/deployer-service/pom.xml
Thu Mar 20 22:41:21 2008
@@ -62,6 +62,18 @@
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-webservices</artifactId>
               </exclusion>
+              <exclusion>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-jaxws-api</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-saaj-api</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>jstl</groupId>
+                <artifactId>jstl</artifactId>
+              </exclusion>
             </exclusions>
         </dependency>
 



Mime
View raw message