You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ch...@apache.org on 2005/11/29 10:40:30 UTC
svn commit: r349688 - in /webservices/sandesha/trunk: ./ config/ docs/
interop/src/org/apache/sandesha2/interop/microsoft/ samples/conf/interop/
test/src/org/apache/sandesha2/ test/src/org/apache/sandesha2/storage/
Author: chamikara
Date: Tue Nov 29 01:39:08 2005
New Revision: 349688
URL: http://svn.apache.org/viewcvs?rev=349688&view=rev
Log:
Updates module files.
Bug fixes in test files.
Updates module.xml and sample services.xml
Added:
webservices/sandesha/trunk/project.properties
Modified:
webservices/sandesha/trunk/config/axis2.xml
webservices/sandesha/trunk/config/module.xml
webservices/sandesha/trunk/docs/sandesha2_db_schema.doc
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/interop/microsoft/MicrosoftAsyncEchoClient.java
webservices/sandesha/trunk/project.xml
webservices/sandesha/trunk/samples/conf/interop/services.xml
webservices/sandesha/trunk/test/src/org/apache/sandesha2/PorpertyLoaderTest.java
webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java
webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java
webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java
Modified: webservices/sandesha/trunk/config/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/config/axis2.xml?rev=349688&r1=349687&r2=349688&view=diff
==============================================================================
--- webservices/sandesha/trunk/config/axis2.xml (original)
+++ webservices/sandesha/trunk/config/axis2.xml Tue Nov 29 01:39:08 2005
@@ -90,7 +90,7 @@
<!-- ================================================= -->
<!-- Comment this to disable Addressing -->
<module ref="addressing"/>
- <module ref="sandesha"/>
+ <!-- <module ref="sandesha"/> -->
<!--Configuring module , providing paramters for modules whether they refer or not-->
Modified: webservices/sandesha/trunk/config/module.xml
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/config/module.xml?rev=349688&r1=349687&r2=349688&view=diff
==============================================================================
--- webservices/sandesha/trunk/config/module.xml (original)
+++ webservices/sandesha/trunk/config/module.xml Tue Nov 29 01:39:08 2005
@@ -2,7 +2,7 @@
<inflow>
<handler name="SandeshaGlobalInHandler" class="org.apache.sandesha2.handlers.SandeshaGlobalInHandler">
- <order phase="PreDispatch"/>
+ <order after="AddressingInHandler" phase="PreDispatch"/>
</handler>
<handler name="SandeshaInHandler" class="org.apache.sandesha2.handlers.SandeshaInHandler">
<order phase="RMPhase"/>
Modified: webservices/sandesha/trunk/docs/sandesha2_db_schema.doc
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/docs/sandesha2_db_schema.doc?rev=349688&r1=349687&r2=349688&view=diff
==============================================================================
Binary files /tmp/tmpzCdrtn and /tmp/tmph-YrA6 differ
Modified: webservices/sandesha/trunk/interop/src/org/apache/sandesha2/interop/microsoft/MicrosoftAsyncEchoClient.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/src/org/apache/sandesha2/interop/microsoft/MicrosoftAsyncEchoClient.java?rev=349688&r1=349687&r2=349688&view=diff
==============================================================================
--- webservices/sandesha/trunk/interop/src/org/apache/sandesha2/interop/microsoft/MicrosoftAsyncEchoClient.java (original)
+++ webservices/sandesha/trunk/interop/src/org/apache/sandesha2/interop/microsoft/MicrosoftAsyncEchoClient.java Tue Nov 29 01:39:08 2005
@@ -20,10 +20,10 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.client.AsyncResult;
import org.apache.axis2.client.Call;
-import org.apache.axis2.client.Callback;
import org.apache.axis2.client.MessageSender;
+import org.apache.axis2.client.async.AsyncResult;
+import org.apache.axis2.client.async.Callback;
import org.apache.axis2.context.MessageContextConstants;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
Added: webservices/sandesha/trunk/project.properties
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/project.properties?rev=349688&view=auto
==============================================================================
--- webservices/sandesha/trunk/project.properties (added)
+++ webservices/sandesha/trunk/project.properties Tue Nov 29 01:39:08 2005
@@ -0,0 +1 @@
+maven.repo.remote=http://svn.apache.org/repository/,http://www.ibiblio.org/maven/
\ No newline at end of file
Modified: webservices/sandesha/trunk/project.xml
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/project.xml?rev=349688&r1=349687&r2=349688&view=diff
==============================================================================
--- webservices/sandesha/trunk/project.xml (original)
+++ webservices/sandesha/trunk/project.xml Tue Nov 29 01:39:08 2005
@@ -11,7 +11,7 @@
<!-- The version of the project under development, e.g.
1.1, 1.2, 2.0-SNAPSHOT -->
- <currentVersion>beta</currentVersion>
+ <currentVersion>0.9</currentVersion>
<!-- details about the organization that 'owns' the project -->
<organization>
@@ -23,7 +23,7 @@
<!-- the year the project started -->
<inceptionYear>2005</inceptionYear>
- <package>org.apache.sandesha</package>
+ <package>org.apache.sandesha2</package>
<logo>http://ws.apache.org/ws-fx/sandesha/images/Sandesha.jpg</logo>
<description>Apache Sandesha2 is an implementation of the Web Services ReliableMessaging (WS-ReliableMessaging), published by the IBM, Microsoft, BEA and TIBCO Software as a joint specification, on top of Apache Axis2. Apache Sandesha provides; An implementation for WS-ReliableMessaging with the support to WS-Policy and WS- Addressing. Interoperability with other WS-ReliableMessaging implementations. Sandesha provides a complete support for WS-ReliableMessaging specification allowing a reliable communication between web services as well as web services and clients. It also provides the INORDER message delivery assurance for the users.
@@ -148,29 +148,23 @@
<!-- ============ -->
<dependencies>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- </dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0-rc3</version>
+ <groupId>axis2</groupId>
+ <artifactId>axis2</artifactId>
+ <version>0.93-SNAPSHOT</version>
</dependency>
-
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
</dependency>
<dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>1.2</version>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0-rc4</version>
</dependency>
<dependency>
@@ -179,6 +173,7 @@
<version>1.1.1-dev</version>
<url>http://dist.codehaus.org/stax/jars/</url>
</dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -186,35 +181,17 @@
<url>http://dist.codehaus.org/stax/jars/</url>
</dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2</artifactId>
- <version>0.93-dev</version>
- </dependency>
-
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>1.0</version>
<url>http://dist.codehaus.org/stax/jars/</url>
</dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-javamail</artifactId>
- <version>1.3.1-rc3</version>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-activation</artifactId>
- <version>1.0.2-rc3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.1.1.0</version>
- </dependency>
+
</dependencies>
+
+<report>maven-javadoc-plugin</report>
<!-- ======= -->
<!-- Reports -->
Modified: webservices/sandesha/trunk/samples/conf/interop/services.xml
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/samples/conf/interop/services.xml?rev=349688&r1=349687&r2=349688&view=diff
==============================================================================
--- webservices/sandesha/trunk/samples/conf/interop/services.xml (original)
+++ webservices/sandesha/trunk/samples/conf/interop/services.xml Tue Nov 29 01:39:08 2005
@@ -1,24 +1,26 @@
-<service name="InteropService">
+<service name="OneWayService">
<parameter name="ServiceClass" locked="xsd:false">org.apache.sandesha2.samples.interop.service.RMInteropService</parameter>
- <parameter name="RMEnabled" >true</parameter>
+ <module ref="sandesha"/>
<description>
This is a testing service , to test the system is working or not
- </description>
+ </description>
<operation name="ping">
<messageReceiver class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver" />
</operation>
+ <operation name="Ping">
+ <messageReceiver class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver" />
+ </operation>
+
<operation name="echoString">
<messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" />
</operation>
-<!--
- <operation name="ping">
- <messageReceiver class="org.apache.sandesha2.msgreceivers.RMMessageReceiver" />
- </operation>
--->
+ <operation name="EchoString">
+ <messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" />
+ </operation>
</service>
Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/PorpertyLoaderTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/PorpertyLoaderTest.java?rev=349688&r1=349687&r2=349688&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/PorpertyLoaderTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/PorpertyLoaderTest.java Tue Nov 29 01:39:08 2005
@@ -36,7 +36,7 @@
public void setUp () {
manager = PropertyManager.getInstance();
- String fileName = "test/resources/sandesha2.properties";
+ String fileName = "./test/resources/sandesha2.properties";
File file= new File (fileName);
if (!file.exists()) {
fail("'test/resources/sandesha2.prop' not found");
Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java?rev=349688&r1=349687&r2=349688&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java Tue Nov 29 01:39:08 2005
@@ -51,7 +51,7 @@
mgr.insert(new CreateSeqBean("TmpSeqId2", "CreateSeqMsgId3", "SeqId3"));
CreateSeqBean target = new CreateSeqBean();
- target.setTempSequenceId("TmpSeqId2");
+ target.setInternalSequenceId("TmpSeqId2");
Iterator iter = mgr.find(target).iterator();
CreateSeqBean tmp = (CreateSeqBean) iter.next();
@@ -71,7 +71,7 @@
CreateSeqBean tmpbean = mgr.retrieve("CreateSeqMsgId4");
assertTrue(tmpbean.getCreateSeqMsgId().equals("CreateSeqMsgId4"));
assertTrue(tmpbean.getSequenceId().equals("SeqId4"));
- assertTrue(tmpbean.getTempSequenceId().equals("TmpSeqId4"));
+ assertTrue(tmpbean.getInternalSequenceId().equals("TmpSeqId4"));
}
@@ -88,9 +88,9 @@
CreateSeqBean bean = new CreateSeqBean("TmpSeqId6", "CreateSeqMsgId6", "SeqId6");
mgr.insert(bean);
- bean.setTempSequenceId("TmpSeqId7");
+ bean.setInternalSequenceId("TmpSeqId7");
mgr.update(bean);
CreateSeqBean tmp = mgr.retrieve("CreateSeqMsgId6");
- assertTrue(tmp.getTempSequenceId().equals("TmpSeqId7"));
+ assertTrue(tmp.getInternalSequenceId().equals("TmpSeqId7"));
}
}
Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java?rev=349688&r1=349687&r2=349688&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java Tue Nov 29 01:39:08 2005
@@ -2,8 +2,8 @@
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.SandeshaTestCase;
-import org.apache.sandesha2.storage.beanmanagers.RetransmitterBeanMgr;
-import org.apache.sandesha2.storage.beans.RetransmitterBean;
+import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
+import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisConfigurationImpl;
@@ -27,7 +27,7 @@
*/
public class RetransmitterBeanMgrTest extends SandeshaTestCase {
- private RetransmitterBeanMgr mgr;
+ private SenderBeanMgr mgr;
public RetransmitterBeanMgrTest() {
super("RetransmitterBeanMgrTest");
@@ -43,7 +43,7 @@
public void testDelete() {
assertNull(mgr.retrieve(""));
try {
- mgr.insert(new RetransmitterBean("MsgId1", "Key1", false , 1001 , "TmpSeqId1", 1001));
+ mgr.insert(new SenderBean("MsgId1", "Key1", false , 1001 , "TmpSeqId1", 1001));
} catch (Exception ex) {
fail("should not throw an exception");
}
@@ -52,20 +52,20 @@
public void testFind() {
try {
- mgr.insert(new RetransmitterBean("MsgId2", "Key2", false , 1001 , "TmpSeqId2", 1002));
- mgr.insert(new RetransmitterBean("MsgId3", "Key3", false , 1001 , "TmpSeqId2", 1003));
+ mgr.insert(new SenderBean("MsgId2", "Key2", false , 1001 , "TmpSeqId2", 1002));
+ mgr.insert(new SenderBean("MsgId3", "Key3", false , 1001 , "TmpSeqId2", 1003));
- RetransmitterBean target = new RetransmitterBean();
- target.setTempSequenceId("TmpSeqId2");
+ SenderBean target = new SenderBean();
+ target.setInternalSequenceId("TmpSeqId2");
Iterator iterator = mgr.find(target).iterator();
- RetransmitterBean tmp = (RetransmitterBean) iterator.next();
+ SenderBean tmp = (SenderBean) iterator.next();
if (tmp.getMessageId().equals("MsgId2")) {
- tmp = (RetransmitterBean) iterator.next();
+ tmp = (SenderBean) iterator.next();
assertTrue(tmp.getMessageId().equals("MsgId3"));
} else {
- tmp = (RetransmitterBean) iterator.next();
+ tmp = (SenderBean) iterator.next();
assertTrue(tmp.getMessageId().equals("MsgId2"));
}
@@ -79,15 +79,15 @@
public void testInsert() {
try {
- mgr.insert(new RetransmitterBean());
+ mgr.insert(new SenderBean());
fail("should throw an exception");
} catch (SandeshaException ex) {
}
try {
- mgr.insert(new RetransmitterBean("MsgId4","Key4", false , 1001 , "TmpSeqId4", 1004));
- RetransmitterBean tmp = mgr.retrieve("MsgId4");
+ mgr.insert(new SenderBean("MsgId4","Key4", false , 1001 , "TmpSeqId4", 1004));
+ SenderBean tmp = mgr.retrieve("MsgId4");
assertTrue(tmp.getKey().equals("Key4"));
@@ -100,7 +100,7 @@
public void testRetrieve() {
assertNull(mgr.retrieve("MsgId5"));
try {
- mgr.insert(new RetransmitterBean("MsgId5", "Key5", false , 1001 , "TmpSeqId5", 1005));
+ mgr.insert(new SenderBean("MsgId5", "Key5", false , 1001 , "TmpSeqId5", 1005));
} catch (SandeshaException e) {
fail("this should not throw an exception");
}
@@ -108,7 +108,7 @@
}
public void testUpdate() {
- RetransmitterBean bean = new RetransmitterBean("MsgId6", "Key6", false , 1001 , "TmpSeqId6", 1006);
+ SenderBean bean = new SenderBean("MsgId6", "Key6", false , 1001 , "TmpSeqId6", 1006);
try {
mgr.insert(bean);
} catch (SandeshaException e) {
@@ -117,7 +117,7 @@
bean.setSend(true);
mgr.update(bean);
- RetransmitterBean tmp = mgr.retrieve("MsgId6");
+ SenderBean tmp = mgr.retrieve("MsgId6");
assertTrue(tmp.isSend());
}
}
Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java?rev=349688&r1=349687&r2=349688&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java Tue Nov 29 01:39:08 2005
@@ -1,7 +1,7 @@
package org.apache.sandesha2.storage;
-import org.apache.sandesha2.storage.beanmanagers.StorageMapBeanMgr;
-import org.apache.sandesha2.storage.beans.StorageMapBean;
+import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
+import org.apache.sandesha2.storage.beans.InvokerBean;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.SandeshaTestCase;
import org.apache.axis2.engine.AxisConfiguration;
@@ -27,7 +27,7 @@
public class StorageMapBeanMgrTest extends SandeshaTestCase {
- StorageMapBeanMgr mgr;
+ InvokerBeanMgr mgr;
public StorageMapBeanMgrTest() {
super ("StorageMapBeanMgrTest");
@@ -41,48 +41,48 @@
}
public void testDelete() {
- mgr.insert(new StorageMapBean("Key1", 1001, "SeqId1"));
+ mgr.insert(new InvokerBean("Key1", 1001, "SeqId1"));
mgr.delete("Key1");
assertNull(mgr.retrieve("Key1"));
}
public void testFind() {
- mgr.insert(new StorageMapBean("Key2", 1002, "SeqId2"));
- mgr.insert(new StorageMapBean("Key3", 1003, "SeqId2"));
+ mgr.insert(new InvokerBean("Key2", 1002, "SeqId2"));
+ mgr.insert(new InvokerBean("Key3", 1003, "SeqId2"));
- StorageMapBean bean = new StorageMapBean();
+ InvokerBean bean = new InvokerBean();
bean.setSequenceId("SeqId2");
Iterator iter = mgr.find(bean).iterator();
- StorageMapBean tmp = (StorageMapBean) iter.next();
+ InvokerBean tmp = (InvokerBean) iter.next();
if (tmp.getKey().equals("Key2")) {
- tmp = (StorageMapBean) iter.next();
+ tmp = (InvokerBean) iter.next();
assertTrue(tmp.getKey().equals("Key3"));
} else {
- tmp = (StorageMapBean) iter.next();
+ tmp = (InvokerBean) iter.next();
assertTrue(tmp.getKey().equals("Key2"));
}
}
public void testInsert() {
- mgr.insert(new StorageMapBean("Key4", 1004, "SeqId4"));
- StorageMapBean tmp = mgr.retrieve("Key4");
+ mgr.insert(new InvokerBean("Key4", 1004, "SeqId4"));
+ InvokerBean tmp = mgr.retrieve("Key4");
assertTrue(tmp.getKey().equals("Key4"));
}
public void testRetrieve() {
assertNull(mgr.retrieve("Key5"));
- mgr.insert(new StorageMapBean("Key5", 1004, "SeqId5"));
+ mgr.insert(new InvokerBean("Key5", 1004, "SeqId5"));
assertNotNull(mgr.retrieve("Key5"));
}
public void testUpdate() {
- StorageMapBean bean = new StorageMapBean("Key6", 1006, "SeqId6");
+ InvokerBean bean = new InvokerBean("Key6", 1006, "SeqId6");
mgr.insert(bean);
bean.setMsgNo(1007);
- StorageMapBean tmp = mgr.retrieve("Key6");
+ InvokerBean tmp = mgr.retrieve("Key6");
assertTrue(tmp.getMsgNo() == 1007);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org