From ff072dfe782f6f22123cd4ba050828d35c0d0fbd Mon Sep 17 00:00:00 2001
From: Benjamin Culkin <scorpress@gmail.com>
Date: Mon, 20 May 2024 17:55:46 -0400
Subject: Some lingering tweaks

---
 projects/net.wotonomy.all/src/site/build.xml | 335 +++++++++++++++------------
 1 file changed, 187 insertions(+), 148 deletions(-)

(limited to 'projects/net.wotonomy.all/src/site/build.xml')

diff --git a/projects/net.wotonomy.all/src/site/build.xml b/projects/net.wotonomy.all/src/site/build.xml
index a71e2fb..4d2856b 100644
--- a/projects/net.wotonomy.all/src/site/build.xml
+++ b/projects/net.wotonomy.all/src/site/build.xml
@@ -1,175 +1,214 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <project name="wotonomy" default="build" basedir=".">
-  <!--
-	<taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" />
+	<!--
+	<taskdef name="junit"
+	classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" />
   -->
-  <!-- 
+	<!-- 
       Sets the compiler property.
       Options are "classic" or "modern" or "jikes".
   -->
-  <property name="build.compiler" value="modern"/>
-  <property name="project.dir.src" value="${basedir}" />
-  <property name="project.dir.src.main.java" value="${project.dir.src}" />
-  <property name="project.dir.src.test.java" value="${basedir}/src/test/java" />
-  <property name="project.dir.target" value="${basedir}/target" />
-  <property name="project.dir.classes" value="${project.dir.target}/classes" />
-  <property name="project.dir.test-classes" value="${project.dir.target}/test-classes" />
-	
-  <property name="project.dir.resources" value="${basedir}" />
-	
-  <property name="project.dir.lib" value="${basedir}/lib" />
-  
-  <property name="project.dir.javadoc" value="${project.dir.target}/javadoc/api-docs" />
-	
-  <property name="project.version" value="0.5-SNAPSHOT" />
-	
-  <property name="package.jar.filename.prefix" value="${project.dir.target}/${ant.project.name}" />
-  <property name="package.jar.filename.suffix" value=".jar" />
-  <property name="package.jar.filename" value="${package.jar.filename.prefix}-${project.version}${package.jar.filename.suffix}" />
-
-  
-  <!-- 
+	<property name="build.compiler" value="modern" />
+	<property name="project.dir.src" value="${basedir}" />
+	<property name="project.dir.src.main.java" value="${project.dir.src}" />
+	<property name="project.dir.src.test.java" value="${basedir}/src/test/java" />
+	<property name="project.dir.target" value="${basedir}/target" />
+	<property name="project.dir.classes" value="${project.dir.target}/classes" />
+	<property name="project.dir.test-classes"
+		value="${project.dir.target}/test-classes" />
+
+	<property name="project.dir.resources" value="${basedir}" />
+
+	<property name="project.dir.lib" value="${basedir}/lib" />
+
+	<property name="project.dir.javadoc"
+		value="${project.dir.target}/javadoc/api-docs" />
+
+	<property name="project.version" value="0.5-SNAPSHOT" />
+
+	<property name="package.jar.filename.prefix"
+		value="${project.dir.target}/${ant.project.name}" />
+	<property name="package.jar.filename.suffix" value=".jar" />
+	<property name="package.jar.filename"
+		value="${package.jar.filename.prefix}-${project.version}${package.jar.filename.suffix}" />
+
+
+	<!-- 
       Builds the entire wotonomy package.
       Requires ognl.jar, servlet.jar, xerces.jar, and xp.jar.
   -->
-	
-  <target name="build" description="Build all sources and build the library" depends="clean,test,package-libraries" />
-	
-  <target name="compile-main">
-    <javac destdir="${project.dir.classes}" 
-    	   includes="**/*.java">
- 		<src path="${project.dir.src.main.java}" />
-	   	<exclude name="src/**" />
-		<exclude name="target/**" />
-		<exclude name="docs/**" />
-		<exclude name="${project.dir.lib}/**" />
-    	<classpath>
-		   <pathelement location="${project.dir.lib}/servlet.jar" />
-		   <pathelement location="${project.dir.lib}/xp.jar" />
-		   <pathelement location="${project.dir.lib}/xerces.jar" />
-	       <pathelement location="${project.dir.lib}/ognl.jar" />
-		</classpath>
-    </javac>
-  </target>
-
-
-  <!-- 
+
+	<target name="build" description="Build all sources and build the library"
+		depends="clean,test,package-libraries" />
+
+	<target name="compile-main">
+		<javac destdir="${project.dir.classes}"
+			includes="**/*.java">
+			<src path="${project.dir.src.main.java}" />
+			<exclude name="src/**" />
+			<exclude name="target/**" />
+			<exclude name="docs/**" />
+			<exclude name="${project.dir.lib}/**" />
+			<classpath>
+				<pathelement location="${project.dir.lib}/servlet.jar" />
+				<pathelement location="${project.dir.lib}/xp.jar" />
+				<pathelement location="${project.dir.lib}/xerces.jar" />
+				<pathelement location="${project.dir.lib}/ognl.jar" />
+			</classpath>
+		</javac>
+	</target>
+
+
+	<!-- 
       Generates documentation for all wotonomy packages.
   -->
-  <target name="docs" depends="javadoc" description="Original doc generation target (deprecated)" />
-  <target name="javadoc">
-    <mkdir dir="docs" />
-    <javadoc sourcepath="." destdir="${project.dir.javadoc}"                
-        packagenames="net.wotonomy.control.*,net.wotonomy.foundation.*,net.wotonomy.ui.*,net.wotonomy.util.*,net.wotonomy.web.*,net.wotonomy.xml.*"                                  
-        windowtitle="wotonomy"
-        Overview="overview.html">
-      <classpath>
-        <pathelement location="${project.dir.lib}/servlet.jar" />
-        <pathelement location="${project.dir.lib}/xp.jar" />
-      </classpath>
-    </javadoc>
-  </target>
-
-  <!-- 
+	<target name="docs" depends="javadoc"
+		description="Original doc generation target (deprecated)" />
+	<target name="javadoc">
+		<mkdir dir="docs" />
+		<javadoc sourcepath="." destdir="${project.dir.javadoc}"
+			packagenames="net.wotonomy.control.*,net.wotonomy.foundation.*,net.wotonomy.ui.*,net.wotonomy.util.*,net.wotonomy.web.*,net.wotonomy.xml.*"
+			windowtitle="wotonomy"
+			Overview="overview.html">
+			<classpath>
+				<pathelement location="${project.dir.lib}/servlet.jar" />
+				<pathelement location="${project.dir.lib}/xp.jar" />
+			</classpath>
+		</javadoc>
+	</target>
+
+	<!-- 
       Builds an executable jar file containing 
       the license file, anything in the images
       directory, and everything in net/wotonomy,
       but excludes all .java source files.
   -->
