Author: chamikara
Date: Sat Mar 18 07:17:49 2006
New Revision: 386855

URL: http://svn.apache.org/viewcvs?rev=386855&view=rev
Log:
changed clients to read toEPR from a property file.

Added:
    webservices/sandesha/trunk/interop/conf/
    webservices/sandesha/trunk/interop/conf/sandesha2_interop.properties
Modified:
    
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_1.java
    
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_2.java
    
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_3.java
    
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_4.java
    
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_1.java
    
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_2.java
    
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_3.java

Added: webservices/sandesha/trunk/interop/conf/sandesha2_interop.properties
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/conf/sandesha2_interop.properties?rev=386855&view=auto
==============================================================================
--- webservices/sandesha/trunk/interop/conf/sandesha2_interop.properties (added)
+++ webservices/sandesha/trunk/interop/conf/sandesha2_interop.properties Sat 
Mar 18 07:17:49 2006
@@ -0,0 +1,2 @@
+to=http://localhost:8080/axis2/services/RMInteropService
+transportTo=http://localhost:8070/axis2/services/RMInteropService
\ No newline at end of file

Modified: 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_1.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_1.java?rev=386855&r1=386854&r2=386855&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_1.java
 (original)
+++ 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_1.java
 Sat Mar 18 07:17:49 2006
@@ -17,6 +17,9 @@
 package org.apache.sandesha2.wsrm_2006_02;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
 
 import javax.xml.namespace.QName;
 
@@ -45,19 +48,19 @@
        private static final String Ping = "Ping";
        private static final String Text = "Text";
        
-       private String toIP = "127.0.0.1";
-       private String toPort = "8080";
-       private String transportToIP = "127.0.0.1";
-       private String transportToPort = "8070";
-       private String servicePart = "/axis2/services/RMInteropService";
-       private String toEPR = "http://"; + toIP +  ":" + toPort + servicePart;
-       private String transportToEPR = "http://"; + transportToIP +  ":" + 
transportToPort + servicePart;
+       private static String toIP = "127.0.0.1";
+       private static String toPort = "9762";
+       private static String transportToIP = "127.0.0.1";
+       private static String transportToPort = "8070";
+       private static String servicePart = "/axis2/services/RMInteropService";
+       private static String toEPR = "http://"; + toIP +  ":" + toPort + 
servicePart;
+       private static String transportToEPR = "http://"; + transportToIP +  ":" 
+ transportToPort + servicePart;
        
        private static String SANDESHA2_HOME = "<SANDESHA2_HOME>"; //Change 
this to ur path.
        
        private static String AXIS2_CLIENT_PATH = SANDESHA2_HOME + 
File.separator + "target" + File.separator +"repos" + File.separator + "client" 
+ File.separator;   //this will be available after a maven build
        
-       public static void main(String[] args) throws AxisFault {
+       public static void main(String[] args) throws AxisFault,IOException  {
                
                String axisClientRepo = null;
                if (args!=null && args.length>0)
@@ -68,6 +71,16 @@
                        SANDESHA2_HOME = "";
                }
                
+               InputStream in = 
Thread.currentThread().getContextClassLoader().getResourceAsStream("sandesha2_interop.properties");
+
+               Properties properties = new Properties();
+               if (in != null) {
+                       properties.load(in);
+               }
+               
+               toEPR = properties.getProperty("to");
+               transportToEPR = properties.getProperty("transportTo");
+
                new Scenario_1_1 ().run();
        }
        

Modified: 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_2.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_2.java?rev=386855&r1=386854&r2=386855&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_2.java
 (original)
+++ 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_2.java
 Sat Mar 18 07:17:49 2006
@@ -17,6 +17,9 @@
 package org.apache.sandesha2.wsrm_2006_02;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
 
 import javax.xml.namespace.QName;
 
@@ -46,19 +49,19 @@
        private static final String Ping = "Ping";
        private static final String Text = "Text";
        
-       private String toIP = "127.0.0.1";
-       private String toPort = "8080";
-       private String transportToIP = "127.0.0.1";
-       private String transportToPort = "8070";
-       private String servicePart = "/axis2/services/RMInteropService";
-       private String toEPR = "http://"; + toIP +  ":" + toPort + servicePart;
-       private String transportToEPR = "http://"; + transportToIP +  ":" + 
transportToPort + servicePart;
+       private static String toIP = "127.0.0.1";
+       private static String toPort = "9762";
+       private static String transportToIP = "127.0.0.1";
+       private static String transportToPort = "8070";
+       private static String servicePart = "/axis2/services/RMInteropService";
+       private static String toEPR = "http://"; + toIP +  ":" + toPort + 
servicePart;
+       private static String transportToEPR = "http://"; + transportToIP +  ":" 
+ transportToPort + servicePart;
        
        private static String SANDESHA2_HOME = "<SANDESHA2_HOME>"; //Change 
