Index: trunk/build/buildTools/buildjar.xml
===================================================================
---  (revision )
+++ trunk/build/buildTools/buildjar.xml (revision 3108)
@@ -1,0 +1,148 @@
+<!-- This file builds a single jar file. It just sets defaults for the java
+     compiler then invokes it.
+
+     This is the only place we compile files.
+
+     On entry we require:
+       build.jar.file        Fully specified name of destination jar file.
+       base.java.sources     Defines the java source files
+       base.class.patternset Defines the java class files
+       base.resource.files   Defines extra resources to go in the jar
+
+     We will copy all files defined by base.java.patternset to a temporary
+     location and compile out of that into a temporary classes location.
+
+     We do that to avoid a problematic feature of the java compilers, the
+     tendency to recompile any referenced sources found on the source path.
+
+     So, if we have all our sources under the directory "src" and compile a
+     single package in that tree, all referenced classes will be compiled,
+     even if they exist in a jar file on the class path.
+
+     The other side-effect is that we might compile and include classes we
+     didn't realise we were compiling.
+
+     The downside is that we need to be very specific about the classes we
+     compile for a package and we might need to put classes in
+     base.java.sources which we don't want in the final jar file.
+
+     On exit we will have created classes in the directory
+        ${jar.temp.classes}
+     and a jar file
+        ${build.jar.file}
+
+     Authors: Mike Douglass   douglm rpi.edu
+-->
+
+<project name="buildjar" default="build" >
+  <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+
+  <target name="init">
+    <!--  =================== Compilation Control Options ===============
+      These properties control option settings on the Javac compiler when it
+      is invoked using the <javac> task.
+
+      compile.debug        Should compilation include the debug option?
+      compile.deprecation  Should compilation include the deprecation option?
+      compile.optimize     Should compilation include the optimize option?
+
+      Below are the defaults. They may already be set in the build properties.
+    -->
+
+    <property name="compile.debug" value="true"/>
+    <property name="compile.deprecation" value="false"/>
+    <property name="compile.optimize" value="true"/>
+    <property name="compile.verbose" value="false"/>
+    <property name="compile.listfiles" value="false"/>
+
+    <property name="jar.temp.sources"
+             location="${dist.home}/source" />
+    <property name="jar.temp.classes"
+             location="${dist.home}/classes" />
+  </target>
+
+  <target name="build" depends="init"
+          description="Compile Java sources">
+    <!-- ==============================================================
+          See if the jar is up to date. We recompile if any of the
+          source files or metainf files are newer. We also recompile if
+          any jars on the package classpath are newer.
+         ============================================================== -->
+
+    <noisyMsg message="build.jar.file=${build.jar.file}" />
+
+    <uptodate property="build.jar.uptodate"
+              targetfile="${build.jar.file}" >
+      <srcfiles refid="buildjar.java.sources" />
+      <srcfiles refid="buildjar.generated.java.sources" />
+      <srcfiles refid="buildjar.resource.files"/>
+    </uptodate>
+
+    <if>
+      <isset property="build.jar.uptodate"/>
+      <then>
+        <noisyMsg message="**** ${build.jar.file} is up to date" />
+      </then>
+      <else>
+        <noisyMsg message="**** ${build.jar.file} needs rebuilding" />
+
+        <!-- Delete jar file -->
+        <delete file="${build.jar.file}"/>
+
+        <dirname property="build.jar.dir" file="${build.jar.file}"/>
+
+        <mkdir dir="${build.jar.dir}" />
+
+        <!-- ==========================================================
+                          Build the classes
+             ========================================================== -->
+
+        <!-- First copy the sources we are going to compile into a temp
+             directory. -->
+        <delete dir="${jar.temp.sources}" />
+        <mkdir dir="${jar.temp.sources}" />
+      	
+        <copy toDir="${jar.temp.sources}">
+          <fileset refid="buildjar.java.sources" />
+          <fileset refid="buildjar.generated.java.sources" />
+          <fileset refid="buildjar.resource.files"/>
+        </copy>
+
+        <mkdir dir="${jar.temp.classes}"/>
+        
+        <debugMsg message="About to build jar ${build.jar.file}"/>
+        <debugCpid idpar="compile.classpath" />
+
+        <javac srcdir="${jar.temp.sources}"
+               destdir="${jar.temp.classes}"
+               debug="${compile.debug}"
+               verbose="${compile.verbose}"
+               listfiles="${compile.listfiles}"
+               deprecation="${compile.deprecation}"
+               optimize="${compile.optimize}">
+          <classpath refid="compile.classpath"/>
+          <include name="**/*.java"/>
+          <compilerarg value="-nowarn" compiler="jikes" />
+        </javac>
+
+        <!-- ==========================================================
+                          Build jar file
+             ========================================================== -->
+
+        <jar jarfile="${build.jar.file}">
+          <fileset dir="${jar.temp.classes}">
+            <patternset refid="base.class.patternset"/>
+          </fileset>
+          <fileset refid="buildjar.resource.files"/>
+        </jar>
+
+        <!-- ==========================================================
+                          Clean up
+             ========================================================== -->
+
+        <delete dir="${jar.temp.sources}" />
+        <delete dir="${jar.temp.classes}"/>
+      </else>
+    </if>
+  </target>
+</project>
Index: trunk/build/buildTools/deftasks.xml
===================================================================
---  (revision )
+++ trunk/build/buildTools/deftasks.xml (revision 3108)
@@ -1,0 +1,184 @@
+<!-- Define a number of tasks and macros
+     deftasks:  define someuseful build tasks
+     projectDefs: standard project definitions
+     xMsg: x=info,debug etc. For message output
+
+     Authors: Mike Douglass   douglm rpi.edu
+-->
+
+<project name="do.deftasks" basedir="." default="">
+  <macrodef name="deftasks">
+    <sequential>
+      <path id="build.cp">
+        <fileset dir="${build.dir}">
+          <include name="*.jar"/>
+        </fileset>
+      </path>
+  
+      <taskdef name="forEachApp"
+               classname="org.bedework.deployment.ForEachAppTask">
+        <classpath refid="build.cp"/>
+      </taskdef>
+
+      <taskdef name="resolveFile"
+               classname="org.bedework.deployment.ResolveFile">
+        <classpath refid="build.cp"/>
+      </taskdef>
+
+      <taskdef name="makeLangXsl"
+               classname="org.bedework.deployment.MakeLangXsl">
+        <classpath refid="build.cp"/>
+      </taskdef>
+
+      <taskdef name="applicationXml"
+               classname="org.bedework.deployment.ApplicationXmlTask">
+        <classpath refid="build.cp"/>
+      </taskdef>
+    </sequential>
+  </macrodef>
+  
+  <macrodef name="projectDefs">
+    <attribute name="name"/>
+    <attribute name="version"/>
+    <attribute name="deployment-name" default=""/>
+    <attribute name="no-default-libs" default="true"/>
+    <attribute name="subproject" default="false"/>
+    <sequential>
+      <property name="project.name" value="@{name}"/>
+      
+      <property name="project.version" value="@{version}"/>
+      
+      <property name="dist.home" location="${project.home}/dist"/>
+      <property name="lib.dir" location="${project.home}/lib"/>
+
+      <property name="build.dir" location="${bedework.home}/build"/>
+
+      <property name="buildjar" location="${build.dir}/buildTools/buildjar.xml"/>
+      <property name="buildwar" location="${build.dir}/buildwar.xml"/>
+      <property name="buildsh" location="${build.dir}/buildsh.xml"/>
+
+      <property name="resources.dir" location="${project.home}/resources"/>
+
+      <property name="org.bedework.libcache.dir"
+                location="${project.home}/libcache"/>
+      
+      <if>
+        <istrue value="@{subproject}" />
+        <then>
+          <property name="source.home" location="${project.home}/src"/>
+        </then>
+        <else>
+          <property name="org.bedework.temp.dir"
+                    location="${dist.home}/temp" />
+
+          <delete dir="${org.bedework.temp.dir}" />
+          <mkdir dir="${org.bedework.temp.dir}" />
+          
+          <property name="org.bedework.deployment.name"
+                    value="@{deployment-name}" />
+
+          <property name="propval.app.no.defaultlibs"
+                    value="@{no-default-libs}" />
+          
+          <deftasks/>
+        </else>
+      </if>
+    </sequential>
+  </macrodef>
+  
+  <macrodef name="build-jar">
+    <attribute name="module-base"/>
+    <attribute name="jar-file"/>
+    <attribute name="generated-sources" default=""/>
+    <attribute name="property-resources" default=""/>
+
+    <sequential>
+      <if>
+        <equals arg1="@{generated-sources}" arg2="" />
+        <then>
+          <fileset id="buildjar.generated.java.sources" refid="empty.fileset" />
+        </then>
+        <else>
+          <fileset id="buildjar.generated.java.sources" dir="@{generated-sources}" >
+            <include name="org/bedework/**/*.java"/>
+          </fileset>
+        </else>
+      </if>
+
+      <if>
+        <equals arg1="@{property-resources}" arg2="" />
+        <then>
+          <fileset id="buildjar.resource.files" refid="empty.fileset" />
+        </then>
+        <else>
+          <fileset id="buildjar.resource.files" dir="@{property-resources}" >
+            <include name="**/*.properties"/>
+          </fileset>
+        </else>
+      </if>
+
+      <fileset id="buildjar.java.sources" dir="@{module-base}/src" >
+        <include name="**/*.java"/>
+      </fileset>
+
+      <patternset id="base.class.patternset">
+        <include name="**/*.class"/>
+      </patternset>
+
+      <ant antfile="${buildjar}" inheritRefs="true" target="build" >
+        <property name="build.jar.file" location="@{jar-file}" />
+      </ant>
+    </sequential>
+  </macrodef>
+  
+  <macrodef name="infoMsg">
+    <attribute name="message"/>
+    <sequential>
+      <if>
+        <not>
+          <istrue value="${org.bedework.build.silent}" />
+        </not>
+        <then>
+          <echo message="@{message}" />
+        </then>
+      </if>
+    </sequential>
+  </macrodef>
+  
+  <macrodef name="noisyMsg">
+    <attribute name="message"/>
+    <sequential>
+      <if>
+        <istrue value="${org.bedework.build.noisy}" />
+        <then>
+          <echo message="@{message}" />
+        </then>
+      </if>
+    </sequential>
+  </macrodef>
+  
+  <macrodef name="debugMsg">
+    <attribute name="message"/>
+    <sequential>
+      <if>
+        <istrue value="${org.bedework.build.debug}" />
+        <then>
+          <echo message="@{message}" />
+        </then>
+      </if>
+    </sequential>
+  </macrodef>
+  
+  <macrodef name="debugCpid">
+    <attribute name="idpar"/>
+    <sequential>
+      <if>
+        <istrue value="${org.bedework.build.debug}" />
+        <then>
+          <property name="cp" refid="@{idpar}" />
+          <echo message="***************cp: ${cp}"/>
+        </then>
+      </if>
+    </sequential>
+  </macrodef>
+</project>
Index: trunk/build/buildTools/getJar.xml
===================================================================
---  (revision )
+++ trunk/build/buildTools/getJar.xml (revision 3108)
@@ -1,0 +1,189 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     Define a macro to fetch jars from the bedework repository or from
+     the generated library in the named project.
+
+     IF a project is named and we cannot locate the named file we try the
+     repository.
+
+     For jars fetched from the archive we have a two step process, first check
+     that a copy in a local cache is up to date, second copy from the local cache
+     into the final destination. This allows the caller to delete and recreate the
+     destination, ensuring that jar version changes don't result in multiple
+     copies of a jar.
+
+     @param name     Name of the jar e.g. junit
+     @param version  optional version for the jar
+     @param src      optional url for the get task
+     @param lib      optional destination for the get task
+     @param libcache optional location of the cache
+     @param property optional name of property to hold location of resulting jar
+     @param project optional project name for local fetch from generated quickstart.
+     =================================================================== -->
+<project name="getJar" basedir="." default="">
+  <macrodef name="getJar">
+    <attribute name="name"/>
+    <attribute name="version" default="" />
+    <attribute name="src" default="http://bedework.org/downloads/lib"/>
+    <attribute name="lib" default="${lib.dir}"/>
+    <attribute name="libcache" default="${org.bedework.libcache.dir}"/>
+    <attribute name="property" default="" />
+    <attribute name="project" default="" />
+    <attribute name="projectHome" default="" />
+    <sequential>
+      <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+    	
+    	<mkdir dir="@{libcache}" />
+
+      <!-- Names are of form
+             <name-part>-<version>.jar   or
+             <name-part>.jar
+        -->
+
+      <if>
+        <equals arg1="@{version}" arg2="" />
+        <then>
+          <var name="org.bedework.getjar.jarname" value="@{name}.jar" />
+        </then>
+        <else>
+          <var name="org.bedework.getjar.jarname" value="@{name}-@{version}.jar" />
+       </else>
+      </if>
+
+      <!-- Ensure projectHome is set to something
+        -->
+
+      <if>
+        <equals arg1="@{projectHome}" arg2="" />
+        <then>
+          <var name="org.bedework.getjar.projecthome"
+               value="${project.home}/../@{project}" />
+        </then>
+        <else>
+          <var name="org.bedework.getjar.projecthome" value="@{projectHome}" />
+       </else>
+      </if>
+
+      <var name="org.bedework.getjar.dest"
+           value="@{lib}/${org.bedework.getjar.jarname}" />
+
+      <var name="org.bedework.getjar.finished" value="false" />
+
+      <!-- If a project or projecthome was specified try to get it from the
+           local file system
+        -->
+      <if>
+        <or>
+          <not>
+            <equals arg1="@{project}" arg2="" />
+          </not>
+          <not>
+            <equals arg1="@{projecthome}" arg2="" />
+          </not>
+        </or>
+        <then>
+          <var name="org.bedework.getjar.project.jar"
+               value="${org.bedework.getjar.projecthome}/dist/${org.bedework.getjar.jarname}" />
+          <noisyMsg message="check ${org.bedework.getjar.project.jar}" />
+        	
+          <if>
+            <available file="${org.bedework.getjar.project.jar}" />
+            <then>
+              <!-- Say we found the file -->
+              <var name="org.bedework.getjar.finished" value="true" />
+
+              <if>
+                <not>
+                  <uptodate srcfile="${org.bedework.getjar.project.jar}"
+                            targetfile="${org.bedework.getjar.dest}" />
+                </not>
+                <then>
+                  <noisyMsg message="Fetch ${org.bedework.getjar.jarname} from project @{project}" />
+                  <copy file="${org.bedework.getjar.project.jar}"
+                        todir="@{lib}" overwrite="yes" />
+                </then>
+              </if>
+            </then>
+          </if>
+        </then>
+      </if>
+
+      <!-- if org.bedework.getjar.finished is true we found a local file,
+          otherwise we need to check the repository. -->
+
+      <if>
+        <equals arg1="${org.bedework.getjar.finished}" arg2="false" />
+        <then>
+          <if>
+            <equals arg1="${org.bedework.offline.build}" arg2="yes" />
+            <then>
+              <noisyMsg message="Offline: skip check for ${org.bedework.getjar.jarname}" />
+            </then>
+            <else>
+              <!-- Not offline - check repository -->
+              <noisyMsg message="Fetch ${org.bedework.getjar.jarname} from archive" />
+              <get src="@{src}/${org.bedework.getjar.jarname}"
+                   dest="@{libcache}/${org.bedework.getjar.jarname}"
+                   ignoreerrors="true"
+                   verbose="${org.bedework.getjar.noisy}"
+                   usetimestamp="true"/>
+            </else>
+          </if>
+
+          <if>
+            <not>
+              <available file="@{libcache}/${org.bedework.getjar.jarname}" />
+            </not>
+            <then>
+              <echo message="******************************************************" />
+              <echo message="File ${org.bedework.getjar.jarname} is not available" />
+              <echo message="******************************************************" />
+            </then>
+            <else>
+              <if>
+                <isset property="org.bedework.getjar.jar.listfile" />
+                <then>
+                  <!-- Write the name to the list -->
+                  <echo file="${org.bedework.getjar.jar.listfile}"
+                        append="yes" 
+                        message="@{name}" />
+                </then>
+              </if>
+            	
+              <copy file="@{libcache}/${org.bedework.getjar.jarname}"
+                    todir="@{lib}" overwrite="yes" />
+            </else>
+          </if>
+
+        </then>
+      </if>
+
+      <if>
+        <not>
+          <equals arg1="@{property}" arg2="" />
+        </not>
+        <then>
+          <noisyMsg message="set property @{property} to ${org.bedework.getjar.dest}" />
+
+          <property name="@{property}" location="${org.bedework.getjar.dest}" />
+        </then>
+        <elseif>
+          <isset property="org.bedework.getjar.property.prefix" />
+          <then>
+            <noisyMsg message="set property ${org.bedework.getjar.property.prefix}.@{name} to ${org.bedework.getjar.dest}" />
+
+            <property name="${org.bedework.getjar.property.prefix}.@{name}"
+                      location="${org.bedework.getjar.dest}" />
+          </then>
+        </elseif>
+        <else>
+          <noisyMsg message="set property org.bedework.getjar.jarloc.@{name} to ${org.bedework.getjar.dest}" />
+
+          <property name="org.bedework.getjar.jarloc.@{name}"
+                    location="${org.bedework.getjar.dest}" />
+        </else>
+      </if>
+    </sequential>
+  </macrodef>
+</project>
Index: trunk/build/buildTools/wsimport.xml
===================================================================
---  (revision )
+++ trunk/build/buildTools/wsimport.xml (revision 3108)
@@ -1,0 +1,121 @@
+<!-- ===================================================================
+     Run wsimport on web service definitions.
+     
+     The jaxb released with java6 is version 2.1. However, to resolve some 
+     issues we have to use version 2.2. This requires either placing the
+     jaxb jars in the endorsed directory or setting xendorsed="true" when
+     running wsimport and adding the 2.2 jars to the classpath.
+     
+     The version of jboss in the quickstart has the 2.2 jars in its 
+     endorsed directory. For the moment we point at that.
+     
+     Hold that: Unfortunately eclipse doesn't appear to have a way to set
+     an endorsed directory for a single project. The generated 2.2 classes
+     don't compile. Managed to get 2.1 wsimport to run - the generated code
+     appears to run OK on 2.2 
+     
+     @param wsdl     Location of the wsdl
+     @param sourcedestdir     Location for the generated source
+       
+     Authors: Mike Douglass   douglm    rpi.edu
+     =================================================================== -->
+
+<project name="do.wsimport" basedir="." default="">
+  <macrodef name="wsimport">
+    <attribute name="wsdl"/>
+    <attribute name="sourcedestdir"/>
+    <attribute name="bindingsdir" default="" />
+    <sequential>
+      <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+  
+      <!--
+      <getJar name="jaxws-tools" version="2.2" /> 
+      <getJar name="jaxb-xjc" version="2.2" /> 
+      <getJar name="jaxws-rt" version="2.2" /> 
+      -->
+      <property name="wsimport.lib" 
+                location="${org.bedework.temp.dir}/wsimportlib" />
+      <delete dir="${wsimport.lib}" />
+      <mkdir dir="${wsimport.lib}" />
+      
+      <getJar lib="${wsimport.lib}"
+              libcache="${org.bedework.libcache.dir}"
+              name="jaxws-tools" version="2.1.4" /> 
+      <getJar lib="${wsimport.lib}"
+              libcache="${org.bedework.libcache.dir}"
+              name="jaxb-xjc" version="2.1.7" /> 
+      <getJar lib="${wsimport.lib}"
+              libcache="${org.bedework.libcache.dir}"
+              name="jaxb-impl" version="2.1.8" /> 
+      <getJar lib="${wsimport.lib}"
+              libcache="${org.bedework.libcache.dir}"
+              name="jaxws-rt" version="2.1.4" /> 
+      <getJar lib="${wsimport.lib}"
+              libcache="${org.bedework.libcache.dir}"
+              name="streambuffer" version="1.0" /> 
+      <getJar lib="${wsimport.lib}"
+              libcache="${org.bedework.libcache.dir}"
+              name="stax-ex" version="2.2.1" /> 
+  
+      <path id="wsimport.classpath">
+        <fileset dir="${ant.home}/lib">
+          <include name="jax*.jar"/>
+        </fileset>
+        <!--
+        <pathelement location="${wsimport.lib}/jaxws-tools-2.2.jar"/>
+        <pathelement location="${wsimport.lib}/jaxb-xjc-2.2.jar"/>
+        <pathelement location="${wsimport.lib}/jaxws-rt-2.2.jar"/>
+        -->
+        <pathelement location="${wsimport.lib}/jaxws-tools-2.1.4.jar"/>
+        <pathelement location="${wsimport.lib}/jaxb-xjc-2.1.7.jar"/>
+        <pathelement location="${wsimport.lib}/jaxb-impl-2.1.8.jar"/>
+        <pathelement location="${wsimport.lib}/jaxws-rt-2.1.4.jar"/>
+        <pathelement location="${wsimport.lib}/tools-1.6.0_21.jar" />
+        <pathelement location="${wsimport.lib}/streambuffer-1.0.jar" />
+        <pathelement location="${wsimport.lib}/stax-ex-2.2.1.jar" />
+        <fileset dir="${ant.home}/lib">
+          <include name="**/*.jar"/>
+        </fileset>
+        <!--
+        <fileset dir="${org.bedework.appserver.dir}/lib/endorsed" >
+          <include name="**/*.jar"/>
+        </fileset>
+        -->
+      </path>
+      
+      <debugCpid idpar="wsimport.classpath" />
+  
+      <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">
+        <classpath refid="wsimport.classpath" />
+      </taskdef>
+      
+      <!-- We don't want the generated classes but there doesn't appear to be a
+           way to suppress generation -->
+      <property name="wsimport.dest" 
+                location="${org.bedework.temp.dir}/wsclasses" />
+      <mkdir dir="${wsimport.dest}" />
+
+      <if>
+        <equals arg1="@{bindingsdir}" arg2="" />
+        <then>
+          <wsimport keep="true"
+                    sourcedestdir="@{sourcedestdir}"
+                    destdir="${wsimport.dest}"
+                    wsdl="@{wsdl}" 
+                    xendorsed="true" >
+          </wsimport>
+        </then>
+        <else>
+          <wsimport keep="true"
+                    sourcedestdir="@{sourcedestdir}"
+                    destdir="${wsimport.dest}"
+                    wsdl="@{wsdl}" 
+                    xendorsed="true" >
+            <binding dir="@{bindingsdir}" includes="*.xml">
+            </binding>
+          </wsimport>
+        </else>
+      </if>
+    </sequential>
+  </macrodef>
+</project>