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/03/02 04:16:31 UTC
cvs commit: ws-fx/sandesha/src/org/apache/sandesha/ws/rm/handlers RMServerRequestHandler.java
jaliya 2005/03/01 19:16:31
Modified: sandesha/config sandesha.properties server-config.wsdd
sandesha/interop DeployClient.bat DeployService.bat
RunSimpleAxisServer.bat
sandesha/interop/org/apache/sandesha/samples/interop
AsyncPingClient.java EchoClient.java
SyncPingClient.java
sandesha maven.xml project.xml
sandesha/src/org/apache/sandesha EnvelopeCreator.java
RMInitiator.java
sandesha/src/org/apache/sandesha/client RMSender.java
sandesha/src/org/apache/sandesha/server/msgprocessors
CompositeProcessor.java
sandesha/src/org/apache/sandesha/storage/queue
OutgoingSequence.java SandeshaQueue.java
sandesha/src/org/apache/sandesha/util PropertyLoader.java
RMMessageCreator.java
sandesha/src/org/apache/sandesha/ws/rm/handlers
RMServerRequestHandler.java
Removed: sandesha build.xml
Log:
Updates for the interop samples
Revision Changes Path
1.2 +2 -2 ws-fx/sandesha/config/sandesha.properties
Index: sandesha.properties
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/config/sandesha.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sandesha.properties 28 Feb 2005 10:17:32 -0000 1.1
+++ sandesha.properties 2 Mar 2005 03:16:30 -0000 1.2
@@ -1,2 +1,2 @@
-CLIENT_LISTENER_PORT = 8080
-SIMPLE_AXIS_SERVER_PORT = 9090
+CLIENT_LISTENER_PORT = 9090
+SIMPLE_AXIS_SERVER_PORT = 8080
1.2 +57 -16 ws-fx/sandesha/config/server-config.wsdd
Index: server-config.wsdd
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/config/server-config.wsdd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- server-config.wsdd 28 Feb 2005 15:14:16 -0000 1.1
+++ server-config.wsdd 2 Mar 2005 03:16:30 -0000 1.2
@@ -1,16 +1,57 @@
-<deployment xmlns="http://xml.apache.org/axis/wsdd/"
- xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
-
- <service name="RMService" provider="Handler">
- <requestFlow>
- <handler type="java:org.apache.sandesha.ws.rm.handlers.RMServerRequestHandler"></handler>
- <handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"></handler>
- </requestFlow>
-
- <parameter name="handlerClass" value="org.apache.sandesha.ws.rm.providers.RMProvider"/>
- <parameter name="className" value="org.apache.sandesha.client.RMService"/>
- <parameter name="allowedMethods" value="*"/>
- <parameter name="scope" value="request"/>
- </service>
-
-</deployment>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
+ <globalConfiguration>
+ <parameter name="adminPassword" value="admin"/>
+ <parameter name="disablePrettyXML" value="true"/>
+ <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/>
+ <parameter name="sendXsiTypes" value="true"/>
+ <parameter name="sendMultiRefs" value="true"/>
+ <parameter name="sendXMLDeclaration" value="true"/>
+ <requestFlow>
+ <handler type="java:org.apache.axis.handlers.JWSHandler">
+ <parameter name="scope" value="session"/>
+ </handler>
+ <handler type="java:org.apache.axis.handlers.JWSHandler">
+ <parameter name="scope" value="request"/>
+ <parameter name="extension" value=".jwr"/>
+ </handler>
+ </requestFlow>
+ </globalConfiguration>
+ <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/>
+ <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
+ <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
+ <service name="AdminService" provider="java:MSG">
+ <parameter name="allowedMethods" value="AdminService"/>
+ <parameter name="enableRemoteAdmin" value="false"/>
+ <parameter name="className" value="org.apache.axis.utils.Admin"/>
+ <namespace>http://xml.apache.org/axis/wsdd/</namespace>
+ </service>
+ <service name="Version" provider="java:RPC">
+ <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.samples.interop.RMInteropService"/>
+ <parameter name="handlerClass" value="org.apache.sandesha.ws.rm.providers.RMProvider"/>
+ </service>
+ <transport name="http">
+ <requestFlow>
+ <handler type="URLMapper"/>
+ <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
+ </requestFlow>
+ <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/>
+ <parameter name="qs:wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/>
+ <parameter name="qs:method" value="org.apache.axis.transport.http.QSMethodHandler"/>
+ </transport>
+ <transport name="local">
+ <responseFlow>
+ <handler type="LocalResponder"/>
+ </responseFlow>
+ </transport>
+</deployment>
1.3 +6 -1 ws-fx/sandesha/interop/DeployClient.bat
Index: DeployClient.bat
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/DeployClient.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeployClient.bat 28 Feb 2005 15:33:37 -0000 1.2
+++ DeployClient.bat 2 Mar 2005 03:16:30 -0000 1.3
@@ -1,7 +1,12 @@
@echo off
set CLASSPATH=%CLASSPATH%;..\lib\axis-1.2-RC2.jar
-set CLASSPATH=%CLASSPATH%;..\lib\commons-logging-1.0.3.jar
+set CLASSPATH=%CLASSPATH%;..\lib\axis-ant-SNAPSHOT.jar
+set CLASSPATH=%CLASSPATH%;..\lib\axis-jaxrpc-1.2-RC2.jar
+set CLASSPATH=%CLASSPATH%;..\lib\axis-saaj-1.2-RC2.jar
set CLASSPATH=%CLASSPATH%;..\lib\commons-discovery-SNAPSHOT.jar
+set CLASSPATH=%CLASSPATH%;..\lib\commons-logging-1.0.3.jar
+set CLASSPATH=%CLASSPATH%;..\lib\junit-3.8.1.jar
+set CLASSPATH=%CLASSPATH%;..\lib\axis-wsdl4j-1.2-RC1.jar
set CLASSPATH=%CLASSPATH%;..\lib\xerces.jar
set CLASSPATH=%CLASSPATH%;..\target\classes
java org.apache.axis.utils.Admin client ClientDeploy.wsdd
1.3 +6 -1 ws-fx/sandesha/interop/DeployService.bat
Index: DeployService.bat
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/DeployService.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeployService.bat 28 Feb 2005 15:33:37 -0000 1.2
+++ DeployService.bat 2 Mar 2005 03:16:30 -0000 1.3
@@ -1,7 +1,12 @@
@echo off
set CLASSPATH=%CLASSPATH%;..\lib\axis-1.2-RC2.jar
-set CLASSPATH=%CLASSPATH%;..\lib\commons-logging-1.0.3.jar
+set CLASSPATH=%CLASSPATH%;..\lib\axis-ant-SNAPSHOT.jar
+set CLASSPATH=%CLASSPATH%;..\lib\axis-jaxrpc-1.2-RC2.jar
+set CLASSPATH=%CLASSPATH%;..\lib\axis-saaj-1.2-RC2.jar
set CLASSPATH=%CLASSPATH%;..\lib\commons-discovery-SNAPSHOT.jar
+set CLASSPATH=%CLASSPATH%;..\lib\commons-logging-1.0.3.jar
+set CLASSPATH=%CLASSPATH%;..\lib\junit-3.8.1.jar
+set CLASSPATH=%CLASSPATH%;..\lib\axis-wsdl4j-1.2-RC1.jar
set CLASSPATH=%CLASSPATH%;..\lib\xerces.jar
set CLASSPATH=%CLASSPATH%;..\target\classes
java org.apache.axis.client.AdminClient RMInteropServiceDeploy.wsdd
\ No newline at end of file
1.3 +2 -3 ws-fx/sandesha/interop/RunSimpleAxisServer.bat
Index: RunSimpleAxisServer.bat
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/RunSimpleAxisServer.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RunSimpleAxisServer.bat 28 Feb 2005 15:33:37 -0000 1.2
+++ RunSimpleAxisServer.bat 2 Mar 2005 03:16:30 -0000 1.3
@@ -1,14 +1,13 @@
@echo off
+set CLASSPATH=%CLASSPATH%;..\lib\addressing-SNAPSHOT.jar
set CLASSPATH=%CLASSPATH%;..\lib\axis-1.2-RC2.jar
-set CLASSPATH=%CLASSPATH%;..\lib\commons-logging-1.0.3.jar
-set CLASSPATH=%CLASSPATH%;..\lib\commons-discovery-SNAPSHOT.jar
set CLASSPATH=%CLASSPATH%;..\lib\axis-ant-SNAPSHOT.jar
set CLASSPATH=%CLASSPATH%;..\lib\axis-jaxrpc-1.2-RC2.jar
set CLASSPATH=%CLASSPATH%;..\lib\axis-saaj-1.2-RC2.jar
set CLASSPATH=%CLASSPATH%;..\lib\commons-discovery-SNAPSHOT.jar
set CLASSPATH=%CLASSPATH%;..\lib\commons-logging-1.0.3.jar
set CLASSPATH=%CLASSPATH%;..\lib\junit-3.8.1.jar
-set CLASSPATH=%CLASSPATH%;..\lib\wsdl4j-1.5-SNAPSHOT.jar
+set CLASSPATH=%CLASSPATH%;..\lib\axis-wsdl4j-1.2-RC1.jar
set CLASSPATH=%CLASSPATH%;..\lib\xerces.jar
set CLASSPATH=%CLASSPATH%;..\target\classes
1.3 +5 -4 ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/AsyncPingClient.java
Index: AsyncPingClient.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/AsyncPingClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AsyncPingClient.java 28 Feb 2005 15:33:37 -0000 1.2
+++ AsyncPingClient.java 2 Mar 2005 03:16:31 -0000 1.3
@@ -28,8 +28,9 @@
import javax.xml.rpc.ParameterMode;
public class AsyncPingClient {
-
- private static String targetURL = "http://127.0.0.1:9090/axis/services/RMInteropService?wsdl";
+ private static String defaultServerPort="8070";
+ private static String defaultClientPort="9070";
+ private static String targetURL = "http://127.0.0.1:"+defaultServerPort+"/axis/services/RMInteropService?wsdl";
public static void main(String[] args) {
System.out.println("Client started...... Asynchronous ");
@@ -44,8 +45,8 @@
call.setProperty("action", "sandesha:ping");
//These two are additional
- //call.setProperty("from","http://schemas.xmlsoap.org/ws/2003/03/addressing/role/anonymous");
- //call.setProperty("replyTo","http://10.10.0.4:8080/axis/services/MyService");
+ call.setProperty("from","http://127.0.0.1:"+defaultClientPort+"/axis/services/RMService");
+ //call.setProperty("replyTo","http://127.0.0.1:"+defaultClientPort+"/axis/services/RMService");
//http://schemas.xmlsoap.org/ws/2003/03/addressing/role/anonymous
call.setTargetEndpointAddress(targetURL);
1.3 +5 -3 ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/EchoClient.java
Index: EchoClient.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/EchoClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EchoClient.java 28 Feb 2005 15:33:37 -0000 1.2
+++ EchoClient.java 2 Mar 2005 03:16:31 -0000 1.3
@@ -29,7 +29,9 @@
public class EchoClient {
- private static String targetURL = "http://127.0.0.1:9090/axis/services/RMInteropService?wsdl";
+ private static String defaultServerPort = "8070";
+ private static String defaultClientPort = "9070";
+ private static String targetURL = "http://127.0.0.1:" + defaultServerPort + "/axis/services/RMInteropService?wsdl";
public static void main(String[] args) {
@@ -54,8 +56,8 @@
//These two are additional
//call.setProperty("from","http://schemas.xmlsoap.org/ws/2003/03/addressing/role/anonymous");
- call.setProperty("from","http://localhost:8080/axis/services/RMService");
- //call.setProperty("replyTo","http://10.10.0.4:8080/axis/services/MyService");
+ call.setProperty("from","http://127.0.0.1:"+defaultClientPort+"/axis/services/RMService");
+ call.setProperty("replyTo","http://127.0.0.1:"+defaultClientPort+"/axis/services/RMService");
call.setTargetEndpointAddress(targetURL);
call.setOperationName(new QName("RMInteropService", "echoString"));
1.3 +4 -2 ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/SyncPingClient.java
Index: SyncPingClient.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/SyncPingClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SyncPingClient.java 28 Feb 2005 15:33:37 -0000 1.2
+++ SyncPingClient.java 2 Mar 2005 03:16:31 -0000 1.3
@@ -1,4 +1,4 @@
- /*
+/*
* Copyright 1999-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -29,7 +29,9 @@
public class SyncPingClient {
- private static String targetURL = "http://127.0.0.1:9090/axis/services/RMInteropService?wsdl";
+ private static String defaultServerPort = "8070";
+
+ private static String targetURL = "http://127.0.0.1:" + defaultServerPort + "/axis/services/RMInteropService?wsdl";
public static void main(String[] args) {
System.out.println("Client started...... Synchronous ");
1.2 +3 -3 ws-fx/sandesha/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 28 Feb 2005 14:49:13 -0000 1.1
+++ maven.xml 2 Mar 2005 03:16:31 -0000 1.2
@@ -24,10 +24,10 @@
debug="${maven.compile.debug}"
optimize="${optimize}"
deprecation="${maven.compile.deprecation}">
- <ant:classpath>
+ <classpath>
<pathelement location="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
- </ant:classpath>
+ </classpath>
</ant:javac>
</goal>
1.2 +10 -0 ws-fx/sandesha/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 28 Feb 2005 14:49:13 -0000 1.1
+++ project.xml 2 Mar 2005 03:16:31 -0000 1.2
@@ -62,6 +62,15 @@
<!-- who the developers are for the project -->
<developers>
+
+ <developer>
+ <name>Sanjiva Weerawarana</name>
+ <id>sanjiva</id>
+ <email>sanjiva@opensource.lk</email>
+ <organization>
+ </organization>
+ </developer>
+
<developer>
<name>Davanum Srinivas</name>
<id>dims</id>
@@ -85,6 +94,7 @@
<organization>
</organization>
</developer>
+
</developers>
<licenses>
1.22 +1 -1 ws-fx/sandesha/src/org/apache/sandesha/EnvelopeCreator.java
Index: EnvelopeCreator.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/EnvelopeCreator.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- EnvelopeCreator.java 28 Feb 2005 14:49:12 -0000 1.21
+++ EnvelopeCreator.java 2 Mar 2005 03:16:31 -0000 1.22
@@ -115,7 +115,7 @@
outGoingAddressingHaders.setFrom(addressingHeaders.getFrom());
outGoingAddressingHaders.setTo(addressingHeaders.getTo());
if (message.getSync()) {
- outGoingAddressingHaders.setReplyTo(new ReplyTo(new Address(Constants.ANONYMOUS_URI)));
+ outGoingAddressingHaders.setReplyTo(new ReplyTo(new Address(org.apache.axis.message.addressing.Constants.NS_URI_ANONYMOUS)));
} else {
if (addressingHeaders.getReplyTo() != null)
outGoingAddressingHaders.setReplyTo(addressingHeaders
1.7 +6 -1 ws-fx/sandesha/src/org/apache/sandesha/RMInitiator.java
Index: RMInitiator.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/RMInitiator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RMInitiator.java 27 Feb 2005 18:17:20 -0000 1.6
+++ RMInitiator.java 2 Mar 2005 03:16:31 -0000 1.7
@@ -33,6 +33,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import java.io.File;
+import java.io.InputStream;
import java.net.ServerSocket;
/**
@@ -124,7 +125,11 @@
dbf.setNamespaceAware(true);
DocumentBuilder db = dbf.newDocumentBuilder();
- Document doc = db.parse(new File(Constants.CLIENT_LISTENER_CONFIG));
+
+ InputStream in=Thread.currentThread().getContextClassLoader().getResourceAsStream("client-listener-config.wsdd");
+
+ //Document doc = db.parse(new File(Constants.CLIENT_LISTENER_CONFIG));
+ Document doc = db.parse(in);
WSDDDocument wsdddoc = new WSDDDocument(doc);
WSDDDeployment wsdddep = wsdddoc.getDeployment();
sas.setMyConfig(wsdddep);
1.29 +15 -0 ws-fx/sandesha/src/org/apache/sandesha/client/RMSender.java
Index: RMSender.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/client/RMSender.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- RMSender.java 27 Feb 2005 18:17:20 -0000 1.28
+++ RMSender.java 2 Mar 2005 03:16:31 -0000 1.29
@@ -18,12 +18,16 @@
import org.apache.axis.AxisFault;
import org.apache.axis.MessageContext;
+import org.apache.axis.message.SOAPHeaderElement;
import org.apache.axis.handlers.BasicHandler;
import org.apache.sandesha.Constants;
import org.apache.sandesha.IStorageManager;
import org.apache.sandesha.RMMessageContext;
import org.apache.sandesha.util.RMMessageCreator;
+import java.util.Vector;
+import java.util.Iterator;
+
public class RMSender extends BasicHandler {
private IStorageManager storageManager;
@@ -55,6 +59,17 @@
responseMessageContext = checkTheQueueForResponse(sequenceID, requestMesssageContext.getMessageID());
Thread.sleep(Constants.CLIENT_RESPONSE_CHECKING_INTERVAL);
}
+ Vector headers=responseMessageContext.getMsgContext().getRequestMessage().getSOAPEnvelope().getHeaders();
+ Iterator ite=headers.iterator();
+
+ while(ite.hasNext()){
+ SOAPHeaderElement headerElement = (SOAPHeaderElement)ite.next();
+ headerElement.setMustUnderstand(false);
+ headerElement.setProcessed(true);
+ }
+
+ msgContext.setResponseMessage(responseMessageContext.getMsgContext()
+ .getRequestMessage());
} else {
boolean gotAck = false;
while (!gotAck) {
1.7 +1 -1 ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/CompositeProcessor.java
Index: CompositeProcessor.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/CompositeProcessor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CompositeProcessor.java 27 Feb 2005 18:17:20 -0000 1.6
+++ CompositeProcessor.java 2 Mar 2005 03:16:31 -0000 1.7
@@ -61,7 +61,7 @@
String messageId = relatesTo.getURI().toString();
seqId = storageManager.getOutgoingSeqOfMsg(messageId);
}
- if (!hasSequence) {
+ if (!hasSequence ) {
storageManager.addIncomingSequence(seqId);
}
if (storageManager.isMessageExist(seqId, messageNumber) != true) {
1.5 +6 -5 ws-fx/sandesha/src/org/apache/sandesha/storage/queue/OutgoingSequence.java
Index: OutgoingSequence.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/storage/queue/OutgoingSequence.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OutgoingSequence.java 28 Feb 2005 13:26:07 -0000 1.4
+++ OutgoingSequence.java 2 Mar 2005 03:16:31 -0000 1.5
@@ -235,13 +235,14 @@
public boolean hasMessageWithId(String msgId) {
Iterator it = hash.keySet().iterator();
+ boolean result=false;
while (it.hasNext()) {
-
- RMMessageContext msg = (RMMessageContext) hash.get(it.next());
- if (msg.getMessageID().equals(msgId))
- return true;
+ RMMessageContext msg = (RMMessageContext) hash.get(it.next());
+ if (msg.getMessageID().equals(msgId)){
+ result = true;
+ break; }
}
- return false;
+ return result;
}
public Vector getReceivedMsgNumbers() {
1.8 +1 -0 ws-fx/sandesha/src/org/apache/sandesha/storage/queue/SandeshaQueue.java
Index: SandeshaQueue.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/storage/queue/SandeshaQueue.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SandeshaQueue.java 25 Feb 2005 13:41:47 -0000 1.7
+++ SandeshaQueue.java 2 Mar 2005 03:16:31 -0000 1.8
@@ -231,6 +231,7 @@
throw new QueueException(Constants.Queue.SEQUENCE_ID_NULL);
synchronized (outgoingMap) {
+ System.out.println("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF "+sequenceId);
OutgoingSequence rsh = new OutgoingSequence(sequenceId);
outgoingMap.put(sequenceId, rsh);
}
1.4 +3 -2 ws-fx/sandesha/src/org/apache/sandesha/util/PropertyLoader.java
Index: PropertyLoader.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/util/PropertyLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PropertyLoader.java 28 Feb 2005 13:26:07 -0000 1.3
+++ PropertyLoader.java 2 Mar 2005 03:16:31 -0000 1.4
@@ -5,6 +5,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Properties;
/**
@@ -36,8 +37,8 @@
private static Properties loadProperties() {
Properties properties = new Properties();
try {
- System.out.println((new File(".")).getAbsolutePath());
- properties.load(new FileInputStream(Constants.PROPERTIES_CONFIG));
+ InputStream in=Thread.currentThread().getContextClassLoader().getResourceAsStream("sandesha.properties") ;
+ properties.load(in);
return properties;
} catch (IOException e) {
e.printStackTrace();
1.5 +2 -2 ws-fx/sandesha/src/org/apache/sandesha/util/RMMessageCreator.java
Index: RMMessageCreator.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/util/RMMessageCreator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RMMessageCreator.java 28 Feb 2005 13:26:07 -0000 1.4
+++ RMMessageCreator.java 2 Mar 2005 03:16:31 -0000 1.5
@@ -144,7 +144,7 @@
AddressingHeaders addrHeaders = new AddressingHeaders();
From from = null;
ReplyTo replyTo = null;
- String fromURL = rmMsgContext.getFrom();
+ //String fromURL = rmMsgContext.getFrom();
String replyToURL = rmMsgContext.getReplyTo();
//Need to use the anonymous_URI if the client is synchronous.
@@ -161,7 +161,7 @@
}
} else {
- from = new From(new Address(Constants.ANONYMOUS_URI));
+ from = new From(new Address(org.apache.axis.message.addressing.Constants.NS_URI_ANONYMOUS));
addrHeaders.setFrom(from);
if (rmMsgContext.isHasResponse()) {
replyTo = new ReplyTo(new Address(replyToURL));
1.14 +1 -0 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/handlers/RMServerRequestHandler.java
Index: RMServerRequestHandler.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/handlers/RMServerRequestHandler.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- RMServerRequestHandler.java 16 Feb 2005 04:21:21 -0000 1.13
+++ RMServerRequestHandler.java 2 Mar 2005 03:16:31 -0000 1.14
@@ -53,6 +53,7 @@
while (iterator.hasNext()) {
elements = (SOAPHeaderElement) iterator.next();
elements.setProcessed(true);
+
}
setPropertyToMessageContext(msgContext, Constants.ENV_RM_REQUEST_HEADERS);