From: <tho...@us...> - 2013-11-13 17:23:35
|
Revision: 7542 http://bigdata.svn.sourceforge.net/bigdata/?rev=7542&view=rev Author: thompsonbry Date: 2013-11-13 17:23:29 +0000 (Wed, 13 Nov 2013) Log Message: ----------- cleanup in HAJournal-X.config and jiniClient.config files for HA CI (jini and zookeeper stuff that was commented out was removed as irrelevant to CI). Modified Paths: -------------- branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-A.config branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-B.config branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-C.config branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/jiniClient.config Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-A.config =================================================================== --- branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-A.config 2013-11-13 17:22:34 UTC (rev 7541) +++ branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-A.config 2013-11-13 17:23:29 UTC (rev 7542) @@ -98,10 +98,6 @@ // runs jini on the localhost using unicast locators. new LookupLocator("jini://localhost/") - - // runs jini on one or more hosts using unicast locators. - //new LookupLocator("jini://"+jini1), - //new LookupLocator("jini://"+jini2), }; @@ -174,11 +170,6 @@ */ // standalone. servers = "localhost:2081"; - // ensemble -// servers = bigdata.zoo1+":2181" -// + ","+bigdata.zoo2+":2181" -// + ","+bigdata.zoo3+":2181" -// ; /* Session timeout (optional). */ sessionTimeout = bigdata.sessionTimeout; Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-B.config =================================================================== --- branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-B.config 2013-11-13 17:22:34 UTC (rev 7541) +++ branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-B.config 2013-11-13 17:23:29 UTC (rev 7542) @@ -98,10 +98,6 @@ // runs jini on the localhost using unicast locators. new LookupLocator("jini://localhost/") - - // runs jini on one or more hosts using unicast locators. - //new LookupLocator("jini://"+jini1), - //new LookupLocator("jini://"+jini2), }; @@ -174,11 +170,6 @@ */ // standalone. servers = "localhost:2081"; - // ensemble -// servers = bigdata.zoo1+":2181" -// + ","+bigdata.zoo2+":2181" -// + ","+bigdata.zoo3+":2181" -// ; /* Session timeout (optional). */ sessionTimeout = bigdata.sessionTimeout; Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-C.config =================================================================== --- branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-C.config 2013-11-13 17:22:34 UTC (rev 7541) +++ branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-C.config 2013-11-13 17:23:29 UTC (rev 7542) @@ -98,10 +98,6 @@ // runs jini on the localhost using unicast locators. new LookupLocator("jini://localhost/") - - // runs jini on one or more hosts using unicast locators. - //new LookupLocator("jini://"+jini1), - //new LookupLocator("jini://"+jini2), }; @@ -174,11 +170,6 @@ */ // standalone. servers = "localhost:2081"; - // ensemble -// servers = bigdata.zoo1+":2181" -// + ","+bigdata.zoo2+":2181" -// + ","+bigdata.zoo3+":2181" -// ; /* Session timeout (optional). */ sessionTimeout = bigdata.sessionTimeout; Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/jiniClient.config =================================================================== --- branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/jiniClient.config 2013-11-13 17:22:34 UTC (rev 7541) +++ branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/jiniClient.config 2013-11-13 17:23:29 UTC (rev 7542) @@ -26,10 +26,6 @@ // runs jini on the localhost using unicast locators. new LookupLocator("jini://localhost/") - - // runs jini on one or more hosts using unicast locators. - //new LookupLocator("jini://"+jini1), - //new LookupLocator("jini://"+jini2), }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |