You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2010/06/13 14:25:04 UTC
svn commit: r954209 - in /camel/trunk: components/camel-smpp/
components/camel-smpp/src/main/java/org/apache/camel/component/smpp/
components/camel-smpp/src/test/java/org/apache/camel/component/smpp/
platforms/karaf/features/
Author: cmueller
Date: Sun Jun 13 12:25:04 2010
New Revision: 954209
URL: http://svn.apache.org/viewvc?rev=954209&view=rev
Log:
CAMEL-2771: Update the jsmpp dependency of camel-smpp to 2.1.0
Added:
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSSLConnectionFactoryTest.java (with props)
Modified:
camel/trunk/components/camel-smpp/pom.xml
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppEndpoint.java
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppMessage.java
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSSLConnectionFactory.java
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java
camel/trunk/platforms/karaf/features/pom.xml
Modified: camel/trunk/components/camel-smpp/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/pom.xml?rev=954209&r1=954208&r2=954209&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/pom.xml (original)
+++ camel/trunk/components/camel-smpp/pom.xml Sun Jun 13 12:25:04 2010
@@ -38,9 +38,9 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jsmpp</artifactId>
- <version>2.0_2</version>
+ <groupId>com.google.code</groupId>
+ <artifactId>jsmpp</artifactId>
+ <version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java?rev=954209&r1=954208&r2=954209&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java (original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java Sun Jun 13 12:25:04 2010
@@ -23,6 +23,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.jsmpp.bean.AlertNotification;
import org.jsmpp.bean.Command;
+import org.jsmpp.bean.DataSm;
import org.jsmpp.bean.DeliverSm;
import org.jsmpp.bean.DeliveryReceipt;
import org.jsmpp.bean.SubmitSm;
@@ -176,10 +177,10 @@ public class SmppBinding {
smppMessage.setHeader(COMMAND_STATUS, alertNotification.getCommandStatus());
smppMessage.setHeader(SOURCE_ADDR, alertNotification.getSourceAddr());
smppMessage.setHeader(SOURCE_ADDR_NPI, alertNotification.getSourceAddrNpi());
- smppMessage.setHeader(SOURCE_ADDR_TON, alertNotification.getSourceAddrNpi());
+ smppMessage.setHeader(SOURCE_ADDR_TON, alertNotification.getSourceAddrTon());
smppMessage.setHeader(ESME_ADDR, alertNotification.getEsmeAddr());
smppMessage.setHeader(ESME_ADDR_NPI, alertNotification.getEsmeAddrNpi());
- smppMessage.setHeader(ESME_ADDR_TON, alertNotification.getEsmeAddrNpi());
+ smppMessage.setHeader(ESME_ADDR_TON, alertNotification.getEsmeAddrTon());
return smppMessage;
}
@@ -213,11 +214,31 @@ public class SmppBinding {
smppMessage.setHeader(DEST_ADDR, deliverSm.getDestAddress());
smppMessage.setHeader(SCHEDULE_DELIVERY_TIME, deliverSm.getScheduleDeliveryTime());
smppMessage.setHeader(VALIDITY_PERIOD, deliverSm.getValidityPeriod());
+ smppMessage.setHeader(SERVICE_TYPE, deliverSm.getServiceType());
}
return smppMessage;
}
+ public SmppMessage createSmppMessage(DataSm dataSm, String smppMessageId) {
+ SmppMessage smppMessage = new SmppMessage(dataSm, configuration);
+
+ smppMessage.setHeader(ID, smppMessageId);
+ smppMessage.setHeader(SEQUENCE_NUMBER, dataSm.getSequenceNumber());
+ smppMessage.setHeader(COMMAND_ID, dataSm.getCommandId());
+ smppMessage.setHeader(COMMAND_STATUS, dataSm.getCommandStatus());
+ smppMessage.setHeader(SOURCE_ADDR, dataSm.getSourceAddr());
+ smppMessage.setHeader(SOURCE_ADDR_NPI, dataSm.getSourceAddrNpi());
+ smppMessage.setHeader(SOURCE_ADDR_TON, dataSm.getSourceAddrTon());
+ smppMessage.setHeader(DEST_ADDR, dataSm.getDestAddress());
+ smppMessage.setHeader(DEST_ADDR_NPI, dataSm.getDestAddrNpi());
+ smppMessage.setHeader(DEST_ADDR_TON, dataSm.getDestAddrTon());
+ smppMessage.setHeader(SERVICE_TYPE, dataSm.getServiceType());
+ smppMessage.setHeader(REGISTERED_DELIVERY, dataSm.getRegisteredDelivery());
+
+ return smppMessage;
+ }
+
/**
* Returns the current date. Externalized for better test support.
*
Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java?rev=954209&r1=954208&r2=954209&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java (original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java Sun Jun 13 12:25:04 2010
@@ -255,17 +255,26 @@ public class SmppConfiguration implement
@Override
public String toString() {
- return "SmppConfiguration[" + "enquireLinkTimer=" + enquireLinkTimer
- + ", host=" + host + ", password=" + password + ", port="
- + port + ", systemId=" + systemId + ", systemType="
- + systemType + ", transactionTimer=" + transactionTimer
- + ", registeredDelivery=" + registeredDelivery
- + ", serviceType=" + serviceType + ", sourceAddrTon="
- + sourceAddrTon + ", destAddrTon=" + destAddrTon
- + ", sourceAddrNpi=" + sourceAddrNpi + ", destAddrNpi="
- + destAddrNpi + ", protocolId=" + protocolId
- + ", priorityFlag=" + priorityFlag + ", replaceIfPresentFlag="
- + replaceIfPresentFlag + ", sourceAddr=" + sourceAddr
- + ", destAddr=" + destAddr + "]";
+ return "SmppConfiguration[usingSSL=" + usingSSL
+ + ", enquireLinkTimer=" + enquireLinkTimer
+ + ", host=" + host
+ + ", password=" + password
+ + ", port=" + port
+ + ", systemId=" + systemId
+ + ", systemType=" + systemType
+ + ", transactionTimer=" + transactionTimer
+ + ", registeredDelivery=" + registeredDelivery
+ + ", serviceType=" + serviceType
+ + ", sourceAddrTon=" + sourceAddrTon
+ + ", destAddrTon=" + destAddrTon
+ + ", sourceAddrNpi=" + sourceAddrNpi
+ + ", destAddrNpi=" + destAddrNpi
+ + ", protocolId=" + protocolId
+ + ", priorityFlag=" + priorityFlag
+ + ", replaceIfPresentFlag=" + replaceIfPresentFlag
+ + ", sourceAddr=" + sourceAddr
+ + ", destAddr=" + destAddr
+ + ", typeOfNumber=" + typeOfNumber
+ + ", numberingPlanIndicator=" + numberingPlanIndicator + "]";
}
}
\ No newline at end of file
Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java?rev=954209&r1=954208&r2=954209&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java (original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java Sun Jun 13 12:25:04 2010
@@ -26,13 +26,20 @@ import org.jsmpp.DefaultPDUSender;
import org.jsmpp.SynchronizedPDUSender;
import org.jsmpp.bean.AlertNotification;
import org.jsmpp.bean.BindType;
+import org.jsmpp.bean.DataSm;
import org.jsmpp.bean.DeliverSm;
import org.jsmpp.bean.NumberingPlanIndicator;
import org.jsmpp.bean.TypeOfNumber;
+import org.jsmpp.extra.ProcessRequestException;
import org.jsmpp.session.BindParameter;
+import org.jsmpp.session.DataSmResult;
import org.jsmpp.session.MessageReceiverListener;
import org.jsmpp.session.SMPPSession;
+import org.jsmpp.session.Session;
import org.jsmpp.util.DefaultComposer;
+import org.jsmpp.util.MessageIDGenerator;
+import org.jsmpp.util.MessageId;
+import org.jsmpp.util.RandomMessageIDGenerator;
/**
* An implementation of @{link Consumer} which use the SMPP protocol
@@ -67,6 +74,8 @@ public class SmppConsumer extends Defaul
session.setEnquireLinkTimer(this.configuration.getEnquireLinkTimer());
session.setTransactionTimer(this.configuration.getTransactionTimer());
session.setMessageReceiverListener(new MessageReceiverListener() {
+ private final MessageIDGenerator messageIDGenerator = new RandomMessageIDGenerator();
+
public void onAcceptAlertNotification(AlertNotification alertNotification) {
if (LOG.isDebugEnabled()) {
LOG.debug("Received an alertNotification " + alertNotification);
@@ -99,6 +108,26 @@ public class SmppConsumer extends Defaul
}
}
+ public DataSmResult onAcceptDataSm(DataSm dataSm, Session session) throws ProcessRequestException {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Received a dataSm " + dataSm);
+ }
+
+ MessageId newMessageId = messageIDGenerator.newMessageId();
+
+ try {
+ Exchange exchange = getEndpoint().createOnAcceptDataSm(dataSm, newMessageId.getValue());
+
+ LOG.trace("processing the new smpp exchange...");
+ getProcessor().process(exchange);
+ LOG.trace("processed the new smpp exchange");
+ } catch (Exception e) {
+ getExceptionHandler().handleException(e);
+ throw new ProcessRequestException(e.getMessage(), 255, e);
+ }
+
+ return new DataSmResult(newMessageId, dataSm.getOptionalParametes());
+ }
});
session.connectAndBind(
Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppEndpoint.java?rev=954209&r1=954208&r2=954209&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppEndpoint.java (original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppEndpoint.java Sun Jun 13 12:25:04 2010
@@ -24,6 +24,7 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
import org.jsmpp.bean.AlertNotification;
+import org.jsmpp.bean.DataSm;
import org.jsmpp.bean.DeliverSm;
/**
@@ -117,6 +118,34 @@ public class SmppEndpoint extends Defaul
exchange.setIn(getBinding().createSmppMessage(deliverSm));
return exchange;
}
+
+ /**
+ * Create a new exchange for communicating with this endpoint from a SMSC
+ *
+ * @param dataSm the received message from the SMSC
+ * @param smppMessageId the smpp message id which will be used in the response
+ * @return a new exchange
+ */
+ public Exchange createOnAcceptDataSm(DataSm dataSm, String smppMessageId) {
+ return createOnAcceptDataSm(getExchangePattern(), dataSm, smppMessageId);
+ }
+
+ /**
+ * Create a new exchange for communicating with this endpoint from a SMSC
+ * with the specified {@link ExchangePattern} such as whether its going
+ * to be an {@link ExchangePattern#InOnly} or {@link ExchangePattern#InOut} exchange
+ *
+ * @param exchangePattern the message exchange pattern for the exchange
+ * @param dataSm the received message from the SMSC
+ * @param smppMessageId the smpp message id which will be used in the response
+ * @return a new exchange
+ */
+ public Exchange createOnAcceptDataSm(ExchangePattern exchangePattern, DataSm dataSm, String smppMessageId) {
+ Exchange exchange = createExchange(exchangePattern);
+ exchange.setProperty(Exchange.BINDING, getBinding());
+ exchange.setIn(getBinding().createSmppMessage(dataSm, smppMessageId));
+ return exchange;
+ }
/**
* Returns the connection string for the current connection which has the form:
Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppMessage.java?rev=954209&r1=954208&r2=954209&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppMessage.java (original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppMessage.java Sun Jun 13 12:25:04 2010
@@ -21,6 +21,7 @@ import java.io.UnsupportedEncodingExcept
import org.apache.camel.impl.DefaultMessage;
import org.jsmpp.bean.AlertNotification;
import org.jsmpp.bean.Command;
+import org.jsmpp.bean.DataSm;
import org.jsmpp.bean.DeliverSm;
import org.jsmpp.bean.MessageRequest;
@@ -49,6 +50,11 @@ public class SmppMessage extends Default
this.configuration = configuration;
}
+ public SmppMessage(DataSm dataSm, SmppConfiguration configuration) {
+ this.command = dataSm;
+ this.configuration = configuration;
+ }
+
@Override
public SmppMessage newInstance() {
return new SmppMessage(this.configuration);
Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSSLConnectionFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSSLConnectionFactory.java?rev=954209&r1=954208&r2=954209&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSSLConnectionFactory.java (original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSSLConnectionFactory.java Sun Jun 13 12:25:04 2010
@@ -32,6 +32,7 @@ import org.jsmpp.session.connection.sock
* @version $Revision$
*/
public final class SmppSSLConnectionFactory implements ConnectionFactory {
+
private static final SmppSSLConnectionFactory CONN_FACTORY = new SmppSSLConnectionFactory();
private SmppSSLConnectionFactory() {
@@ -51,6 +52,5 @@ public final class SmppSSLConnectionFact
} catch (Exception e) {
throw new IOException(e.getMessage());
}
-
}
-}
+}
\ No newline at end of file
Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java?rev=954209&r1=954208&r2=954209&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java (original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java Sun Jun 13 12:25:04 2010
@@ -23,6 +23,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultExchange;
import org.jsmpp.bean.AlertNotification;
+import org.jsmpp.bean.DataSm;
import org.jsmpp.bean.DeliverSm;
import org.jsmpp.bean.NumberingPlanIndicator;
import org.jsmpp.bean.SubmitSm;
@@ -155,10 +156,10 @@ public class SmppBindingTest {
assertEquals(0, smppMessage.getHeader(SmppBinding.COMMAND_STATUS));
assertEquals("1616", smppMessage.getHeader(SmppBinding.SOURCE_ADDR));
assertEquals((byte) 8, smppMessage.getHeader(SmppBinding.SOURCE_ADDR_NPI));
- assertEquals((byte) 8, smppMessage.getHeader(SmppBinding.SOURCE_ADDR_TON));
+ assertEquals((byte) 2, smppMessage.getHeader(SmppBinding.SOURCE_ADDR_TON));
assertEquals("1717", smppMessage.getHeader(SmppBinding.ESME_ADDR));
assertEquals((byte) 8, smppMessage.getHeader(SmppBinding.ESME_ADDR_NPI));
- assertEquals((byte) 8, smppMessage.getHeader(SmppBinding.ESME_ADDR_TON));
+ assertEquals((byte) 2, smppMessage.getHeader(SmppBinding.ESME_ADDR_TON));
}
@Test
@@ -190,16 +191,50 @@ public class SmppBindingTest {
deliverSm.setDestAddress("1919");
deliverSm.setScheduleDeliveryTime("090831230627004+");
deliverSm.setValidityPeriod("090901230627004+");
+ deliverSm.setServiceType("WAP");
SmppMessage smppMessage = binding.createSmppMessage(deliverSm);
assertEquals("Hello SMPP world!", smppMessage.getBody());
- assertEquals(6, smppMessage.getHeaders().size());
+ assertEquals(7, smppMessage.getHeaders().size());
assertEquals(1, smppMessage.getHeader(SmppBinding.SEQUENCE_NUMBER));
assertEquals(1, smppMessage.getHeader(SmppBinding.COMMAND_ID));
assertEquals("1818", smppMessage.getHeader(SmppBinding.SOURCE_ADDR));
assertEquals("1919", smppMessage.getHeader(SmppBinding.DEST_ADDR));
assertEquals("090831230627004+", smppMessage.getHeader(SmppBinding.SCHEDULE_DELIVERY_TIME));
assertEquals("090901230627004+", smppMessage.getHeader(SmppBinding.VALIDITY_PERIOD));
+ assertEquals("WAP", smppMessage.getHeader(SmppBinding.SERVICE_TYPE));
+ }
+
+ @Test
+ public void createSmppMessageFromDataSmShouldReturnASmppMessage() throws Exception {
+ DataSm dataSm = new DataSm();
+ dataSm.setSequenceNumber(1);
+ dataSm.setCommandId(1);
+ dataSm.setCommandStatus(0);
+ dataSm.setSourceAddr("1818");
+ dataSm.setSourceAddrNpi(NumberingPlanIndicator.NATIONAL.value());
+ dataSm.setSourceAddrTon(TypeOfNumber.NATIONAL.value());
+ dataSm.setDestAddress("1919");
+ dataSm.setDestAddrNpi(NumberingPlanIndicator.NATIONAL.value());
+ dataSm.setDestAddrTon(TypeOfNumber.NATIONAL.value());
+ dataSm.setServiceType("WAP");
+ dataSm.setRegisteredDelivery((byte) 0);
+ SmppMessage smppMessage = binding.createSmppMessage(dataSm, "1");
+
+ assertNull(smppMessage.getBody());
+ assertEquals(12, smppMessage.getHeaders().size());
+ assertEquals("1", smppMessage.getHeader(SmppBinding.ID));
+ assertEquals(1, smppMessage.getHeader(SmppBinding.SEQUENCE_NUMBER));
+ assertEquals(1, smppMessage.getHeader(SmppBinding.COMMAND_ID));
+ assertEquals(0, smppMessage.getHeader(SmppBinding.COMMAND_STATUS));
+ assertEquals("1818", smppMessage.getHeader(SmppBinding.SOURCE_ADDR));
+ assertEquals((byte) 8, smppMessage.getHeader(SmppBinding.SOURCE_ADDR_NPI));
+ assertEquals((byte) 2, smppMessage.getHeader(SmppBinding.SOURCE_ADDR_TON));
+ assertEquals("1919", smppMessage.getHeader(SmppBinding.DEST_ADDR));
+ assertEquals((byte) 8, smppMessage.getHeader(SmppBinding.DEST_ADDR_NPI));
+ assertEquals((byte) 2, smppMessage.getHeader(SmppBinding.DEST_ADDR_TON));
+ assertEquals("WAP", smppMessage.getHeader(SmppBinding.SERVICE_TYPE));
+ assertEquals((byte) 0, smppMessage.getHeader(SmppBinding.REGISTERED_DELIVERY));
}
@Test
Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java?rev=954209&r1=954208&r2=954209&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java (original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java Sun Jun 13 12:25:04 2010
@@ -133,6 +133,33 @@ public class SmppConfigurationTest {
assertEquals(config.getTypeOfNumber(), configuration.getTypeOfNumber());
assertEquals(config.getUsingSSL(), configuration.getUsingSSL());
}
+
+ @Test
+ public void toStringShouldListAllInstanceVariables() {
+ String expected = "SmppConfiguration["
+ + "usingSSL=false, "
+ + "enquireLinkTimer=5000, "
+ + "host=localhost, "
+ + "password=password, "
+ + "port=2775, "
+ + "systemId=smppclient, "
+ + "systemType=cp, "
+ + "transactionTimer=10000, "
+ + "registeredDelivery=1, "
+ + "serviceType=CMT, "
+ + "sourceAddrTon=0, "
+ + "destAddrTon=0, "
+ + "sourceAddrNpi=0, "
+ + "destAddrNpi=0, "
+ + "protocolId=0, "
+ + "priorityFlag=1, "
+ + "replaceIfPresentFlag=0, "
+ + "sourceAddr=1616, "
+ + "destAddr=1717, "
+ + "typeOfNumber=0, "
+ + "numberingPlanIndicator=0]";
+ assertEquals(expected, configuration.toString());
+ }
private void setNoneDefaultValues(SmppConfiguration config) {
config.setDestAddr("1919");
@@ -158,4 +185,4 @@ public class SmppConfigurationTest {
config.setTypeOfNumber(TypeOfNumber.NATIONAL.value());
config.setUsingSSL(true);
}
-}
+}
\ No newline at end of file
Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java?rev=954209&r1=954208&r2=954209&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java (original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java Sun Jun 13 12:25:04 2010
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.smpp;
-import junit.framework.TestCase;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Exchange;
@@ -24,15 +23,20 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.jsmpp.bean.AlertNotification;
+import org.jsmpp.bean.DataSm;
import org.jsmpp.bean.DeliverSm;
import org.junit.Before;
import org.junit.Test;
+import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
import static org.easymock.classextension.EasyMock.createMock;
import static org.easymock.classextension.EasyMock.replay;
import static org.easymock.classextension.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
/**
@@ -41,7 +45,7 @@ import static org.easymock.classextensio
* @version $Revision$
* @author muellerc
*/
-public class SmppEndpointTest extends TestCase {
+public class SmppEndpointTest {
private SmppEndpoint endpoint;
private SmppConfiguration configuration;
@@ -70,6 +74,7 @@ public class SmppEndpointTest extends Te
@Test
public void createEndpointUriShouldReturnTheEndpointUri() {
+ expect(configuration.getUsingSSL()).andReturn(false);
expect(configuration.getSystemId()).andReturn("smppclient");
expect(configuration.getHost()).andReturn("localhost");
expect(configuration.getPort()).andReturn(new Integer(2775));
@@ -95,14 +100,14 @@ public class SmppEndpointTest extends Te
}
@Test
- public void vreateProducerShouldReturnASmppProducer() throws Exception {
+ public void createProducerShouldReturnASmppProducer() throws Exception {
Producer producer = endpoint.createProducer();
assertTrue(producer instanceof SmppProducer);
}
@Test
- public void createOnAcceptAlertNotificationExchangeAlertNotification() {
+ public void createOnAcceptAlertNotificationExchange() {
AlertNotification alertNotification = createMock(AlertNotification.class);
SmppMessage message = createMock(SmppMessage.class);
expect(binding.createSmppMessage(alertNotification)).andReturn(message);
@@ -120,7 +125,7 @@ public class SmppEndpointTest extends Te
}
@Test
- public void testCreateOnAcceptAlertNotificationExchangeExchangePatternAlertNotification() {
+ public void createOnAcceptAlertNotificationExchangeWithExchangePattern() {
AlertNotification alertNotification = createMock(AlertNotification.class);
SmppMessage message = createMock(SmppMessage.class);
expect(binding.createSmppMessage(alertNotification)).andReturn(message);
@@ -138,7 +143,7 @@ public class SmppEndpointTest extends Te
}
@Test
- public void testCreateOnAcceptDeliverSmExchangeDeliverSm() throws Exception {
+ public void createOnAcceptDeliverSmExchange() throws Exception {
DeliverSm deliverSm = createMock(DeliverSm.class);
SmppMessage message = createMock(SmppMessage.class);
expect(binding.createSmppMessage(deliverSm)).andReturn(message);
@@ -156,7 +161,7 @@ public class SmppEndpointTest extends Te
}
@Test
- public void testCreateOnAcceptDeliverSmExchangeExchangePatternDeliverSm() throws Exception {
+ public void createOnAcceptDeliverSmWithExchangePattern() throws Exception {
DeliverSm deliverSm = createMock(DeliverSm.class);
SmppMessage message = createMock(SmppMessage.class);
expect(binding.createSmppMessage(deliverSm)).andReturn(message);
@@ -172,9 +177,46 @@ public class SmppEndpointTest extends Te
assertSame(message, exchange.getIn());
assertSame(ExchangePattern.InOut, exchange.getPattern());
}
+
+ @Test
+ public void createOnAcceptDataSm() throws Exception {
+ DataSm dataSm = createMock(DataSm.class);
+ SmppMessage message = createMock(SmppMessage.class);
+ expect(binding.createSmppMessage(eq(dataSm), isA(String.class))).andReturn(message);
+ message.setExchange(isA(Exchange.class));
+
+ replay(dataSm, binding, message);
+
+ Exchange exchange = endpoint.createOnAcceptDataSm(dataSm, "1");
+
+ verify(dataSm, binding, message);
+
+ assertSame(binding, exchange.getProperty(Exchange.BINDING));
+ assertSame(message, exchange.getIn());
+ assertSame(ExchangePattern.InOnly, exchange.getPattern());
+ }
+
+ @Test
+ public void createOnAcceptDataSmWithExchangePattern() throws Exception {
+ DataSm dataSm = createMock(DataSm.class);
+ SmppMessage message = createMock(SmppMessage.class);
+ expect(binding.createSmppMessage(eq(dataSm), isA(String.class))).andReturn(message);
+ message.setExchange(isA(Exchange.class));
+
+ replay(dataSm, binding, message);
+
+ Exchange exchange = endpoint.createOnAcceptDataSm(ExchangePattern.InOut, dataSm, "1");
+
+ verify(dataSm, binding, message);
+
+ assertSame(binding, exchange.getProperty(Exchange.BINDING));
+ assertSame(message, exchange.getIn());
+ assertSame(ExchangePattern.InOut, exchange.getPattern());
+ }
@Test
public void getConnectionStringShouldReturnTheConnectionString() {
+ expect(configuration.getUsingSSL()).andReturn(false);
expect(configuration.getSystemId()).andReturn("smppclient");
expect(configuration.getHost()).andReturn("localhost");
expect(configuration.getPort()).andReturn(new Integer(2775));
@@ -190,5 +232,4 @@ public class SmppEndpointTest extends Te
public void getConfigurationShouldReturnTheSetValue() {
assertSame(configuration, endpoint.getConfiguration());
}
-
-}
+}
\ No newline at end of file
Added: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSSLConnectionFactoryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSSLConnectionFactoryTest.java?rev=954209&view=auto
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSSLConnectionFactoryTest.java (added)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSSLConnectionFactoryTest.java Sun Jun 13 12:25:04 2010
@@ -0,0 +1,60 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.smpp;
+
+import java.io.IOException;
+
+import org.jsmpp.session.connection.Connection;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * JUnit test class for <code>org.apache.camel.component.smpp.SmppSSLConnectionFactory</code>
+ *
+ * @version $Revision: $
+ * @author cmueller
+ */
+public class SmppSSLConnectionFactoryTest {
+
+ private SmppSSLConnectionFactory factory;
+
+ @Before
+ public void setUp() {
+ factory = SmppSSLConnectionFactory.getInstance();
+ }
+
+ @Test
+ public void getInstanceShouldReturnTheSameInstance() {
+ assertSame(factory, SmppSSLConnectionFactory.getInstance());
+ }
+
+ @Test
+ @Ignore("Must be manually tested")
+ public void createConnection() throws IOException {
+ Connection connection = factory.createConnection("localhost", 2775);
+
+ try {
+ assertNotNull(connection);
+ assertTrue(connection.isOpen());
+ } finally {
+ connection.close();
+ }
+ }
+}
\ No newline at end of file
Propchange: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSSLConnectionFactoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSSLConnectionFactoryTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=954209&r1=954208&r2=954209&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Sun Jun 13 12:25:04 2010
@@ -90,7 +90,7 @@
<jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
<juel-bundle-version>2.1.2_1</juel-bundle-version>
<junit-bundle-version>4.7_1</junit-bundle-version>
- <jsmpp-bundle-version>2.0_2</jsmpp-bundle-version>
+ <jsmpp-bundle-version>2.1.0_1-SNAPSHOT</jsmpp-bundle-version>
<lucene-bundle-version>3.0.1_1</lucene-bundle-version>
<mvel-bundle-version>2.0.8_3</mvel-bundle-version>
<mina-bundle-version>1.1.7_3</mina-bundle-version>