CVS update of gotm-jts (5 files)

[Romain Rouvoy <rouvoy@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Tuesday, June 28, 2005 @ 15:30:31
  Author: rouvoy
    Path: /cvsroot/gotm/gotm-jts

   Added: examples/benchmark/src/xml/benchmark.xml
Modified: .cvsignore build.xml examples/benchmark/build.xml
 Removed: examples/benchmark/src/cfg/benchmark.xml

* correcting a ant bug in the JTS benchmark example.


------------------------------------------+
 .cvsignore                               |    1 +
 build.xml                                |    7 +++----
 examples/benchmark/build.xml             |   10 +++++-----
 examples/benchmark/src/cfg/benchmark.xml |   18 ------------------
 examples/benchmark/src/xml/benchmark.xml |   18 ++++++++++++++++++
 5 files changed, 27 insertions(+), 27 deletions(-)


Index: gotm-jts/.cvsignore
diff -u gotm-jts/.cvsignore:1.4 gotm-jts/.cvsignore:1.5
--- gotm-jts/.cvsignore:1.4     Tue Jun 28 10:02:28 2005
+++ gotm-jts/.cvsignore Tue Jun 28 15:30:31 2005
@@ -3,3 +3,4 @@
 files*
 alias.xml
 build.properties
+alias.properties
Index: gotm-jts/build.xml
diff -u gotm-jts/build.xml:1.6 gotm-jts/build.xml:1.7
--- gotm-jts/build.xml:1.6      Tue Jun 28 10:02:28 2005
+++ gotm-jts/build.xml  Tue Jun 28 15:30:31 2005
@@ -21,7 +21,7 @@
 <!-- Initial developer(s): Romain Rouvoy.                                 -->
 <!-- Contributor(s): ______________________________________.              -->
 
-<!-- $Id: build.xml,v 1.6 2005/06/28 08:02:28 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.7 2005/06/28 13:30:31 rouvoy Exp $ -->
 <!-- ==================================================================== -->
 
 <project name="GoTM JTS" default="all">
@@ -46,7 +46,6 @@
   <!-- PATH DEFINITIONS -->
   <!-- ================ -->
   <path id="classpath">
-    <fileset dir="${basedir}" includes="${lib.dir}/**/*.jar"/>
     <fileset dir="${build.dir}" includes="${lib.dir}/**/*.jar"/>
   </path>
 
@@ -84,7 +83,7 @@
   <target name="-jts-prepare" depends="copy-alias,-gotm.explorer">
     <copy todir="${build.dir}/${lib.dir}">
          <mapper type="flatten"/>
-      <fileset dir="${basedir}/${lib.dir}" includes="**/*"/>
+      <fileset dir="${basedir}/${lib.dir}" includes="**/*.*"/>
     </copy>
   </target>
 
@@ -92,7 +91,7 @@
     <mkdir dir="${build.dir}/${class.dir}"/> 
     <java.c srcdir="${basedir}/${src.dir}/${java.dir}" />
     <copy todir="${build.dir}/${class.dir}">
-      <fileset dir="${basedir}/${src.dir}/${cfg.dir}" includes="**/*"/>
+      <fileset dir="${basedir}/${src.dir}/${xml.dir}" includes="**/*.*"/>
     </copy>
   </target>
 
Index: gotm-jts/examples/benchmark/build.xml
diff -u gotm-jts/examples/benchmark/build.xml:1.1 
gotm-jts/examples/benchmark/build.xml:1.2
--- gotm-jts/examples/benchmark/build.xml:1.1   Tue Jun 28 10:02:28 2005
+++ gotm-jts/examples/benchmark/build.xml       Tue Jun 28 15:30:31 2005
@@ -21,7 +21,7 @@
 <!-- Initial developer(s): Romain Rouvoy.                                 -->
 <!-- Contributor(s): ______________________________________.              -->
 
-<!-- $Id: build.xml,v 1.1 2005/06/28 08:02:28 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.2 2005/06/28 13:30:31 rouvoy Exp $ -->
 <!-- ==================================================================== -->
 
 <project name="JTS Benchmark" default="all">
@@ -61,10 +61,10 @@
     <mkdir dir="${build.dir}/${class.dir}"/>
     <java.c srcdir="${basedir}/${src.dir}/${java.dir}"/>
     <copy todir="${build.dir}/${class.dir}">
-      <fileset dir="${basedir}/${src.dir}/${cfg.dir}" includes="**/*"/>
+      <fileset dir="${basedir}/${src.dir}/${xml.dir}" includes="**/*"/>
     </copy>
     <copy todir="${build.dir}/${class.dir}">
-      <fileset dir="${build.dir}/${cfg.dir}" includes="**/*"/>
+      <fileset dir="${build.dir}/${lib.dir}" includes="**/*.properties"/>
     </copy>
   </target>
 
@@ -78,8 +78,8 @@
   
   <target name="execute" depends="import"
    description="run local JTS example">
-    <property name="julia.cfg" value="${build.dir}/${cfg.dir}/julia.cfg"/>
-    <property name="cache.cfg"  value="${build.dir}/${cfg.dir}/cache.cfg"/>
+    <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"
Index: gotm-jts/examples/benchmark/src/cfg/benchmark.xml
diff -u gotm-jts/examples/benchmark/src/cfg/benchmark.xml:1.1 
gotm-jts/examples/benchmark/src/cfg/benchmark.xml:removed
--- gotm-jts/examples/benchmark/src/cfg/benchmark.xml:1.1       Tue Jun 28 
10:02:29 2005
+++ gotm-jts/examples/benchmark/src/cfg/benchmark.xml   Tue Jun 28 15:30:32 
2005
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<browser>
-
-  <include url="JTA.xml" />
-
-  <!-- ================================================================= -->
-  <!--                            Main                                   -->
-  <!-- ================================================================= -->
-  <node type-name="java.lang.Runnable">
-    <menu>
-      <item label="Run">
-        <code>org.objectweb.gotm.jts.benchmark.InvokeRunnableAction</code>
-      </item>
-    </menu>
-  </node>
-
-</browser>
\ No newline at end of file
Index: gotm-jts/examples/benchmark/src/xml/benchmark.xml
diff -u /dev/null gotm-jts/examples/benchmark/src/xml/benchmark.xml:1.1
--- /dev/null   Tue Jun 28 15:30:32 2005
+++ gotm-jts/examples/benchmark/src/xml/benchmark.xml   Tue Jun 28 15:30:31 
2005
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<browser>
+
+  <include url="JTA.xml" />
+
+  <!-- ================================================================= -->
+  <!--                            Main                                   -->
+  <!-- ================================================================= -->
+  <node type-name="java.lang.Runnable">
+    <menu>
+      <item label="Run">
+        <code>org.objectweb.gotm.jts.benchmark.InvokeRunnableAction</code>
+      </item>
+    </menu>
+  </node>
+
+</browser>
\ No newline at end of file