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

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

Revision: 4606
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4606&view=rev
Author:   thompsonbry
Date:     2011-06-02 16:59:34 +0000 (Thu, 02 Jun 2011)

Log Message:
-----------
This turned out to be a relatively simple issue.  The ant 'bundle' task now flattens the directory structure of the jars.  This was causing a problem for the cluster deployment since the jini jars were divided into three directories (jini/lib, jini/lib-dl, and jini-lib-ext). The solution was simply to divide the "bundle" task into two "copy" operations.  One flattens most of the jars, but does not handle the jars which are specific to the cluster deployment.  The other copies the jars for the cluster deployment, maintaining their directory hierarchy.

This issue only effected the 'ant-install-artifact' task and service startup when using "bigdata 'start'".  It would not have effected the alternative install procedure which is based on the REL.<version>.tgz artifact since that does not rely on the 'bundle' target.

I also modified bigdataStandalone.config to not override the class path for zookeeper.  Doing so is only asking for problems since then you have to maintain the right version information for the zookeeper dependencies in the config file as well.

See https://sourceforge.net/apps/trac/bigdata/ticket/314

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/build.xml
    branches/QUADS_QUERY_BRANCH/src/resources/config/bigdataStandalone.config

Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml	2011-06-02 14:19:18 UTC (rev 4605)
+++ branches/QUADS_QUERY_BRANCH/build.xml	2011-06-02 16:59:34 UTC (rev 4606)
@@ -199,7 +199,7 @@
 </target>
 
 <target name="bundle" description="Bundles all dependencies for easier deployments and releases (does not bundle the bigdata jar).">
-<copy toDir="${build.dir}/lib" flatten="true">
+     <copy toDir="${build.dir}/lib" flatten="true">
 	<fileset dir="${bigdata.dir}/bigdata/lib">
 		<include name="**/*.jar" />
 		<include name="**/*.so" />
@@ -211,16 +211,20 @@
 		<!-- The BytesUtil JNI class is not recommended at this time (no performance gain). -->
 		<exclude name="**/*BytesUtil*" />
 	</fileset>
-	<fileset dir="${bigdata.dir}/bigdata-jini/lib">
-		<include name="**/*.jar" />
-	</fileset>
 	<fileset dir="${bigdata.dir}/bigdata-rdf/lib">
 		<include name="**/*.jar" />
 	</fileset>
 	<fileset dir="${bigdata.dir}/bigdata-sails/lib">
 		<include name="**/*.jar" />
 	</fileset>
-</copy>
+     </copy>
+     <!-- Do NOT flatten the jini jars. We need the to preserve the -->
+     <!-- lib, lib-dl, and lib-ext distinctions.                    -->
+     <copy toDir="${build.dir}/lib" flatten="false">
+	<fileset dir="${bigdata.dir}/bigdata-jini/lib">
+		<include name="**/*.jar" />
+	</fileset>
+     </copy>
 </target>
 
 	<!-- 
@@ -1026,6 +1030,8 @@
 
     <target name="ant-install-prepare" depends="jar, bundle"
             description="Stage all files (src, lib, config, etc.) needed for ant based install.">
+
+      <!-- stage source files. -->
       <copy toDir="${build.dir}/bigdata/src">
         <fileset dir="${bigdata.dir}/bigdata/src" />
       </copy>
@@ -1045,11 +1051,11 @@
         <fileset dir="${bigdata.dir}/lgpl-utils/src" />
       </copy>
 
+      <!-- stage library dependencies. -->
       <mkdir dir="${build.dir}/bigdata/lib" />
       <copy toDir="${build.dir}/bigdata/lib">
         <fileset dir="${bigdata.dir}/bigdata/lib" />
       </copy>
-
       <mkdir dir="${build.dir}/bigdata-jini/lib" />
       <copy toDir="${build.dir}/bigdata-jini/lib">
         <fileset dir="${bigdata.dir}/bigdata-jini/lib" />
@@ -1058,7 +1064,6 @@
       <copy toDir="${build.dir}/bigdata-rdf/lib">
         <fileset dir="${bigdata.dir}/bigdata-rdf/lib" />
       </copy>
-
       <mkdir dir="${build.dir}/bigdata-sails/lib" />
       <copy toDir="${build.dir}/bigdata-sails/lib">
         <fileset dir="${bigdata.dir}/bigdata-sails/lib" />

Modified: branches/QUADS_QUERY_BRANCH/src/resources/config/bigdataStandalone.config
===================================================================
--- branches/QUADS_QUERY_BRANCH/src/resources/config/bigdataStandalone.config	2011-06-02 14:19:18 UTC (rev 4605)
+++ branches/QUADS_QUERY_BRANCH/src/resources/config/bigdataStandalone.config	2011-06-02 16:59:34 UTC (rev 4606)
@@ -499,11 +499,11 @@
 //	    + ",3="+bigdata.zoo3+":2888:3888"
 	    ;
 
-    // This is all you need to run zookeeper.
-    classpath = new String[] {
-    	"@LIB_DIR@/apache/zookeeper-3.2.1.jar",
-        "@LIB_DIR@/apache/log4j-1.2.15.jar"
-    };
+    // This is all you need to run zookeeper, but then you have to keep the version numbers up to date.
+//    classpath = new String[] {
+//    	"@LIB_DIR@/apache/zookeeper-3.2.1.jar",
+//        "@LIB_DIR@/apache/log4j-1.2.15.jar"
+//    };
 
     /* Optional command line arguments for the JVM used to execute
      * zookeeper.


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