[MO-java-dev] CVS: mockobjects-java/doc site.xml,1.5,1.6

[Jeff M. <cus...@us...>]

Update of /cvsroot/mockobjects/mockobjects-java/doc
In directory usw-pr-cvs1:/tmp/cvs-serv826/doc

Modified Files:
	site.xml 
Log Message:
Simplified site deployment


Index: site.xml
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/doc/site.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- site.xml	9 Sep 2002 21:25:41 -0000	1.5
+++ site.xml	17 Sep 2002 14:31:15 -0000	1.6
@@ -1,81 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="site" default="site" basedir=".">
 
-    <target name="project-properties">
-        <property name="project.name" value="mockobjects" />
-        <property name="site.name" value="${project.name}-website" />
-        <property name="out.dir" value="out" />
-        <property name="site.tar" value="${site.name}.tar" />
-    </target>
-
-    <target name="copy-stylesheet">
-        <copy file="html/stylesheet.css" todir="out"/>
-    </target>
-
-    <target name="clean"
-            depends="project-properties">
-        <delete quiet="true">
-            <fileset dir="${out.dir}"/>
-            <fileset includes="**/*.class"/>
-        </delete>
-    </target>
-
-    <target name="add-task">
-        <javac srcdir="."/>
-        <taskdef name="template"
-            classname="com.mockobjects.doc.SiteTemplate"
-            classpath="."/>
-    </target>
-
-    <target name="site"
-        depends="project-properties, add-task, copy-stylesheet"
-        description="Create the output directory and copy templated files over.">
-        <mkdir dir="${out.dir}"/>
-        <template
-            templatefile="html/template.txt"
-            todir="${out.dir}"
-            dir="html"
-            includes="*.html"/>
-    </target>
-
-    <target name="archive.site"
-            depends="site">
-        <tar tarfile="${site.tar}"
-             basedir="${out.dir}" />
-
-        <gzip zipfile="${site.tar}.gz"
-              src="${site.tar}" />
-
-        <delete file="${site.tar}" />
-    </target>
-
-    <!--
-       ========================================================================
-         Deploy the web site to SourceForge, using the 'scp'
-         and 'ssh' commands. The variable "username" need to be passed to Ant
-         when calling this target and represent your username on SourceForge.
-
-         Ex: ant -Dusername=vmassol deploy-site
-
-       ========================================================================
-     -->
-    <target name="deploy-site"
-            depends="project-properties"
-            if="username"
-            description="Deploy the web site to SourceForge (see target for details)">
-
-        <property name="deploy.homepage" value="/home/groups/m/mo/mockobjects/htdocs"/>
-        <property name="deploy.host" value="mockobjects.sourceforge.net"/>
-
-        <exec dir="." executable="scp">
-            <arg value="${site.tar}.gz"/>
-            <arg value="${username}@${deploy.host}:${deploy.homepage}"/>
-        </exec>
-
-        <exec dir="." executable="ssh">
-            <arg
-                line="-l ${username} ${deploy.host} 'cd ${deploy.homepage};gunzip ${site.tar}.gz;tar xvf ${site.tar};rm ${site.tar}'"/>
-        </exec>
-    </target>
+  <target name="project-properties">
+    <property name="project.name" value="mockobjects" />
+    <property name="site.name" value="${project.name}-website" />
+    <property name="out.dir" value="out" />
+    <property name="site.tar" value="${site.name}.tar" />
+  </target>
+
+  <target name="copy-stylesheet">
+    <copy file="html/stylesheet.css" todir="out"/>
+  </target>
+
+  <target name="clean"
+    depends="project-properties">
+    <delete quiet="true">
+      <fileset dir="${out.dir}"/>
+      <fileset includes="**/*.class"/>
+    </delete>
+  </target>
+
+  <target name="add-task">
+    <javac srcdir="."/>
+    <taskdef name="template"
+      classname="com.mockobjects.doc.SiteTemplate"
+      classpath="."/>
+  </target>
+
+  <target name="site"
+    depends="project-properties, add-task, copy-stylesheet"
+    description="Create the output directory and copy templated files over.">
+    <mkdir dir="${out.dir}"/>
+    <template
+      templatefile="html/template.txt"
+      todir="${out.dir}"
+      dir="html"
+      includes="*.html"/>
+  </target>
+
+  <!--
+  ========================================================================
+  Deploy the web site to SourceForge, using the 'scp'
+  command. The variable "username" need to be passed to Ant
+  when calling this target and represent your username on SourceForge.
+
+  Ex: ant -Dusername=vmassol deploy-site
+
+  ========================================================================
+  -->
+  <target name="deploy-site"
+    depends="project-properties"
+    if="username"
+    description="Deploy the web site to SourceForge (see target for details)">
+
+    <property name="deploy.homepage"
+      value="/home/groups/m/mo/mockobjects/htdocs"/>
+    <property name="deploy.host"
+      value="mockobjects.sourceforge.net"/>
+
+    <apply dir="." executable="scp" parallel="true" relative="true">
+      <srcfile/>
+      <arg value="${username}@${deploy.host}:${deploy.homepage}"/>
+      <fileset dir="${out.dir}"/>
+    </apply>
+
+  </target>
 
 </project>