Author: lhein
Date: Wed Jan 28 07:40:33 2009
New Revision: 738394
URL: http://svn.apache.org/viewvc?rev=738394&view=rev
Log:
applied patches for SM-1623 provided by Christian Mueller
removed Nanthrax repository (jsmpp lib is now hosted at asf repo)
Added:
servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/marshaler/
servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshalerTest.java
(contents, props changed)
- copied, changed from r738383,
servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/SmppMarshalerTest.java
Removed:
servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/SmppMarshalerTest.java
Modified:
servicemix/components/bindings/servicemix-smpp/trunk/pom.xml
servicemix/components/bindings/servicemix-smpp/trunk/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java
servicemix/components/bindings/servicemix-smpp/trunk/src/test/resources/spring.xml
servicemix/components/bindings/servicemix-smpp/trunk/src/test/resources/xbean/xbean.xml
Modified: servicemix/components/bindings/servicemix-smpp/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-smpp/trunk/pom.xml?rev=738394&r1=738393&r2=738394&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-smpp/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-smpp/trunk/pom.xml Wed Jan 28
07:40:33 2009
@@ -76,14 +76,6 @@
</servicemix.osgi.bundles>
</properties>
- <repositories>
- <repository>
- <id>nanthrax</id>
- <name>Nanthrax Maven Repository</name>
- <url>http://maven.nanthrax.net</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.servicemix</groupId>
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=738394&r1=738393&r2=738394&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
Wed Jan 28 07:40:33 2009
@@ -125,6 +125,10 @@
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());
+ }
}
/**
Copied:
servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshalerTest.java
(from r738383,
servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/SmppMarshalerTest.java)
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshalerTest.java?p2=servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshalerTest.java&p1=servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/SmppMarshalerTest.java&r1=738383&r2=738394&rev=738394&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/SmppMarshalerTest.java
(original)
+++
servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshalerTest.java
Wed Jan 28 07:40:33 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.smpp;
+package org.apache.servicemix.smpp.marshaler;
import java.io.IOException;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -46,7 +46,7 @@
*
* @author jbonofre
*/
-public class SmppMarshalerTest extends TestCase {
+public class DefaultSmppMarshalerTest extends TestCase {
private static final String SOURCE = "0123456789";
private static final String DESTINATION = "9876543210";
Propchange:
servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshalerTest.java
------------------------------------------------------------------------------
svn:executable = *
Propchange:
servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshalerTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
servicemix/components/bindings/servicemix-smpp/trunk/src/test/resources/spring.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-smpp/trunk/src/test/resources/spring.xml?rev=738394&r1=738393&r2=738394&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-smpp/trunk/src/test/resources/spring.xml
(original)
+++
servicemix/components/bindings/servicemix-smpp/trunk/src/test/resources/spring.xml
Wed Jan 28 07:40:33 2009
@@ -29,7 +29,7 @@
<sm:component>
<smpp:component>
<smpp:endpoints>
- <smpp:sender service="test:service"
endpoint="endpoint"
+ <smpp:provider service="test:service"
endpoint="endpoint"
host="localhost"
port="2700"
systemId="test"
Modified:
servicemix/components/bindings/servicemix-smpp/trunk/src/test/resources/xbean/xbean.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-smpp/trunk/src/test/resources/xbean/xbean.xml?rev=738394&r1=738393&r2=738394&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-smpp/trunk/src/test/resources/xbean/xbean.xml
(original)
+++
servicemix/components/bindings/servicemix-smpp/trunk/src/test/resources/xbean/xbean.xml
Wed Jan 28 07:40:33 2009
@@ -20,7 +20,7 @@
<beans xmlns:smpp="http://servicemix.apache.org/smpp/1.0";
xmlns:test="http://test";>
- <smpp:sender service="test:service"
+ <smpp:provider service="test:service"
endpoint="sender"
host="localhost"
port="2700"
