Merge branch 'update-lookup-test-url' into 'master'

Update lookup test url

See merge request !7

build.xml

 <project name="ibis-client" default="all" xmlns:if="ant:if">
-    <property name="api.version" value="1.3.0"/>
+    <property name="api.version" value="1.3.1"/>
 
     <!-- =================================
           target: Java autogen

setup.py

@@ -4,12 +4,11 @@ Lookup/Ibis web service API
 Python installation.
 """
 
-import sys
 from setuptools import setup
 
 setup(
     name="ibisclient",
-    version="1.3.0",
+    version="1.3.1",
     description="Lookup API client",
     license="LGPL",
     url="https://www.lookup.cam.ac.uk/doc/ws-doc/",

src/java/uk/ac/cam/ucs/ibis/client/IbisClientConnection.java

@@ -70,7 +70,7 @@ public class IbisClientConnection implements ClientConnection
     /** The HTTP basic authentication authorization string. */
     private String authorization;
 
-    /** An optional SSLSocketFactory to use on HTTPS connections. */ 
+    /** An optional SSLSocketFactory to use on HTTPS connections. */
     protected SSLSocketFactory sf;
 
     /** An optional HostnameVerifier to use on HTTPS connections. */
@@ -99,7 +99,7 @@ public class IbisClientConnection implements ClientConnection
 
     /**
      * Create a ClientConnection to the Lookup/Ibis test web service API at
-     * {@code https://lookup-test.csx.cam.ac.uk/}.
+     * {@code https://lookup-test.srv.uis.cam.ac.uk/}.
      * <p>
      * The connection is initially anonymous, but this may be changed using
      * {@link #setUsername(String)} and {@link #setPassword(String)}.
@@ -112,7 +112,7 @@ public class IbisClientConnection implements ClientConnection
     public static IbisClientConnection createTestConnection()
         throws GeneralSecurityException, IOException, JAXBException
     {
-        return new IbisClientConnection("https://lookup-test.csx.cam.ac.uk/", true);
+        return new IbisClientConnection("https://lookup-test.srv.uis.cam.ac.uk/v/", true);
     }
 
     /**
@@ -183,7 +183,7 @@ public class IbisClientConnection implements ClientConnection
 
     /*
      * Update the authorization string for HTTP basic authentication, in
-     * response to a change in the username or password. 
+     * response to a change in the username or password.
      */
     private void updateAuthorization()
     {

src/java/uk/ac/cam/ucs/ibis/example/Example.java

@@ -49,7 +49,7 @@ public class Example
         //
         // To connect to the live server on www.lookup.cam.ac.uk use:
         // ClientConnection conn = IbisClientConnection.createConnection();
-        // or to connect to the test server on lookup-test.csx.cam.ac.uk:
+        // or to connect to the test server on lookup-test.srv.uis.cam.ac.uk:
         ClientConnection conn = IbisClientConnection.createTestConnection();
 
         // Create instances of the method classes, depending on which

src/make-phpdocs

@@ -85,7 +85,7 @@ table#methods.summary div.description dd {
 EOF
 
 # Fix the JavaScript that scrolls to the selected lines in the source code
-sed -i "s/\(\s*if [(][$]firstLine[.]length > 0[)] [{]\)/\1\n\
+sed -i "" "s/\(\s*if [(][$]firstLine[.]length > 0[)] [{]\)/\1\n\
 \t\t\t\$('div#right').scrollTop(\$firstLine.offset().top -\n\
 \t\t\t\t\t\t \$('div#right').offset().top);/" \
     $BUILDDIR/html/resources/combined.js
@@ -94,18 +94,19 @@ sed -i "s/\(\s*if [(][$]firstLine[.]length > 0[)] [{]\)/\1\n\
 # Also, don't use cookies to remember to splitter's position, since that can
 # make the site unusable if the stored position is larger than the browser's
 # window width.
-sed -i "s/\(var splitterPosition.*\) = .*;/\1 = $SPLITTER_POS;/" \
+sed -i "" "s/\(var splitterPosition.*\) = .*;/\1 = $SPLITTER_POS;/" \
     $BUILDDIR/html/resources/combined.js
 
 # Allow the splitter to be moved arbitrarily far to the left and right
-sed -i "s/event.pageX >= 230/event.pageX >= 0/" \
+sed -i "" "s/event.pageX >= 230/event.pageX >= 0/" \
     $BUILDDIR/html/resources/combined.js
-sed -i "s/event.pageX >= 600 +/event.pageX >=/" \
+sed -i "" "s/event.pageX >= 600 +/event.pageX >=/" \
     $BUILDDIR/html/resources/combined.js
 
+echo "HERE"
 # Fix the footer text's repeated "API"
 for FILE in $(find $BUILDDIR/html -name "*.html") ; do
-    sed -i "s/API API documentation/API documentation/" $FILE
+    sed -i "" "s/API API documentation/API documentation/" $FILE
 done
 
 echo ""

src/php/ibisclient/client/IbisClientConnection.php

@@ -63,7 +63,7 @@ class IbisClientConnection implements ClientConnection
 
     /**
      * Create an IbisClientConnection to the Lookup/Ibis test web service API
-     * at {@link https://lookup-test.csx.cam.ac.uk/}.
+     * at {@link https://lookup-test.srv.uis.cam.ac.uk/}.
      *
      * The connection is initially anonymous, but this may be changed using
      * {@link setUsername()} and {@link setPassword()}.
@@ -76,7 +76,7 @@ class IbisClientConnection implements ClientConnection
      */
     public static function createTestConnection()
     {
-        return new IbisClientConnection("https://lookup-test.csx.cam.ac.uk/", true);
+        return new IbisClientConnection("https://lookup-test.srv.uis.cam.ac.uk/", true);
     }
 
     /**

src/python3/ibisclient/connection.py

@@ -275,7 +275,7 @@ def createConnection():
 def createTestConnection():
     """
     Create an IbisClientConnection to the Lookup/Ibis test web service API
-    at https://lookup-test.csx.cam.ac.uk/.
+    at https://lookup-test.srv.uis.cam.ac.uk/.
 
     The connection is initially anonymous, but this may be changed using
     its :any:`set_username() <IbisClientConnection.set_username>` and
@@ -289,7 +289,7 @@ def createTestConnection():
       :any:`IbisClientConnection`
         A new connection to the Lookup test server.
     """
-    return IbisClientConnection("lookup-test.csx.cam.ac.uk", 443, "", True)
+    return IbisClientConnection("lookup-test.srv.uis.cam.ac.uk", 443, "", True)
 
 
 def createLocalConnection():