svn commit: r738040 - in /servicemix/components/bindings/servicemix-smpp/trunk/src/main/java/org/apache/servicemix/smpp: SmppComponent.java SmppProviderEndpoint.java

[lh...@apache.org]

Author: lhein
Date: Tue Jan 27 09:02:33 2009
New Revision: 738040

URL: http://svn.apache.org/viewvc?rev=738040&view=rev
Log:
better naming

Modified:
    servicemix/components/bindings/servicemix-smpp/trunk/src/main/java/org/apache/servicemix/smpp/SmppComponent.java
    servicemix/components/bindings/servicemix-smpp/trunk/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java

Modified: servicemix/components/bindings/servicemix-smpp/trunk/src/main/java/org/apache/servicemix/smpp/SmppComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-smpp/trunk/src/main/java/org/apache/servicemix/smpp/SmppComponent.java?rev=738040&r1=738039&r2=738040&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-smpp/trunk/src/main/java/org/apache/servicemix/smpp/SmppComponent.java (original)
+++ servicemix/components/bindings/servicemix-smpp/trunk/src/main/java/org/apache/servicemix/smpp/SmppComponent.java Tue Jan 27 09:02:33 2009
@@ -65,6 +65,6 @@
      * @see org.apache.servicemix.common.DefaultComponent#getEndpointClasses()
      */
     protected Class[] getEndpointClasses() {
-        return new Class[] {SmppConsumerEndpoint.class, SmppSenderEndpoint.class};
+        return new Class[] {SmppConsumerEndpoint.class, SmppProviderEndpoint.class};
     }
 }

Modified: servicemix/components/bindings/servicemix-smpp/trunk/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-smpp/trunk/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java?rev=738040&r1=738039&r2=738040&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-smpp/trunk/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-smpp/trunk/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java Tue Jan 27 09:02:33 2009
@@ -54,14 +54,14 @@
  * A provider component receives XML message from the NMR and converts into SMPP
  * packet and sends it to SMS.
  * 
- * @org.apache.xbean.XBean element="sender"
+ * @org.apache.xbean.XBean element="provider"
  * @author jbonofre
  * @author lhein
  */
-public class SmppSenderEndpoint extends ProviderEndpoint implements SmppEndpointType {
+public class SmppProviderEndpoint extends ProviderEndpoint implements SmppEndpointType {
 
     // logging facility
-    private final static transient Log log = LogFactory.getLog(SmppSenderEndpoint.class);
+    private final static transient Log log = LogFactory.getLog(SmppProviderEndpoint.class);
 
     // SMPP default port number
     private final static int SMPP_DEFAULT_PORT = 2775;
@@ -125,14 +125,6 @@
         if (this.password == null || this.password.trim().length() <= 0) {
             throw new IllegalArgumentException("The SMPP system password is mandatory.");
         }
-        // check the marshaler
-        if (this.getMarshaler() == null) {
-            this.setMarshaler(new DefaultSmppMarshaler());
-        } else {
-            if (!(this.getMarshaler() instanceof SmppMarshalerSupport)) {
-                throw new IllegalArgumentException("The provided marshaler is not a valid SMPP marshaler");
-            }
-        }
     }
 
     /**