JAL-3026 refines, generalizes build-site.xml

diff --git a/build-site.xml b/build-site.xml
index 5558f8e..edd9e5e 100644 (file)
--- a/build-site.xml
+++ b/build-site.xml
@@ -33,8 +33,8 @@
        
        <!-- output directories -->
 
-       <property name="site" value="site" />
-       <property name="j2s.dir" value="${site}/swingjs/j2s" />
+       <property name="site.dir" value="site" />
+       <property name="j2s.dir" value="${site.dir}/swingjs/j2s" />
         
     <!-- <for  ...> construct needs ant-contrib.jar -->
     <taskdef resource="net/sf/antcontrib/antlib.xml">
@@ -54,7 +54,7 @@
            <fileset dir="${libjs.dir}" includes="*.zip"/>
          </path>
          <sequential>
-                       <unzip src="@{file.zip}" dest="${site}" overwrite="true"/>      
+                       <unzip src="@{file.zip}" dest="${site.dir}" overwrite="true"/>          
          </sequential>
        </for>
 
@@ -64,7 +64,7 @@
        
        -->
 
-       <unzip src="${swingjs.zip}" dest="${site}/" overwrite="true"/>          
+       <unzip src="${swingjs.zip}" dest="${site.dir}/" overwrite="true"/>      
 
        <!-- transfer resources -->