Changeset cfc4d68cb4e45963ff15d3552f527f4c420f6978

Timestamp:

01/12/12 19:41:47 (4 months ago)

Author:

Ted Faber <faber@…>

Children:

5bbad0849d0e3e3c2e87ee597cde5fe000a6f031

Parents:

40c599fc6b630e00fa88daf69d9d01825abe4573

git-committer:

Ted Faber <faber@isi.edu> / 2012-01-12T19:41:47Z-0800

Message:

Take url as a parameter for easier testing

Location:

axis

Files:

• Create.java (modified) (1 diff)
• MultiStatus.java (modified) (1 diff)
• Terminate.java (modified) (1 diff)
• build.xml (modified) (6 diffs)

axis/Create.java

@@ -164 +164 @@
 
         // Reloading the port clears cached SSL connections.
-        port = getPort("https://users.isi.deterlab.net:23235");
+        port = getPort(urlString);
 
         // This block creates an ABAC credential telling the fedd that the

axis/MultiStatus.java

@@ -17 +17 @@
             java.rmi.RemoteException {
         
-        FeddPortType port = getPort("https://users.isi.deterlab.net:23235");
+        String urlString = "https://users.isi.deterlab.net:23235";
+
+        if (args.length > 0) urlString = args[0];
+
+        FeddPortType port = getPort(urlString);
         MultiInfoRequestType req = new MultiInfoRequestType();
         MultiInfoResponseType resp = null;

axis/Terminate.java

@@ -15 +15 @@
             java.rmi.RemoteException {
 
-        boolean force = args.length > 1;
+        boolean force = args.length > 2;
+        String exptName = "test";
+        String urlString = "https://users.isi.deterlab.net:23235";
+
+        if (args.length > 0) exptName = args[0];
+        if (args.length > 1) urlString = args[1];
 
         // Get the port and construct the (simple) request.
-        FeddPortType port = getPort("https://users.isi.deterlab.net:23235");
+        FeddPortType port = getPort(urlString);
         TerminateRequestType req = new TerminateRequestType(
-                new IDType(null, null, null, args[0], null), 
+                new IDType(null, null, null, exptName, null), 
                 force);
         TerminateResponseType resp = null;

axis/build.xml

@@ -32 +32 @@
   <property name="fedd.jar" value="fedd-${version}.jar"/>
   <property name="experiment.name" value="${user.name}-test"/>
+  <property name="fedd.url" value="https://users.isi.deterlab.net:23235"/>
 
   <path id="compile.classpath">
@@ -228 +229 @@
         <pathelement path="${classes.dir}"/>
       </classpath>
+      <arg value="${fedd.url}"/>
     </java>
   </target>
@@ -240 +242 @@
       <arg file="${topology.file}"/>
       <arg file="${fedid.pem}"/>
+      <arg value="${fedd.url}"/>
     </java>
   </target>
@@ -251 +254 @@
       </classpath>
       <arg value="${experiment.name}"/>
+      <arg value="${fedd.url}"/>
     </java>
   </target>
@@ -261 +265 @@
       </classpath>
       <arg value="${experiment.name}"/>
+      <arg value="${fedd.url}"/>
       <arg value="force"/>
     </java>
@@ -282 +287 @@
       </classpath>
       <arg value="${experiment.name}"/>
+      <arg value="${fedd.url}"/>
     </java>
   </target>