this to ur path.
        
        private static String AXIS2_CLIENT_PATH = SANDESHA2_HOME + 
File.separator + "target" + File.separator +"repos" + File.separator + "client" 
+ File.separator;   //this will be available after a maven build
        
-       public static void main(String[] args) throws AxisFault {
+       public static void main(String[] args) throws AxisFault,IOException {
                
                String axisClientRepo = null;
                if (args!=null && args.length>0)
@@ -69,6 +72,15 @@
                        SANDESHA2_HOME = "";
                }
 
+               InputStream in = 
Thread.currentThread().getContextClassLoader().getResourceAsStream("sandesha2_interop.properties");
+
+               Properties properties = new Properties();
+               if (in != null) {
+                       properties.load(in);
+               }
+               
+               toEPR = properties.getProperty("to");
+               transportToEPR = properties.getProperty("transportTo");
                
                new Scenario_1_2 ().run();
        }

Modified: 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_3.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_3.java?rev=386855&r1=386854&r2=386855&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_3.java
 (original)
+++ 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_3.java
 Sat Mar 18 07:17:49 2006
@@ -17,6 +17,9 @@
 package org.apache.sandesha2.wsrm_2006_02;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
 
 import javax.xml.namespace.QName;
 
@@ -46,19 +49,19 @@
        private static final String Ping = "Ping";
        private static final String Text = "Text";
        
-       private String toIP = "127.0.0.1";
-       private String toPort = "8080";
-       private String transportToIP = "127.0.0.1";
-       private String transportToPort = "8070";
-       private String servicePart = "/axis2/services/RMInteropService";
-       private String toEPR = "http://"; + toIP +  ":" + toPort + servicePart;
-       private String transportToEPR = "http://"; + transportToIP +  ":" + 
transportToPort + servicePart;
+       private static String toIP = "127.0.0.1";
+       private static String toPort = "9762";
+       private static String transportToIP = "127.0.0.1";
+       private static String transportToPort = "8070";
+       private static String servicePart = "/axis2/services/RMInteropService";
+       private static String toEPR = "http://"; + toIP +  ":" + toPort + 
servicePart;
+       private static String transportToEPR = "http://"; + transportToIP +  ":" 
+ transportToPort + servicePart;
        
        private static String SANDESHA2_HOME = "<SANDESHA2_HOME>"; //Change 
this to ur path.
        
        private static String AXIS2_CLIENT_PATH = SANDESHA2_HOME + 
File.separator + "target" + File.separator +"repos" + File.separator + "client" 
+ File.separator;   //this will be available after a maven build
        
-       public static void main(String[] args) throws AxisFault {
+       public static void main(String[] args) throws AxisFault,IOException {
                
                String axisClientRepo = null;
                if (args!=null && args.length>0)
@@ -68,6 +71,16 @@
                        AXIS2_CLIENT_PATH = axisClientRepo;
                        SANDESHA2_HOME = "";
                }
+               
+               InputStream in = 
Thread.currentThread().getContextClassLoader().getResourceAsStream("sandesha2_interop.properties");
+
+               Properties properties = new Properties();
+               if (in != null) {
+                       properties.load(in);
+               }
+               
+               toEPR = properties.getProperty("to");
+               transportToEPR = properties.getProperty("transportTo");
                
                new Scenario_1_3 ().run();
        }

Modified: 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_4.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_4.java?rev=386855&r1=386854&r2=386855&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_4.java
 (original)
+++ 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_1_4.java
 Sat Mar 18 07:17:49 2006
@@ -17,6 +17,9 @@
 package org.apache.sandesha2.wsrm_2006_02;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
 
 import javax.xml.namespace.QName;
 
@@ -48,13 +51,13 @@
 
        private static final String Text = "Text";
 
-       private String toIP = "127.0.0.1";
-       private String toPort = "8080";
-       private String transportToIP = "127.0.0.1";
-       private String transportToPort = "8070";
-       private String servicePart = "/axis2/services/RMInteropService";
-       private String toEPR = "http://"; + toIP +  ":" + toPort + servicePart;
-       private String transportToEPR = "http://"; + transportToIP +  ":" + 
transportToPort + servicePart;
+       private static String toIP = "127.0.0.1";
+       private static String toPort = "9762";
+       private static String transportToIP = "127.0.0.1";
+       private static String transportToPort = "8070";
+       private static String servicePart = "/axis2/services/RMInteropService";
+       private static String toEPR = "http://"; + toIP +  ":" + toPort + 
servicePart;
+       private static String transportToEPR = "http://"; + transportToIP +  ":" 
+ transportToPort + servicePart;
        
        private static String SANDESHA2_HOME = "<SANDESHA2_HOME>"; // Change
                                                                                
                                                                                
                                                        // this
@@ -66,7 +69,7 @@
                        + "target" + File.separator + "repos" + File.separator 
+ "client"
                        + File.separator; // this will be available after a 
maven build
 
-       public static void main(String[] args) throws AxisFault {
+       public static void main(String[] args) throws AxisFault,IOException {
 
                String axisClientRepo = null;
                if (args != null && args.length > 0)
@@ -77,6 +80,16 @@
                        SANDESHA2_HOME = "";
                }
 
+               InputStream in = 
Thread.currentThread().getContextClassLoader().getResourceAsStream("sandesha2_interop.properties");
+
+               Properties properties = new Properties();
+               if (in != null) {
+                       properties.load(in);
+               }
+               
+               toEPR = properties.getProperty("to");
+               transportToEPR = properties.getProperty("transportTo");
+               
                new Scenario_1_4().run();
        }
 

Modified: 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_1.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_1.java?rev=386855&r1=386854&r2=386855&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_1.java
 (original)
+++ 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_1.java
 Sat Mar 18 07:17:49 2006
@@ -17,6 +17,9 @@
 package org.apache.sandesha2.wsrm_2006_02;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
 
 import javax.xml.namespace.QName;
 
@@ -51,19 +54,19 @@
        private final static String echoStringResponse = "echoStringResponse";
        private final static String EchoStringReturn = "EchoStringReturn";
        
-       private String toIP = "127.0.0.1";
-       private String toPort = "8080";
-       private String transportToIP = "127.0.0.1";
-       private String transportToPort = "8070";
-       private String servicePart = "/axis2/services/RMInteropService";
-       private String toEPR = "http://"; + toIP +  ":" + toPort + servicePart;
-       private String transportToEPR = "http://"; + transportToIP +  ":" + 
transportToPort + servicePart;
+       private static String toIP = "127.0.0.1";
+       private static String toPort = "9762";
+       private static String transportToIP = "127.0.0.1";
+       private static String transportToPort = "8070";
+       private static String servicePart = "/axis2/services/RMInteropService";
+       private static String toEPR = "http://"; + toIP +  ":" + toPort + 
servicePart;
+       private static String transportToEPR = "http://"; + transportToIP +  ":" 
+ transportToPort + servicePart;
        
        private static String SANDESHA2_HOME = "<SANDESHA2_HOME>"; //Change 
this to ur path.
        
        private static String AXIS2_CLIENT_PATH = SANDESHA2_HOME + 
File.separator + "target" + File.separator +"repos" + File.separator + "client" 
+ File.separator;   //this will be available after a maven build
        
-       public static void main(String[] args) throws Exception {
+       public static void main(String[] args) throws Exception,IOException {
                
                
                String axisClientRepo = null;
@@ -74,6 +77,16 @@
                        AXIS2_CLIENT_PATH = axisClientRepo;
                        SANDESHA2_HOME = "";
                }
+               
+               InputStream in = 
Thread.currentThread().getContextClassLoader().getResourceAsStream("sandesha2_interop.properties");
+
+               Properties properties = new Properties();
+               if (in != null) {
+                       properties.load(in);
+               }
+               
+               toEPR = properties.getProperty("to");
+               transportToEPR = properties.getProperty("transportTo");
                
                new Scenario_2_1 ().run();
        }

Modified: 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_2.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_2.java?rev=386855&r1=386854&r2=386855&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_2.java
 (original)
+++ 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_2.java
 Sat Mar 18 07:17:49 2006
@@ -17,6 +17,9 @@
 package org.apache.sandesha2.wsrm_2006_02;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
 
 import javax.xml.namespace.QName;
 
@@ -50,19 +53,19 @@
        private final static String echoStringResponse = "echoStringResponse";
        private final static String EchoStringReturn = "EchoStringReturn";
        
