From: <bsc...@us...> - 2010-08-12 07:51:55
|
Revision: 7542 http://unicore.svn.sourceforge.net/unicore/?rev=7542&view=rev Author: bschuller Date: 2010-08-12 07:51:49 +0000 (Thu, 12 Aug 2010) Log Message: ----------- test fixes; doc layout fixes Modified Paths: -------------- gateway/trunk/docs/gateway-doc.txt gateway/trunk/src/main/java/eu/unicore/gateway/VSite.java gateway/trunk/src/test/java/eu/unicore/gateway/TestVsite.java gateway/trunk/src/test/java/eu/unicore/gateway/cluster/TestMultiSite.java Modified: gateway/trunk/docs/gateway-doc.txt =================================================================== --- gateway/trunk/docs/gateway-doc.txt 2010-08-12 07:35:21 UTC (rev 7541) +++ gateway/trunk/docs/gateway-doc.txt 2010-08-12 07:51:49 UTC (rev 7542) @@ -134,7 +134,7 @@ Dynamic registration of Vsites -++++++++++++++++++++++++++++++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Dynamic registration is controlled by three properties in gateway.properties @@ -164,7 +164,7 @@ Disabling the detailed Vsite listing (monkey page) -++++++++++++++++++++++++++++++++++++++++++++++++++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ To disable the Vsite details page, set @@ -174,7 +174,7 @@ ---- Server parameters -+++++++++++++++++ +~~~~~~~~~~~~~~~~~ To fine-tune the operational parameters of the embedded Jetty server, you can set some properties. These are the defaults: @@ -208,7 +208,7 @@ This will scale up to higher numbers of concurrent connections than the default connector. Controlling the number of concurrent connections -++++++++++++++++++++++++++++++++++++++++++++++++ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The gateway acts as a https client for the VSites behind it. The number of concurrent calls is limited, and controlled by two parameters @@ -221,7 +221,7 @@ ---- Proxy certificate support -+++++++++++++++++++++++++ +~~~~~~~~~~~~~~~~~~~~~~~~~ UNICORE optionally supports proxy certificates as used by other Grid middleware systems. In general, we think proxies are a bad idea, but for interoperability purposes, proxies @@ -458,7 +458,7 @@ The following general parameters exist [grid="all"] -`-----------------------------`------------------------------------------------------- +`----------------------`------------------------------------------------------- vsites List of physical sites strategy Class name of the site selection strategy to use (see below) config Name of a file containing additional parameters Modified: gateway/trunk/src/main/java/eu/unicore/gateway/VSite.java =================================================================== --- gateway/trunk/src/main/java/eu/unicore/gateway/VSite.java 2010-08-12 07:35:21 UTC (rev 7541) +++ gateway/trunk/src/main/java/eu/unicore/gateway/VSite.java 2010-08-12 07:51:49 UTC (rev 7542) @@ -260,6 +260,7 @@ public int hashCode() { final int prime = 31; int result = 1; + result = prime * result + ((name == null) ? 0 : name.hashCode()); result = prime * result + ((realURI == null) ? 0 : realURI.hashCode()); return result; } @@ -273,6 +274,11 @@ if (getClass() != obj.getClass()) return false; VSite other = (VSite) obj; + if (name == null) { + if (other.name != null) + return false; + } else if (!name.equals(other.name)) + return false; if (realURI == null) { if (other.realURI != null) return false; @@ -281,4 +287,6 @@ return true; } + + } Modified: gateway/trunk/src/test/java/eu/unicore/gateway/TestVsite.java =================================================================== --- gateway/trunk/src/test/java/eu/unicore/gateway/TestVsite.java 2010-08-12 07:35:21 UTC (rev 7541) +++ gateway/trunk/src/test/java/eu/unicore/gateway/TestVsite.java 2010-08-12 07:51:49 UTC (rev 7542) @@ -31,7 +31,7 @@ public void testVSiteEquals()throws Exception{ URI gw=new URI("http://localhost"); - Site s1=new VSite(gw,"FOO","http://localhost:3456", null); + Site s1=new VSite(gw,"FOO","http://localhost:1234", null); Site s2=new VSite(gw,"FOO","http://localhost:1234", null); assertEquals(s1,s2); } Modified: gateway/trunk/src/test/java/eu/unicore/gateway/cluster/TestMultiSite.java =================================================================== --- gateway/trunk/src/test/java/eu/unicore/gateway/cluster/TestMultiSite.java 2010-08-12 07:35:21 UTC (rev 7541) +++ gateway/trunk/src/test/java/eu/unicore/gateway/cluster/TestMultiSite.java 2010-08-12 07:51:49 UTC (rev 7542) @@ -82,7 +82,7 @@ assertEquals(2, sites.size()); assertTrue(ms.ping()); - assertEquals("Cluster 2/2 nodes OK",ms.getStatusMessage()); + assertEquals("OK (2/2 nodes online)",ms.getStatusMessage()); v1.stop(); v2.stop(); } @@ -149,13 +149,13 @@ //re-registration should not do any harm ms.registerVsite(new URI("http://localhost:"+s1.getPort())); assertEquals(1,ms.getConfiguredSites().size()); - assertEquals("Cluster 1/1 nodes OK",ms.getStatusMessage()); + assertEquals("OK (1/1 nodes online)",ms.getStatusMessage()); //register 2nd site ms.registerVsite(new URI("http://localhost:"+s2.getPort())); assertEquals(2,ms.getConfiguredSites().size()); - assertEquals("Cluster 2/2 nodes OK",ms.getStatusMessage()); + assertEquals("OK (2/2 nodes online)",ms.getStatusMessage()); s1.stop(); s2.stop(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |