CVS update of gotm-jts/examples (benchmark/build.xml explorer/build.xml)

[Romain Rouvoy <rouvoy@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Thursday, December 22, 2005 @ 12:33:05
  Author: rouvoy
    Path: /cvsroot/gotm/gotm-jts/examples

Modified: benchmark/build.xml explorer/build.xml

* using the macrodef fractal to execute Fractal applications.


---------------------+
 benchmark/build.xml |   81 +++++++++-----------------------------------------
 explorer/build.xml  |   45 +++++++++++----------------
 2 files changed, 35 insertions(+), 91 deletions(-)


Index: gotm-jts/examples/benchmark/build.xml
diff -u gotm-jts/examples/benchmark/build.xml:1.9 
gotm-jts/examples/benchmark/build.xml:1.10
--- gotm-jts/examples/benchmark/build.xml:1.9   Tue Dec 20 16:43:30 2005
+++ gotm-jts/examples/benchmark/build.xml       Thu Dec 22 12:33:05 2005
@@ -21,7 +21,7 @@
 <!-- Initial developer(s): Romain Rouvoy.                                 -->
 <!-- Contributor(s): ______________________________________.              -->
 
-<!-- $Id: build.xml,v 1.9 2005/12/20 15:43:30 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.10 2005/12/22 11:33:05 rouvoy Exp $ -->
 <!-- ==================================================================== -->
 
 <project name="JTS Benchmark" default="all">
@@ -77,83 +77,34 @@
 
   <target name="import" depends="bench-compile,clear" unless="imported"/>
   
-  <target name="execute" depends="import"
-   description="execute All Benchmarks">
+  <target name="execute" depends="import" description="execute All 
Benchmarks">
     <property name="imported" value="true"/>
     <antcall target="execute-jts"/>
     <antcall target="execute-2pc"/>
-    <antcall target="execute-apc"/>
+    <antcall target="execute-acom"/>
   </target>
   
   <target name="execute-jts"
    description="execute JTS Benchmark">
-<!--    <property name="julia.cfg" 
value="${build.dir}/${lib.dir}/julia.cfg"/>
-    <property name="cache.cfg"  
value="${build.dir}/${lib.dir}/cache.cfg"/>-->
-    <java classname="org.objectweb.fractal.adl.Launcher"
-       classpathref="classpath"
-               fork="yes"
-        failonerror="yes">
-       <sysproperty key="fractal.provider"
-                  value="aokell.AOKell"/>
-<!--   <sysproperty key="fractal.provider"
-                  value="org.objectweb.fractal.julia.Julia"/>
-       <sysproperty key="julia.loader"
-                  value="org.objectweb.fractal.julia.loader.DynamicLoader" />
-       <sysproperty key="julia.config"
-                  value="${julia.cfg},${cache.cfg}" />-->
-       <arg line=" -fractal org.objectweb.benchmark.FcBenchmarkJTS r"/>
-    </java>
+    <fractal definition="org.objectweb.benchmark.FcBenchmarkJTS r" 
+                library="classpath"/>
   </target>
 
   <target name="execute-2pc" depends="import"
-   description="execute Commit Protocol Benchmark">
-    <property name="julia.cfg" value="${build.dir}/${lib.dir}/julia.cfg"/>
-    <property name="cache.cfg"  value="${build.dir}/${lib.dir}/cache.cfg"/>
-    <java classname="org.objectweb.fractal.adl.Launcher"
-       classpathref="classpath"
-               fork="yes"
-        failonerror="yes">
-       <sysproperty key="fractal.provider"
-                  value="aokell.AOKell"/>
-<!--   <sysproperty key="fractal.provider"
-                  value="org.objectweb.fractal.julia.Julia"/>
-       <sysproperty key="julia.loader"
-                  value="org.objectweb.fractal.julia.loader.DynamicLoader" />
-       <sysproperty key="julia.config"
-                  value="${julia.cfg},${cache.cfg}" />-->
-       <arg line=" -fractal org.objectweb.benchmark.FcBenchmark2PC r"/>
-    </java>
-  </target>
-
-  <target name="execute-apc" depends="import"
-   description="execute Adaptive Commit Protocol Benchmark">
-    <property name="julia.cfg" value="${build.dir}/${lib.dir}/julia.cfg"/>
-    <property name="cache.cfg"  value="${build.dir}/${lib.dir}/cache.cfg"/>
-    <java classname="org.objectweb.fractal.adl.Launcher"
-       classpathref="classpath"
-               fork="yes"
-        failonerror="yes">
-       <sysproperty key="fractal.provider"
-                  value="aokell.AOKell"/>
-<!--   <sysproperty key="fractal.provider"
-                  value="org.objectweb.fractal.julia.Julia"/>
-       <sysproperty key="julia.loader"
-                  value="org.objectweb.fractal.julia.loader.DynamicLoader" />
-       <sysproperty key="julia.config"
-                  value="${julia.cfg},${cache.cfg}" />-->
-       <arg line=" -fractal org.objectweb.benchmark.FcBenchmarkAPC r"/>
-    </java>
+   description="execute 2PC Protocols Benchmark">
+    <fractal definition="org.objectweb.benchmark.FcBenchmark2PC r" 
+                library="classpath"/>
+  </target>
+
+  <target name="execute-acom" depends="import"
+   description="execute self-Adaptive COmmit Management Benchmark">
+    <fractal definition="org.objectweb.benchmark.FcBenchmarkAPC r" 
+                library="classpath"/>
   </target>
 
   <target name="execute-thread"
    description="execute Concurrent Transactions Benchmark">
-    <java classname="org.objectweb.fractal.adl.Launcher"
-       classpathref="classpath"
-               fork="yes"
-        failonerror="yes">
-       <sysproperty key="fractal.provider"
-                  value="aokell.AOKell"/>
-       <arg line=" -fractal org.objectweb.benchmark.FcBenchmarkThread r"/>
-    </java>
+    <fractal definition="org.objectweb.benchmark.FcBenchmarkThread r" 
+                library="classpath"/>
   </target>
 </project>
\ No newline at end of file
Index: gotm-jts/examples/explorer/build.xml
diff -u gotm-jts/examples/explorer/build.xml:1.8 
gotm-jts/examples/explorer/build.xml:1.9
--- gotm-jts/examples/explorer/build.xml:1.8    Mon Dec 19 16:08:22 2005
+++ gotm-jts/examples/explorer/build.xml        Thu Dec 22 12:33:05 2005
@@ -21,7 +21,7 @@
 <!-- Initial developer(s): Romain Rouvoy.                                 -->
 <!-- Contributor(s): ______________________________________.              -->
 
-<!-- $Id: build.xml,v 1.8 2005/12/19 15:08:22 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.9 2005/12/22 11:33:05 rouvoy Exp $ -->
 <!-- ==================================================================== -->
 
 <project name="JTS Explorer" default="all">
@@ -69,34 +69,27 @@
 
   <target name="execute" depends="import" description="run local JTS 
example">
     <property file="${basedir}/execute.properties"/>
-<!--
-    <property name="cfg.julia" value="${build.dir}/${lib.dir}/julia.cfg"/>
-    <property name="cfg.cache"  value="${build.dir}/${lib.dir}/cache.cfg"/>
-    <property name="julia.config" value="${cfg.julia},${cfg.cache}"/>
--->
-    <java classname="org.objectweb.fractal.adl.Launcher" fork="yes"
-       classpathref="classpath" failonerror="yes">
-      <syspropertyset id="fractal">
-        <propertyref prefix="fractal"/>
-        <!--<propertyref prefix="julia"/>-->
-        <propertyref prefix="gotm"/>
-      </syspropertyset>
-      <arg line="-fractal org.objectweb.gotm.jts.local.FcExplorer r"/>
-    </java>
+    <fractal definition="org.objectweb.gotm.jts.local.FcExplorer" 
library="classpath">
+      <parameters>
+        <syspropertyset id="fractal">
+          <propertyref prefix="fractal"/>
+          <propertyref prefix="gotm"/>
+        </syspropertyset>
+      </parameters>
+    </fractal>
   </target>
 
   <target name="explorer" depends="import" description="run GoTM explorer">
     <property file="${basedir}/execute.properties"/>
-    <java classname="org.objectweb.fractal.adl.Launcher" fork="yes"
-       classpathref="classpath" failonerror="yes">
-      <syspropertyset id="fractal">
-        <propertyref prefix="fractal"/>
-        <propertyref prefix="gotm"/>
-      </syspropertyset>
-<!--      <arg line="-fractal 
org.objectweb.fractal.explorer.BasicFractalExplorer(application,org.objectweb.gotm.jts.local.FcApplication)"/>-->
-      <arg line="-fractal 
org.objectweb.fractal.explorer.BasicFractalExplorer(tx,org.objectweb.gotm.lib.JtsTransaction)"/>
-<!--      <arg line="-fractal 
org.objectweb.fractal.explorer.BasicFractalExplorer(manager,org.objectweb.gotm.lib.JtsTransactionManager(org.objectweb.gotm.lib.factory.FcTransactionFactoryObservable))"/>-->
-<!--      <arg line="-fractal 
org.objectweb.fractal.explorer.BasicFractalExplorer(manager,org.objectweb.gotm.lib.JtsTransactionManager(org.objectweb.gotm.lib.FcAdaptiveTransactionFactory))"/>-->
-    </java>
+    <property name="explorer" 
value="org.objectweb.fractal.explorer.BasicFractalExplorer"/>
+    <property name="component" 
value="org.objectweb.gotm.lib.JtsTransaction"/>
+    <fractal definition="${explorer}(tx,${component})" library="classpath">
+      <parameters>
+        <syspropertyset id="fractal">
+          <propertyref prefix="fractal"/>
+          <propertyref prefix="gotm"/>
+        </syspropertyset>
+      </parameters>
+    </fractal>
   </target>
 </project>
\ No newline at end of file