-       private String toIP = "127.0.0.1";
-       private String toPort = "8080";
-       private String transportToIP = "127.0.0.1";
-       private String transportToPort = "8070";
-       private String servicePart = "/axis2/services/RMInteropService";
-       private String toEPR = "http://"; + toIP +  ":" + toPort + servicePart;
-       private String transportToEPR = "http://"; + transportToIP +  ":" + 
transportToPort + servicePart;
+       private static String toIP = "127.0.0.1";
+       private static String toPort = "9762";
+       private static String transportToIP = "127.0.0.1";
+       private static String transportToPort = "8070";
+       private static String servicePart = "/axis2/services/RMInteropService";
+       private static String toEPR = "http://"; + toIP +  ":" + toPort + 
servicePart;
+       private static String transportToEPR = "http://"; + transportToIP +  ":" 
+ transportToPort + servicePart;
        
        private static String SANDESHA2_HOME = "<SANDESHA2_HOME>"; //Change 
this to ur path.
        
        private static String AXIS2_CLIENT_PATH = SANDESHA2_HOME + 
File.separator + "target" + File.separator +"repos" + File.separator + "client" 
+ File.separator;   //this will be available after a maven build
        
-       public static void main(String[] args) throws Exception {
+       public static void main(String[] args) throws Exception,IOException {
                
                
                String axisClientRepo = null;
@@ -73,6 +76,16 @@
                        AXIS2_CLIENT_PATH = axisClientRepo;
                        SANDESHA2_HOME = "";
                }
+               
+               InputStream in = 
Thread.currentThread().getContextClassLoader().getResourceAsStream("sandesha2_interop.properties");
+
+               Properties properties = new Properties();
+               if (in != null) {
+                       properties.load(in);
+               }
+               
+               toEPR = properties.getProperty("to");
+               transportToEPR = properties.getProperty("transportTo");
                
                new Scenario_2_2 ().run();
        }

Modified: 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_3.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_3.java?rev=386855&r1=386854&r2=386855&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_3.java
 (original)
+++ 
webservices/sandesha/trunk/interop/src/org/apache/sandesha2/wsrm_2006_02/Scenario_2_3.java
 Sat Mar 18 07:17:49 2006
@@ -17,6 +17,9 @@
 package org.apache.sandesha2.wsrm_2006_02;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
 
 import javax.xml.namespace.QName;
 
@@ -50,19 +53,19 @@
        private final static String echoStringResponse = "echoStringResponse";
        private final static String EchoStringReturn = "EchoStringReturn";
        
-       private String toIP = "127.0.0.1";
-       private String toPort = "8080";
-       private String transportToIP = "127.0.0.1";
-       private String transportToPort = "8070";
-       private String servicePart = "/axis2/services/RMInteropService";
-       private String toEPR = "http://"; + toIP +  ":" + toPort + servicePart;
-       private String transportToEPR = "http://"; + transportToIP +  ":" + 
transportToPort + servicePart;
+       private static String toIP = "127.0.0.1";
+       private static String toPort = "9762";
+       private static String transportToIP = "127.0.0.1";
+       private static String transportToPort = "8070";
+       private static String servicePart = "/axis2/services/RMInteropService";
+       private static String toEPR = "http://"; + toIP +  ":" + toPort + 
servicePart;
+       private static String transportToEPR = "http://"; + transportToIP +  ":" 
+ transportToPort + servicePart;
        
        private static String SANDESHA2_HOME = "<SANDESHA2_HOME>"; //Change 
this to ur path.
        
        private static String AXIS2_CLIENT_PATH = SANDESHA2_HOME + 
File.separator + "target" + File.separator +"repos" + File.separator + "client" 
+ File.separator;   //this will be available after a maven build
        
-       public static void main(String[] args) throws Exception {
+       public static void main(String[] args) throws Exception,IOException {
                
                
                String axisClientRepo = null;
@@ -73,6 +76,16 @@
                        AXIS2_CLIENT_PATH = axisClientRepo;
                        SANDESHA2_HOME = "";
                }
+               
+               InputStream in = 
Thread.currentThread().getContextClassLoader().getResourceAsStream("sandesha2_interop.properties");
+
+               Properties properties = new Properties();
+               if (in != null) {
+                       properties.load(in);
+               }
+               
+               toEPR = properties.getProperty("to");
+               transportToEPR = properties.getProperty("transportTo");
                
                new Scenario_2_3 ().run();
        }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to