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

[io...@apache.org]

Author: iocanel
Date: Thu Jan 27 12:30:29 2011
New Revision: 1064103

URL: http://svn.apache.org/viewvc?rev=1064103&view=rev
Log:
[SMXCOMP-849] Added serviceType property on SMPP endpoints.

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

Modified: servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java?rev=1064103&r1=1064102&r2=1064103&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java Thu Jan 27 12:30:29 2011
@@ -47,7 +47,7 @@ public class SmppConsumerEndpoint extend
     // default SMPP port
     private static final int SMPP_DEFAULT_PORT = 2775;
     // default system type
-    private static final String SYSTEM_TYPE = "cp";
+    private static final String DEFAULT_SYSTEM_TYPE = "cp";
 
     // SMPP session and listener
     private SMPPSession session;
@@ -57,6 +57,7 @@ public class SmppConsumerEndpoint extend
     private int port;
     private String systemId;
     private String password;
+    private String systemType=DEFAULT_SYSTEM_TYPE;
     private int enquireLinkTimer = 50000;
     private int transactionTimer = 100000;
 
@@ -188,7 +189,7 @@ public class SmppConsumerEndpoint extend
         // connect and bind to the SMPP server
         try {
             session.connectAndBind(this.host, this.port, new BindParameter(BindType.BIND_RX, this.systemId,
-                    this.password, SYSTEM_TYPE,
+                    this.password, this.systemType,
                     TypeOfNumber.UNKNOWN,
                     NumberingPlanIndicator.UNKNOWN,
                     null));
@@ -276,6 +277,20 @@ public class SmppConsumerEndpoint extend
     public void setPassword(String password) {
         this.password = password;
     }
+    
+    public String getSystemType() {
+        return systemType;
+    }
+
+    /**
+     * <p />
+     * This attribute specifies the system type that will be used for connecting to the server. <p />
+     * <i/> The default value is <b>cp</b>
+     * @param systemType 
+     */
+    public void setSystemType(String systemType) {
+        this.systemType = systemType;
+    }
 
     public SmppMarshalerSupport getMarshaler() {
         return marshaler;

Modified: servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java?rev=1064103&r1=1064102&r2=1064103&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java Thu Jan 27 12:30:29 2011
@@ -57,7 +57,7 @@ public class SmppProviderEndpoint extend
     // SMPP default port number
     private final static int SMPP_DEFAULT_PORT = 2775;
     // SMPP system type
-    private final static String SYSTEM_TYPE = "cp";
+    private final static String DEFAULT_SYSTEM_TYPE = "cp";
 
     private SMPPSession session;
     private static TimeFormatter timeFormatter = new AbsoluteTimeFormatter();
@@ -66,6 +66,7 @@ public class SmppProviderEndpoint extend
     private int port;
     private String systemId;
     private String password;
+    private String systemType=DEFAULT_SYSTEM_TYPE;
     private int enquireLinkTimer = 50000;
     private int transactionTimer = 100000;
 
@@ -144,7 +145,7 @@ public class SmppProviderEndpoint extend
         // connect and bind to the SMPP server
         try {
             session.connectAndBind(this.host, this.port, new BindParameter(BindType.BIND_TX, this.systemId,
-                    this.password, SYSTEM_TYPE,
+                    this.password, this.systemType,
                     TypeOfNumber.UNKNOWN,
                     NumberingPlanIndicator.UNKNOWN,
                     null));
@@ -305,6 +306,20 @@ public class SmppProviderEndpoint extend
         this.password = password;
     }
 
+    public String getSystemType() {
+        return systemType;
+    }
+
+    /**
+     * <p />
+     * This attribute specifies the system type that will be used for connecting to the server. <p />
+     * <i/> The default value is <b>cp</b>
+     * @param systemType 
+     */
+    public void setSystemType(String systemType) {
+        this.systemType = systemType;
+    }
+
     public SmppMarshalerSupport getMarshaler() {
         return marshaler;
     }