servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r429277 - in /incubator/servicemix/trunk/servicemix-components/src: main/java/org/apache/servicemix/components/activesoap/ main/java/org/apache/servicemix/components/email/ main/java/org/apache/servicemix/components/jabber/ main/java/org/ap...
Date Mon, 07 Aug 2006 08:37:09 GMT
Author: gnodet
Date: Mon Aug  7 01:37:08 2006
New Revision: 429277

URL: http://svn.apache.org/viewvc?rev=429277&view=rev
Log:
SM-508: Use Marshaler instead of Marshaller

Modified:
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/activesoap/ASInOutBinding.java
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/activesoap/ASOutBinding.java
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/email/MimeMailMarshaler.java
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/email/SimpleMailMarshaler.java
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberMarshaler.java
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsServiceComponent.java
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/saaj/SaajBinding.java
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFBinding.java
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOutBinding.java
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XFireOutBinding.java
    incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/jms/JmsInOutBinding.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajSoapActionTest.java

Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/activesoap/ASInOutBinding.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/activesoap/ASInOutBinding.java?rev=429277&r1=429276&r2=429277&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/activesoap/ASInOutBinding.java
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/activesoap/ASInOutBinding.java
Mon Aug  7 01:37:08 2006
@@ -41,11 +41,31 @@
         this.service = service;
     }
 
+    /**
+     * @deprecated use getMarshaler instead
+     */
     public ASMarshaler getMarshaller() {
         return marshaler;
     }
 
+    /**
+     * @deprecated use setMarshaler instead
+     */
     public void setMarshaller(ASMarshaler marshaler) {
+        this.marshaler = marshaler;
+    }
+
+    /**
+     * @return the marshaler
+     */
+    public ASMarshaler getMarshaler() {
+        return marshaler;
+    }
+
+    /**
+     * @param marshaler the marshaler to set
+     */
+    public void setMarshaler(ASMarshaler marshaler) {
         this.marshaler = marshaler;
     }
 

Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/activesoap/ASOutBinding.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/activesoap/ASOutBinding.java?rev=429277&r1=429276&r2=429277&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/activesoap/ASOutBinding.java
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/activesoap/ASOutBinding.java
Mon Aug  7 01:37:08 2006
@@ -38,11 +38,31 @@
         this.service = service;
     }
 
+    /**
+     * @deprecated use getMarshaler instead
+     */
     public ASMarshaler getMarshaller() {
         return marshaler;
     }
 
+    /**
+     * @deprecated use setMarshaler instead
+     */
     public void setMarshaller(ASMarshaler marshaler) {
+        this.marshaler = marshaler;
+    }
+
+    /**
+     * @return the marshaler
+     */
+    public ASMarshaler getMarshaler() {
+        return marshaler;
+    }
+
+    /**
+     * @param marshaler the marshaler to set
+     */
+    public void setMarshaler(ASMarshaler marshaler) {
         this.marshaler = marshaler;
     }
 

Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/email/MimeMailMarshaler.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/email/MimeMailMarshaler.java?rev=429277&r1=429276&r2=429277&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/email/MimeMailMarshaler.java
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/email/MimeMailMarshaler.java
Mon Aug  7 01:37:08 2006
@@ -48,7 +48,7 @@
 import org.apache.servicemix.jbi.jaxp.StringSource;
 
 /**
- * The default marshaller from the {@link NormalizedMessage} to a Mime email using
+ * The default marshaler from the {@link NormalizedMessage} to a Mime email using
  * expressions for each field required on the email.
  *
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/email/SimpleMailMarshaler.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/email/SimpleMailMarshaler.java?rev=429277&r1=429276&r2=429277&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/email/SimpleMailMarshaler.java
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/email/SimpleMailMarshaler.java
Mon Aug  7 01:37:08 2006
@@ -27,7 +27,7 @@
 import org.springframework.mail.SimpleMailMessage;
 
 /**
- * The default marshaller from the {@link NormalizedMessage} to a {@link SimpleMailMessage}
using
+ * The default marshaler from the {@link NormalizedMessage} to a {@link SimpleMailMessage}
using
  * expressions for each field required on the email.
  *
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberMarshaler.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberMarshaler.java?rev=429277&r1=429276&r2=429277&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberMarshaler.java
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jabber/JabberMarshaler.java
Mon Aug  7 01:37:08 2006
@@ -76,11 +76,31 @@
 
     // Properties
     //-------------------------------------------------------------------------
+    /**
+     * @deprecated use getSourceMarshaler instead
+     */
     public SourceMarshaler getSourceMarshaller() {
         return sourceMarshaler;
     }
 
