Menu
▾
▴
bigdata-commit
|
From: <tho...@us...> - 2010-09-28 15:58:10
|
Revision: 3662
http://bigdata.svn.sourceforge.net/bigdata/?rev=3662&view=rev
Author: thompsonbry
Date: 2010-09-28 15:58:03 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
Missed something in build.xml to get the ctc-striterators to compile.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2010-09-28 14:44:43 UTC (rev 3661)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2010-09-28 15:58:03 UTC (rev 3662)
@@ -21,6 +21,9 @@
<fileset dir="${bigdata.dir}/bigdata-sails/lib">
<include name="**/*.jar" />
</fileset>
+ <fileset dir="${bigdata.dir}/ctc-striterator/lib">
+ <include name="**/*.jar" />
+ </fileset>
</path>
<!-- runtime classpath w/o install. -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2010-09-28 16:06:39
|
Revision: 3663
http://bigdata.svn.sourceforge.net/bigdata/?rev=3663&view=rev
Author: thompsonbry
Date: 2010-09-28 16:06:33 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
other changes to build.xml for the ctc striterators appear to have been lost when merging from the trunk...
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2010-09-28 15:58:03 UTC (rev 3662)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2010-09-28 16:06:33 UTC (rev 3663)
@@ -21,9 +21,10 @@
<fileset dir="${bigdata.dir}/bigdata-sails/lib">
<include name="**/*.jar" />
</fileset>
+ <!--
<fileset dir="${bigdata.dir}/ctc-striterator/lib">
<include name="**/*.jar" />
- </fileset>
+ </fileset> -->
</path>
<!-- runtime classpath w/o install. -->
@@ -158,7 +159,6 @@
<bndwrap jars="${build.dir}/lib/unimi/colt-1.2.0.jar" output="${build.dir}/bundles/colt-1.2.0.jar" definitions="${basedir}/osgi/" />
<bndwrap jars="${build.dir}/lib/unimi/fastutil-5.1.5.jar" output="${build.dir}/bundles/fastutil-5.1.5.jar" definitions="${basedir}/osgi/" />
- <bndwrap jars="${build.dir}/lib/ctc_utils-5-4-2005.jar" output="${build.dir}/bundles/ctc_utils-5-4-2005.jar" definitions="${basedir}/osgi/" />
<bndwrap jars="${build.dir}/lib/cweb-commons-1.1-b2-dev.jar" output="${build.dir}/bundles/cweb-commons-1.1.2.jar" definitions="${basedir}/osgi/" />
<bndwrap jars="${build.dir}/lib/cweb-extser-0.1-b2-dev.jar" output="${build.dir}/bundles/cweb-extser-1.1.2.jar" definitions="${basedir}/osgi/" />
<bndwrap jars="${build.dir}/lib/dsi-utils-1.0.6-020610.jar" output="${build.dir}/bundles/dsi-utils-1.0.6-020610.jar" definitions="${basedir}/osgi/" />
@@ -1456,7 +1456,7 @@
<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}/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>
@@ -1696,7 +1696,6 @@
<pathelement location="${dist.lib}/colt.jar" />
<pathelement location="${dist.lib}/cweb-commons.jar" />
<pathelement location="${dist.lib}/cweb-extser.jar" />
- <pathelement location="${dist.lib}/ctc_utils.jar" />
<pathelement location="${dist.lib}/highscalelib.jar" />
<pathelement location="${dist.lib}/dsiutils.jar" />
<pathelement location="${dist.lib}/lgplutils.jar" />
@@ -1718,7 +1717,7 @@
<pathelement location="${dist.lib}/zookeeper.jar" />
</path>
- <property name="run.class.path" value="${junit.jar}${path.separator}${bigdata-test.jar}${path.separator}${cweb-junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${dist.lib}/bigdata.jar${path.separator}${dist.lib}/colt.jar${path.separator}${dist.lib}/cweb-commons.jar${path.separator}${dist.lib}/cweb-extser.jar${path.separator}${dist.lib}/ctc_utils.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}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/lucene-analyzer.jar${path.separator}${dist.lib}/lucene-core.jar${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/slf4j-log4j.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar" />
+ <property name="run.class.path" value="${junit.jar}${path.separator}${bigdata-test.jar}${path.separator}${cweb-junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${dist.lib}/bigdata.jar${path.separator}${dist.lib}/colt.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}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/lucene-analyzer.jar${path.separator}${dist.lib}/lucene-core.jar${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/slf4j-log4j.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar" />
<echo> classpath: ${run.class.path}
</echo>
@@ -1810,7 +1809,6 @@
<sysproperty key="classserver.jar" value="${dist.lib}/classserver.jar" />
<sysproperty key="colt.jar" value="${dist.lib}/colt.jar" />
- <sysproperty key="ctc_utils.jar" value="${dist.lib}/ctc_utils.jar" />
<sysproperty key="cweb-commons.jar" value="${dist.lib}/cweb-commons.jar" />
<sysproperty key="cweb-extser.jar" value="${dist.lib}/cweb-extser.jar" />
<sysproperty key="highscalelib.jar" value="${dist.lib}/highscalelib.jar" />
@@ -1911,7 +1909,6 @@
<pathelement location="${dist.lib}/colt.jar" />
<pathelement location="${dist.lib}/cweb-commons.jar" />
<pathelement location="${dist.lib}/cweb-extser.jar" />
- <pathelement location="${dist.lib}/ctc_utils.jar" />
<pathelement location="${dist.lib}/highscalelib.jar" />
<pathelement location="${dist.lib}/dsiutils.jar" />
<pathelement location="${dist.lib}/lgplutils.jar" />
@@ -1930,7 +1927,7 @@
<pathelement location="${dist.lib}/nxparser.jar" />
<pathelement location="${dist.lib}/zookeeper.jar" />
</path>
-<property name="run.class.path" value="${junit.jar}${path.separator}${bigdata-test.jar}${path.separator}${cweb-junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${dist.lib}/bigdata.jar${path.separator}${dist.lib}/colt.jar${path.separator}${dist.lib}/cweb-commons.jar${path.separator}${dist.lib}/cweb-extser.jar${path.separator}${dist.lib}/ctc_utils.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}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/lucene-analyzer.jar${path.separator}${dist.lib}/lucene-core.jar${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/slf4j-log4j.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar" />
+<property name="run.class.path" value="${junit.jar}${path.separator}${bigdata-test.jar}${path.separator}${cweb-junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${dist.lib}/bigdata.jar${path.separator}${dist.lib}/colt.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}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/lucene-analyzer.jar${path.separator}${dist.lib}/lucene-core.jar${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/slf4j-log4j.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar" />
<!-- Generate the LUBM dataset.
<mkdir dir="${data}"/>
<java classname="edu.lehigh.swat.bench.uba.Generator" dir="${data}" fork="yes">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2010-09-28 16:10:33
|
Revision: 3664
http://bigdata.svn.sourceforge.net/bigdata/?rev=3664&view=rev
Author: thompsonbry
Date: 2010-09-28 16:10:27 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
Another edit to get the ctc stiterators to compile for CI.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2010-09-28 16:06:33 UTC (rev 3663)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2010-09-28 16:10:27 UTC (rev 3664)
@@ -80,6 +80,7 @@
<src path="${bigdata.dir}/bigdata-jini/src/java" />
<src path="${bigdata.dir}/bigdata-rdf/src/java" />
<src path="${bigdata.dir}/bigdata-sails/src/java" />
+ <src path="${bigdata.dir}/ctc-striterators/src/java" />
<!-- Do not include the unit tests @todo conditionally include?
<src path="${bigdata.dir}/bigdata/src/test"/>
<src path="${bigdata.dir}/bigdata-jini/src/test"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2010-09-29 11:52:26
|
Revision: 3674
http://bigdata.svn.sourceforge.net/bigdata/?rev=3674&view=rev
Author: thompsonbry
Date: 2010-09-29 11:52:20 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Added the CTC striterators to the set of unit tests to run in the CI builds.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2010-09-29 11:16:15 UTC (rev 3673)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2010-09-29 11:52:20 UTC (rev 3674)
@@ -1842,6 +1842,7 @@
<!-- Test suites to run when -DtestName is not set -->
+ <test name="cutthecrap.utils.striterator.TestAll" todir="${test.results.dir}" unless="testName" />
<test name="com.bigdata.cache.TestAll" todir="${test.results.dir}" unless="testName" />
<test name="com.bigdata.io.TestAll" todir="${test.results.dir}" unless="testName" />
<test name="com.bigdata.net.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.
|
|
From: <dm...@us...> - 2010-10-26 16:32:00
|
Revision: 3846
http://bigdata.svn.sourceforge.net/bigdata/?rev=3846&view=rev
Author: dmacgbr
Date: 2010-10-26 16:31:54 +0000 (Tue, 26 Oct 2010)
Log Message:
-----------
Cause the ctc-striterator unit test suite to run by a) fixing typo in package name and b) compiling the test class. NB running this test suite no longer results in an error but there is a failure because of an empty place-holder test class. The remaining tests defined in the suite pass.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2010-10-25 17:45:26 UTC (rev 3845)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2010-10-26 16:31:54 UTC (rev 3846)
@@ -1501,6 +1501,7 @@
<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}/ctc-striterators/src/test" />
<!--
<src path="${bigdata.dir}/bigdata-gom/src/test" />
-->
@@ -1846,7 +1847,7 @@
<!-- Test suites to run when -DtestName is not set -->
- <test name="cutthecrap.utils.striterator.TestAll" todir="${test.results.dir}" unless="testName" />
+ <test name="cutthecrap.utils.striterators.TestAll" todir="${test.results.dir}" unless="testName" />
<test name="com.bigdata.cache.TestAll" todir="${test.results.dir}" unless="testName" />
<test name="com.bigdata.io.TestAll" todir="${test.results.dir}" unless="testName" />
<test name="com.bigdata.net.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.
|
|
From: <tho...@us...> - 2010-11-02 12:06:54
|
Revision: 3862
http://bigdata.svn.sourceforge.net/bigdata/?rev=3862&view=rev
Author: thompsonbry
Date: 2010-11-02 12:06:48 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
Updated the javadoc target to include the ctc-striterators source tree.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2010-11-02 10:41:53 UTC (rev 3861)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2010-11-02 12:06:48 UTC (rev 3862)
@@ -188,6 +188,7 @@
<packageset dir="${bigdata.dir}/bigdata-rdf/src/java" />
<packageset dir="${bigdata.dir}/bigdata-sails/src/java" />
<packageset dir="${bigdata.dir}/bigdata-sails/src/samples" />
+ <packageset dir="${bigdata.dir}/ctc-striterators/src/java" />
<doctitle>
<![CDATA[<h1>bigdata®</h1>]]></doctitle>
<bottom>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2011-01-13 22:04:29
|
Revision: 4093
http://bigdata.svn.sourceforge.net/bigdata/?rev=4093&view=rev
Author: thompsonbry
Date: 2011-01-13 22:04:23 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
modified the zookeeper start/stop and targets.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2011-01-13 21:25:49 UTC (rev 4092)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2011-01-13 22:04:23 UTC (rev 4093)
@@ -1708,18 +1708,29 @@
<echo message="test.zookeeper.installDir=${test.zookeeper.installDir}"/>
<echo>bin/zkServer.sh start
</echo>
- <exec command="bin/zkServer.sh start" dir="${test.zookeeper.installDir}" logerror="true">
-</exec>
+ <exec executable="bin/zkServer.sh" dir="${test.zookeeper.installDir}" logerror="true">
+ <arg value="start"/>
+ </exec>
</target>
<target name="stopZookeeper">
<echo message="test.zookeeper.installDir=${test.zookeeper.installDir}"/>
- <echo>bin/zkServer.sh start
+ <echo>bin/zkServer.sh stop
</echo>
- <exec command="bin/zkServer.sh stop" dir="${test.zookeeper.installDir}" logerror="true">
-</exec>
+ <exec executable="bin/zkServer.sh" dir="${test.zookeeper.installDir}" logerror="true">
+ <arg value="stop"/>
+ </exec>
</target>
+ <target name="statusZookeeper">
+ <echo message="test.zookeeper.installDir=${test.zookeeper.installDir}"/>
+ <echo>bin/zkServer.sh status
+</echo>
+ <exec executable="bin/zkServer.sh" dir="${test.zookeeper.installDir}" logerror="true">
+ <arg value="status"/>
+ </exec>
+ </target>
+
<!-- runs all junit tests -->
<target name="run-junit">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2011-01-13 22:06:34
|
Revision: 4094
http://bigdata.svn.sourceforge.net/bigdata/?rev=4094&view=rev
Author: thompsonbry
Date: 2011-01-13 22:06:28 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
removed the statusZookeeper ant target since the output is not written to the console.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2011-01-13 22:04:23 UTC (rev 4093)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2011-01-13 22:06:28 UTC (rev 4094)
@@ -1722,15 +1722,6 @@
</exec>
</target>
- <target name="statusZookeeper">
- <echo message="test.zookeeper.installDir=${test.zookeeper.installDir}"/>
- <echo>bin/zkServer.sh status
-</echo>
- <exec executable="bin/zkServer.sh" dir="${test.zookeeper.installDir}" logerror="true">
- <arg value="status"/>
- </exec>
- </target>
-
<!-- runs all junit tests -->
<target name="run-junit">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2011-01-18 21:57:53
|
Revision: 4125
http://bigdata.svn.sourceforge.net/bigdata/?rev=4125&view=rev
Author: thompsonbry
Date: 2011-01-18 21:57:47 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
Modified the build file to try and stop zookeeper before starting it. This addresses an issue with the zkServer script. That script writes a pid file. If the zookeeper service does, then that file will be lying around until it is removed. A "zkServer stop" will remove the pid file, so we do that before trying a "zkServer start".
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2011-01-18 21:50:42 UTC (rev 4124)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2011-01-18 21:57:47 UTC (rev 4125)
@@ -1619,6 +1619,10 @@
<copy file="${build.properties.from.file}"
todir="${build.properties.test.to.path}" />
+ <!-- Issue stop on zookeeper first since zkServer leaves a pid file -->
+ <!-- around if the JVM is killed. That pid file needs to be cleaned -->
+ <!-- up before we can start a new instance. -->
+ <antcall target="stopZookeeper" />
<antcall target="startZookeeper" />
<antcall target="startHttpd" />
<antcall target="startLookup" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2011-01-18 21:59:41
|
Revision: 4126
http://bigdata.svn.sourceforge.net/bigdata/?rev=4126&view=rev
Author: thompsonbry
Date: 2011-01-18 21:59:35 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
echoing the tickTime and clientPort for zookeeper during the build.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2011-01-18 21:57:47 UTC (rev 4125)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2011-01-18 21:59:35 UTC (rev 4126)
@@ -1783,6 +1783,10 @@
</echo>
<echo> federation: ${bigdata.fedname}
</echo>
+ <echo> zkClientPort: ${test.zookeeper.clientPort}
+</echo>
+ <echo> zkTickTime: ${test.zookeeper.tickTime}
+</echo>
<echo>
</echo>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2011-01-22 21:13:23
|
Revision: 4163
http://bigdata.svn.sourceforge.net/bigdata/?rev=4163&view=rev
Author: thompsonbry
Date: 2011-01-22 21:13:16 +0000 (Sat, 22 Jan 2011)
Log Message:
-----------
Removed the lubm-* ant build targets. See bigdata-perf/lubm, bigdata-perf/bsbm3, etc. for performance tests. Removed some utility targets which are also now accessible via the bigdata-perf package.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2011-01-22 12:04:30 UTC (rev 4162)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2011-01-22 21:13:16 UTC (rev 4163)
@@ -627,161 +627,6 @@
</java>
</target>
-
-<!-- -->
-<!-- LUBM TARGETS (OPTIONAL) -->
-<!-- -->
-
-<target name="lubm-clean" description="Clean the lubm-integration from the build directory.">
-<delete dir="${build.dir}/lubm" />
-</target>
-
-<target name="lubm-prepare" description="Clean the lubm-integration from the build directory.">
-<mkdir dir="${build.dir}/lubm" />
-<mkdir dir="${build.dir}/lubm/classes" />
-<mkdir dir="${build.dir}/lubm/lib" />
-</target>
-
-<path id="lubm.build.classpath" description="The lubm build-time classpath (this expects to find the bigdata JAR already installed).">
-<fileset dir="${install.lib.dir}">
- <include name="**/*.jar" />
-</fileset>
-</path>
-
-<!-- And now for something totally weird. If you compile against the bigdata.jar
- rather than build.dir/classes then you will see some errors reported in
- LubmGeneratorMaster.java which otherwise are not reported... -->
-<target name="lubm-compile" depends="lubm-prepare" description="Compile the optional lubm integration.">
-<javac destdir="${build.dir}/lubm/classes" classpathref="runtime.classpath" debug="${javac.debug}" debuglevel="${javac.debuglevel}" verbose="${javac.verbose}" encoding="${javac.encoding}">
- <!-- note: must also specify -bootclasspath and -extdirs when cross-compiling -->
- <!-- target="${javac.target}" source="${javac.source}" -->
- <src path="${bigdata.dir}/bigdata-lubm/src/java" />
-</javac>
-<!-- copy resources. -->
-<copy toDir="${build.dir}/lubm/classes">
- <fileset dir="${bigdata.dir}/bigdata-lubm/src/java">
- <exclude name="**/*.java" />
- </fileset>
-</copy>
-</target>
-
-<target name="lubm-jar" depends="lubm-compile" description="Generates the JAR containing the optional LUBM integration.">
-<jar destfile="${build.dir}/lubm/lib/bigdata-lubm.jar">
- <fileset dir="${build.dir}/lubm/classes" />
-</jar>
-</target>
-
-<!-- This explicitly enumerates the lubm scripts so we don't run
- fixcrlf or set the execute bit on arbitrary files in the
- install directory. -->
-<fileset dir="${install.bin.dir}" id="lubm-scripts" description="The lubm scripts.">
-<include name="lubmMaster.sh" />
-<include name="lubmQuery.sh" />
-<include name="lubmGen.sh" />
-</fileset>
-
-<!-- While this installs the LUBM integration into the same place as the
- bigdata federation, you do not need to have the LUBM classes or the
- integration classes installed when you start the bigdata federation.
- Those classes will be automatically found when you run the lubmMaster
- script, which exposes them using a ClassServer. You can use this as
- a model for how to install and run your own software against a bigdata
- federation that is already up and running. -->
-<target name="lubm-install" depends="lubm-jar" description="Install the optional lubm integration which may be used for benchmarking the RDF database.">
-<mkdir dir="${install.lubm.dir}" />
-<mkdir dir="${install.lubm.lib.dir}" />
-<mkdir dir="${install.lubm.config.dir}" />
-<!-- install JAR. -->
-<copy toDir="${install.lubm.lib.dir}" file="${build.dir}/lubm/lib/bigdata-lubm.jar" />
-<!-- install ontology, configuration files, and query files. -->
-<copy toDir="${install.lubm.config.dir}">
- <fileset dir="bigdata-lubm/resources/config" />
-</copy>
-<!-- install scripts. -->
-<copy toDir="${install.bin.dir}">
- <fileset dir="bigdata-lubm/resources/scripts" />
-</copy>
-<!-- replace will only find those @XXX@ parameters which have not yet been
- transcribed out by the bigdata ant install. -->
-<replace dir="${install.bin.dir}" summary="true">
- <replacefilter token="@NAS@" value="${NAS}" />
- <replacefilter token="@BIN_DIR@" value="${install.bin.dir}" />
- <replacefilter token="@BIGDATA_CONFIG@" value="${bigdata.config}" />
- <replacefilter token="@LUBM_CLASS_SERVER_PORT@" value="${LUBM_CLASS_SERVER_PORT}" />
- <replacefilter token="@LUBM_CLASS_SERVER_HOSTNAME@" value="${LUBM_CLASS_SERVER_HOSTNAME}" />
- <replacefilter token="@LUBM_RMI_CODEBASE_URL@" value="${LUBM_RMI_CODEBASE_URL}" />
- <replacefilter token="@install.lubm.lib.dir@" value="${install.lubm.lib.dir}" />
- <replacefilter token="@install.lubm.config.dir@" value="${install.lubm.config.dir}" />
-</replace>
-<replace dir="${install.lubm.config.dir}" summary="true">
- <replacefilter token="@NAS@" value="${NAS}" />
- <replacefilter token="@BIN_DIR@" value="${install.bin.dir}" />
- <replacefilter token="@BIGDATA_CONFIG@" value="${bigdata.config}" />
- <replacefilter token="@LUBM_CLASS_SERVER_PORT@" value="${LUBM_CLASS_SERVER_PORT}" />
- <replacefilter token="@LUBM_CLASS_SERVER_HOSTNAME@" value="${LUBM_CLASS_SERVER_HOSTNAME}" />
- <replacefilter token="@LUBM_RMI_CODEBASE_URL@" value="${LUBM_RMI_CODEBASE_URL}" />
- <replacefilter token="@install.lubm.lib.dir@" value="${install.lubm.lib.dir}" />
- <replacefilter token="@install.lubm.config.dir@" value="${install.lubm.config.dir}" />
-</replace>
-<!-- fix newlines (otherwise substitutions cause things to break). -->
-<fixcrlf srcDir="${install.bin.dir}">
- <!-- file set not supported. <fileset refid="scripts" /> -->
-</fixcrlf>
-<!-- set execute bit for scripts in this directory (must be the last step). -->
-<chmod perm="u+x,g+rx,o-rwx">
- <fileset refid="lubm-scripts" />
-</chmod>
-<!-- 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"/>
- -->
-<!-- Works for earlier versions of ant LT 1.6 which do not bundle "chown". -->
-<apply executable="chown" description="set owner on NAS files" osfamily="unix">
- <arg value="-R" />
- <arg value="${install.user}.${install.group}" />
- <dirset dir="${install.bin.dir}" />
-</apply>
-<apply executable="chown" description="set owner on NAS files" osfamily="unix">
- <arg value="-R" />
- <arg value="${install.user}.${install.group}" />
- <dirset dir="${install.lubm.dir}" />
-</apply>
-</target>
-
-<!-- lubm runtime classpath w/o install. -->
-<path id="lubm.runtime.classpath">
-<pathelement location="${build.dir}/lubm/classes" />
-<pathelement location="${build.dir}/classes" />
-<path refid="build.classpath" />
-</path>
-
-<target name="lubm-load" depends="jar, lubm-compile" description="Load data into a configured lubm test harness, typically standalone.">
-
-<java classname="edu.lehigh.swat.bench.ubt.Test" failonerror="true" fork="true" logerror="true">
- <classpath refid="lubm.runtime.classpath" />
- <jvmarg value="-server" />
- <jvmarg value="-Xmx1024m" />
- <jvmarg value="-Dcom.bigdata.jmx.log4j.disable=true" />
- <jvmarg value="-Dlog4j.configuration=file:bigdata/src/resources/logging/log4j.properties" />
- <arg value="load" />
- <arg value="bigdata-lubm/src/java/edu/lehigh/swat/bench/ubt/bigdata/config.kb.bigdata" />
-</java>
-
-</target>
-
-<target name="lubm-test" depends="jar, lubm-compile" description="Run queries against a configured lubm test harness, typically standalone.">
-
-<java classname="edu.lehigh.swat.bench.ubt.Test" failonerror="true" fork="true" logerror="true">
- <classpath refid="lubm.runtime.classpath" />
- <jvmarg value="-server" />
- <jvmarg value="-Xmx1024m" />
- <jvmarg value="-Dcom.bigdata.jmx.log4j.disable=true" />
- <jvmarg value="-Dlog4j.configuration=file:bigdata/src/resources/logging/log4j.properties" />
- <arg value="query" />
- <arg value="bigdata-lubm/src/java/edu/lehigh/swat/bench/ubt/bigdata/config.kb.bigdata" />
- <arg value="bigdata-lubm/src/java/edu/lehigh/swat/bench/ubt/bigdata/config.query.sparql" />
-</java>
-
-</target>
<!-- -->
<!-- MISC. UTILITY TARGETS -->
@@ -809,54 +654,6 @@
</target>
-<target name="DataLoader" depends="compile" description="Loads RDF data into a local KB. You MUST edit this ant target before running it.">
-<java classname="com.bigdata.rdf.store.DataLoader" fork="true" failonerror="true">
- <!-- usage: [-namespace namespace] propertyFile (fileOrDir)+ -->
- <!-- Where: -->
- <!-- [-namespace namespace] is the KB namespace (default is 'kb'). -->
- <!-- propertyFile is a properties file identifying the Journal and
- giving various Journal and/or kb configuration properties if one
- or the other needs to be created. -->
- <!-- (fileOrDir)+ is a list of one or more RDF files or directories to
- be loaded. zip and gz extensions are recognized, but only one file
- is loaded per archive. -->
- <arg line="custom.properties fileOrDir" />
- <jvmarg value="-server" />
- <!-- Specify the maximum Java heap size. -->
- <jvmarg value="-Xmx10g" />
- <!-- optionally enable yourkit profiler.
- <jvmarg value="-DLD_LIBRARY_PATH=/nas/install/yjp-8.0.19/bin/linux-x86-64"/>
- <jvmarg value="-agentpath:/nas/install/yjp-8.0.20/bin/linux-x86-64/libyjpagent.so"/>
- <jvmarg value="-agentlib:yjpagent=disableexceptiontelemetry,disablestacktelemetry"/>
- -->
- <jvmarg value="-XX:+UseParallelOldGC" />
- <!-- Optional enable GC trace.
- <jvmarg line="-XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Xloggc:jvm_gc.log"/>
- -->
- <classpath>
- <path refid="runtime.classpath" />
- </classpath>
-</java>
-</target>
-
-<target name="set-properties" depends="compile" description="Set or change properties for a kb instance. You MUST edit this target to specify the name of the journal. The new values are read from stdin.">
-<java classname="com.bigdata.rdf.sail.BigdataSailHelper" fork="true" failonerror="true" inputstring="com.bigdata.relation.rule.eval.DefaultRuleTaskFactory.nestedSubquery=false">
- <!-- Various things you might want to change:
-
- Maximum #of threads for joins.
- inputstring="com.bigdata.relation.rule.eval.ProgramTask.maxParallelSubqueries=5"
-
- Nested subquery vs pipeline joins.
- inputstring="com.bigdata.relation.rule.eval.DefaultRuleTaskFactory.nestedSubquery=true"
-
--->
- <arg line="d:/LTS.U50.jnl LTS kb" />
- <classpath>
- <path refid="runtime.classpath" />
- </classpath>
-</java>
-</target>
-
<!-- -->
<!-- STAGING -->
<!-- -->
@@ -1960,7 +1757,7 @@
<!-- PERFORMANCE TESTS -->
<!-- -->
-<target name="run-performance-tests" depends="testCompile, lubm-jar" description="Runs a variety of performance tests.">
+<target name="run-performance-tests" depends="testCompile" description="Runs a variety of performance tests.">
<!-- Note: This depends on the stage target. -->
<path id="run.class.path.id">
<pathelement location="${junit.jar}" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2011-02-02 14:30:00
|
Revision: 4172
http://bigdata.svn.sourceforge.net/bigdata/?rev=4172&view=rev
Author: thompsonbry
Date: 2011-02-02 14:29:54 +0000 (Wed, 02 Feb 2011)
Log Message:
-----------
Modified the startZookeeper target to spawn the process since control was not returning to ant under Centos.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2011-02-01 20:23:34 UTC (rev 4171)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2011-02-02 14:29:54 UTC (rev 4172)
@@ -1504,11 +1504,14 @@
</java>
</target>
+ <!-- Note: It appears to be necessary to spawn the script which starts -->
+ <!-- zookeeper under some OS platforms (for example, Centos 5.4) even -->
+ <!-- though it will start without being spawned under others (OSX). -->
<target name="startZookeeper">
<echo message="test.zookeeper.installDir=${test.zookeeper.installDir}"/>
<echo>bin/zkServer.sh start
</echo>
- <exec executable="bin/zkServer.sh" dir="${test.zookeeper.installDir}" logerror="true">
+ <exec executable="bin/zkServer.sh" dir="${test.zookeeper.installDir}" spawn="true">
<arg value="start"/>
</exec>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2011-02-02 19:00:07
|
Revision: 4175
http://bigdata.svn.sourceforge.net/bigdata/?rev=4175&view=rev
Author: thompsonbry
Date: 2011-02-02 18:59:56 +0000 (Wed, 02 Feb 2011)
Log Message:
-----------
added a step to the ant junit task to archive the generated HTML pages as a tarball. This is in support of hudson builds on non-master nodes.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2011-02-02 15:26:55 UTC (rev 4174)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2011-02-02 18:59:56 UTC (rev 4175)
@@ -1747,6 +1747,9 @@
<report format="frames" todir="${test.results.dir}/report" />
</junitreport>
+ <!-- Archive the generated HTML report. -->
+ <tar destfile="${test.results.dir}/report.tgz" basedir="${test.results.dir}/report" compression="gzip"/>
+
</target>
<target name="clean-sparql-test-suite" description="delete the files unpacked by the Sesame SPARQL test suite.">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2011-02-03 13:04:54
|
Revision: 4176
http://bigdata.svn.sourceforge.net/bigdata/?rev=4176&view=rev
Author: thompsonbry
Date: 2011-02-03 13:04:48 +0000 (Thu, 03 Feb 2011)
Log Message:
-----------
switched back to NOT spawning the zkServer start script since zk was not starting....
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2011-02-02 18:59:56 UTC (rev 4175)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2011-02-03 13:04:48 UTC (rev 4176)
@@ -1507,11 +1507,13 @@
<!-- Note: It appears to be necessary to spawn the script which starts -->
<!-- zookeeper under some OS platforms (for example, Centos 5.4) even -->
<!-- though it will start without being spawned under others (OSX). -->
+ <!-- However, this change appears to result in zookeeper not running -->
+ <!-- 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>
- <exec executable="bin/zkServer.sh" dir="${test.zookeeper.installDir}" spawn="true">
+ <exec executable="bin/zkServer.sh" dir="${test.zookeeper.installDir}" logerror="true">
<arg value="start"/>
</exec>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2011-02-04 13:01:07
|
Revision: 4178
http://bigdata.svn.sourceforge.net/bigdata/?rev=4178&view=rev
Author: thompsonbry
Date: 2011-02-04 13:01:01 +0000 (Fri, 04 Feb 2011)
Log Message:
-----------
Modified to first stop the lookup service and httpd classserver in addition to zookeeper before starting those services. This change was made in an effort to keep CI clean when a previous CI run was broken, e.g., due to a timeout, and thus left some services running.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2011-02-03 23:40:35 UTC (rev 4177)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2011-02-04 13:01:01 UTC (rev 4178)
@@ -1420,6 +1420,9 @@
<!-- around if the JVM is killed. That pid file needs to be cleaned -->
<!-- up before we can start a new instance. -->
<antcall target="stopZookeeper" />
+ <antcall target="stopLookup" />
+ <antcall target="stopHttpd" />
+
<antcall target="startZookeeper" />
<antcall target="startHttpd" />
<antcall target="startLookup" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2011-03-31 19:14:50
|
Revision: 4361
http://bigdata.svn.sourceforge.net/bigdata/?rev=4361&view=rev
Author: thompsonbry
Date: 2011-03-31 19:14:41 +0000 (Thu, 31 Mar 2011)
Log Message:
-----------
Fixed some more places where the jetty jars need to be included to support CI builds.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2011-03-31 19:02:10 UTC (rev 4360)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2011-03-31 19:14:41 UTC (rev 4361)
@@ -1577,9 +1577,15 @@
<pathelement location="${dist.lib}/slf4j-log4j.jar" />
<pathelement location="${dist.lib}/nxparser.jar" />
<pathelement location="${dist.lib}/zookeeper.jar" />
+ <pathelement location="${dist.lib}/jetty-continuation.jar" />
+ <pathelement location="${dist.lib}/jetty-http.jar" />
+ <pathelement location="${dist.lib}/jetty-io.jar" />
+ <pathelement location="${dist.lib}/jetty-server.jar" />
+ <pathelement location="${dist.lib}/jetty-util.jar" />
+ <pathelement location="${dist.lib}/servlet-api.jar" />
</path>
- <property name="run.class.path" value="${junit.jar}${path.separator}${bigdata-test.jar}${path.separator}${cweb-junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${dist.lib}/bigdata.jar${path.separator}${dist.lib}/colt.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}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/lucene-analyzer.jar${path.separator}${dist.lib}/lucene-core.jar${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/slf4j-log4j.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar" />
+ <property name="run.class.path" value="${junit.jar}${path.separator}${bigdata-test.jar}${path.separator}${cweb-junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${dist.lib}/bigdata.jar${path.separator}${dist.lib}/colt.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}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/lucene-analyzer.jar${path.separator}${dist.lib}/lucene-core.jar${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/slf4j-log4j.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar${path.separator}${dist.lib}/jetty-continuation.jar${path.separator}${dist.lib}/jetty-http.jar${path.separator}${dist.lib}/jetty-io.jar${path.separator}${dist.lib}/jetty-server.jar${path.separator}${dist.lib}/jetty-util.jar${path.separator}${dist.lib}/servlet-api.jar" />
<echo> classpath: ${run.class.path}
</echo>
@@ -1695,6 +1701,12 @@
<sysproperty key="slf4j.jar" value="${dist.lib}/slf4j.jar" />
<sysproperty key="nxparser.jar" value="${dist.lib}/nxparser.jar" />
<sysproperty key="zookeeper.jar" value="${dist.lib}/zookeeper.jar" />
+ <sysproperty key="jetty-continuation.jar" value="${dist.lib}/jetty-continuation.jar" />
+ <sysproperty key="jetty-http.jar" value="${dist.lib}/jetty-http.jar" />
+ <sysproperty key="jetty-io.jar" value="${dist.lib}/jetty-io.jar" />
+ <sysproperty key="jetty-server.jar" value="${dist.lib}/jetty-server.jar" />
+ <sysproperty key="jetty-util.jar" value="${dist.lib}/jetty-util.jar" />
+ <sysproperty key="servlet-api.jar" value="${dist.lib}/servlet-api.jar" />
<!-- Jini group name -->
<sysproperty key="bigdata.fedname" value="${bigdata.fedname}" />
@@ -1748,6 +1760,7 @@
<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" />
+ <test name="com.bigdata.rdf.sail.webapp.TestAll" todir="${test.results.dir}" unless="testName" />
<!-- All tests.
<test name="com.bigdata.TestAll" todir="${test.results.dir}" unless="testName" />
@@ -1810,8 +1823,14 @@
<pathelement location="${dist.lib}/slf4j-log4j.jar" />
<pathelement location="${dist.lib}/nxparser.jar" />
<pathelement location="${dist.lib}/zookeeper.jar" />
+ <pathelement location="${dist.lib}/jetty-continuation.jar" />
+ <pathelement location="${dist.lib}/jetty-http.jar" />
+ <pathelement location="${dist.lib}/jetty-io.jar" />
+ <pathelement location="${dist.lib}/jetty-server.jar" />
+ <pathelement location="${dist.lib}/jetty-util.jar" />
+ <pathelement location="${dist.lib}/servlet-api.jar" />
</path>
-<property name="run.class.path" value="${junit.jar}${path.separator}${bigdata-test.jar}${path.separator}${cweb-junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${dist.lib}/bigdata.jar${path.separator}${dist.lib}/colt.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}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/lucene-analyzer.jar${path.separator}${dist.lib}/lucene-core.jar${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/slf4j-log4j.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar" />
+<property name="run.class.path" value="${junit.jar}${path.separator}${bigdata-test.jar}${path.separator}${cweb-junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${dist.lib}/bigdata.jar${path.separator}${dist.lib}/colt.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}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/lucene-analyzer.jar${path.separator}${dist.lib}/lucene-core.jar${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/slf4j-log4j.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar${path.separator}${dist.lib}/jetty-continuation.jar${path.separator}${dist.lib}/jetty-http.jar${path.separator}${dist.lib}/jetty-io.jar${path.separator}${dist.lib}/jetty-server.jar${path.separator}${dist.lib}/jetty-util.jar${path.separator}${dist.lib}/servlet-api.jar" />
<!-- Generate the LUBM dataset.
<mkdir dir="${data}"/>
<java classname="edu.lehigh.swat.bench.uba.Generator" dir="${data}" fork="yes">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2011-05-03 16:50:35
|
Revision: 4442
http://bigdata.svn.sourceforge.net/bigdata/?rev=4442&view=rev
Author: thompsonbry
Date: 2011-05-03 16:50:28 +0000 (Tue, 03 May 2011)
Log Message:
-----------
Modified build.xml in the quads branch to copy all test resources into the bigdata-test JAR (fix is parallel to a fix made against the SIDS branch).
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2011-05-03 16:42:23 UTC (rev 4441)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2011-05-03 16:50:28 UTC (rev 4442)
@@ -1429,7 +1429,7 @@
<include name="**/*.class" />
<include name="**/log4j*.properties" />
</fileset>
-
+<!--
<fileset dir="${bigdata.dir}/bigdata/src/test">
<include name="**/*.csv" />
<include name="**/*.xml" />
@@ -1443,6 +1443,20 @@
<fileset dir="${bigdata.dir}">
<include name="**/*.owl" />
</fileset>
+-->
+ <fileset dir="${bigdata.dir}/bigdata/src/test">
+ <exclude name="**/*.java" />
+ </fileset>
+ <fileset dir="${bigdata.dir}/bigdata-rdf/src/test">
+ <exclude name="**/*.java" />
+ </fileset>
+ <fileset dir="${bigdata.dir}/bigdata-sails/src/test">
+ <exclude name="**/*.java" />
+ </fileset>
+ <fileset dir="${bigdata.dir}/bigdata-jini/src/test">
+ <exclude name="**/*.java" />
+ </fileset>
+
</jar>
<!-- Generate lookupstarter.jar file -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tho...@us...> - 2011-06-02 18:37:11
|
Revision: 4608
http://bigdata.svn.sourceforge.net/bigdata/?rev=4608&view=rev
Author: thompsonbry
Date: 2011-06-02 18:37:05 +0000 (Thu, 02 Jun 2011)
Log Message:
-----------
Documentation in build.xml on various deployment mechanisms.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/build.xml
Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml 2011-06-02 18:07:02 UTC (rev 4607)
+++ branches/QUADS_QUERY_BRANCH/build.xml 2011-06-02 18:37:05 UTC (rev 4608)
@@ -3,6 +3,50 @@
<!-- @todo change the release target to put release notes into the root of the archives. -->
<!-- @todo maven2 setup so we can run and publish unit tests results. -->
<!-- $Id$ -->
+
+<!-- Deployment models.
+
+Embedded. Bigdata can be run as an embedded database. You just need to bundle
+the various jars. The jini and zookeeper dependencies are NOT required when
+used as an embedded database. You can also use this approach to run bigdata
+using the NanoSparqlServer with an embedded jetty servlet engine.
+
+See 'bundleJar'.
+
+Webapp. Bigdata can be deployed as a web application exposing a SPARQL end point
+with a RESTful API.
+
+See 'war'.
+
+Cluster deployment. There are two ways to deploy the cluster. One is
+using 'ant-install' from either the top-level directory (either as
+checked out from SVN or as unpacked from the distribution artifact
+DIST.${version}.tgz). The second is to use the deployment artifact
+REL.${version}.tgz.
+
+(A) This provides deployment from the project source either as checked
+out from SVN or form a DIST.${version}.tgz file.
+
+See 'ant-install'
+
+(B) This is the new deployment model, but it is not yet complete.
+It is based on the "stage" target which provides unversioned jar
+names in dist/bigdata/lib, lib-dl, and lib-ext. Basically, you
+unpack the archive and install onto the node. A script can then
+start the various services using pstart based on a desired node
+configuration. See the btm branch and trac for details and code.
+
+See 'ant deploy-artifact'
+
+Source and binary releases. There are two targets which provide source and
+binary releases.
+
+See 'ant-install-artifact' (source code artifact: DIST.${version}.tgz).
+
+See 'deploy-artifact' (binary artifact: REL.${version}.tgz).
+
+-->
+
<project name="bigdata" default="bundleJar" basedir=".">
<property file="build.properties" />
@@ -1006,6 +1050,41 @@
<!-- -->
<!-- RELEASE -->
<!-- -->
+ <!--
+ REL.${version}.tgz - This is basically a tarball wrapping the 'dist'
+ directory generated by "stage". It has everything you need to deploy
+ a bigdata instance to a node. The paradigm for a deployment based on
+ this artifact is to create an installer which will start the appropriate
+ services for each node of your cluster. For example, based on a config
+ file in a known location on each node. The installer can use pstart to
+ actually start the services as described by that configuration file. For
+ example, you might wrap the generated REL.${version}.tgz file with your
+ own installer.
+
+ The structure of the archive is as follows.
+
+ bigdata
+ bigdata/bin
+ bigdata/bin/disco-tool - command line utility for DiscoveryTool.
+ bigdata/bin/pstart - python service start utility.
+ bigdata/bin/config - jini configuration for use Jini ServiceStarter.
+ bigdata/bin/config/browser.config
+ bigdata/bin/config/disco.config
+ bigdata/bin/config/disco-logging.properties
+ bigdata/bin/config/reggie.config
+ bigdata/bin/config/serviceStarter.config - Jini ServiceStarter configuration for jini core services, zookeeper, and bigdata services.
+ bigdata/lib - unversioned jars.
+ bigdata/lib-dl - downloadable jars for jini ("*-dl.jar").
+ bigdata/lib-ext - jsk-policy.jar
+ bigdata/var
+ bigdata/var/config - bigdata config files,
+ bigdata/var/config/build.properties - a copy of the top level project build.properties file.
+ bigdata/var/jini - jini core service configuration files, including startAll.config which is used to start the core jini services.
+ bigdata/var/logging - log4j and java.util log configuration files.
+ bigdata/var/policy - java policy files
+ bigdata/var/policy/policy.all - policy with all permissions granted.
+ bigdata/var/policy/service.policy
+ -->
<target name="deploy-artifact" depends="clean, stage"
description="Create compressed tar file for deployment.">
@@ -1099,6 +1178,10 @@
</copy>
</target>
+ <!--
+ Generate DIST.${version}.tgz - This is basically a tarball containing the
+ entire source distribution.
+ -->
<target name="ant-install-artifact" depends="deploy-artifact, ant-install-prepare"
description="Create complete source tar file for ant based install.">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X