[Bigdata-commit] SF.net SVN: bigdata:[4769] branches/QUADS_QUERY_BRANCH

[<tho...@us...>]

Revision: 4769
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4769&view=rev
Author:   thompsonbry
Date:     2011-06-22 13:17:28 +0000 (Wed, 22 Jun 2011)

Log Message:
-----------
Updated the zookeeper bundled dependency to 3.3.3 from 3.2.1.  The specific version is now parameterized through build.properties. Build.xml was modified to support that version parameterization.

Updated the tuprolog dependency from 2.1.1 to 2.2 and bundled the 2p jar rather than the tuprolog jar.  The 2p jar includes the CLI and GUI interfaces and is more useful for interactive work with prolog.  The tuprolog jar contains the core of the prolog implementation is might be all that it required for some applications, but it is not really enough for application development.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/.classpath
    branches/QUADS_QUERY_BRANCH/build.properties
    branches/QUADS_QUERY_BRANCH/build.xml

Added Paths:
-----------
    branches/QUADS_QUERY_BRANCH/bigdata/lib/tuprolog/2p-v2.2.jar
    branches/QUADS_QUERY_BRANCH/bigdata-jini/lib/apache/zookeeper-3.3.3.jar

Removed Paths:
-------------
    branches/QUADS_QUERY_BRANCH/bigdata/lib/tuprolog/tuprolog-v2.1.1.jar
    branches/QUADS_QUERY_BRANCH/bigdata-jini/lib/apache/zookeeper-3.2.1.jar

Modified: branches/QUADS_QUERY_BRANCH/.classpath
===================================================================
--- branches/QUADS_QUERY_BRANCH/.classpath	2011-06-22 12:21:32 UTC (rev 4768)
+++ branches/QUADS_QUERY_BRANCH/.classpath	2011-06-22 13:17:28 UTC (rev 4769)
@@ -18,11 +18,10 @@
 	<classpathentry kind="src" path="ctc-striterators/src/java"/>
 	<classpathentry kind="src" path="ctc-striterators/src/test"/>
 	<classpathentry kind="src" path="bigdata-perf/bsbm/src/test"/>
-	<classpathentry kind="lib" path="bigdata-jini/lib/apache/zookeeper-3.2.1.jar"/>
+	<classpathentry kind="src" path="bigdata-sails/src/prolog"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/dsi-utils-1.0.6-020610.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/lgpl-utils-1.0.6-020610.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/nxparser-6-22-2010.jar"/>
-	<classpathentry kind="lib" path="bigdata/lib/tuprolog/tuprolog-v2.1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-continuation-7.2.2.v20101205.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-http-7.2.2.v20101205.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-io-7.2.2.v20101205.jar"/>
@@ -33,6 +32,7 @@
 	<classpathentry kind="lib" path="bigdata/lib/jetty/jetty-security-7.2.2.v20101205.jar"/>
 	<classpathentry kind="lib" path="bigdata/lib/jetty/jetty-webapp-7.2.2.v20101205.jar"/>
 	<classpathentry kind="lib" path="bigdata/lib/jetty/jetty-xml-7.2.2.v20101205.jar"/>
+	<classpathentry kind="lib" path="bigdata/lib/tuprolog/2p-v2.2.jar"/>
 	<classpathentry kind="src" path="lgpl-utils/src/java"/>
 	<classpathentry kind="src" path="lgpl-utils/src/test"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/icu/icu4j-3_6.jar"/>
@@ -71,5 +71,6 @@
 	<classpathentry kind="lib" path="bigdata-sails/lib/sesame-sparql-testsuite-2.3.0.jar"/>
 	<classpathentry kind="lib" path="bigdata-sails/lib/sesame-store-testsuite-2.3.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/high-scale-lib-v1.1.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata-jini/lib/apache/zookeeper-3.3.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Added: branches/QUADS_QUERY_BRANCH/bigdata/lib/tuprolog/2p-v2.2.jar
===================================================================
(Binary files differ)


Property changes on: branches/QUADS_QUERY_BRANCH/bigdata/lib/tuprolog/2p-v2.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: branches/QUADS_QUERY_BRANCH/bigdata/lib/tuprolog/tuprolog-v2.1.1.jar
===================================================================
(Binary files differ)

Deleted: branches/QUADS_QUERY_BRANCH/bigdata-jini/lib/apache/zookeeper-3.2.1.jar
===================================================================
(Binary files differ)

Added: branches/QUADS_QUERY_BRANCH/bigdata-jini/lib/apache/zookeeper-3.3.3.jar
===================================================================
(Binary files differ)


