[wsas-java-dev] svn commit r90 - in wsas/java/trunk/modules/samples/CommodityQuote: conf src/org/wso2/wsas/sample/commodityquote/client

[svn at wso2.com]

Author: saminda
Date: Fri Dec  1 11:51:08 2006
New Revision: 90

Modified:
   wsas/java/trunk/modules/samples/CommodityQuote/conf/default_epr.properties
   wsas/java/trunk/modules/samples/CommodityQuote/conf/default_epr_web.properties
   wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java
Log:
small fix 


Modified: wsas/java/trunk/modules/samples/CommodityQuote/conf/default_epr.properties
==============================================================================
--- wsas/java/trunk/modules/samples/CommodityQuote/conf/default_epr.properties	(original)
+++ wsas/java/trunk/modules/samples/CommodityQuote/conf/default_epr.properties	Fri Dec  1 11:51:08 2006
@@ -14,5 +14,8 @@
 # limitations under the License.
 #
 
-http.epr=http://127.0.0.1:9762/soap/CommodityQuote
-https.epr=https://127.0.0.1:9443/soap/CommodityQuote
\ No newline at end of file
+http.port=9762
+https.port=9443
+
+contextRoot=/
+servicePath=soap/CommodityQuote
\ No newline at end of file

Modified: wsas/java/trunk/modules/samples/CommodityQuote/conf/default_epr_web.properties
==============================================================================
--- wsas/java/trunk/modules/samples/CommodityQuote/conf/default_epr_web.properties	(original)
+++ wsas/java/trunk/modules/samples/CommodityQuote/conf/default_epr_web.properties	Fri Dec  1 11:51:08 2006
@@ -14,5 +14,8 @@
 # limitations under the License.
 #
 
-http.epr=http://127.0.0.1:9762/wso2wsas/soap/CommodityQuote
-https.epr=https://127.0.0.1:9443/wso2wsas/soap/CommodityQuote
\ No newline at end of file
+http.port=9762
+https.port=9443
+
+contextRoot=/wso2wsas
+servicePath=/soap/CommodityQuote
\ No newline at end of file

Modified: wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java
==============================================================================
--- wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java	(original)
+++ wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java	Fri Dec  1 11:51:08 2006
@@ -24,6 +24,7 @@
 import org.apache.ws.secpolicy.WSSPolicyException;
 import org.wso2.wsas.security.WSS4JUtil;
 import org.wso2.www.types.client.*;
+import org.wso2.wsf.common.util.NetworkUtils;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
@@ -387,7 +388,17 @@
 
         String serviceEPR = getParam(PARAM_ENDPOINT, args);
         if (serviceEPR == null) {
-            serviceEPR = props.getProperty("https.epr");
+
+            StringBuffer httpStringBuffer = new StringBuffer();
+
+            httpStringBuffer.append("https://");
+            httpStringBuffer.append(NetworkUtils.getLocalHostname());
+            httpStringBuffer.append(":");
+            httpStringBuffer.append(props.getProperty("http.port"));
+            httpStringBuffer.append(props.getProperty("contextRoot"));
+            httpStringBuffer.append(props.getProperty("servicePath"));
+
+            serviceEPR = httpStringBuffer.toString();
         }
 
         int scenario;
@@ -546,13 +557,24 @@
         serviceEPR = getParam(PARAM_ENDPOINT, args);
         Properties props = new Properties();
 
+        StringBuffer httpStringBuffer = new StringBuffer();
+
         try {
             String defEPRProperties = wso2wsasHome + File.separator + "samples" +
                                       File.separator + "CommodityQuote" + File.separator +
                                       "conf" + File.separator + "default_epr.properties";
             props.load(new FileInputStream(defEPRProperties));
             if (serviceEPR == null) {
-                serviceEPR = props.getProperty("http.epr");
+                httpStringBuffer.append("http://");
+                httpStringBuffer.append(NetworkUtils.getLocalHostname());
+                httpStringBuffer.append(":");
+                httpStringBuffer.append(props.getProperty("http.port"));
+                httpStringBuffer.append(props.getProperty("contextRoot"));
+                httpStringBuffer.append(props.getProperty("servicePath"));
+                serviceEPR = httpStringBuffer.toString();
+
+                System.out.println("servie epr  :  " + serviceEPR);
+
             }
         } catch (IOException e) {
             System.err.println(