Author: lhein
Date: Tue Jan 27 09:00:12 2009
New Revision: 738038
URL: http://svn.apache.org/viewvc?rev=738038&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/SmppConsumerEndpoint.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=738038&r1=738037&r2=738038&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:00:12 2009
@@ -65,6 +65,6 @@
* @see org.apache.servicemix.common.DefaultComponent#getEndpointClasses()
*/
protected Class[] getEndpointClasses() {
- return new Class[] {SmppPollerEndpoint.class,
SmppSenderEndpoint.class};
+ return new Class[] {SmppConsumerEndpoint.class,
SmppSenderEndpoint.class};
}
}
Modified:
servicemix/components/bindings/servicemix-smpp/trunk/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-smpp/trunk/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java?rev=738038&r1=738037&r2=738038&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-smpp/trunk/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java
(original)
+++
servicemix/components/bindings/servicemix-smpp/trunk/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java
Tue Jan 27 09:00:12 2009
@@ -43,14 +43,14 @@
* A polling component which bind with jSMPP and receive SMPP messages and
sends
* the SMPPs into the JBI bus as messages.
*
- * @org.apache.xbean.XBean element="poller"
+ * @org.apache.xbean.XBean element="consumer"
* @author jbonofre
* @author lhein
*/
-public class SmppPollerEndpoint extends ConsumerEndpoint implements
SmppEndpointType {
+public class SmppConsumerEndpoint extends ConsumerEndpoint implements
SmppEndpointType {
// logging facility
- private final static transient Log log =
LogFactory.getLog(SmppPollerEndpoint.class);
+ private final static transient Log log =
LogFactory.getLog(SmppConsumerEndpoint.class);
// default SMPP port
private static final int SMPP_DEFAULT_PORT = 2775;
@@ -111,14 +111,6 @@
if (this.systemId == null || this.systemId.trim().length() <= 0) {
throw new IllegalArgumentException("The SMPP system ID 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.");
- }
- }
}
/*