+    /**
+     * @deprecated use setSourceMashaler instead
+     */
     public void setSourceMarshaller(SourceMarshaler sourceMarshaler) {
+        this.sourceMarshaler = sourceMarshaler;
+    }
+
+    /**
+     * @return the sourceMarshaler
+     */
+    public SourceMarshaler getSourceMarshaler() {
+        return sourceMarshaler;
+    }
+
+    /**
+     * @param sourceMarshaler the sourceMarshaler to set
+     */
+    public void setSourceMarshaler(SourceMarshaler sourceMarshaler) {
         this.sourceMarshaler = sourceMarshaler;
     }
 

Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsServiceComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsServiceComponent.java?rev=429277&r1=429276&r2=429277&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsServiceComponent.java
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsServiceComponent.java
Mon Aug  7 01:37:08 2006
@@ -165,16 +165,16 @@
     }
 
     /**
-     * Get the JMSMarshaller
+     * Get the JMSMarshaler
      * 
-     * @return the Marshaller
+     * @return the marshaler
      */
     public JmsMarshaler getMarshaler() {
         return marshaler;
     }
 
     /**
-     * Set the JMSMarshaller
+     * Set the JMSMarshaler
      * 
      * @param marshaler
      */

Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/saaj/SaajBinding.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/saaj/SaajBinding.java?rev=429277&r1=429276&r2=429277&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/saaj/SaajBinding.java
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/saaj/SaajBinding.java
Mon Aug  7 01:37:08 2006
@@ -67,11 +67,31 @@
         this.soapEndpoint = soapEndpoint;
     }
 
+    /**
+     * @deprecated use getMarshaler instead
+     */
     public SaajMarshaler getMarshaller() {
         return marshaler;
     }
 
+    /**
+     * @deprecated use setMarshaler instead
+     */
     public void setMarshaller(SaajMarshaler marshaler) {
+        this.marshaler = marshaler;
+    }
+
+    /**
+     * @return the marshaler
+     */
+    public SaajMarshaler getMarshaler() {
+        return marshaler;
+    }
+
+    /**
+     * @param marshaler the marshaler to set
+     */
+    public void setMarshaler(SaajMarshaler marshaler) {
         this.marshaler = marshaler;
     }
 

Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFBinding.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFBinding.java?rev=429277&r1=429276&r2=429277&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFBinding.java
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFBinding.java
Mon Aug  7 01:37:08 2006
@@ -90,10 +90,16 @@
         }
     }
 
+    /**
+     * @deprecated use getMarshaler instead
+     */
     public WSIFMarshaler getMarshaller() {
         return marshaler;
     }
 
+    /**
+     * @deprecated use setMarshaler instead
+     */
     public void setMarshaller(WSIFMarshaler marshaler) {
         this.marshaler = marshaler;
     }

Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOutBinding.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOutBinding.java?rev=429277&r1=429276&r2=429277&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOutBinding.java
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOutBinding.java
Mon Aug  7 01:37:08 2006
@@ -33,11 +33,31 @@
     private WSIFMarshaler marshaler = new WSIFMarshaler();
     private WSIFOperationMap operationMap;
 
+    /**
+     * @deprecated use getMarshaler instead
+     */
     public WSIFMarshaler getMarshaller() {
         return marshaler;
     }
 
+    /**
+     * @deprecated use setMarshaler instead
+     */
     public void setMarshaller(WSIFMarshaler marshaler) {
+        this.marshaler = marshaler;
+    }
+
+    /**
+     * @return the marshaler
+     */
+    public WSIFMarshaler getMarshaler() {
+        return marshaler;
+    }
+
+    /**
+     * @param marshaler the marshaler to set
+     */
+    public void setMarshaler(WSIFMarshaler marshaler) {
         this.marshaler = marshaler;
     }
 

Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XFireOutBinding.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XFireOutBinding.java?rev=429277&r1=429276&r2=429277&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XFireOutBinding.java
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XFireOutBinding.java
Mon Aug  7 01:37:08 2006
@@ -30,7 +30,7 @@
 import javax.xml.stream.XMLStreamReader;
 
 public class XFireOutBinding extends OutBinding {
-    private XMarshaler marshaller;
+    private XMarshaler marshaler;
 
     private XFire xfire;
 
@@ -38,12 +38,12 @@
     {
         super();
 
-        this.marshaller = new XMarshaler();
+        this.marshaler = new XMarshaler();
     }
     
     protected void process(MessageExchange messageExchange, NormalizedMessage nm) throws
Exception {
         
-        XMLStreamReader reader = marshaller.createStreamReader(nm);
+        XMLStreamReader reader = marshaler.createStreamReader(nm);
         if (reader == null) {
             throw new JBIException("Could not get source as XMLStreamReader.");
         }

Modified: incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/jms/JmsInOutBinding.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/jms/JmsInOutBinding.java?rev=429277&r1=429276&r2=429277&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/jms/JmsInOutBinding.java
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/sandbox/java/org/apache/servicemix/components/jms/JmsInOutBinding.java
Mon Aug  7 01:37:08 2006
@@ -58,11 +58,11 @@
         this.destinationChooser = destinationChooser;
     }
 
-    public JmsMarshaler getMarshaller() {
+    public JmsMarshaler getMarshaler() {
         return marshaler;
     }
 
-    public void setMarshaller(JmsMarshaler marshaler) {
+    public void setMarshaler(JmsMarshaler marshaler) {
         this.marshaler = marshaler;
     }
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajSoapActionTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajSoapActionTest.java?rev=429277&r1=429276&r2=429277&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajSoapActionTest.java
(original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajSoapActionTest.java
Mon Aug  7 01:37:08 2006
@@ -61,7 +61,7 @@
         saaj.setSoapAction(soapAction);
         SaajMarshaler marshaler = new SaajMarshaler();
         marshaler.setMessageFactory(messageFactory);
-        saaj.setMarshaller(marshaler);
+        saaj.setMarshaler(marshaler);
         jbi.activateComponent(saaj, "saaj");
         
         http = new HttpConnector(new org.mortbay.jetty.nio.SelectChannelConnector());



Mime
View raw message