Changeset cfc4d68


Ignore:
Timestamp:
Jan 12, 2012 7:41:47 PM (13 years ago)
Author:
Ted Faber <faber@…>
Branches:
compt_changes, info-ops, master
Children:
5bbad08
Parents:
40c599f
Message:

Take url as a parameter for easier testing

Location:
axis
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • axis/Create.java

    r40c599f rcfc4d68  
    164164
    165165        // Reloading the port clears cached SSL connections.
    166         port = getPort("https://users.isi.deterlab.net:23235");
     166        port = getPort(urlString);
    167167
    168168        // This block creates an ABAC credential telling the fedd that the

  • axis/MultiStatus.java

    r40c599f rcfc4d68  
    1717            java.rmi.RemoteException {
    1818       
    19         FeddPortType port = getPort("https://users.isi.deterlab.net:23235");
     19        String urlString = "https://users.isi.deterlab.net:23235";
     20
     21        if (args.length > 0) urlString = args[0];
     22
     23        FeddPortType port = getPort(urlString);
    2024        MultiInfoRequestType req = new MultiInfoRequestType();
    2125        MultiInfoResponseType resp = null;

  • axis/Terminate.java

    r40c599f rcfc4d68  
    1515            java.rmi.RemoteException {
    1616
    17         boolean force = args.length > 1;
     17        boolean force = args.length > 2;
     18        String exptName = "test";
     19        String urlString = "https://users.isi.deterlab.net:23235";
     20
     21        if (args.length > 0) exptName = args[0];
     22        if (args.length > 1) urlString = args[1];
    1823
    1924        // Get the port and construct the (simple) request.
    20         FeddPortType port = getPort("https://users.isi.deterlab.net:23235");
     25        FeddPortType port = getPort(urlString);
    2126        TerminateRequestType req = new TerminateRequestType(
    22                 new IDType(null, null, null, args[0], null),
     27                new IDType(null, null, null, exptName, null),
    2328                force);
    2429        TerminateResponseType resp = null;

  • axis/build.xml

    r40c599f rcfc4d68  
    3232  <property name="fedd.jar" value="fedd-${version}.jar"/>
    3333  <property name="experiment.name" value="${user.name}-test"/>
     34  <property name="fedd.url" value="https://users.isi.deterlab.net:23235"/>
    3435
    3536  <path id="compile.classpath">
    … …  
    228229        <pathelement path="${classes.dir}"/>
    229230      </classpath>
     231      <arg value="${fedd.url}"/>
    230232    </java>
    231233  </target>
    … …  
    240242      <arg file="${topology.file}"/>
    241243      <arg file="${fedid.pem}"/>
     244      <arg value="${fedd.url}"/>
    242245    </java>
    243246  </target>
    … …  
    251254      </classpath>
    252255      <arg value="${experiment.name}"/>
     256      <arg value="${fedd.url}"/>
    253257    </java>
    254258  </target>
    … …  
    261265      </classpath>
    262266      <arg value="${experiment.name}"/>
     267      <arg value="${fedd.url}"/>
    263268      <arg value="force"/>
    264269    </java>
    … …  
    282287      </classpath>
    283288      <arg value="${experiment.name}"/>
     289      <arg value="${fedd.url}"/>
    284290    </java>
    285291  </target>
Note: See TracChangeset for help on using the changeset viewer.