Updated to include a cleaner build.xml, and the use of ivy:configure …

…instead of ivy:settings

README.txt

@@ -14,6 +14,9 @@ tools that you need for doing your builds. Right now these include:
   errors.
 * CPD - Copy Paste Detector - Checks code for large amounts of copy
   and pasted code.
+* JaCoCo - Java Code Coverage. Like Emma or Cobertura, but this project
+  is being kept up to date. Emma and Cobertura have not seen changes in
+  a long while.
 
 It also includes the Ant Contrib tasks
 (http://ant-contrib.sourceforge.net). These extentions help make it
@@ -161,10 +164,10 @@ Default target: package
 STANDARD DIRECTORY STRUCTURE
 ============================
 
-There are several Macros that expect the standard Maven directory
-structure. The exception will be a directory called ${basedir}/archive.
-Any files in this directory will be automatically archived by the
-Jenkins CI system.
+We will standardize on the Maven directory structure. Except there will
+be a directory called ${basedir}/archive. Any files in this directory
+will be automatically archived by the Jenkins CI system.
+
 
 * src/main/java - All current java source files
 
@@ -209,12 +212,15 @@ JENKINS EXPECTED OUTPUT
 =======================
 
 * target/findbugs.xml     - Findbugs Output
-* target/apidocs/         - Location of all Javadocs
+* target/apidocs/        - Location of all Javadocs
 * target/surfire-tests/   - All tests in XML format
 * target/pmd.xml          - PMD output
 * target/cpd.xml          - CPD output
 * target/checkstyles.xml  - Checkstyles output
 * target/archive/         - File to save for this build
+* target/maven/		  - Where the Maven distributed jars are stored.
+                            There should be a sub directory for each
+			    jar file that is being deployed to Maven
 
 
 BUILD WORKINGS
@@ -305,7 +311,7 @@ into your META-INF/maven directory. It will also put
 Jenkins build information and Maven information into
 your MANIFEST.MF file:
 
-    <jar.macro destfile="${target.dir}/{$jar.name}.jar">
+    <jar.macro destfile="${maven.dir}/${jar.name}/{$jar.name}">
 	<fileset dir="${main.destdir}"/>
 	<fileset dir="${main.resouces}"/>
     </jar.macro>

build.template.properties

@@ -1,13 +1,18 @@
-# This is a template of a build.properties file. You may add this file
-# into your project as build.template.properties, and people may copy
-# this file over to build.properties, but cannot add it to their
-# project. This file is for each individual and is made to allow
-# users to override defaults. It should not be used to actually
-# set the values in the build.xml file itself!
-
-target.dir=${basedir}/target
-ivy.dir=${basedir}/ivy.dir
-
+########################################################################
+# BUILD.PROPERTIES TEMPLATE
+#
+# The "build.properties" file is for the developer's use. It allows
+# the developers to customize aspect of the build for development
+# purposes, but that shouldn't be part of the Jenkins build. For example,
+# Jenkins always cleans the Ivy cache before each build. However, if a
+# developer did this, it would slow down their development. Therefore,
+# they can set "ivy.cleancache" to false in this file to stop that
+# behavior. Jenkins will still clean the Ivy cache, but not the developer.
+#
+# This file can be committed in projects as build.template.properties, but
+# a file called "build.properties" should not be committed into the
+# project.
+########################################################################
 
 ########################################################################
 # Ivy
@@ -28,11 +33,9 @@ ivy.resolve.haltonfailure=true
 ########################################################################
 # Checkstyle
 #
-checkstyle.config.file=${ivy.dir}/checkstyle/checkstyle_checks.xml
 
 # Can be set to "plain" or "xml"
 checkstyle.formatter.type=xml
-checkstyle.formatter.tofile="${target.dir}/checkstyle.${checkstyle.formatter.type}
 #
 ########################################################################
 
@@ -62,11 +65,13 @@ cpd.language=java
 ########################################################################
 # Javac
 #
-javac.nowarn=false
+javac.lint=true
+javac.deprecation=true
+
+# The following aren't used in the build.xml template, but can be added
 javac.debug=true
 javac.debuglevel=lines,vars,source
 javac.listfiles=false
-javac.deprecation=true
 javac.target=1.6
 javac.source=1.6
 javac.includeAntRuntime=false
@@ -76,26 +81,13 @@ javac.fork=false
 javac.memoryInitialSize=64m
 javac.memoryMaximumSizt=256m
 javac.executable=${java.home}/bin/java
-javac.lint=true
 #
 ########################################################################
 
 ########################################################################
 # Junit
 #
-junit.includeAntRuntime=true
-junit.fork=true
 junit.maxmemory=64m
-junit.jvm=${java.home}/bin/java
 junit.formatter.type=xml
 #
 ########################################################################
-
-########################################################################
-# Copy
-#
-
-# Set to "true" to see all files as they're being copied
-copy.verbose=false
-#
-########################################################################