[Bigdata-commit] SF.net SVN: bigdata:[3266] trunk/build.xml

[<btm...@us...>]

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.