You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by js...@apache.org on 2006/04/04 18:05:23 UTC
svn commit: r391356 - in
/incubator/servicemix/trunk/sandbox/servicemix-wsrm/src:
main/java/org/servicemix/ws/rm/ main/wsdl/ test/java/org/servicemix/ws/rm/
Author: jstrachan
Date: Tue Apr 4 09:05:22 2006
New Revision: 391356
URL: http://svn.apache.org/viewcvs?rev=391356&view=rev
Log:
got the WS-RM module building
Modified:
incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/main/java/org/servicemix/ws/rm/NonPersistentSequenceStore.java
incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/main/java/org/servicemix/ws/rm/SequenceManager.java
incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/main/wsdl/wsrm.wsdl
incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/test/java/org/servicemix/ws/rm/SequenceManagerTest.java
Modified: incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/main/java/org/servicemix/ws/rm/NonPersistentSequenceStore.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/main/java/org/servicemix/ws/rm/NonPersistentSequenceStore.java?rev=391356&r1=391355&r2=391356&view=diff
==============================================================================
--- incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/main/java/org/servicemix/ws/rm/NonPersistentSequenceStore.java (original)
+++ incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/main/java/org/servicemix/ws/rm/NonPersistentSequenceStore.java Tue Apr 4 09:05:22 2006
@@ -19,12 +19,12 @@
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
-import org.activemq.util.IdGenerator;
+import org.apache.activemq.util.IdGenerator;
import org.xmlsoap.schemas.ws._2005._02.rm.Identifier;
/**
- * A simple implementation of the {@link SequenceStore} which doesn not persist messages
- * but is usesful for testing.
+ * A simple implementation of the {@link SequenceStore} which does not persist messages
+ * but is useful for testing.
*
* @version $Revision$
*/
Modified: incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/main/java/org/servicemix/ws/rm/SequenceManager.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/main/java/org/servicemix/ws/rm/SequenceManager.java?rev=391356&r1=391355&r2=391356&view=diff
==============================================================================
--- incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/main/java/org/servicemix/ws/rm/SequenceManager.java (original)
+++ incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/main/java/org/servicemix/ws/rm/SequenceManager.java Tue Apr 4 09:05:22 2006
@@ -17,7 +17,6 @@
**/
package org.servicemix.ws.rm;
-import org.servicemix.wspojo.rm.SequenceAbsractPortType;
import org.xmlsoap.schemas.ws._2005._02.rm.AckRequestedType;
import org.xmlsoap.schemas.ws._2005._02.rm.CreateSequenceResponseType;
import org.xmlsoap.schemas.ws._2005._02.rm.CreateSequenceType;
@@ -27,6 +26,7 @@
import org.xmlsoap.schemas.ws._2005._02.rm.SequenceType;
import org.xmlsoap.schemas.ws._2005._02.rm.TerminateSequenceType;
import org.xmlsoap.schemas.ws._2005._02.rm.SequenceAcknowledgement.AcknowledgementRange;
+import org.xmlsoap.schemas.ws._2005._02.rm.wsdl.SequenceAbstractPortType;
import java.math.BigInteger;
@@ -35,7 +35,7 @@
*
* @version $Revision$
*/
-public class SequenceManager implements SequenceAbsractPortType {
+public class SequenceManager implements SequenceAbstractPortType {
private static final BigInteger MAX_INTEGER = new BigInteger("" + Integer.MAX_VALUE);
Modified: incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/main/wsdl/wsrm.wsdl
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/main/wsdl/wsrm.wsdl?rev=391356&r1=391355&r2=391356&view=diff
==============================================================================
--- incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/main/wsdl/wsrm.wsdl (original)
+++ incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/main/wsdl/wsrm.wsdl Tue Apr 4 09:05:22 2006
@@ -37,7 +37,7 @@
No other rights are granted by implication, estoppel or otherwise.
-->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:rm="http://schemas.xmlsoap.org/ws/2005/02/rm" xmlns:tns="http://schemas.xmlsoap.org/ws/2005/02/rm/wsdl" targetNamespace="http://schemas.xmlsoap.org/ws/2005/02/rm/wsdl">
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:rm="http://schemas.xmlsoap.org/ws/2005/02/rm" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://schemas.xmlsoap.org/ws/2005/02/rm/wsdl" targetNamespace="http://schemas.xmlsoap.org/ws/2005/02/rm/wsdl">
<wsdl:types>
<xs:schema>
<xs:import namespace="http://schemas.xmlsoap.org/ws/2005/02/rm" schemaLocation="http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm.xsd"/>
@@ -53,7 +53,7 @@
<wsdl:message name="TerminateSequence">
<wsdl:part name="terminate" element="rm:TerminateSequence"/>
</wsdl:message>
- <wsdl:portType name="SequenceAbsractPortType">
+ <wsdl:portType name="SequenceAbstractPortType">
<wsdl:operation name="CreateSequence">
<wsdl:input message="tns:CreateSequence" wsa:Action="http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence"/>
<wsdl:output message="tns:CreateSequenceResponse" wsa:Action="http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequenceResponse"/>
@@ -62,4 +62,37 @@
<wsdl:input message="tns:TerminateSequence" wsa:Action="http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequenceResponse"/>
</wsdl:operation>
</wsdl:portType>
-</wsdl:definitions>
+
+ <!-- default binding for out-of band RM protocol messages -->
+
+ <wsdl:binding name="SequenceAbstractSoapBinding" type="tns:SequenceAbstractPortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="CreateSequence">
+ <soap:operation style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <!--
+ <wsdl:fault name="SequenceFault">
+ <soap:fault name="SequenceFault" use="literal"/>
+ </wsdl:fault>
+ -->
+ </wsdl:operation>
+ <wsdl:operation name="TerminateSequence">
+ <soap:operation style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <!-- TODO: fault -->
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="SequenceAbstractService">
+ <wsdl:port name="SequenceAbstractPort" binding="tns:SequenceAbstractSoapBinding">
+ <soap:address location="http://localhost:9000/SequenceAbstractContext/SequenceAbstractPort"/>
+ </wsdl:port>
+ </wsdl:service>
+ </wsdl:definitions>
Modified: incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/test/java/org/servicemix/ws/rm/SequenceManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/test/java/org/servicemix/ws/rm/SequenceManagerTest.java?rev=391356&r1=391355&r2=391356&view=diff
==============================================================================
--- incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/test/java/org/servicemix/ws/rm/SequenceManagerTest.java (original)
+++ incubator/servicemix/trunk/sandbox/servicemix-wsrm/src/test/java/org/servicemix/ws/rm/SequenceManagerTest.java Tue Apr 4 09:05:22 2006
@@ -17,7 +17,6 @@
**/
package org.servicemix.ws.rm;
-import org.servicemix.wspojo.rm.SequenceAbsractPortType;
import org.xmlsoap.schemas.ws._2004._08.addressing.AttributedURI;
import org.xmlsoap.schemas.ws._2004._08.addressing.EndpointReferenceType;
import org.xmlsoap.schemas.ws._2005._02.rm.CreateSequenceResponseType;
@@ -25,6 +24,7 @@
import org.xmlsoap.schemas.ws._2005._02.rm.Expires;
import org.xmlsoap.schemas.ws._2005._02.rm.Identifier;
import org.xmlsoap.schemas.ws._2005._02.rm.TerminateSequenceType;
+import org.xmlsoap.schemas.ws._2005._02.rm.wsdl.SequenceAbstractPortType;
import junit.framework.TestCase;
@@ -33,7 +33,7 @@
* @version $Revision$
*/
public class SequenceManagerTest extends TestCase {
- protected SequenceAbsractPortType sequenceManager;
+ protected SequenceAbstractPortType sequenceManager;
protected boolean specifyExpires = false;
public void testCreateAndTerminateSequence() throws Exception {
@@ -67,7 +67,7 @@
sequenceManager = createSequenceManager();
}
- protected SequenceAbsractPortType createSequenceManager() {
+ protected SequenceAbstractPortType createSequenceManager() {
return new SequenceManager(createSequenceStore());
}