jaliya 2005/05/13 23:52:31
Modified: sandesha/interop build.xml
sandesha/src/org/apache/sandesha IStorageManager.java
sandesha/src/org/apache/sandesha/client
ClientPropertyValidator.java
ClientStorageManager.java
sandesha/src/org/apache/sandesha/server Sender.java
ServerStorageManager.java
sandesha/src/org/apache/sandesha/storage/dao
ISandeshaDAO.java SandeshaDatabaseDAO.java
SandeshaQueueDAO.java
sandesha/test/org/apache/sandesha SimpleServerImpl.java
Log:
Committing some changes related to interop clients
Revision Changes Path
1.7 +27 -5 ws-fx/sandesha/interop/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 13 May 2005 11:54:01 -0000 1.6
+++ build.xml 14 May 2005 06:52:30 -0000 1.7
@@ -85,6 +85,9 @@
<property name="build.junit.xml" value="${build.doc.xml}/junit"/>
<property name="build.junit.html" value="${build.doc.html}/junit"/>
+
+ <property environment="env1" />
+
<!--
for the time being following path id uses the libs in the sandesha
@@ -253,11 +256,23 @@
<exclude name="**/BouncyCastle.java" unless="bc.present"/>
</javac>
<!-- Copy Property files -->
+
<copy todir="${build.classes}">
- <fileset dir="${dir.src}">
+
+ <!--
+ <fileset dir="${dir.src}">
<include name="**/*.properties"/>
<exclude name="**/axis/**/*.properties"/>
</fileset>
+ -->
+
+ <fileset dir="${dir.config}">
+ <include name="sandesha.properties" />
+ <include name="log4j.properties" />
+ <include name="WSRMPolicy.xml" />
+ <include name="commons-logging.properties" />
+ </fileset>
+
</copy>
</target>
@@ -275,6 +290,7 @@
</ant-->
<copy todir="${build.interop}">
<fileset dir="${dir.interop}" includes="client-config.wsdd"/>
+ <fileset dir="${dir.config}"
includes="client-listener-config.wsdd"/>
<fileset dir="${dir.config}" includes="sandesha.properties"/>
</copy>
@@ -388,6 +404,7 @@
<property name="webxml" value="${dir.interop}/webapp/web.xml" />
<property name="dir.dist.war" value="${dir.dist}/war" />
<property name="sandesha.war"
value="${dir.dist.war}/${sandesha.war.name}" />
+ <property name="webapps" value="${env1.CATALINA_HOME}/webapps"
/>
<mkdir dir="${dir.dist.war}" />
</target>
@@ -395,7 +412,7 @@
<target name="create.war" depends="prepare-war" description="creates
the sandesha war">
<war destfile="${sandesha.war}" webxml="${webxml}">
- <fileset dir="${dir.interop}/jsp" />
+ <fileset dir="${dir.interop}/webapp/jsp" />
<classes dir="${build.interop}" />
<lib dir="${dir.libs}" />
<lib file="${sandesha.jar}" />
@@ -403,10 +420,15 @@
</target>
- <target name="clean.war" description="cleans the temporary files">
- <delete dir="${build.dir}" />
+ <target name="war.copy.clean" depends="war.copy" description="cleans
the temporary files">
+ <delete dir="${dir.dist}" />
+ <delete dir="${build.interop}" />
+ </target>
+
+ <target name="war.copy" depends="war" >
+ <copy file="${sandesha.war}" todir="${webapps}" />
</target>
- <target name="war" depends="create.war,clean.war" description="creates
the war file" />
+ <target name="war" depends="create.war" description="creates the war
file" />
</project>
1.22 +2 -0
ws-fx/sandesha/src/org/apache/sandesha/IStorageManager.java
Index: IStorageManager.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/IStorageManager.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- IStorageManager.java 8 May 2005 19:10:51 -0000 1.21
+++ IStorageManager.java 14 May 2005 06:52:31 -0000 1.22
@@ -170,4 +170,6 @@
void addOffer(String msgID, String offerID);
String getOffer(String msgID);
+
+ void clearStorage();
}
\ No newline at end of file
1.21 +1 -2
ws-fx/sandesha/src/org/apache/sandesha/client/ClientPropertyValidator.java
Index: ClientPropertyValidator.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/client/ClientPropertyValidator.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ClientPropertyValidator.java 13 May 2005 11:54:01 -0000 1.20
+++ ClientPropertyValidator.java 14 May 2005 06:52:31 -0000 1.21
@@ -30,7 +30,6 @@
* @author Jaliya
*/
public class ClientPropertyValidator {
- private static long messageNumber=0;
public static RMMessageContext validate(Call call) throws AxisFault {
@@ -170,7 +169,7 @@
long msgNumber = 0;
if (temp != null)
msgNumber = ((Long) temp).longValue();
- return messageNumber++;
+ return msgNumber;
}
private static boolean getLastMessage(Call call) {
1.34 +4 -0
ws-fx/sandesha/src/org/apache/sandesha/client/ClientStorageManager.java
Index: ClientStorageManager.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/client/ClientStorageManager.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ClientStorageManager.java 11 May 2005 13:04:26 -0000 1.33
+++ ClientStorageManager.java 14 May 2005 06:52:31 -0000 1.34
@@ -399,6 +399,10 @@
if (callBack != null)
callBack.onOutgoingMessage(cbData);
}
+
+ public void clearStorage(){
+ accessor.clear();
+ }
}
\ No newline at end of file
1.38 +26 -1 ws-fx/sandesha/src/org/apache/sandesha/server/Sender.java
Index: Sender.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/Sender.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Sender.java 7 May 2005 08:14:44 -0000 1.37
+++ Sender.java 14 May 2005 06:52:31 -0000 1.38
@@ -33,9 +33,13 @@
import org.apache.sandesha.IStorageManager;
import org.apache.sandesha.RMMessageContext;
import org.apache.sandesha.server.msgprocessors.IRMMessageProcessor;
+import org.apache.sandesha.storage.Callback;
+import org.apache.sandesha.storage.CallbackData;
import org.apache.sandesha.util.PolicyLoader;
import org.apache.sandesha.ws.rm.RMHeaders;
+import sun.util.calendar.CalendarDate;
+
import javax.xml.rpc.ServiceException;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
@@ -48,10 +52,19 @@
private static final Log log = LogFactory.getLog(Sender.class.getName());
public static final UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
-
+ public static Callback callback;
public boolean running = true;
private IStorageManager storageManager;
+
+ public static synchronized Callback getCallback() {
+ return callback;
+ }
+
+ public static synchronized void setCallback(Callback cb) {
+ callback = cb;
+ }
+
private SimpleChain requestChain = null;
private SimpleChain responseChain = null;
@@ -331,6 +344,9 @@
}
private void processResponseMessage(Call call, RMMessageContext
rmMessageContext) throws Exception {
+
+
+
if (call.getResponseMessage() != null) {
RMHeaders rmHeaders = new RMHeaders();
rmHeaders.fromSOAPEnvelope(call.getResponseMessage().getSOAPEnvelope());
@@ -342,6 +358,15 @@
.getMessageProcessor(rmMessageContext, storageManager);
messagePrcessor.processMessage(rmMessageContext);
}
+
+ if(getCallback()!=null){
+ CallbackData data = new CallbackData ();
+ data.setMessageId(rmMessageContext.getMessageID());
+ data.setMessageType(rmMessageContext.getMessageType());
+ data.setSequenceId(rmMessageContext.getSequenceID());
+ callback.onIncomingMessage(data);
+ }
+
}
}
\ No newline at end of file
1.30 +4 -0
ws-fx/sandesha/src/org/apache/sandesha/server/ServerStorageManager.java
Index: ServerStorageManager.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/ServerStorageManager.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ServerStorageManager.java 11 May 2005 13:04:26 -0000 1.29
+++ ServerStorageManager.java 14 May 2005 06:52:31 -0000 1.30
@@ -422,6 +422,10 @@
public String getOffer(String msgID) {
return null; //To change body of implemented methods use File |
Settings | File Templates.
}
+
+ public void clearStorage(){
+ accessor.clear();
+ }
}
\ No newline at end of file
1.11 +2 -0
ws-fx/sandesha/src/org/apache/sandesha/storage/dao/ISandeshaDAO.java
Index: ISandeshaDAO.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/storage/dao/ISandeshaDAO.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ISandeshaDAO.java 7 May 2005 08:14:44 -0000 1.10
+++ ISandeshaDAO.java 14 May 2005 06:52:31 -0000 1.11
@@ -130,4 +130,6 @@
void addOffer(String msgID, String offerID);
public String getOffer(String msgID);
+
+ void clear();
}
\ No newline at end of file
1.12 +4 -0
ws-fx/sandesha/src/org/apache/sandesha/storage/dao/SandeshaDatabaseDAO.java
Index: SandeshaDatabaseDAO.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/storage/dao/SandeshaDatabaseDAO.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SandeshaDatabaseDAO.java 11 May 2005 13:04:27 -0000 1.11
+++ SandeshaDatabaseDAO.java 14 May 2005 06:52:31 -0000 1.12
@@ -456,4 +456,8 @@
return false; //To change body of implemented methods use File |
Settings | File Templates.
}
+ public void clear(){
+
+ }
+
}
\ No newline at end of file
1.13 +4 -0
ws-fx/sandesha/src/org/apache/sandesha/storage/dao/SandeshaQueueDAO.java
Index: SandeshaQueueDAO.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/src/org/apache/sandesha/storage/dao/SandeshaQueueDAO.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SandeshaQueueDAO.java 11 May 2005 13:04:27 -0000 1.12
+++ SandeshaQueueDAO.java 14 May 2005 06:52:31 -0000 1.13
@@ -506,5 +506,9 @@
return sq.getOffer(msgID);
}
+ public void clear(){
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
+ sq.clear(true);
+ }
}
1.6 +2 -1
ws-fx/sandesha/test/org/apache/sandesha/SimpleServerImpl.java
Index: SimpleServerImpl.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/test/org/apache/sandesha/SimpleServerImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleServerImpl.java 13 May 2005 11:54:01 -0000 1.5
+++ SimpleServerImpl.java 14 May 2005 06:52:31 -0000 1.6
@@ -11,7 +11,8 @@
try {
SimpleAxisServer sas = new SimpleAxisServer();
- sas.setServerSocket(new
ServerSocket(PropertyLoader.getSimpleAxisServerPort()));
+ //sas.setServerSocket(new
ServerSocket(PropertyLoader.getSimpleAxisServerPort()));
+ sas.setServerSocket(new ServerSocket(7070));
Thread serverThread = new Thread(sas);
serverThread.start();
} catch (Exception e) {