Property changes on: branches/QUADS_QUERY_BRANCH/bigdata-jini/lib/apache/zookeeper-3.3.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: branches/QUADS_QUERY_BRANCH/build.properties
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.properties	2011-06-22 12:21:32 UTC (rev 4768)
+++ branches/QUADS_QUERY_BRANCH/build.properties	2011-06-22 13:17:28 UTC (rev 4769)
@@ -28,6 +28,9 @@
 #javac.source=1.6
 javac.encoding=Cp1252
 
+# The zookeeper version.
+zookeeper.version=3.3.3
+
 # Set to false to NOT start services (zookeeper, lookup server, class server, etc).
 # When false, tests which depend on those services will not run. (This can also be
 # set by CI if you leave if undefined here.)  For example:
@@ -386,7 +389,8 @@
 
 # CI properties. These must agree with the actual installation directory and zoo.cfg
 # file for the zookeeper instance used to run CI.
-test.zookeeper.installDir=/Users/bryan/zookeeper-3.2.1
+test.zookeeper.installDir=/Users/bryan/zookeeper-${zookeeper.version}
 #test.zookeeper.installDir=/usr/java/zookeeper-3.2.1
+#test.zookeeper.installDir=/usr/local/zookeeper-${zookeeper.version}
 test.zookeeper.tickTime=2000
 test.zookeeper.clientPort=2081

Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml	2011-06-22 12:21:32 UTC (rev 4768)
+++ branches/QUADS_QUERY_BRANCH/build.xml	2011-06-22 13:17:28 UTC (rev 4769)
@@ -211,7 +211,7 @@
 		<bndwrap jars="${build.dir}/lib/lgpl-utils-1.0.6-020610.jar" output="${build.dir}/bundles/lgpl-utils-1.0.6-020610.jar" definitions="${basedir}/osgi/" />
 		<bndwrap jars="${build.dir}/lib/high-scale-lib-v1.1.2.jar" output="${build.dir}/bundles/high-scale-lib-v1.1.2.jar" definitions="${basedir}/osgi/" />
 		<bndwrap jars="${build.dir}/lib/openrdf-sesame-2.3.0-onejar.jar" output="${build.dir}/bundles/openrdf-sesame-2.3.0.jar" definitions="${basedir}/osgi/" />
-		<bndwrap jars="${build.dir}/lib/apache/zookeeper-3.2.1.jar" output="${build.dir}/bundles/zookeeper-3.2.1.jar" definitions="${basedir}/osgi/" />
+		<bndwrap jars="${build.dir}/lib/apache/zookeeper-${zookeeper.version}.jar" output="${build.dir}/bundles/zookeeper-${zookeeper.version}.jar" definitions="${basedir}/osgi/" />
 		<bndwrap jars="${build.dir}/lib/nxparser-6-22-2010.jar" output="${build.dir}/bundles/nxparser-2010.6.22.jar" definitions="${basedir}/osgi/" />
 	</target>
 
@@ -911,7 +911,7 @@
             tofile="${dist.lib}/nxparser.jar" />
 
       <!-- Zookeeper library -->
-      <copy file="${bigdata-zookeeper.lib}/zookeeper-3.2.1.jar"
+      <copy file="${bigdata-zookeeper.lib}/zookeeper-${zookeeper.version}.jar"
             tofile="${dist.lib}/zookeeper.jar" />
 
       <!-- Jini library -->
@@ -1753,20 +1753,26 @@
 	<!-- so I have backed it out for now.                                  -->
     <target name="startZookeeper">
     	<echo message="test.zookeeper.installDir=${test.zookeeper.installDir}"/>
-        <echo>bin/zkServer.sh start
+        <echo>bin/zkServer.(sh|cmd) start
 </echo>
-    	<exec executable="bin/zkServer.sh" dir="${test.zookeeper.installDir}" logerror="true">
+    	<exec executable="bin/zkServer.sh" dir="${test.zookeeper.installDir}" logerror="true" osfamily="unix">
     		<arg value="start"/>
 		</exec>
+    	<exec executable="bin/zkServer.cmd" dir="${test.zookeeper.installDir}" logerror="true" osfamily="windows">
+    		<arg value="start"/>
+		</exec>
     </target>
 
     <target name="stopZookeeper">
 	<echo message="test.zookeeper.installDir=${test.zookeeper.installDir}"/>
-    <echo>bin/zkServer.sh stop
+    <echo>bin/zkServer.(sh|cmd) stop
 </echo>
-	<exec executable="bin/zkServer.sh" dir="${test.zookeeper.installDir}" logerror="true">
+	<exec executable="bin/zkServer.sh" dir="${test.zookeeper.installDir}" logerror="true" osfamily="unix">
 		<arg value="stop"/>
 	</exec>
+	<exec executable="bin/zkServer.cmd" dir="${test.zookeeper.installDir}" logerror="true" osfamily="windows">
+		<arg value="stop"/>
+	</exec>
     </target>
 
     <!-- runs all junit tests -->


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.