-  <target name="library" depends="package" description="Original packaging target (deprecated)." />
-  <target name="package" depends="compile-main">
-  	<property name="jar.filename.library" value="${project.dir.target}/${ant.project.name}-${project.version}.jar" />
-    <delete failonerror="false" file="${jar.filename.library}" />
-  	<mkdir dir="${project.dir.target}" />
-  	<jar jarfile="${jar.filename.library}" basedir="${project.dir.resources}"
-  		 includes="license.txt" manifest="manifest.txt" />
-    <jar update="true" jarfile="${jar.filename.library}" basedir="${project.dir.classes}" />
-  </target>
-
-  <target name="package-libraries" depends="compile-main">
-  	<jar jarfile="${package.jar.filename.prefix}_ui_components-${project.version}${package.jar.filename.suffix}" 
-  		 basedir="${project.dir.resources}" includes="license.txt" />
-  	<jar jarfile="${package.jar.filename.prefix}_ui_components-${project.version}${package.jar.filename.suffix}" 
-  		 update="true" basedir="${project.dir.classes}" includes="net/wotonomy/ui/swing/**/*.java"
-         excludes="net/wotonomy/ui/swing/*.java" />
-  	
-  	<jar jarfile="${package.jar.filename.prefix}_datastore-${project.version}${package.jar.filename.suffix}" 
-  		 basedir="${project.dir.resources}" includes="license.txt" />
-  	<jar jarfile="${package.jar.filename.prefix}_datastore-${project.version}${package.jar.filename.suffix}" 
-  		 update="true" basedir="${project.dir.classes}" includes="net/wotonomy/datastore/**/*.java" />
-  	
-  	<jar jarfile="${package.jar.filename.prefix}_foundation-${project.version}${package.jar.filename.suffix}" 
-  		 basedir="${project.dir.resources}" includes="license.txt" />
-  	<jar jarfile="${package.jar.filename.prefix}_foundation-${project.version}${package.jar.filename.suffix}" 
-  		 update="true" basedir="${project.dir.classes}" includes="net/wotonomy/foundation/**/*.java" />
-  	
-  	<jar jarfile="${package.jar.filename.prefix}_control-${project.version}${package.jar.filename.suffix}" 
-  		 basedir="${project.dir.resources}" includes="license.txt" />
-  	<jar jarfile="${package.jar.filename.prefix}_control-${project.version}${package.jar.filename.suffix}" 
-  		 update="true" basedir="${project.dir.classes}" includes="net/wotonomy/control/**/*.java" />
-
-  	<jar jarfile="${package.jar.filename.prefix}_ui-${project.version}${package.jar.filename.suffix}" 
-  		 basedir="${project.dir.resources}" includes="license.txt" />
-  	<jar jarfile="${package.jar.filename.prefix}_ui-${project.version}${package.jar.filename.suffix}" 
-  		 update="true" basedir="${project.dir.classes}" includes="net/wotonomy/ui/**/*.java" />
-  	
-  	<jar jarfile="${package.jar.filename.prefix}_foundation-${project.version}${package.jar.filename.suffix}" 
-  		 basedir="${project.dir.resources}" includes="license.txt" />
-  	<jar jarfile="${package.jar.filename.prefix}_foundation-${project.version}${package.jar.filename.suffix}" 
-  		 update="true" basedir="${project.dir.classes}" includes="net/wotonomy/foundation/**/*.java" />
-  	
-  	<jar jarfile="${package.jar.filename.prefix}_util-${project.version}${package.jar.filename.suffix}" 
-  		 basedir="${project.dir.resources}" includes="license.txt" />
-  	<jar jarfile="${package.jar.filename.prefix}_util-${project.version}${package.jar.filename.suffix}" 
-  		 update="true" basedir="${project.dir.classes}" includes="net/wotonomy/util/**/*.java" />
-  	
-  	<jar jarfile="${package.jar.filename.prefix}_web-${project.version}${package.jar.filename.suffix}" 
-  		 basedir="${project.dir.resources}" includes="license.txt" />
-  	<jar jarfile="${package.jar.filename.prefix}_web-${project.version}${package.jar.filename.suffix}" 
-  		 update="true" basedir="${project.dir.classes}" includes="net/wotonomy/web/**/*.java" />
-  	
-  	<jar jarfile="${package.jar.filename.prefix}_xml-${project.version}${package.jar.filename.suffix}" 
-  		 basedir="${project.dir.resources}" includes="license.txt" />
-  	<jar jarfile="${package.jar.filename.prefix}_xml-${project.version}${package.jar.filename.suffix}" 
-  		 update="true" basedir="${project.dir.classes}" includes="net/wotonomy/xml/**/*.java" />
-</target>
-
-  <!-- 
+	<target name="library" depends="package"
+		description="Original packaging target (deprecated)." />
+	<target name="package" depends="compile-main">
+		<property name="jar.filename.library"
+			value="${project.dir.target}/${ant.project.name}-${project.version}.jar" />
+		<delete failonerror="false" file="${jar.filename.library}" />
+		<mkdir dir="${project.dir.target}" />
+		<jar jarfile="${jar.filename.library}"
+			basedir="${project.dir.resources}"
+			includes="license.txt" manifest="manifest.txt" />
+		<jar update="true" jarfile="${jar.filename.library}"
+			basedir="${project.dir.classes}" />
+	</target>
+
+	<target name="package-libraries" depends="compile-main">
+		<jar
+			jarfile="${package.jar.filename.prefix}_ui_components-${project.version}${package.jar.filename.suffix}"
+			basedir="${project.dir.resources}" includes="license.txt" />
+		<jar
+			jarfile="${package.jar.filename.prefix}_ui_components-${project.version}${package.jar.filename.suffix}"
+			update="true" basedir="${project.dir.classes}"
+			includes="net/wotonomy/ui/swing/**/*.java"
+			excludes="net/wotonomy/ui/swing/*.java" />
+
+		<jar
+			jarfile="${package.jar.filename.prefix}_datastore-${project.version}${package.jar.filename.suffix}"
+			basedir="${project.dir.resources}" includes="license.txt" />
+		<jar
+			jarfile="${package.jar.filename.prefix}_datastore-${project.version}${package.jar.filename.suffix}"
+			update="true" basedir="${project.dir.classes}"
+			includes="net/wotonomy/datastore/**/*.java" />
+
+		<jar
+			jarfile="${package.jar.filename.prefix}_foundation-${project.version}${package.jar.filename.suffix}"
+			basedir="${project.dir.resources}" includes="license.txt" />
+		<jar
+			jarfile="${package.jar.filename.prefix}_foundation-${project.version}${package.jar.filename.suffix}"
+			update="true" basedir="${project.dir.classes}"
+			includes="net/wotonomy/foundation/**/*.java" />
+
+		<jar
+			jarfile="${package.jar.filename.prefix}_control-${project.version}${package.jar.filename.suffix}"
+			basedir="${project.dir.resources}" includes="license.txt" />
+		<jar
+			jarfile="${package.jar.filename.prefix}_control-${project.version}${package.jar.filename.suffix}"
+			update="true" basedir="${project.dir.classes}"
+			includes="net/wotonomy/control/**/*.java" />
+
+		<jar
+			jarfile="${package.jar.filename.prefix}_ui-${project.version}${package.jar.filename.suffix}"
+			basedir="${project.dir.resources}" includes="license.txt" />
+		<jar
+			jarfile="${package.jar.filename.prefix}_ui-${project.version}${package.jar.filename.suffix}"
+			update="true" basedir="${project.dir.classes}"
+			includes="net/wotonomy/ui/**/*.java" />
+
+		<jar
+			jarfile="${package.jar.filename.prefix}_foundation-${project.version}${package.jar.filename.suffix}"
+			basedir="${project.dir.resources}" includes="license.txt" />
+		<jar
+			jarfile="${package.jar.filename.prefix}_foundation-${project.version}${package.jar.filename.suffix}"
+			update="true" basedir="${project.dir.classes}"
+			includes="net/wotonomy/foundation/**/*.java" />
+
+		<jar
+			jarfile="${package.jar.filename.prefix}_util-${project.version}${package.jar.filename.suffix}"
+			basedir="${project.dir.resources}" includes="license.txt" />
+		<jar
+			jarfile="${package.jar.filename.prefix}_util-${project.version}${package.jar.filename.suffix}"
+			update="true" basedir="${project.dir.classes}"
+			includes="net/wotonomy/util/**/*.java" />
+
+		<jar
+			jarfile="${package.jar.filename.prefix}_web-${project.version}${package.jar.filename.suffix}"
+			basedir="${project.dir.resources}" includes="license.txt" />
+		<jar
+			jarfile="${package.jar.filename.prefix}_web-${project.version}${package.jar.filename.suffix}"
+			update="true" basedir="${project.dir.classes}"
+			includes="net/wotonomy/web/**/*.java" />
+
+		<jar
+			jarfile="${package.jar.filename.prefix}_xml-${project.version}${package.jar.filename.suffix}"
+			basedir="${project.dir.resources}" includes="license.txt" />
+		<jar
+			jarfile="${package.jar.filename.prefix}_xml-${project.version}${package.jar.filename.suffix}"
+			update="true" basedir="${project.dir.classes}"
+			includes="net/wotonomy/xml/**/*.java" />
+	</target>
+
+	<!-- 
       Deletes all class files in the wotonomy
       directories, and any recognized temp files.
   -->
-  <target name="clean">
-    <delete dir="${project.dir.target}" includes="**/*"/>
-  </target>
-
-  <target name="compile-test" depends="package">
-    <javac destdir="${project.dir.classes}">
-    	<compilerarg value="-Xlint:unchecked" />
- 		<src path="${project.dir.src.test.java}" />
- 	   	<classpath>
- 		   <pathelement location="${project.dir.lib}/servlet.jar" />
- 		   <pathelement location="${project.dir.lib}/xp.jar" />
- 		   <pathelement location="${project.dir.lib}/xerces.jar" />
- 	       <pathelement location="${project.dir.lib}/ognl.jar" />
- 		   <pathelement location="${project.dir.lib}/junit.jar" />
-     	   <pathelement location="${package.jar.filename}" />
- 		</classpath>
-     </javac>
-  </target>
-	
-  <target name="test" depends="package,compile-test">
-    <echo message="TODO: Make junit tests work from ant." />
-  	<!--
-  	<junit fork="true" includeantruntime="true" haltonerror="true" haltonfailure="true" printsummary="true">
+	<target name="clean">
+		<delete dir="${project.dir.target}" includes="**/*" />
+	</target>
+
+	<target name="compile-test" depends="package">
+		<javac destdir="${project.dir.classes}">
+			<compilerarg value="-Xlint:unchecked" />
+			<src path="${project.dir.src.test.java}" />
+			<classpath>
+				<pathelement location="${project.dir.lib}/servlet.jar" />
+				<pathelement location="${project.dir.lib}/xp.jar" />
+				<pathelement location="${project.dir.lib}/xerces.jar" />
+				<pathelement location="${project.dir.lib}/ognl.jar" />
+				<pathelement location="${project.dir.lib}/junit.jar" />
+				<pathelement location="${package.jar.filename}" />
+			</classpath>
+		</javac>
+	</target>
+
+	<target name="test" depends="package,compile-test">
+		<echo message="TODO: Make junit tests work from ant." />
+		<!--
+  	<junit fork="true" includeantruntime="true" haltonerror="true"
+		haltonfailure="true" printsummary="true">
   		<classpath>
   			<pathelement path="${package.jar.filename}" />
   			<pathelement path="${project.dir.test-classes}" />
   		</classpath>
   	</junit>
   	-->
-  </target>
+	</target>
 
-  <target name="env" description="Display all properties">
+	<target name="env" description="Display all properties">
 
-  </target>
+	</target>
 </project>
-- 
cgit v1.2.3