From: <tho...@us...> - 2010-07-21 13:00:04
|
Revision: 3257 http://bigdata.svn.sourceforge.net/bigdata/?rev=3257&view=rev Author: thompsonbry Date: 2010-07-21 12:59:52 +0000 (Wed, 21 Jul 2010) Log Message: ----------- Merged updates from BrianM and attempted to reconcile the standalone-XXX targets for benchmarking a federation running on a single machine with the LookupStarter as used by the unit tests. I am still missing something critical about how to setup the LUS as it fails with exceptions such as below. standalone-setup: standalone-startLookup: [java] Jul 21, 2010 8:58:57 AM com.sun.jini.start.HTTPDStatus httpdWarning [java] WARNING: Problem accessing desired URL[http://192.168.1.102:23333/reggie-dl.jar]: java.net.ConnectException: Connection refused: connect. [java] Jul 21, 2010 8:58:58 AM com.sun.jini.start.HTTPDStatus httpdWarning [java] WARNING: Problem accessing desired URL[http://192.168.1.102:23333/jsk-dl.jar]: java.net.ConnectException: Connection refused: connect. [java] Jul 21, 2010 8:59:00 AM com.sun.jini.reggie.RegistrarImpl init [java] INFO: started Reggie: c8778e6d-8df4-468b-bf41-96167ed1a2d5, [testFed], ConstrainableLookupLocator[[jini://192.168.1.102/], [null]] [java] java.lang.ClassNotFoundException: com.sun.jini.reggie.ConstrainableRegistrarProxy (could not determine preferred setting; original codebase: "http://192.168.1.102:23333/reggie-dl.jar http://192.168.1.102:23333/jsk-dl.jar") [java] at net.jini.loader.pref.PreferredClassProvider.loadClass(PreferredClassProvider.java:580) [java] at java.rmi.server.RMIClassLoader.loadClass(RMIClassLoader.java:247) [java] at sun.rmi.server.MarshalInputStream.resolveClass(MarshalInputStream.java:197) [java] at java.io.ObjectInputStream.readNonProxyDesc(ObjectInputStream.java:1575) [java] at java.io.ObjectInputStream.readClassDesc(ObjectInputStream.java:1496) [java] at java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1732) [java] at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1329) [java] at java.io.ObjectInputStream.readObject(ObjectInputStream.java:351) [java] at java.rmi.MarshalledObject.get(MarshalledObject.java:142) [java] at com.sun.jini.start.NonActivatableServiceDescriptor.create(NonActivatableServiceDescriptor.java:644) [java] at com.bigdata.service.jini.util.LookupStarter.startLookupService(LookupStarter.java:228) [java] at com.bigdata.service.jini.util.LookupStarter.access$100(LookupStarter.java:58) [java] at com.bigdata.service.jini.util.LookupStarter$LookupStartThread.run(LookupStarter.java:152) [java] Caused by: java.net.ConnectException: Connection refused: connect [java] at java.net.PlainSocketImpl.socketConnect(Native Method) [java] at java.net.PlainSocketImpl.doConnect(PlainSocketImpl.java:333) [java] at java.net.PlainSocketImpl.connectToAddress(PlainSocketImpl.java:195) [java] at java.net.PlainSocketImpl.connect(PlainSocketImpl.java:182) [java] at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:366) [java] at java.net.Socket.connect(Socket.java:525) [java] at java.net.Socket.connect(Socket.java:475) [java] at sun.net.NetworkClient.doConnect(NetworkClient.java:163) [java] at sun.net.www.http.HttpClient.openServer(HttpClient.java:394) [java] at sun.net.www.http.HttpClient.openServer(HttpClient.java:529) [java] at sun.net.www.http.HttpClient.<init>(HttpClient.java:233) [java] at sun.net.www.http.HttpClient.New(HttpClient.java:306) [java] at sun.net.www.http.HttpClient.New(HttpClient.java:323) [java] at sun.net.www.protocol.http.HttpURLConnection.getNewHttpClient(HttpURLConnection.java:860) [java] at sun.net.www.protocol.http.HttpURLConnection.plainConnect(HttpURLConnection.java:801) [java] at sun.net.www.protocol.http.HttpURLConnection.connect(HttpURLConnection.java:726) [java] at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1049) [java] at java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:373) [java] at net.jini.loader.pref.PreferredClassLoader.getPreferredConnection(PreferredClassLoader.java:656) [java] at net.jini.loader.pref.PreferredClassLoader.jarExists(PreferredClassLoader.java:584) [java] at net.jini.loader.pref.PreferredClassLoader.getPreferredInputStream(PreferredClassLoader.java:534) [java] at net.jini.loader.pref.PreferredClassLoader.initializePreferredResources(PreferredClassLoader.java:482) [java] at net.jini.loader.pref.PreferredClassLoader.isPreferredResource0(PreferredClassLoader.java:760) [java] at net.jini.loader.pref.PreferredClassLoader.access$100(PreferredClassLoader.java:226) [java] at net.jini.loader.pref.PreferredClassLoader$3.run(PreferredClassLoader.java:742) [java] at java.security.AccessController.doPrivileged(Native Method) [java] at net.jini.loader.pref.PreferredClassLoader.isPreferredResource(PreferredClassLoader.java:739) [java] at net.jini.loader.pref.PreferredClassProvider.loadClass(PreferredClassProvider.java:576) [java] ... 12 more [java] Java Result: -2 Modified Paths: -------------- trunk/build.xml Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2010-07-20 22:31:05 UTC (rev 3256) +++ trunk/build.xml 2010-07-21 12:59:52 UTC (rev 3257) @@ -849,12 +849,13 @@ <!-- --> <!-- STANDALONE FEDERATION TARGETS --> - <!-- --> + <!-- (test/benchamarking) --> <target name="standalone-setup" description="Setup properties used by the standalone federation and LUS start/stop."> <property name="app.home" location="${bigdata.dir}" /> <property name="test.codebase.port" value="23333"/> - <property name="test.codebase.dir" location="${bigdata.dir}/bigdata-jini/lib/jini/lib-dl" /> + <property name="jini.lib" location="${bigdata.dir}/bigdata-jini/lib/jini/lib" /> + <property name="jini.lib.dl" location="${bigdata.dir}/bigdata-jini/lib/jini/lib-dl" /> <property name="test.codebase" value="http://${this.hostname}:${test.codebase.port}/jsk-dl.jar"/> <property name="java.security.policy" value="${bigdata.dir}/policy.all"/> <property name="log4j.configuration" value="${bigdata.dir}/src/resources/config/standalone/log4j.properties"/> @@ -864,11 +865,11 @@ <target name="standalone-startLookup" depends="jar,standalone-setup" description="Start the lookup service for the standalone federation."> <java classname="com.bigdata.service.jini.util.LookupStarter" - fork="true" spawn="true"> + fork="true" spawn="false"> <classpath refid="runtime.classpath" /> <sysproperty key="app.home" value="${app.home}"/> - <sysproperty key="jini.lib" value="${dist.lib}"/> - <sysproperty key="jini.lib.dl" value="${dist.lib.dl}"/> + <sysproperty key="jini.lib" value="${jini.lib}"/> + <sysproperty key="jini.lib.dl" value="${jini.lib.dl}"/> <sysproperty key="java.security.policy" value="${java.security.policy}"/> <sysproperty key="java.security.debug" value="off"/> <sysproperty key="java.protocol.handler.pkgs" value="net.jini.url"/> @@ -933,25 +934,22 @@ <antcall target="standalone-stopLookup" /> </target> -<!-- @todo Add target to stand up a SPARQL endpoint for a KB namespace. Could be - Sesame Server or bigdata REST API. --> - -<!-- Note: The source files must be "reasonable" for the bulk loader. Each file - will be fully parsed into memory before writing onto the database. Very - large source files must be split into smaller files. See the 'split' - command under unix, but be aware that it will not generate more than 576 - output files (24 x 24 = 576) and only 100 if you are using number suffixes. - For example, split an NT file into files of 200000 lines each: - - mkdir splits; cd splits - split -l 200000 ../dataset.nt dataset - - You will also have to fix up the file extensions. You can do this using - bash as follows: - - for file in *; do mv $file $file.nt; done - - --> +<target name="standalone-start-nano-server" depends="jar" description="Start a small http server fronting for a bigdata database instance."> + <java classname="com.bigdata.rdf.sail.bench.NanoSparqlServer" fork="true" failonerror="true"> + <arg line="${standalone.nanoServerPort} ${standalone.namespace} src/resources/config/standalone/bigdataStandalone.config" /> + <jvmarg line="-server"/> + <jvmarg line="-Xmx200M"/> + <classpath refid="runtime.classpath" /> + </java> +</target> + +<target name="standalone-stop-nano-server" depends="jar" description="Stop the small http server running at the configured port."> + <java classname="com.bigdata.rdf.sail.bench.NanoSparqlServer" fork="true" failonerror="true"> + <arg line="${standalone.nanoServerPort} -stop" /> + <classpath refid="runtime.classpath" /> + </java> +</target> + <target name="standalone-bulk-load" depends="jar" description="Bulk load RDF data into the standalone federation."> <java classname="com.bigdata.rdf.load.MappedRDFDataLoadMaster" failonerror="true" fork="true" logerror="true"> @@ -967,30 +965,14 @@ <!-- --> <!-- Per job parameters --> <!-- --> - <!-- The KB namespace ("kb" is a common default). --> - <jvmarg value="-Dbigdata.rdf.namespace=U10"/> + <!-- The namespace of the target KB. --> + <jvmarg value="-Dbigdata.rdf.namespace=${standalone.namespace}"/> <!-- The job name (same as the KB namespace is a common default). --> - <jvmarg value="-Dbigdata.rdf.job.name=bulk-load-kb"/> - <!-- The file or directory containing RDF data to be loaded. - - Possible interesting data: - - d:/bigdata-perf-analysis/lubm/U10 - d:/bigdata-perf-analysis/bsbm/bsbm_2785/dataset.nt - --> - <jvmarg value="-Dbigdata.rdf.data=d:/bigdata-perf-analysis/lubm/U10"/> - <!-- The file or directory containing zero or more RDF ontology files to be loaded. - - Note: If you do not want to load any "ontology" data you can point this at an - empty directory. "ontology" data is loaded once - when a new KB instance is - created. - - Possible interesting ontologies: - - bigdata-rdf/src/resources/data/lehigh/univ-bench.owl - d:/bigdata-perf-analysis/emptyDir - --> - <jvmarg value="-Dbigdata.rdf.ontology=bigdata-rdf/src/resources/data/lehigh/univ-bench.owl"/> + <jvmarg value="-Dbigdata.rdf.job.name=bulk-load-kb-${standalone-namespace}"/> + <!-- The file or directory containing zero or more files to be loaded first. --> + <jvmarg value="-Dbigdata.rdf.ontology=${standalone.bulkLoad.ontology}"/> + <!-- The file or directory containing RDF data to be loaded. --> + <jvmarg value="-Dbigdata.rdf.data=${standalone.bulkLoad.data}"/> <!-- The main configuration file. --> <arg value="src/resources/config/standalone/bigdataStandalone.config" /> </java> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <btm...@us...> - 2010-07-22 20:30:40
|
Revision: 3266 http://bigdata.svn.sourceforge.net/bigdata/?rev=3266&view=rev Author: btmurphy Date: 2010-07-22 20:30:34 +0000 (Thu, 22 Jul 2010) Log Message: ----------- [trunk]: trac #115 - Provide a means to setup and tear down a federation running on a single server to support operator directed benchmarking and CI performance tests. Modified Paths: -------------- trunk/build.xml Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2010-07-22 14:37:05 UTC (rev 3265) +++ trunk/build.xml 2010-07-22 20:30:34 UTC (rev 3266) @@ -852,56 +852,37 @@ <!-- STANDALONE FEDERATION TARGETS --> <!-- (test/benchamarking) --> -<target name="standalone-setup" description="Setup properties used by the standalone federation and LUS start/stop."> +<target name="generateLookupStarterJar" unless="lookupStarterJarAvailable"> + <antcall target="testCompile" /> +</target> + +<target name="testLookupStarterJarAvailability"> + <property name="bigdata-test.lib" location="${bigdata.dir}/bigdata-test/lib" /> + <condition property="lookupStarterJarAvailable"> + <available file="${bigdata-test.lib}/lookupstarter.jar"/> + </condition> +</target> + +<target name="standalone-setup" depends="testLookupStarterJarAvailability,generateLookupStarterJar" description="Setup properties used by standalone federation and LUS start/stop."> <property name="app.home" location="${bigdata.dir}" /> <property name="test.codebase.port" value="23333"/> - <property name="jini.lib" location="${bigdata.dir}/bigdata-jini/lib/jini/lib" /> - <property name="jini.lib.dl" location="${bigdata.dir}/bigdata-jini/lib/jini/lib-dl" /> + <property name="test.codebase.dir" location="${bigdata.dir}/bigdata-jini/lib/jini/lib-dl"/> + <property name="dist.lib" location="${bigdata.dir}/bigdata-jini/lib/jini/lib" /> + <property name="dist.lib.dl" location="${bigdata.dir}/bigdata-jini/lib/jini/lib-dl" /> <property name="test.codebase" value="http://${this.hostname}:${test.codebase.port}/jsk-dl.jar"/> <property name="java.security.policy" value="${bigdata.dir}/policy.all"/> - <property name="log4j.configuration" value="${bigdata.dir}/src/resources/config/standalone/log4j.properties"/> + <property name="log4j.configuration" value="resources/logging/log4j.properties"/> <property name="java.net.preferIPv4Stack" value="true"/> <property name="bigdata.fedname" value="${standalone.fed}"/> </target> -<target name="standalone-startLookup" depends="jar,standalone-setup" description="Start the lookup service for the standalone federation."> - <java classname="com.bigdata.service.jini.util.LookupStarter" - fork="true" spawn="false"> - <classpath refid="runtime.classpath" /> - <sysproperty key="app.home" value="${app.home}"/> - <sysproperty key="jini.lib" value="${jini.lib}"/> - <sysproperty key="jini.lib.dl" value="${jini.lib.dl}"/> - <sysproperty key="java.security.policy" value="${java.security.policy}"/> - <sysproperty key="java.security.debug" value="off"/> - <sysproperty key="java.protocol.handler.pkgs" value="net.jini.url"/> - <sysproperty key="log4j.configuration" value="${log4j.configuration}"/> - <sysproperty key="codebase.port" value="${test.codebase.port}"/> - <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}"/> - <sysproperty key="bigdata.fedname" value="${bigdata.fedname}"/> - </java> -</target> - -<target name="standalone-stopLookup" depends="jar,standalone-setup" description="Stop the lookup service for the standalone federation."> - <java classname="com.bigdata.service.jini.util.LookupStarter" - failonerror="true" fork="true" logerror="true"> - <classpath refid="runtime.classpath" /> - <sysproperty key="app.home" value="${app.home}"/> - <sysproperty key="jini.lib" value="${dist.lib}"/> - <sysproperty key="jini.lib.dl" value="${dist.lib.dl}"/> - <sysproperty key="java.security.policy" value="${java.security.policy}"/> - <sysproperty key="log4j.configuration" value="${log4j.configuration}"/> - <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}"/> - <sysproperty key="bigdata.fedname" value="${bigdata.fedname}"/> - <arg value="-stop" /> - </java> -</target> - <!-- Note: You should 'nohup' this, e.g., "nohup ant standalone-start" to avoid taking down the ServicesManagerServer if you are disconnected from a terminal. --> <target name="standalone-start" depends="jar,standalone-setup" description="Start the standalone federation."> <!-- Start the lookup service. --> - <antcall target="standalone-startLookup" /> + <antcall target="startHttpd" /> + <antcall target="startLookup" /> <java classname="com.bigdata.jini.start.ServicesManagerServer" failonerror="true" fork="true" logerror="true"> <classpath refid="runtime.classpath" /> @@ -932,7 +913,8 @@ <arg value="src/resources/config/standalone/bigdataStandalone.config" /> </java> <!-- Then take down the lookup service as well. --> - <antcall target="standalone-stopLookup" /> + <antcall target="stopLookup" /> + <antcall target="stopHttpd" /> </target> <target name="standalone-start-nano-server" depends="jar" description="Start a small http server fronting for a bigdata database instance."> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <btm...@us...> - 2010-08-06 19:43:32
|
Revision: 3427 http://bigdata.svn.sourceforge.net/bigdata/?rev=3427&view=rev Author: btmurphy Date: 2010-08-06 19:43:24 +0000 (Fri, 06 Aug 2010) Log Message: ----------- [trunk]: un-did the reformatting performed on the staging-through-junit targets in changeset 3419 (to prevent future conflicts when/if the dev-btm branch is merged back to the trunk) Modified Paths: -------------- trunk/build.xml Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2010-08-06 16:51:44 UTC (rev 3426) +++ trunk/build.xml 2010-08-06 19:43:24 UTC (rev 3427) @@ -852,950 +852,1044 @@ </java> </target> -<!-- --> -<!-- STAGING --> -<!-- --> -<target name="stage" description="stages resources (jar, config, policy, logging files) needed to package or execute the bigdata distribution." depends="jar"> + <!-- --> + <!-- STAGING --> + <!-- --> + <target name="stage" + description="stages resources (jar, config, policy, logging files) needed to package or execute the bigdata distribution." + depends="jar"> -<!-- Create staging directories --> -<property name="dist.dir" location="${bigdata.dir}/dist/bigdata" /> + <!-- Create staging directories --> + <property name="dist.dir" location="${bigdata.dir}/dist/bigdata" /> -<property name="dist.bin" location="${dist.dir}/bin" /> -<property name="dist.bin.config" location="${dist.bin}/config" /> -<property name="dist.lib" location="${dist.dir}/lib" /> -<property name="dist.lib.dl" location="${dist.dir}/lib-dl" /> -<property name="dist.lib.ext" location="${dist.dir}/lib-ext" /> -<property name="dist.var" location="${dist.dir}/var" /> + <property name="dist.bin" location="${dist.dir}/bin" /> + <property name="dist.bin.config" location="${dist.bin}/config" /> + <property name="dist.lib" location="${dist.dir}/lib" /> + <property name="dist.lib.dl" location="${dist.dir}/lib-dl" /> + <property name="dist.lib.ext" location="${dist.dir}/lib-ext" /> + <property name="dist.var" location="${dist.dir}/var" /> -<property name="dist.var.config" location="${dist.var}/config" /> -<property name="dist.var.config.policy" location="${dist.var.config}/policy" /> -<property name="dist.var.config.logging" location="${dist.var.config}/logging" /> -<property name="dist.var.config.jini" location="${dist.var.config}/jini" /> + <property name="dist.var.config" location="${dist.var}/config" /> + <property name="dist.var.config.policy" location="${dist.var.config}/policy" /> + <property name="dist.var.config.logging" location="${dist.var.config}/logging" /> + <property name="dist.var.config.jini" location="${dist.var.config}/jini" /> -<delete dir="${dist.dir}" quiet="true" /> -<mkdir dir="${dist.dir}" /> -<mkdir dir="${dist.bin}" /> -<mkdir dir="${dist.lib}" /> -<mkdir dir="${dist.lib.dl}" /> -<mkdir dir="${dist.lib.ext}" /> -<mkdir dir="${dist.var}" /> -<mkdir dir="${dist.var.config}" /> -<mkdir dir="${dist.var.config.policy}" /> -<mkdir dir="${dist.var.config.logging}" /> -<mkdir dir="${dist.var.config.jini}" /> + <delete dir="${dist.dir}" quiet="true" /> + <mkdir dir="${dist.dir}" /> + <mkdir dir="${dist.bin}" /> + <mkdir dir="${dist.lib}" /> + <mkdir dir="${dist.lib.dl}" /> + <mkdir dir="${dist.lib.ext}" /> + <mkdir dir="${dist.var}" /> + <mkdir dir="${dist.var.config}" /> + <mkdir dir="${dist.var.config.policy}" /> + <mkdir dir="${dist.var.config.logging}" /> + <mkdir dir="${dist.var.config.jini}" /> -<!-- Copy the jar files created by the jar target to --> -<!-- an application-specific but non-version-specific --> -<!-- jar file to either the lib or lib-dl staging --> -<!-- directory. When a new version of a given application's --> -<!-- jar file becomes available, the version-specific jar --> -<!-- file name should be changed here. --> + <!-- Copy the jar files created by the jar target to --> + <!-- an application-specific but non-version-specific --> + <!-- jar file to either the lib or lib-dl staging --> + <!-- directory. When a new version of a given application's --> + <!-- jar file becomes available, the version-specific jar --> + <!-- file name should be changed here. --> -<property name="bigdata.lib" location="${bigdata.dir}/bigdata/lib" /> -<property name="bigdata-jini.dir" location="${bigdata.dir}/bigdata-jini" /> -<property name="bigdata-jini.lib" location="${bigdata.dir}/bigdata-jini/lib/jini/lib" /> -<property name="bigdata-rdf.lib" location="${bigdata.dir}/bigdata-rdf/lib" /> -<property name="bigdata-sails.lib" location="${bigdata.dir}/bigdata-sails/lib" /> -<property name="bigdata-zookeeper.lib" location="${bigdata.dir}/bigdata-jini/lib/apache" /> + <property name="bigdata.lib" location="${bigdata.dir}/bigdata/lib" /> + <property name="bigdata-jini.dir" location="${bigdata.dir}/bigdata-jini" /> + <property name="bigdata-jini.lib" location="${bigdata.dir}/bigdata-jini/lib/jini/lib" /> + <property name="bigdata-rdf.lib" location="${bigdata.dir}/bigdata-rdf/lib" /> + <property name="bigdata-sails.lib" location="${bigdata.dir}/bigdata-sails/lib" /> + <property name="bigdata-zookeeper.lib" location="${bigdata.dir}/bigdata-jini/lib/apache" /> -<!-- Utility libraries --> + <!-- Utility libraries --> -<copy file="${bigdata.lib}/unimi/colt-1.2.0.jar" tofile="${dist.lib}/colt.jar" /> -<copy file="${bigdata.lib}/ctc_utils-5-4-2005.jar" tofile="${dist.lib}/ctc_utils.jar" /> -<copy file="${bigdata.lib}/cweb-commons-1.1-b2-dev.jar" tofile="${dist.lib}/cweb-commons.jar" /> -<copy file="${bigdata.lib}/cweb-extser-0.1-b2-dev.jar" tofile="${dist.lib}/cweb-extser.jar" /> -<copy file="${bigdata.lib}/high-scale-lib-v1.1.2.jar" tofile="${dist.lib}/highscalelib.jar" /> -<copy file="${bigdata.lib}/dsi-utils-1.0.6-020610.jar" tofile="${dist.lib}/dsiutils.jar" /> -<copy file="${bigdata.lib}/lgpl-utils-1.0.6-020610.jar" tofile="${dist.lib}/lgplutils.jar" /> -<copy file="${bigdata.lib}/unimi/fastutil-5.1.5.jar" tofile="${dist.lib}/fastutil.jar" /> -<copy file="${bigdata.lib}/icu/icu4j-3_6.jar" tofile="${dist.lib}/icu4j.jar" /> -<copy file="${bigdata.lib}/apache/log4j-1.2.15.jar" tofile="${dist.lib}/log4j.jar" /> -<copy file="${bigdata.lib}/lucene/lucene-analyzers-3.0.0.jar" tofile="${dist.lib}/lucene-analyzer.jar" /> -<copy file="${bigdata.lib}/lucene/lucene-core-3.0.0.jar" tofile="${dist.lib}/lucene-core.jar" /> + <copy file="${bigdata.lib}/unimi/colt-1.2.0.jar" + tofile="${dist.lib}/colt.jar" /> + <copy file="${bigdata.lib}/ctc_utils-5-4-2005.jar" + tofile="${dist.lib}/ctc_utils.jar" /> + <copy file="${bigdata.lib}/cweb-commons-1.1-b2-dev.jar" + tofile="${dist.lib}/cweb-commons.jar" /> + <copy file="${bigdata.lib}/cweb-extser-0.1-b2-dev.jar" + tofile="${dist.lib}/cweb-extser.jar" /> + <copy file="${bigdata.lib}/high-scale-lib-v1.1.2.jar" + tofile="${dist.lib}/highscalelib.jar" /> + <copy file="${bigdata.lib}/dsi-utils-1.0.6-020610.jar" + tofile="${dist.lib}/dsiutils.jar" /> + <copy file="${bigdata.lib}/lgpl-utils-1.0.6-020610.jar" + tofile="${dist.lib}/lgplutils.jar" /> + <copy file="${bigdata.lib}/unimi/fastutil-5.1.5.jar" + tofile="${dist.lib}/fastutil.jar" /> + <copy file="${bigdata.lib}/icu/icu4j-3_6.jar" + tofile="${dist.lib}/icu4j.jar" /> + <copy file="${bigdata.lib}/apache/log4j-1.2.15.jar" + tofile="${dist.lib}/log4j.jar" /> + <copy file="${bigdata.lib}/lucene/lucene-analyzers-3.0.0.jar" + tofile="${dist.lib}/lucene-analyzer.jar" /> + <copy file="${bigdata.lib}/lucene/lucene-core-3.0.0.jar" + tofile="${dist.lib}/lucene-core.jar" /> -<!-- RDF library --> + <!-- RDF library --> -<copy file="${bigdata-rdf.lib}/iris-0.58.jar" tofile="${dist.lib}/iris.jar" /> -<copy file="${bigdata-rdf.lib}/jgrapht-jdk1.5-0.7.1.jar" tofile="${dist.lib}/jgrapht.jar" /> -<copy file="${bigdata-rdf.lib}/openrdf-sesame-2.3.0-onejar.jar" tofile="${dist.lib}/openrdf-sesame.jar" /> -<copy file="${bigdata-rdf.lib}/slf4j-api-1.4.3.jar" tofile="${dist.lib}/slf4j.jar" /> -<copy file="${bigdata-rdf.lib}/slf4j-log4j12-1.4.3.jar" tofile="${dist.lib}/slf4j-log4j.jar" /> + <copy file="${bigdata-rdf.lib}/iris-0.58.jar" + tofile="${dist.lib}/iris.jar" /> + <copy file="${bigdata-rdf.lib}/jgrapht-jdk1.5-0.7.1.jar" + tofile="${dist.lib}/jgrapht.jar" /> + <copy file="${bigdata-rdf.lib}/openrdf-sesame-2.3.0-onejar.jar" + tofile="${dist.lib}/openrdf-sesame.jar" /> + <copy file="${bigdata-rdf.lib}/slf4j-api-1.4.3.jar" + tofile="${dist.lib}/slf4j.jar" /> + <copy file="${bigdata-rdf.lib}/slf4j-log4j12-1.4.3.jar" + tofile="${dist.lib}/slf4j-log4j.jar" /> -<!-- NxParser (RDF NQuads support) --> -<copy file="${bigdata-rdf.lib}/nxparser-6-22-2010.jar" tofile="${dist.lib}/nxparser.jar" /> + <!-- NxParser (RDF NQuads support) --> + <copy file="${bigdata-rdf.lib}/nxparser-6-22-2010.jar" + tofile="${dist.lib}/nxparser.jar" /> -<!-- Zookeeper library --> -<copy file="${bigdata-zookeeper.lib}/zookeeper-3.2.1.jar" tofile="${dist.lib}/zookeeper.jar" /> + <!-- Zookeeper library --> + <copy file="${bigdata-zookeeper.lib}/zookeeper-3.2.1.jar" + tofile="${dist.lib}/zookeeper.jar" /> -<!-- Jini library --> + <!-- Jini library --> -<copy file="${bigdata-jini.lib}/browser.jar" todir="${dist.lib}" /> -<copy file="${bigdata-jini.lib}/classserver.jar" todir="${dist.lib}" /> -<copy file="${bigdata-jini.lib}/jsk-lib.jar" todir="${dist.lib}" /> -<copy file="${bigdata-jini.lib}/jsk-platform.jar" todir="${dist.lib}" /> -<copy file="${bigdata-jini.lib}/jsk-resources.jar" todir="${dist.lib}" /> -<copy file="${bigdata-jini.lib}/reggie.jar" todir="${dist.lib}" /> -<copy file="${bigdata-jini.lib}/start.jar" todir="${dist.lib}" /> -<copy file="${bigdata-jini.lib}/tools.jar" todir="${dist.lib}" /> + <copy file="${bigdata-jini.lib}/browser.jar" + todir="${dist.lib}" /> + <copy file="${bigdata-jini.lib}/classserver.jar" + todir="${dist.lib}" /> + <copy file="${bigdata-jini.lib}/jsk-lib.jar" + todir="${dist.lib}" /> + <copy file="${bigdata-jini.lib}/jsk-platform.jar" + todir="${dist.lib}" /> + <copy file="${bigdata-jini.lib}/jsk-resources.jar" + todir="${dist.lib}" /> + <copy file="${bigdata-jini.lib}/reggie.jar" + todir="${dist.lib}" /> + <copy file="${bigdata-jini.lib}/start.jar" + todir="${dist.lib}" /> + <copy file="${bigdata-jini.lib}/tools.jar" + todir="${dist.lib}" /> -<property name="bigdata-jini.lib.dl" location="${bigdata.dir}/bigdata-jini/lib/jini/lib-dl" /> + <property name="bigdata-jini.lib.dl" location="${bigdata.dir}/bigdata-jini/lib/jini/lib-dl" /> -<copy file="${bigdata-jini.lib.dl}/browser-dl.jar" todir="${dist.lib.dl}" /> -<copy file="${bigdata-jini.lib.dl}/group-dl.jar" todir="${dist.lib.dl}" /> -<copy file="${bigdata-jini.lib.dl}/jsk-dl.jar" todir="${dist.lib.dl}" /> -<copy file="${bigdata-jini.lib.dl}/phoenix-dl.jar" todir="${dist.lib.dl}" /> -<copy file="${bigdata-jini.lib.dl}/reggie-dl.jar/" todir="${dist.lib.dl}" /> -<copy file="${bigdata-jini.lib.dl}/sdm-dl.jar" todir="${dist.lib.dl}" /> + <copy file="${bigdata-jini.lib.dl}/browser-dl.jar" + todir="${dist.lib.dl}" /> + <copy file="${bigdata-jini.lib.dl}/group-dl.jar" + todir="${dist.lib.dl}" /> + <copy file="${bigdata-jini.lib.dl}/jsk-dl.jar" + todir="${dist.lib.dl}" /> + <copy file="${bigdata-jini.lib.dl}/phoenix-dl.jar" + todir="${dist.lib.dl}" /> + <copy file="${bigdata-jini.lib.dl}/reggie-dl.jar/" + todir="${dist.lib.dl}" /> + <copy file="${bigdata-jini.lib.dl}/sdm-dl.jar" + todir="${dist.lib.dl}" /> -<property name="bigdata-jini.lib.ext" location="${bigdata.dir}/bigdata-jini/lib/jini/lib-ext" /> + <property name="bigdata-jini.lib.ext" location="${bigdata.dir}/bigdata-jini/lib/jini/lib-ext" /> -<copy file="${bigdata-jini.lib.ext}/jsk-policy.jar" todir="${dist.lib.ext}" /> + <copy file="${bigdata-jini.lib.ext}/jsk-policy.jar" + todir="${dist.lib.ext}" /> -<!-- Bigdata library --> -<property name="bigdata.jar" location="${bigdata.dir}/${build.dir}/${version}.jar" /> -<copy file="${bigdata.dir}/${build.dir}/${version}.jar" tofile="${dist.lib}/bigdata.jar" /> + <!-- Bigdata library --> + <property name="bigdata.jar" location="${bigdata.dir}/${build.dir}/${version}.jar" /> + <copy file="${bigdata.dir}/${build.dir}/${version}.jar" + tofile="${dist.lib}/bigdata.jar" /> -<property name="src.resources" location="${bigdata.dir}/src/resources" /> -<property name="src.resources.config" location="${src.resources}/config" /> + <property name="src.resources" location="${bigdata.dir}/src/resources" /> + <property name="src.resources.config" location="${src.resources}/config" /> -<!-- Stage the top-level bigdata deployment configuration files --> + <!-- Stage the top-level bigdata deployment configuration files --> -<property name="build.properties.from.file" location="${bigdata.dir}/build.properties" /> + <property name="build.properties.from.file" location="${bigdata.dir}/build.properties" /> -<copy file="${build.properties.from.file}" todir="${dist.var.config}" /> + <copy file="${build.properties.from.file}" + todir="${dist.var.config}" /> -<!-- Stage utility scripts and related resources --> + <!-- Stage utility scripts and related resources --> -<copy file="${src.resources}/bin/disco-tool" todir="${dist.bin}" /> -<chmod file="${dist.bin}/disco-tool" perm="755" /> + <copy file="${src.resources}/bin/disco-tool" + todir="${dist.bin}" /> + <chmod file="${dist.bin}/disco-tool" perm="755" /> -<copy file="${src.resources}/bin/pstart" todir="${dist.bin}" /> -<chmod file="${dist.bin}/pstart" perm="755" /> + <copy file="${src.resources}/bin/pstart" + todir="${dist.bin}" /> + <chmod file="${dist.bin}/pstart" perm="755" /> -<copy file="${src.resources}/bin/config/browser.config" todir="${dist.bin.config}" /> -<copy file="${src.resources}/bin/config/reggie.config" todir="${dist.bin.config}" /> -<copy file="${src.resources}/bin/config/serviceStarter.config" todir="${dist.bin.config}" /> + <copy file="${src.resources}/bin/config/browser.config" + todir="${dist.bin.config}" /> + <copy file="${src.resources}/bin/config/reggie.config" + todir="${dist.bin.config}" /> + <copy file="${src.resources}/bin/config/serviceStarter.config" + todir="${dist.bin.config}" /> -<!-- Stage security policy (config) files --> + <!-- Stage security policy (config) files --> -<copy file="${src.resources.config}/policy.all" todir="${dist.var.config.policy}" /> -<copy file="${src.resources.config}/service.policy" todir="${dist.var.config.policy}" /> + <copy file="${src.resources.config}/policy.all" + todir="${dist.var.config.policy}" /> + <copy file="${src.resources.config}/service.policy" + todir="${dist.var.config.policy}" /> -<!-- Stage the bigdata logging config files --> + <!-- Stage the bigdata logging config files --> -<property name="logging.to.path" location="${dist.var.config.logging}" /> + <property name="logging.to.path" location="${dist.var.config.logging}" /> -<property name="log4j.from.file" location="${bigdata.dir}/bigdata/src/resources/logging/log4j.properties" /> -<copy file="${log4j.from.file}" todir="${logging.to.path}" /> + <property name="log4j.from.file" location="${bigdata.dir}/bigdata/src/resources/logging/log4j.properties" /> + <copy file="${log4j.from.file}" + todir="${logging.to.path}" /> -<property name="logging.from.file" location="${bigdata.dir}/bigdata/src/resources/logging/logging.properties" /> -<copy file="${logging.from.file}" todir="${logging.to.path}" /> + <property name="logging.from.file" location="${bigdata.dir}/bigdata/src/resources/logging/logging.properties" /> + <copy file="${logging.from.file}" + todir="${logging.to.path}" /> -<property name="standalone.log4j.from.file" location="${src.resources.config}/standalone/log4j.properties" /> -<property name="standalone.log4j.to.file" location="${logging.to.path}/log4jStandalone.properties" /> -<copy file="${standalone.log4j.from.file}" tofile="${standalone.log4j.to.file}" /> + <property name="standalone.log4j.from.file" location="${src.resources.config}/standalone/log4j.properties" /> + <property name="standalone.log4j.to.file" location="${logging.to.path}/log4jStandalone.properties" /> + <copy file="${standalone.log4j.from.file}" + tofile="${standalone.log4j.to.file}" /> -<property name="server.log4j.from.file" location="${src.resources.config}/log4jServer.properties" /> -<copy file="${server.log4j.from.file}" todir="${logging.to.path}" /> + <property name="server.log4j.from.file" location="${src.resources.config}/log4jServer.properties" /> + <copy file="${server.log4j.from.file}" + todir="${logging.to.path}" /> -<!-- Stage service-specific logging config file --> + <!-- Stage service-specific logging config file --> -<property name="bigdata-jini.root" location="${bigdata-jini.dir}/src/java/com/bigdata" /> + <property name="bigdata-jini.root" location="${bigdata-jini.dir}/src/java/com/bigdata" /> -<copy file="${bigdata-jini.root}/disco/config/disco.config" todir="${dist.bin.config}" /> + <copy file="${bigdata-jini.root}/disco/config/disco.config" + todir="${dist.bin.config}" /> -<copy file="${bigdata-jini.root}/disco/config/logging.properties" tofile="${dist.bin.config}/disco-logging.properties" /> + <copy file="${bigdata-jini.root}/disco/config/logging.properties" + tofile="${dist.bin.config}/disco-logging.properties" /> -<copy file="${src.resources.config}/zookeeper-logging.properties" todir="${logging.to.path}" /> -<copy file="${src.resources.config}/reggie-logging.properties" todir="${logging.to.path}" /> -<copy file="${src.resources.config}/browser-logging.properties" todir="${logging.to.path}" /> + <copy file="${src.resources.config}/zookeeper-logging.properties" + todir="${logging.to.path}" /> + <copy file="${src.resources.config}/reggie-logging.properties" + todir="${logging.to.path}" /> + <copy file="${src.resources.config}/browser-logging.properties" + todir="${logging.to.path}" /> -<!-- Stage the bigdata Jini config files --> + <!-- Stage the bigdata Jini config files --> -<copy file="${src.resources.config}/bigdataStandalone.config" todir="${dist.var.config.jini}" /> -<copy file="${src.resources.config}/bigdataCluster.config" todir="${dist.var.config.jini}" /> -<copy file="${src.resources.config}/bigdataCluster16.config" todir="${dist.var.config.jini}" /> + <copy file="${src.resources.config}/bigdataStandalone.config" + todir="${dist.var.config.jini}" /> + <copy file="${src.resources.config}/bigdataCluster.config" + todir="${dist.var.config.jini}" /> + <copy file="${src.resources.config}/bigdataCluster16.config" + todir="${dist.var.config.jini}" /> -<!-- Stage the infrastructure service config files --> + <!-- Stage the infrastructure service config files --> -<copy file="${src.resources.config}/jini/reggie.config" todir="${dist.var.config.jini}" /> -<copy file="${src.resources.config}/jini/browser.config" todir="${dist.var.config.jini}" /> -<copy file="${src.resources.config}/jini/startAll.config" todir="${dist.var.config.jini}" /> -</target> + <copy file="${src.resources.config}/jini/reggie.config" + todir="${dist.var.config.jini}" /> + <copy file="${src.resources.config}/jini/browser.config" + todir="${dist.var.config.jini}" /> + <copy file="${src.resources.config}/jini/startAll.config" + todir="${dist.var.config.jini}" /> + </target> -<!-- --> -<!-- RELEASE --> -<!-- --> -<target name="deploy-artifact" depends="clean, stage" description="Create compressed tar file for deployment."> -<tar destfile="${bigdata.dir}/REL.${version}.tgz" compression="gzip"> + <!-- --> + <!-- RELEASE --> + <!-- --> + <target name="deploy-artifact" depends="clean, stage" + description="Create compressed tar file for deployment."> - <tarfileset dir="${bigdata.dir}/dist"> - <include name="bigdata/**" /> + <tar destfile="${bigdata.dir}/REL.${version}.tgz" + compression="gzip"> - <exclude name="bigdata/bin/disco-tool" /> - <exclude name="bigdata/bin/pstart" /> + <tarfileset dir="${bigdata.dir}/dist"> + <include name="bigdata/**" /> + <exclude name="bigdata/bin/disco-tool" /> + <exclude name="bigdata/bin/pstart" /> + </tarfileset> - </tarfileset> + <!-- Add scripts separately, making them executable --> - <!-- Add scripts separately, making them executable --> + <tarfileset dir="${bigdata.dir}/dist" filemode="755"> + <include name="bigdata/bin/disco-tool" /> + <include name="bigdata/bin/pstart" /> + </tarfileset> + </tar> - <tarfileset dir="${bigdata.dir}/dist" filemode="755"> - <include name="bigdata/bin/disco-tool" /> - <include name="bigdata/bin/pstart" /> + </target> - </tarfileset> -</tar> -</target> + <target name="ant-install-prepare" depends="jar, bundle" + description="Stage all files (src, lib, config, etc.) needed for ant based install."> + <copy toDir="${build.dir}/bigdata/src"> + <fileset dir="${bigdata.dir}/bigdata/src" /> + </copy> + <copy toDir="${build.dir}/bigdata-jini/src"> + <fileset dir="${bigdata.dir}/bigdata-jini/src" /> + </copy> + <copy toDir="${build.dir}/bigdata-rdf/src"> + <fileset dir="${bigdata.dir}/bigdata-rdf/src" /> + </copy> + <copy toDir="${build.dir}/bigdata-sails/src"> + <fileset dir="${bigdata.dir}/bigdata-sails/src" /> + </copy> + <copy toDir="${build.dir}/lgpl-utils/src"> + <fileset dir="${bigdata.dir}/lgpl-utils/src" /> + </copy> -<target name="ant-install-prepare" depends="jar, bundle" description="Stage all files (src, lib, config, etc.) needed for ant based install."> -<copy toDir="${build.dir}/bigdata/src"> - <fileset dir="${bigdata.dir}/bigdata/src" /> -</copy> -<copy toDir="${build.dir}/bigdata-jini/src"> - <fileset dir="${bigdata.dir}/bigdata-jini/src" /> -</copy> -<copy toDir="${build.dir}/bigdata-rdf/src"> - <fileset dir="${bigdata.dir}/bigdata-rdf/src" /> -</copy> -<copy toDir="${build.dir}/bigdata-sails/src"> - <fileset dir="${bigdata.dir}/bigdata-sails/src" /> -</copy> -<copy toDir="${build.dir}/lgpl-utils/src"> - <fileset dir="${bigdata.dir}/lgpl-utils/src" /> -</copy> + <mkdir dir="${build.dir}/bigdata/lib" /> + <copy toDir="${build.dir}/bigdata/lib"> + <fileset dir="${bigdata.dir}/bigdata/lib" /> + </copy> -<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" /> + </copy> + <mkdir dir="${build.dir}/bigdata-rdf/lib" /> + <copy toDir="${build.dir}/bigdata-rdf/lib"> + <fileset dir="${bigdata.dir}/bigdata-rdf/lib" /> + </copy> -<mkdir dir="${build.dir}/bigdata-jini/lib" /> -<copy toDir="${build.dir}/bigdata-jini/lib"> - <fileset dir="${bigdata.dir}/bigdata-jini/lib" /> -</copy> -<mkdir dir="${build.dir}/bigdata-rdf/lib" /> -<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" /> + </copy> -<mkdir dir="${build.dir}/bigdata-sails/lib" /> -<copy toDir="${build.dir}/bigdata-sails/lib"> - <fileset dir="${bigdata.dir}/bigdata-sails/lib" /> -</copy> + <mkdir dir="${build.dir}/src" /> + <mkdir dir="${build.dir}/src/resources" /> + <mkdir dir="${build.dir}/src/resources/config" /> + <copy toDir="${build.dir}/src/resources/config"> + <fileset dir="${bigdata.dir}/src/resources/config" /> + </copy> -<mkdir dir="${build.dir}/src" /> -<mkdir dir="${build.dir}/src/resources" /> -<mkdir dir="${build.dir}/src/resources/config" /> -<copy toDir="${build.dir}/src/resources/config"> - <fileset dir="${bigdata.dir}/src/resources/config" /> -</copy> + <mkdir dir="${build.dir}/src/resources/scripts" /> + <copy toDir="${build.dir}/src/resources/scripts"> + <fileset dir="${bigdata.dir}/src/resources/scripts" /> + </copy> -<mkdir dir="${build.dir}/src/resources/scripts" /> -<copy toDir="${build.dir}/src/resources/scripts"> - <fileset dir="${bigdata.dir}/src/resources/scripts" /> -</copy> + <!-- Stage all analysis tools (queries directory is required for extractCounters.sh) --> + <mkdir dir="${build.dir}/src/resources/analysis" /> + <copy toDir="${build.dir}/src/resources/analysis"> + <fileset dir="${bigdata.dir}/src/resources/analysis" /> + </copy> -<!-- Copy the analysis tools. The queries directory is required for extractCounters.sh. --> -<mkdir dir="${build.dir}/src/resources/analysis" /> -<copy toDir="${build.dir}/src/resources/analysis"> - <fileset dir="${bigdata.dir}/src/resources/analysis" /> -</copy> + <copy tofile="${build.dir}/build.properties" file="build.properties" /> + <copy tofile="${build.dir}/build.xml" file="build.xml" /> + <copy tofile="${build.dir}/LICENSE.txt" file="LICENSE.txt" /> + <copy tofile="${build.dir}/overview.html" file="overview.html" /> + <copy tofile="${build.dir}/README-JINI" file="README-JINI" /> + <copy toDir="${build.dir}/LEGAL" flatten="true"> + <fileset dir="${bigdata.dir}"> + <include name="**/LEGAL/*" /> + </fileset> + </copy> + </target> -<copy tofile="${build.dir}/build.properties" file="build.properties" /> -<copy tofile="${build.dir}/build.xml" file="build.xml" /> -<copy tofile="${build.dir}/LICENSE.txt" file="LICENSE.txt" /> -<copy tofile="${build.dir}/overview.html" file="overview.html" /> -<copy tofile="${build.dir}/README-JINI" file="README-JINI" /> -<copy toDir="${build.dir}/LEGAL" flatten="true"> - <fileset dir="${bigdata.dir}"> - <include name="**/LEGAL/*" /> - </fileset> -</copy> -</target> + <target name="ant-install-artifact" depends="clean, ant-install-prepare, stage" + description="Create complete source tar file for ant based install."> -<target name="ant-install-artifact" depends="clean, ant-install-prepare, stage" description="Create complete source tar file for ant based install."> -<mkdir dir="${release.dir}" /> -<tar destfile="${bigdata.dir}/DIST.${version}.tgz" compression="gzip"> - <tarfileset dir="${build.dir}" prefix="${version}"> - <include name="build.properties" /> - <include name="build.xml" /> - <include name="LICENSE.txt" /> - <include name="overview.html" /> - <include name="README-JINI" /> - <include name="LEGAL/*" /> + <mkdir dir="${release.dir}" /> + <tar destfile="${bigdata.dir}/DIST.${version}.tgz" compression="gzip"> + <tarfileset dir="${build.dir}" prefix="${version}"> + <include name="build.properties" /> + <include name="build.xml" /> + <include name="LICENSE.txt" /> + <include name="overview.html" /> + <include name="README-JINI" /> + <include name="LEGAL/*" /> - <include name="bigdata/src/**" /> - <include name="bigdata-jini/src/**" /> - <include name="bigdata-rdf/src/**" /> - <include name="bigdata-sails/src/**" /> - <include name="lgpl-utils/src/**" /> - <include name="bigdata/lib/**" /> - <include name="bigdata-jini/lib/**" /> - <include name="bigdata-rdf/lib/**" /> - <include name="bigdata-sails/lib/**" /> - <include name="src/**" /> - <exclude name="classes/**" /> - <exclude name="${version}.jar" /> - <exclude name="lib/**" /> - <exclude name="docs/**" /> + <include name="bigdata/src/**" /> + <include name="bigdata-jini/src/**" /> + <include name="bigdata-rdf/src/**" /> + <include name="bigdata-sails/src/**" /> + <include name="lgpl-utils/src/**" /> + <include name="bigdata/lib/**" /> + <include name="bigdata-jini/lib/**" /> + <include name="bigdata-rdf/lib/**" /> + <include name="bigdata-sails/lib/**" /> + <include name="src/**" /> + <exclude name="classes/**" /> + <exclude name="${version}.jar" /> + <exclude name="lib/**" /> + <exclude name="docs/**" /> - <exclude name="dist/bigdata/**" /> + <exclude name="dist/bigdata/**" /> - <exclude name="dist/bigdata/bin/disco-tool" /> - <exclude name="dist/bigdata/bin/pstart" /> - </tarfileset> + <exclude name="dist/bigdata/bin/disco-tool" /> + <exclude name="dist/bigdata/bin/pstart" /> + </tarfileset> - <!-- Add dist files separately, minus scripts --> + <!-- Add dist files separately, minus scripts --> - <tarfileset dir="${bigdata.dir}" prefix="${version}"> - <include name="dist/bigdata/**" /> + <tarfileset dir="${bigdata.dir}" prefix="${version}"> + <include name="dist/bigdata/**" /> + <exclude name="dist/bigdata/bin/disco-tool" /> + <exclude name="dist/bigdata/bin/pstart" /> + </tarfileset> - <exclude name="dist/bigdata/bin/disco-tool" /> - <exclude name="dist/bigdata/bin/pstart" /> - </tarfileset> + <!-- Add dist scripts separately, making them executable --> - <!-- Add dist scripts separately, making them executable --> + <tarfileset dir="${bigdata.dir}" prefix="${version}" filemode="755"> + <include name="dist/bigdata/bin/disco-tool" /> + <include name="dist/bigdata/bin/pstart" /> + </tarfileset> + </tar> - <tarfileset dir="${bigdata.dir}" prefix="${version}" filemode="755"> - <include name="dist/bigdata/bin/disco-tool" /> - <include name="dist/bigdata/bin/pstart" /> - </tarfileset> -</tar> + <tar destfile="${bigdata.dir}/REL.${version}.tgz" + basedir="${bigdata.dir}/dist" + compression="gzip"> + </tar> + </target> -<tar destfile="${bigdata.dir}/REL.${version}.tgz" basedir="${bigdata.dir}/dist" compression="gzip"> -</tar> -</target> + <target name="ant-install" depends="jar, banner, bundle" description="Ant based install on a node."> + <mkdir dir="${NAS}" /> + <mkdir dir="${LAS}" /> + <chmod perm="ug+rw,o-rw"> + <fileset dir="${NAS}" /> + </chmod> + <chmod perm="ug+rw,o-rw"> + <fileset dir="${LAS}" /> + </chmod> + <mkdir dir="${install.config.dir}" /> + <mkdir dir="${install.doc.dir}" /> + <mkdir dir="${install.lib.dir}" /> + <mkdir dir="${install.bin.dir}" /> + <mkdir dir="${install.log.dir}" /> + <mkdir dir="${install.dist.dir}" /> + <copy toDir="${install.config.dir}"> + <fileset dir="${bigdata.dir}/src/resources/config" /> + </copy> + <copy toDir="${install.doc.dir}"> + <fileset dir="${bigdata.dir}"> + <include name="LICENSE.txt" /> + <include name="overview.html" /> + <include name="README-JINI" /> + <include name="bigdata/LEGAL/*" /> + <include name="bigdata-jini/LEGAL/*" /> + <include name="bigdata-rdf/LEGAL/*" /> + <include name="bigdata-sails/LEGAL/*" /> + </fileset> + </copy> -<target name="ant-install" depends="jar, banner, bundle" description="Ant based install on a node."> -<mkdir dir="${NAS}" /> -<mkdir dir="${LAS}" /> -<chmod perm="ug+rw,o-rw"> - <fileset dir="${NAS}" /> -</chmod> -<chmod perm="ug+rw,o-rw"> - <fileset dir="${LAS}" /> -</chmod> -<mkdir dir="${install.config.dir}" /> -<mkdir dir="${install.doc.dir}" /> -<mkdir dir="${install.lib.dir}" /> -<mkdir dir="${install.bin.dir}" /> -<mkdir dir="${install.log.dir}" /> -<mkdir dir="${install.dist.dir}" /> -<copy toDir="${install.config.dir}"> - <fileset dir="${bigdata.dir}/src/resources/config" /> -</copy> -<copy toDir="${install.doc.dir}"> - <fileset dir="${bigdata.dir}"> - <include name="LICENSE.txt" /> - <include name="overview.html" /> - <include name="README-JINI" /> - <include name="bigdata/LEGAL/*" /> - <include name="bigdata-jini/LEGAL/*" /> - <include name="bigdata-rdf/LEGAL/*" /> - <include name="bigdata-sails/LEGAL/*" /> - </fileset> -</copy> + <copy toDir="${install.lib.dir}"> + <fileset dir="${build.dir}/lib" /> + <fileset file="${build.dir}/${version}.jar" /> + </copy> -<copy toDir="${install.lib.dir}"> - <fileset dir="${build.dir}/lib" /> - <fileset file="${build.dir}/${version}.jar" /> -</copy> + <copy toDir="${install.bin.dir}"> + <fileset dir="src/resources/scripts" /> + </copy> -<copy toDir="${install.bin.dir}"> - <fileset dir="src/resources/scripts" /> -</copy> + <copy toDir="${install.dist.dir}"> + <fileset dir="${bigdata.dir}/dist"> + <include name="bigdata/**" /> + </fileset> + </copy> -<copy toDir="${install.dist.dir}"> - <fileset dir="${bigdata.dir}/dist"> - <include name="bigdata/**" /> - </fileset> -</copy> + <!-- parameter substitution. --> + <property name="myclasspath" refid="install.classpath" /> + <replace dir="${install.bin.dir}" summary="true"> + <replacefilter token="@FED@" value="${FED}" /> + <replacefilter token="@NAS@" value="${NAS}" /> + <replacefilter token="@LAS@" value="${LAS}" /> + <replacefilter token="@JAVA_HOME@" value="${JAVA_HOME}" /> + <replacefilter token="@JINI_CLASS_SERVER_PORT@" value="${JINI_CLASS_SERVER_PORT}" /> + <replacefilter token="@LOAD_BALANCER_PORT@" value="${LOAD_BALANCER_PORT}" /> + <replacefilter token="@SYSSTAT_HOME@" value="${SYSSTAT_HOME}" /> + <replacefilter token="@USE_NIO@" value="${USE_NIO}" /> + <replacefilter token="@BIN_DIR@" value="${install.bin.dir}" /> + <replacefilter token="@LIB_DIR@" value="${install.lib.dir}" /> + <replacefilter token="@LOG_DIR@" value="${install.log.dir}" /> + <replacefilter token="@CONFIG_DIR@" value="${install.config.dir}" /> + <replacefilter token="@INSTALL_USER@" value="${install.user}" /> + <replacefilter token="@INSTALL_GROUP@" value="${install.group}" /> + <replacefilter token="@LOCK_FILE@" value="${LOCK_FILE}" /> + <replacefilter token="@BIGDATA_CONFIG@" value="${bigdata.config}" /> + <replacefilter token="@JINI_CONFIG@" value="${jini.config}" /> + <replacefilter token="@POLICY_FILE@" value="${policyFile}" /> + <replacefilter token="@LOG4J_SOCKET_LOGGER_HOST@" value="${LOG4J_SOCKET_LOGGER_HOST}" /> + <replacefilter token="@LOG4J_SOCKET_LOGGER_PORT@" value="${LOG4J_SOCKET_LOGGER_PORT}" /> + <replacefilter token="@LOG4J_SOCKET_LOGGER_CONFIG@" value="${log4jServer.config}" /> + <replacefilter token="@LOG4J_DATE_PATTERN@" value="${LOG4J_DATE_PATTERN}" /> + <replacefilter token="@LOG4J_CONFIG@" value="${log4j.config}" /> + <replacefilter token="@LOGGING_CONFIG@" value="${logging.config}" /> + <replacefilter token="@ERROR_LOG@" value="${errorLog}" /> + <replacefilter token="@DETAIL_LOG@" value="${detailLog}" /> + <replacefilter token="@EVENT_LOG@" value="${eventLog}" /> + <replacefilter token="@RULE_LOG@" value="${ruleLog}" /> + <replacefilter token="@STATE_LOG@" value="${stateLog}" /> + <replacefilter token="@STATE_FILE@" value="${stateFile}" /> + <replacefilter token="@FORCE_KILL_ALL@" value="${forceKillAll}" /> + <replacefilter token="@NTP_MASTER@" value="${NTP_MASTER}" /> + <replacefilter token="@NTP_NETWORK@" value="${NTP_NETWORK}" /> + <replacefilter token="@NTP_NETMASK@" value="${NTP_NETMASK}" /> + <replacefilter token="@CLASSPATH@" value="${myclasspath}" /> + </replace> -<!-- parameter substitution. --> -<property name="myclasspath" refid="install.classpath" /> -<replace dir="${install.bin.dir}" summary="true"> - <replacefilter token="@FED@" value="${FED}" /> - <replacefilter token="@NAS@" value="${NAS}" /> - <replacefilter token="@LAS@" value="${LAS}" /> - <replacefilter token="@JAVA_HOME@" value="${JAVA_HOME}" /> - <replacefilter token="@JINI_CLASS_SERVER_PORT@" value="${JINI_CLASS_SERVER_PORT}" /> - <replacefilter token="@LOAD_BALANCER_PORT@" value="${LOAD_BALANCER_PORT}" /> - <replacefilter token="@SYSSTAT_HOME@" value="${SYSSTAT_HOME}" /> - <replacefilter token="@USE_NIO@" value="${USE_NIO}" /> - <replacefilter token="@BIN_DIR@" value="${install.bin.dir}" /> - <replacefilter token="@LIB_DIR@" value="${install.lib.dir}" /> - <replacefilter token="@LOG_DIR@" value="${install.log.dir}" /> - <replacefilter token="@CONFIG_DIR@" value="${install.config.dir}" /> - <replacefilter token="@INSTALL_USER@" value="${install.user}" /> - <replacefilter token="@INSTALL_GROUP@" value="${install.group}" /> - <replacefilter token="@LOCK_FILE@" value="${LOCK_FILE}" /> - <replacefilter token="@BIGDATA_CONFIG@" value="${bigdata.config}" /> - <replacefilter token="@JINI_CONFIG@" value="${jini.config}" /> - <replacefilter token="@POLICY_FILE@" value="${policyFile}" /> - <replacefilter token="@LOG4J_SOCKET_LOGGER_HOST@" value="${LOG4J_SOCKET_LOGGER_HOST}" /> - <replacefilter token="@LOG4J_SOCKET_LOGGER_PORT@" value="${LOG4J_SOCKET_LOGGER_PORT}" /> - <replacefilter token="@LOG4J_SOCKET_LOGGER_CONFIG@" value="${log4jServer.config}" /> - <replacefilter token="@LOG4J_DATE_PATTERN@" value="${LOG4J_DATE_PATTERN}" /> - <replacefilter token="@LOG4J_CONFIG@" value="${log4j.config}" /> - <replacefilter token="@LOGGING_CONFIG@" value="${logging.config}" /> - <replacefilter token="@ERROR_LOG@" value="${errorLog}" /> - <replacefilter token="@DETAIL_LOG@" value="${detailLog}" /> - <replacefilter token="@EVENT_LOG@" value="${eventLog}" /> - <replacefilter token="@RULE_LOG@" value="${ruleLog}" /> - <replacefilter token="@STATE_LOG@" value="${stateLog}" /> - <replacefilter token="@STATE_FILE@" value="${stateFile}" /> - <replacefilter token="@FORCE_KILL_ALL@" value="${forceKillAll}" /> - <replacefilter token="@NTP_MASTER@" value="${NTP_MASTER}" /> - <replacefilter token="@NTP_NETWORK@" value="${NTP_NETWORK}" /> - <replacefilter token="@NTP_NETMASK@" value="${NTP_NETMASK}" /> - <replacefilter token="@CLASSPATH@" value="${myclasspath}" /> -</replace> + <replace dir="${install.config.dir}" summary="true"> + <replacefilter token="@FED@" value="${FED}" /> + <replacefilter token="@NAS@" value="${NAS}" /> + <replacefilter token="@LAS@" value="${LAS}" /> + <replacefilter token="@LOG4J_SOCKET_LOGGER_HOST@" value="${LOG4J_SOCKET_LOGGER_HOST}" /> + <replacefilter token="@JAVA_HOME@" value="${JAVA_HOME}" /> + <replacefilter token="@JINI_CLASS_SERVER_PORT@" value="${JINI_CLASS_SERVER_PORT}" /> + <replacefilter token="@LOAD_BALANCER_PORT@" value="${LOAD_BALANCER_PORT}" /> + <replacefilter token="@SYSSTAT_HOME@" value="${SYSSTAT_HOME}" /> + <replacefilter token="@USE_NIO@" value="${USE_NIO}" /> + <replacefilter token="@BIN_DIR@" value="${install.bin.dir}" /> + <replacefilter token="@LIB_DIR@" value="${install.lib.dir}" /> + <replacefilter token="@LOG_DIR@" value="${install.log.dir}" /> + <replacefilter token="@CONFIG_DIR@" value="${install.config.dir}" /> + <replacefilter token="@INSTALL_USER@" value="${install.user}" /> + <replacefilter token="@INSTALL_GROUP@" value="${install.group}" /> + <replacefilter token="@LOCK_FILE@" value="${LOCK_FILE}" /> + <replacefilter token="@BIGDATA_CONFIG@" value="${bigdata.config}" /> + <replacefilter token="@JINI_CONFIG@" value="${jini.config}" /> + <replacefilter token="@POLICY_FILE@" value="${policyFile}" /> + <replacefilter token="@LOG4J_SOCKET_LOGGER_HOST@" value="${LOG4J_SOCKET_LOGGER_HOST}" /> + <replacefilter token="@LOG4J_SOCKET_LOGGER_PORT@" value="${LOG4J_SOCKET_LOGGER_PORT}" /> + <replacefilter token="@LOG4J_SOCKET_LOGGER_CONFIG@" value="${log4jServer.config}" /> + <replacefilter token="@LOG4J_DATE_PATTERN@" value="${LOG4J_DATE_PATTERN}" /> + <replacefilter token="@LOG4J_CONFIG@" value="${log4j.config}" /> + <replacefilter token="@LOGGING_CONFIG@" value="${logging.config}" /> + <replacefilter token="@ERROR_LOG@" value="${errorLog}" /> + <replacefilter token="@DETAIL_LOG@" value="${detailLog}" /> + <replacefilter token="@EVENT_LOG@" value="${eventLog}" /> + <replacefilter token="@RULE_LOG@" value="${ruleLog}" /> + <replacefilter token="@STATE_LOG@" value="${stateLog}" /> + <replacefilter token="@STATE_FILE@" value="${stateFile}" /> + <replacefilter token="@FORCE_KILL_ALL@" value="${forceKillAll}" /> + <replacefilter token="@NTP_MASTER@" value="${NTP_MASTER}" /> + <replacefilter token="@NTP_NETWORK@" value="${NTP_NETWORK}" /> + <replacefilter token="@NTP_NETMASK@" value="${NTP_NETMASK}" /> + <replacefilter token="@CLASSPATH@" value="${myclasspath}" /> + <!-- updates the configuration file to locate the lubm ontology. --> + <replacefilter token="@install.lubm.config.dir@" value="${install.lubm.config.dir}" /> + </replace> -<replace dir="${install.config.dir}" summary="true"> - <replacefilter token="@FED@" value="${FED}" /> - <replacefilter token="@NAS@" value="${NAS}" /> - <replacefilter token="@LAS@" value="${LAS}" /> - <replacefilter token="@LOG4J_SOCKET_LOGGER_HOST@" value="${LOG4J_SOCKET_LOGGER_HOST}" /> - <replacefilter token="@JAVA_HOME@" value="${JAVA_HOME}" /> - <replacefilter token="@JINI_CLASS_SERVER_PORT@" value="${JINI_CLASS_SERVER_PORT}" /> - <replacefilter token="@LOAD_BALANCER_PORT@" value="${LOAD_BALANCER_PORT}" /> - <replacefilter token="@SYSSTAT_HOME@" value="${SYSSTAT_HOME}" /> - <replacefilter token="@USE_NIO@" value="${USE_NIO}" /> - <replacefilter token="@BIN_DIR@" value="${install.bin.dir}" /> - <replacefilter token="@LIB_DIR@" value="${install.lib.dir}" /> - <replacefilter token="@LOG_DIR@" value="${install.log.dir}" /> - <replacefilter token="@CONFIG_DIR@" value="${install.config.dir}" /> - <replacefilter token="@INSTALL_USER@" value="${install.user}" /> - <replacefilter token="@INSTALL_GROUP@" value="${install.group}" /> - <replacefilter token="@LOCK_FILE@" value="${LOCK_FILE}" /> - <replacefilter token="@BIGDATA_CONFIG@" value="${bigdata.config}" /> - <replacefilter token="@JINI_CONFIG@" value="${jini.config}" /> - <replacefilter token="@POLICY_FILE@" value="${policyFile}" /> - <replacefilter token="@LOG4J_SOCKET_LOGGER_HOST@" value="${LOG4J_SOCKET_LOGGER_HOST}" /> - <replacefilter token="@LOG4J_SOCKET_LOGGER_PORT@" value="${LOG4J_SOCKET_LOGGER_PORT}" /> - <replacefilter token="@LOG4J_SOCKET_LOGGER_CONFIG@" value="${log4jServer.config}" /> - <replacefilter token="@LOG4J_DATE_PATTERN@" value="${LOG4J_DATE_PATTERN}" /> - <replacefilter token="@LOG4J_CONFIG@" value="${log4j.config}" /> - <replacefilter token="@LOGGING_CONFIG@" value="${logging.config}" /> - <replacefilter token="@ERROR_LOG@" value="${errorLog}" /> - <replacefilter token="@DETAIL_LOG@" value="${detailLog}" /> - <replacefilter token="@EVENT_LOG@" value="${eventLog}" /> - <replacefilter token="@RULE_LOG@" value="${ruleLog}" /> - <replacefilter token="@STATE_LOG@" value="${stateLog}" /> - <replacefilter token="@STATE_FILE@" value="${stateFile}" /> - <replacefilter token="@FORCE_KILL_ALL@" value="${forceKillAll}" /> - <replacefilter token="@NTP_MASTER@" value="${NTP_MASTER}" /> - <replacefilter token="@NTP_NETWORK@" value="${NTP_NETWORK}" /> - <replacefilter token="@NTP_NETMASK@" value="${NTP_NETMASK}" /> - <replacefilter token="@CLASSPATH@" value="${myclasspath}" /> - <!-- updates the configuration file to locate the lubm ontology. --> - <replacefilter token="@install.lubm.config.dir@" value="${install.lubm.config.dir}" /> -</replace> + <!-- fix newlines (otherwise substitutions cause things to break). --> + <fixcrlf srcDir="${install.config.dir}" /> + <fixcrlf srcDir="${install.bin.dir}" /> -<!-- fix newlines (otherwise substitutions cause things to break). --> -<fixcrlf srcDir="${install.config.dir}" /> -<fixcrlf srcDir="${install.bin.dir}" /> + <!-- set execute bit for scripts in this directory (must be the last step). --> + <chmod perm="u+x,g+rx,o-rwx"> + <fileset dir="${install.bin.dir}"> + <exclude name="README" /> + <exclude name="POST-INSTALL" /> + </fileset> + </chmod> -<!-- set execute bit for scripts in this directory (must be the last step). --> -<chmod perm="u+x,g+rx,o-rwx"> - <fileset dir="${install.bin.dir}"> - <exclude name="README" /> - <exclude name="POST-INSTALL" /> - </fileset> -</chmod> + <!-- Setup the status file which will be read by the bigdata script and + the log on which that script will write its output. This is used + if cron, or a similar process, will execute the script on a periodic + basis. The initial state is always 'status'. The initial stateLog + is always empty. The state file must be readable by the group, but + could be restricted to write by a specific user. The stateLog must be + read/write for the group. --> -<!-- Setup the status file which will be read by the bigdata script and - the log on which that script will write its output. This is used - if cron, or a similar process, will execute the script on a periodic - basis. The initial state is always 'status'. The initial stateLog - is always empty. The state file must be readable by the group, but - could be restricted to write by a specific user. The stateLog must be - read/write for the group. --> - <echo file="${stateFile}">status</echo> <echo file="${stateLog}"> </echo> -<chmod perm="g+rw,o-rw" file="${stateFile}" /> -<chmod perm="g+rw,o-rw" file="${stateLog}" /> + <chmod perm="g+rw,o-rw" file="${stateFile}" /> + <chmod perm="g+rw,o-rw" file="${stateLog}" /> -<!-- Make sure that the entire shared directory structure is read/write for the group. --> -<chmod perm="g+rwx" type="both" dir="${NAS}" verbose="true" /> + <!-- Make sure that the entire shared directory structure is read/write for the group. --> + <chmod perm="g+rwx" type="both" dir="${NAS}" verbose="true" /> <!-- Make sure that it is all accessible to the install group (ant 1.6+ plus extension module required). - <chown file="${NAS}" type="both" owner="${install.user}.${install.group}" verbose="true"/> + <chown file="${NAS}" type="both" owner="${install.user}.${install.group}" verbose="true" /> --> -<!-- Works for earlier versions of ant LT 1.6 which do not bundle "chown". --> -<apply executable="chown" description="set owner on NAS files" os="Linux"> - <arg value="-R" /> - <arg value="${install.user}.${install.group}" /> - <dirset dir="${NAS}" /> -</apply> + <!-- Works for earlier versions of ant LT 1.6 which do not bundle "chown". --> + <apply executable="chown" description="set owner on NAS files" os="Linux"> + <arg value="-R" /> + <arg value="${install.user}.${install.group}" /> + <dirset dir="${NAS}" /> + </apply> -<!-- @todo check the installed configuration file (after parameter substitution). --> -<!-- @todo also check the installed jini configuration files. --> -<java classname="com.bigdata.jini.util.CheckConfiguration" failonerror="true" fork="true" logerror="true"> - <classpath refid="install.classpath" /> - <arg value="${bigdata.config}" /> -</java> + <!-- @todo check the installed configuration file (after parameter substitution). --> + <!-- @todo also check the installed jini configuration files. --> + <java classname="com.bigdata.jini.util.CheckConfiguration" + failonerror="true" fork="true" logerror="true"> + <classpath refid="install.classpath" /> + <arg value="${bigdata.config}" /> + </java> -<loadfile property="postInstallMessage" srcFile="${install.bin.dir}/POST-INSTALL" /> + <loadfile property="postInstallMessage" srcFile="${install.bin.dir}/POST-INSTALL" /> <echo> ${postInstallMessage}</echo> -</target> + </target> -<!-- --> -<!-- UNIT TESTS --> -<!-- --> -<target name="testCompile" description="compiles the test source and generates the appropriate jar files." depends="stage"> + <!-- --> + <!-- UNIT TESTS --> + <!-- --> + <target name="testCompile" + description="compiles the test source and generates the appropriate jar files." + depends="stage"> -<property name="classes.dir" location="${bigdata.dir}/${build.dir}/classes" /> + <property name="classes.dir" location="${bigdata.dir}/${build.dir}/classes" /> -<!-- Some of the tests look for build.properties in the user's --> -<!-- home directory, so must copy it from its location in the --> -<!-- codebase to that home directory. --> + <!-- Some of the tests look for build.properties in the user's --> + <!-- home directory, so must copy it from its location in the --> + <!-- codebase to that home directory. --> -<property name="build.properties.test.to.path" location="${user.home}" /> -<property name="build.properties.test.to.file" location="${build.properties.test.to.path}/build.properties" /> + <property name="build.properties.test.to.path" location="${user.home}" /> + <property name="build.properties.test.to.file" location="${build.properties.test.to.path}/build.properties" /> -<!-- Want value (not location) for relative paths to log4j --> -<!-- config file so the junit classloader will search for that --> -<!-- file on the classpath. Thus, use location (instead of --> -<!-- value) for absolute paths so fully-qualified paths are --> -<!-- used when copying that file under the classes dir. --> + <!-- Want value (not location) for relative paths to log4j --> + <!-- config file so the junit classloader will search for that --> + <!-- file on the classpath. Thus, use location (instead of --> + <!-- value) for absolute paths so fully-qualified paths are --> + <!-- used when copying that file under the classes dir. --> -<property name="bigdata.test.log4j.rel.path" value="resources/logging" /> -<property name="bigdata.test.log4j.rel" value="${bigdata.test.log4j.rel.path}/log4j.properties" /> + <property name="bigdata.test.log4j.rel.path" value="resources/logging" /> + <property name="bigdata.test.log4j.rel" value="${bigdata.test.log4j.rel.path}/log4j.properties" /> -<property name="bigdata.test.log4j.abs.path" location="${classes.dir}/test/${bigdata.test.log4j.rel.path}" /> -<property name="bigdata.test.log4j.abs" location="${bigdata.test.log4j.abs.path}/log4j.properties" /> + <property name="bigdata.test.log4j.abs.path" location="${classes.dir}/test/${bigdata.test.log4j.rel.path}" /> + <property name="bigdata.test.log4j.abs" location="${bigdata.test.log4j.abs.path}/log4j.properties" /> -<!-- Version-specific jar files that are only needed when --> -<!-- running the tests. When a new version of one of these jars --> -<!-- is available, change the corresponding property value set --> -<!-- below. --> + <!-- Version-specific jar files that are only needed when --> + <!-- running the tests. When a new version of one of these jars --> + <!-- is available, change the corresponding property value set --> + <!-- below. --> -<property name="junit.jar" location="${bigdata.lib}/junit-3.8.1.jar" /> -<property name="cweb-junit-ext.jar" location="${bigdata.lib}/cweb-junit-ext-1.1-b3-dev.jar" /> -<property name="sesame-sparql-test.jar" location="${bigdata-sails.lib}/sesame-sparql-testsuite-2.3.0.jar" /> -<property name="sesame-store-test.jar" location="${bigdata-sails.lib}/sesame-store-testsuite-2.3.0.jar" /> + <property name="junit.jar" location="${bigdata.lib}/junit-3.8.1.jar" /> + <property name="cweb-junit-ext.jar" location="${bigdata.lib}/cweb-junit-ext-1.1-b3-dev.jar" /> + <property name="sesame-sparql-test.jar" location="${bigdata-sails.lib}/sesame-sparql-testsuite-2.3.0.jar" /> + <property name="sesame-store-test.jar" location="${bigdata-sails.lib}/sesame-store-testsuite-2.3.0.jar" /> -<property name="classes.test.dir" location="${classes.dir}/test" /> -<mkdir dir="${classes.test.dir}" /> + <property name="classes.test.dir" location="${classes.dir}/test" /> + <mkdir dir="${classes.test.dir}" /> -<property name="bigdata-test.lib" location="${bigdata.dir}/bigdata-test/lib" /> -<mkdir dir="${bigdata-test.lib}" /> -<property name="bigdata-test.jar" location="${bigdata-test.lib}/bigdata-test.jar" /> + <property name="bigdata-test.lib" location="${bigdata.dir}/bigdata-test/lib" /> + <mkdir dir="${bigdata-test.lib}" /> + <property name="bigdata-test.jar" location="${bigdata-test.lib}/bigdata-test.jar" /> -<property name="javac.test.classpath" value="${classes.dir}${path.separator}${junit.jar}${path.separator}${cweb-junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${dist.lib}/classserver.jar${path.separator}${dist.lib}/ctc_utils.jar${path.separator}${dist.lib}/cweb-commons.jar${path.separator}${dist.lib}/cweb-extser.jar${path.separator}${dist.lib}/highscalelib.jar${path.separator}${dist.lib}/dsiutils.jar${path.separator}${dist.lib}/lgplutils.jar${path.separator}${dist.lib}/fastutil.jar${path.separator}${dist.lib}/icu4j.jar${path.separator}${dist.lib}/iris.jar${path.separator}${dist.lib}/jgrapht.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar" /> + <property name="javac.test.classpath" value="${classes.dir}${path.separator}${junit.jar}${path.separator}${cweb-junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${dist.lib}/classserver.jar${path.separator}${dist.lib}/ctc_utils.jar${path.separator}${dist.lib}/cweb-commons.jar${path.separator}${dist.lib}/cweb-extser.jar${path.separator}${dist.lib}/highscalelib.jar${path.separator}${dist.lib}/dsiutils.jar${path.separator}${dist.lib}/lgplutils.jar${path.separator}${dist.lib}/fastutil.jar${path.separator}${dist.lib}/icu4j.jar${path.separator}${dist.lib}/iris.jar${path.separator}${dist.lib}/jgrapht.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar" /> -<echo>javac + <echo>javac </echo> -<echo> javac.test.classpath="${javac.test.classpath}" + <echo> javac.test.classpath="${javac.test.classpath}" </echo> -<echo> destdir="${classes.test.dir}" + <echo> destdir="${classes.test.dir}" </echo> -<echo> fork="yes" + <echo> fork="yes" </echo> -<echo> debug="yes" + <echo> debug="yes" </echo> -<echo> debuglevel="${javac.debuglevel}" + <echo> debuglevel="${javac.debuglevel}" </echo> -<echo> deprecation="no" + <echo> deprecation="no" </echo> -<echo> nowarn="no" + <echo> nowarn="no" </echo> -<echo> source="1.5" + <echo> source="1.5" </echo> -<echo> target="1.5" + <echo> target="1.5" </echo> -<echo> verbose="${javac.verbose}" + <echo> verbose="${javac.verbose}" </echo> -<javac fork="yes" debug="yes" debuglevel="${javac.debuglevel}" deprecation="no" destdir="${classes.test.dir}" nowarn="no" source="1.5" target="1.5" classpath="${javac.test.classpath}" verbose="${javac.verbose}"> + <javac fork="yes" + debug="yes" + debuglevel="${javac.debuglevel}" + deprecation="no" + destdir="${classes.test.dir}" + nowarn="no" + source="1.5" + target="1.5" + classpath="${javac.test.classpath}" + verbose="${javac.verbose}"> - <src path="${bigdata.dir}/bigdata/src/test" /> - <src path="${bigdata.dir}/bigdata-jini/src/test" /> - <src path="${bigdata.dir}/bigdata-rdf/src/test" /> - <src path="${bigdata.dir}/bigdata-sails/src/test" /> - <!-- - <src path="${bigdata.dir}/bigdata-gom/src/test"/> + <src path="${bigdata.dir}/bigdata/src/test" /> + <src path="${bigdata.dir}/bigdata-jini/src/test" /> + <src path="${bigdata.dir}/bigdata-rdf/src/test" /> + <src path="${bigdata.dir}/bigdata-sails/src/test" /> +<!-- + <src path="${bigdata.dir}/bigdata-gom/src/test" /> --> - <compilerarg value="-version" /> -</javac> + <compilerarg value="-version" /> + </javac> -<!-- Make logging config file available to test framework --> + <!-- Make logging config file available to test framework --> -<delete file="${bigdata.test.log4j.abs}" quiet="true" /> -<copy file="${dist.var.config.logging}/log4j.properties" todir="${bigdata.test.log4j.abs.path}" /> + <delete file="${bigdata.test.log4j.abs}" quiet="true" /> + <copy file="${dist.var.config.logging}/log4j.properties" + todir="${bigdata.test.log4j.abs.path}" /> -<!-- Generate bigdata-test.jar file --> + <!-- Generate bigdata-test.jar file --> -<delete file="${bigdata-test.jar}" quiet="true" /> -<jar destfile="${bigdata-test.jar}" index="false"> - <manifest> - <attribute name="Manifest-Version" value="1.0" /> - </manifest> + <delete file="${bigdata-test.jar}" quiet="true" /> + <jar destfile="${bigdata-test.jar}" index="false"> + <manifest> + <attribute name="Manifest-Version" value="1.0" /> + </manifest> - <fileset dir="${classes.test.dir}"> - <include name="**/*.class" /> - <include name="**/log4j*.properties" /> - </fileset> + <fileset dir="${classes.test.dir}"> + <include name="**/*.class" /> + <include name="**/log4j*.properties" /> + </fileset> - <fileset dir="${bigdata.dir}/bigdata/src/test"> - <include name="**/*.csv" /> - <include name="**/*.xml" /> - <include name="**/*.dtd" /> - </fileset> + <fileset dir="${bigdata.dir}/bigdata/src/test"> + <include name="**/*.csv" /> + <include name="**/*.xml" /> + <include name="**/*.dtd" /> + </fileset> - <fileset dir="${bigd... [truncated message content] |
From: <btm...@us...> - 2010-08-08 15:20:22
|
Revision: 3432 http://bigdata.svn.sourceforge.net/bigdata/?rev=3432&view=rev Author: btmurphy Date: 2010-08-08 15:20:16 +0000 (Sun, 08 Aug 2010) Log Message: ----------- [trunk]: build.xml - changed ant-install-artifact target to depend on deploy-artifact so that scripts in the REL*.tgz file are executable Modified Paths: -------------- trunk/build.xml Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2010-08-06 22:34:57 UTC (rev 3431) +++ trunk/build.xml 2010-08-08 15:20:16 UTC (rev 3432) @@ -1175,7 +1175,7 @@ </copy> </target> - <target name="ant-install-artifact" depends="clean, ant-install-prepare, stage" + <target name="ant-install-artifact" depends="deploy-artifact, ant-install-prepare" description="Create complete source tar file for ant based install."> <mkdir dir="${release.dir}" /> @@ -1225,10 +1225,6 @@ </tarfileset> </tar> - <tar destfile="${bigdata.dir}/REL.${version}.tgz" - basedir="${bigdata.dir}/dist" - compression="gzip"> - </tar> </target> <target name="ant-install" depends="jar, banner, bundle" description="Ant based install on a node."> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrp...@us...> - 2010-09-02 22:24:28
|
Revision: 3499 http://bigdata.svn.sourceforge.net/bigdata/?rev=3499&view=rev Author: mrpersonick Date: 2010-09-02 22:24:22 +0000 (Thu, 02 Sep 2010) Log Message: ----------- added jini jars to Sesame Server install Modified Paths: -------------- trunk/build.xml Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2010-09-02 20:42:43 UTC (rev 3498) +++ trunk/build.xml 2010-09-02 22:24:22 UTC (rev 3499) @@ -1992,6 +1992,10 @@ <fileset dir="${bigdata.dir}/bigdata/lib"> <include name="**/*.jar" /> </fileset> + <fileset dir="${bigdata.dir}/bigdata-jini/lib/jini/lib"> + <include name="jini-core.jar" /> + <include name="jini-ext.jar" /> + </fileset> </copy> <!-- copy resources to Workbench webapp. --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tho...@us...> - 2010-11-02 12:11:47
|
Revision: 3863 http://bigdata.svn.sourceforge.net/bigdata/?rev=3863&view=rev Author: thompsonbry Date: 2010-11-02 12:11:41 +0000 (Tue, 02 Nov 2010) Log Message: ----------- Removed the jini dependencies for the Sesame WAR. Modified Paths: -------------- trunk/build.xml Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2010-11-02 12:06:48 UTC (rev 3862) +++ trunk/build.xml 2010-11-02 12:11:41 UTC (rev 3863) @@ -1992,10 +1992,12 @@ <fileset dir="${bigdata.dir}/bigdata/lib"> <include name="**/*.jar" /> </fileset> +<!-- Jini should not be required for the Sesame WAR. <fileset dir="${bigdata.dir}/bigdata-jini/lib/jini/lib"> <include name="jini-core.jar" /> <include name="jini-ext.jar" /> </fileset> + --> </copy> <!-- copy resources to Workbench webapp. --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tho...@us...> - 2011-04-26 20:33:39
|
Revision: 4429 http://bigdata.svn.sourceforge.net/bigdata/?rev=4429&view=rev Author: thompsonbry Date: 2011-04-26 20:33:33 +0000 (Tue, 26 Apr 2011) Log Message: ----------- Modified to disable the start/stop of services so we can re-enable CI for the trunk per [1]. [1] https://sourceforge.net/apps/trac/bigdata/ticket/286 Modified Paths: -------------- trunk/build.xml Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2011-04-26 18:19:03 UTC (rev 4428) +++ trunk/build.xml 2011-04-26 20:33:33 UTC (rev 4429) @@ -1600,14 +1600,18 @@ <copy file="${build.properties.from.file}" todir="${build.properties.test.to.path}" /> + <!-- <antcall target="startHttpd" /> <antcall target="startLookup" /> + --> <!-- Run the tests --> <antcall target="run-junit" /> + <!-- <antcall target="stopLookup" /> <antcall target="stopHttpd" /> + --> <!-- This message is noticed by the hudson build and is used to trigger after various after actions. --> @@ -1864,7 +1868,9 @@ <test name="com.bigdata.relation.TestAll" todir="${test.results.dir}" unless="testName" /> <!-- See https://sourceforge.net/apps/trac/bigdata/ticket/53 --> + <!-- <test name="com.bigdata.jini.TestAll" todir="${test.results.dir}" unless="testName" /> + --> <test name="com.bigdata.rdf.TestAll" todir="${test.results.dir}" unless="testName" /> <test name="com.bigdata.rdf.sail.TestAll" todir="${test.results.dir}" unless="testName" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |