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 ja...@apache.org on 2005/07/08 13:51:45 UTC
cvs commit: ws-sandesha/test-resources server-config.wsdd
jaliya 2005/07/08 04:51:45
Modified: samples build.xml
src/org/apache/sandesha/client ClientStorageManager.java
src/org/apache/sandesha/server ServerStorageManager.java
test/org/apache/sandesha SimpleServerImpl.java
test-resources server-config.wsdd
Log:
few small changes
Revision Changes Path
1.6 +13 -4 ws-sandesha/samples/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-sandesha/samples/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 8 Jul 2005 08:45:27 -0000 1.5
+++ build.xml 8 Jul 2005 11:51:44 -0000 1.6
@@ -47,7 +47,7 @@
<target name="set.jar.at.root" depends="check.jar" unless="sandesha.jar.found1">
<echo message="Cannot find the Sandesha-1.0-RC1.jar."/>
<fail message="If you are using the source distribution, please build the source using maven before running the samples."/>
- </target>
+ </target>
<target name="check.target.dir" depends="check.jar" unless="target.directory.found">
<mkdir dir="../target"/>
@@ -61,6 +61,8 @@
<property name="dir.target" value="../target"/>
<property name="jar.name" value="Sandesha-1.0-RC1.jar"/>
+ <mkdir dir="classes"/>
+
<path id="classpath.libraries" description="3rd party libs">
<fileset dir="${dir.libs}">
<include name="**/*.jar"/>
@@ -71,7 +73,13 @@
<fileset dir="${dir.target}">
<include name="${jar.name}"/>
</fileset>
- </path>
+ <pathelement location="classes"/>
+
+ </path>
+
+ <javac srcdir="." destdir="classes" debug="on">
+ <classpath refid="classpath.libraries"/>
+ </javac>
</target>
@@ -99,6 +107,7 @@
<arg value="localhost"/>
<arg value="9090"/>
<classpath refid="classpath.libraries"/>
+
</java>
</target>
@@ -106,7 +115,7 @@
<!-- =================================================================== -->
<!-- Launches the functional test HTTP server -->
<!-- =================================================================== -->
- <target name="run_server" depends="init" >
+ <target name="run_server" depends="init">
<echo message="Starting test http server."/>
<java classname="org.apache.axis.transport.http.SimpleAxisServer" spawn="true" fork="yes">
<arg line="-p 8080"/> <!-- arbitrary port -->
@@ -139,7 +148,7 @@
</java>
</target>
- <target name="shutdown_server" depends="init" >
+ <target name="shutdown_server" depends="init">
<echo message="ShutDown the server "/>
<java classname="org.apache.axis.client.AdminClient" fork="yes" spawn="true">
<classpath refid="classpath.libraries"/>
1.48 +0 -6 ws-sandesha/src/org/apache/sandesha/client/ClientStorageManager.java
Index: ClientStorageManager.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/client/ClientStorageManager.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ClientStorageManager.java 7 Jul 2005 13:09:26 -0000 1.47
+++ ClientStorageManager.java 8 Jul 2005 11:51:44 -0000 1.48
@@ -186,16 +186,10 @@
* proper sequenceID
*/
public boolean setApprovedOutSequence(String oldSeqId, String newSeqId) {
-
- boolean done = false;
- // String oldOutsequenceId = accessor.getFirstCreateSequenceMsgId(createSeqId);
-
if (oldSeqId == null) {
return false;
}
-
String sequenceID = accessor.getSequenceOfOutSequence(oldSeqId);
-
if (null == sequenceID) {
log.error(Constants.ErrorMessages.SET_APPROVED_OUT_SEQ);
return false;
1.39 +14 -12 ws-sandesha/src/org/apache/sandesha/server/ServerStorageManager.java
Index: ServerStorageManager.java
===================================================================
RCS file: /home/cvs/ws-sandesha/src/org/apache/sandesha/server/ServerStorageManager.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ServerStorageManager.java 7 Jul 2005 13:09:26 -0000 1.38
+++ ServerStorageManager.java 8 Jul 2005 11:51:44 -0000 1.39
@@ -66,7 +66,7 @@
* same sequence id. But if that doesnt hv processable messages it will go for
* a new sequence.
*/
- public RMMessageContext getNextMessageToProcess(Object seq) {
+ public RMMessageContext getNextMessageToProcess(Object seq) {
if (seq == null)
return null;
@@ -76,11 +76,12 @@
}
public void setAcknowledged(String seqID, long msgNumber) {
- accessor.markOutgoingMessageToDelete(seqID, new Long(msgNumber));
+ accessor.markOutgoingMessageToDelete(seqID, new Long(msgNumber));
}
public void init() {
- }
+ }
+
/**
* Used to find out weather the sequence with this id has already been
* created.
@@ -90,11 +91,11 @@
}
public boolean isResponseSequenceExist(String sequenceID) {
- return accessor.isOutgoingSequenceExists(sequenceID);
+ return accessor.isOutgoingSequenceExists(sequenceID);
}
public Object getNextSeqToProcess() {
- return accessor.getRandomSeqToProcess();
+ return accessor.getRandomSeqToProcess();
}
@@ -175,7 +176,7 @@
addPriorityMessage(rmMessageContext);
}
- public void addAcknowledgement(RMMessageContext rmMessageContext) {
+ public void addAcknowledgement(RMMessageContext rmMessageContext) {
String sequenceID = rmMessageContext.getSequenceID();
if (sequenceID != null)
accessor.removeAllAcks(sequenceID);
@@ -187,7 +188,7 @@
accessor.addPriorityMessage(msg);
}
- public void setTemporaryOutSequence(String sequenceId, String outSequenceId) {
+ public void setTemporaryOutSequence(String sequenceId, String outSequenceId) {
accessor.setOutSequence(sequenceId, outSequenceId);
accessor.setOutSequenceApproved(sequenceId, false);
}
@@ -247,10 +248,10 @@
}
public RMMessageContext checkForResponseMessage(String sequenceId, String requestMsgId) {
- return null;
+ return null;
}
- public void insertTerminateSeqMessage(RMMessageContext terminateSeqMessage) {
+ public void insertTerminateSeqMessage(RMMessageContext terminateSeqMessage) {
accessor.addLowPriorityMessage(terminateSeqMessage);
}
@@ -259,16 +260,17 @@
}
- public void insertFault(RMMessageContext rmMsgCtx) { }
+ public void insertFault(RMMessageContext rmMsgCtx) {
+ }
public void addSendMsgNo(String seqId, long msgNo) {
accessor.addSendMsgNo(accessor.getSequenceOfOutSequence(seqId), msgNo);
- }
+ }
public boolean isSentMsg(String seqId, long msgNo) {
return accessor.isSentMsg(accessor.getSequenceOfOutSequence(seqId), msgNo);
- }
+ }
public void addOutgoingSequence(String sequenceId) {
1.8 +16 -0 ws-sandesha/test/org/apache/sandesha/SimpleServerImpl.java
Index: SimpleServerImpl.java
===================================================================
RCS file: /home/cvs/ws-sandesha/test/org/apache/sandesha/SimpleServerImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SimpleServerImpl.java 16 May 2005 13:09:18 -0000 1.7
+++ SimpleServerImpl.java 8 Jul 2005 11:51:45 -0000 1.8
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.sandesha;
import org.apache.axis.transport.http.SimpleAxisServer;
1.4 +0 -11 ws-sandesha/test-resources/server-config.wsdd
Index: server-config.wsdd
===================================================================
RCS file: /home/cvs/ws-sandesha/test-resources/server-config.wsdd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- server-config.wsdd 10 Jun 2005 11:46:37 -0000 1.3
+++ server-config.wsdd 8 Jul 2005 11:51:45 -0000 1.4
@@ -30,17 +30,6 @@
<parameter name="allowedMethods" value="getVersion"/>
<parameter name="className" value="org.apache.axis.Version"/>
</service>
-
- <service name="RMInteropService" provider="Handler">
- <requestFlow>
- <handler type="java:org.apache.sandesha.ws.rm.handlers.RMServerRequestHandler"/>
- <handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
- </requestFlow>
- <parameter name="allowedMethods" value="*"/>
- <parameter name="scope" value="request"/>
- <parameter name="className" value="org.apache.sandesha.interop.RMInteropService"/>
- <parameter name="handlerClass" value="org.apache.sandesha.ws.rm.providers.RMProvider"/>
- </service>
<service name="RMService" provider="Handler">
<requestFlow>
<handler type="java:org.apache.sandesha.ws.rm.handlers.RMServerRequestHandler"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org