Bug 1760649: Rearrge to Maven 2 Standard Directory Layout

git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/cpptasks/trunk@121 32d7a393-a5a9-423c-abd3-5d954feb1f2f

245 files changed, 16 insertions, 13 deletions

diff --git a/build.xml b/build.xml
index 31c55c6..e757b12 100644
--- a/build.xml
+++ b/build.xml
@@ -41,16 +41,18 @@ Copyright 2001-2006 The Ant-Contrib project
          Set the properties related to the source tree
        ===================================================================
   -->
-  <property name="src.dir" value="src"/>
-  <property name="java.dir" value="src"/>
-  <property name="tests.java.dir" value="test/junit"/>
+  <property name="src.dir" value="src/main/java"/>
+  <property name="resources.dir" value="src/main/resources"/>
+  <property name="java.dir" value="src/main/java"/>
+  <property name="tests.java.dir" value="src/test/java"/>
+  <property name="tests.resources.dir" value="src/test/resources"/>
 
   <!--
        ===================================================================
          Set the properties for the build area
        ===================================================================
   -->
-  <property name="build.dir" value="build"/>
+  <property name="build.dir" value="target"/>
   <property name="build.classes" value="${build.dir}/classes"/>
   <property name="tests.build.classes" value="${build.dir}/tests"/>
   <property name="tests.build.lib" value="${build.dir}/lib"/>
@@ -65,7 +67,7 @@ Copyright 2001-2006 The Ant-Contrib project
        ===================================================================
   -->
   <property name="dist.name" value="${name}-${version}"/>
-  <property name="dist.base" value="dist"/>
+  <property name="dist.base" value="target"/>
   <property name="dist.dir" value="${dist.base}/${dist.name}"/>
   <property name="dist.javadocs" value="${dist.dir}/docs/manual/api"/>
 
@@ -145,10 +147,10 @@ Copyright 2001-2006 The Ant-Contrib project
           depends="build"
           description="--> creates the jar">
     <mkdir dir="${build.lib}"/>
-    <jar jarfile="${build.lib}/${name}.jar" manifest="${src.dir}/cpptasks.mf">
+    <jar jarfile="${build.lib}/${name}.jar" manifest="${resources.dir}/cpptasks.mf">
                  <fileset dir="." includes="LICENSE NOTICE"/>
          <fileset dir="${build.classes}"/>
-                 <fileset dir="${src.dir}" includes="cpptasks.tasks,cpptasks.types,net/sf/antcontrib/cpptasks/antlib.xml"/>
+                 <fileset dir="${resources.dir}" includes="cpptasks.tasks,cpptasks.types,net/sf/antcontrib/cpptasks/antlib.xml"/>
     </jar>
   </target>
 
@@ -177,8 +179,9 @@ Copyright 2001-2006 The Ant-Contrib project
   <target name="run-tests"  depends="build-tests" description="Run tests">
         <junit printsummary="false"
                 fork="true"
-                dir="${tests.java.dir}">
+                dir="${tests.resources.dir}">
             <classpath>
+                <pathelement location="${java.dir}"/>
                 <pathelement location="${tests.build.lib}/${name}_test.jar" />
                 <pathelement location="${build.lib}/${name}.jar" />
             </classpath>
@@ -194,7 +197,7 @@ Copyright 2001-2006 The Ant-Contrib project
   <target name="run-coverage-tests"  depends="build-tests">
         <junit printsummary="false"
                 fork="true"
-                dir="${tests.java.dir}">
+                dir="${tests.resources.dir}">
             <classpath>
                 <pathelement location="${tests.build.lib}/${name}_test.jar" />
                 <pathelement location="${build.lib}/${name}.jar" />
diff --git a/src/net/sf/antcontrib/cpptasks/AboutCCTask.java b/src/main/java/net/sf/antcontrib/cpptasks/AboutCCTask.java
index 4f17111..4f17111 100644
--- a/src/net/sf/antcontrib/cpptasks/AboutCCTask.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/AboutCCTask.java
diff --git a/src/net/sf/antcontrib/cpptasks/ArchEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/ArchEnum.java
index 0f36405..0f36405 100644
--- a/src/net/sf/antcontrib/cpptasks/ArchEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ArchEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/CCTask.java b/src/main/java/net/sf/antcontrib/cpptasks/CCTask.java
index beeed89..beeed89 100644
--- a/src/net/sf/antcontrib/cpptasks/CCTask.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/CCTask.java
diff --git a/src/net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java b/src/main/java/net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java
index 317d6c3..317d6c3 100644
--- a/src/net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java
diff --git a/src/net/sf/antcontrib/cpptasks/CPUEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/CPUEnum.java
index 512ef37..512ef37 100644
--- a/src/net/sf/antcontrib/cpptasks/CPUEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/CPUEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/CUtil.java b/src/main/java/net/sf/antcontrib/cpptasks/CUtil.java
index 2ac18e5..2ac18e5 100644
--- a/src/net/sf/antcontrib/cpptasks/CUtil.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/CUtil.java
diff --git a/src/net/sf/antcontrib/cpptasks/CompilerDef.java b/src/main/java/net/sf/antcontrib/cpptasks/CompilerDef.java
index 1bbdabf..1bbdabf 100644
--- a/src/net/sf/antcontrib/cpptasks/CompilerDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/CompilerDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/CompilerEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/CompilerEnum.java
index 9926cc4..9926cc4 100644
--- a/src/net/sf/antcontrib/cpptasks/CompilerEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/CompilerEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/CompilerParam.java b/src/main/java/net/sf/antcontrib/cpptasks/CompilerParam.java
index 8a15a77..8a15a77 100755
--- a/src/net/sf/antcontrib/cpptasks/CompilerParam.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/CompilerParam.java
diff --git a/src/net/sf/antcontrib/cpptasks/DependencyInfo.java b/src/main/java/net/sf/antcontrib/cpptasks/DependencyInfo.java
index d29826f..d29826f 100644
--- a/src/net/sf/antcontrib/cpptasks/DependencyInfo.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/DependencyInfo.java
diff --git a/src/net/sf/antcontrib/cpptasks/DependencyTable.java b/src/main/java/net/sf/antcontrib/cpptasks/DependencyTable.java
index 9e57eb1..9e57eb1 100644
--- a/src/net/sf/antcontrib/cpptasks/DependencyTable.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/DependencyTable.java
diff --git a/src/net/sf/antcontrib/cpptasks/DistributerDef.java b/src/main/java/net/sf/antcontrib/cpptasks/DistributerDef.java
index f40ac8e..f40ac8e 100644
--- a/src/net/sf/antcontrib/cpptasks/DistributerDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/DistributerDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/DistributerMap.java b/src/main/java/net/sf/antcontrib/cpptasks/DistributerMap.java
index ec0f4a4..ec0f4a4 100644
--- a/src/net/sf/antcontrib/cpptasks/DistributerMap.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/DistributerMap.java
diff --git a/src/net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java
index 7d3734d..7d3734d 100644
--- a/src/net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/FileVisitor.java b/src/main/java/net/sf/antcontrib/cpptasks/FileVisitor.java
index c59f04f..c59f04f 100644
--- a/src/net/sf/antcontrib/cpptasks/FileVisitor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/FileVisitor.java
diff --git a/src/net/sf/antcontrib/cpptasks/LinkerDef.java b/src/main/java/net/sf/antcontrib/cpptasks/LinkerDef.java
index af1d307..af1d307 100644
--- a/src/net/sf/antcontrib/cpptasks/LinkerDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/LinkerDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/LinkerEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/LinkerEnum.java
index df96723..df96723 100644
--- a/src/net/sf/antcontrib/cpptasks/LinkerEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/LinkerEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/LinkerParam.java b/src/main/java/net/sf/antcontrib/cpptasks/LinkerParam.java
index 3dae933..3dae933 100755
--- a/src/net/sf/antcontrib/cpptasks/LinkerParam.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/LinkerParam.java
diff --git a/src/net/sf/antcontrib/cpptasks/OSFamilyEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/OSFamilyEnum.java
index 68ebd82..68ebd82 100644
--- a/src/net/sf/antcontrib/cpptasks/OSFamilyEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/OSFamilyEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/ObjectFileCollector.java b/src/main/java/net/sf/antcontrib/cpptasks/ObjectFileCollector.java
index fd4cda5..fd4cda5 100644
--- a/src/net/sf/antcontrib/cpptasks/ObjectFileCollector.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ObjectFileCollector.java
diff --git a/src/net/sf/antcontrib/cpptasks/OptimizationEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/OptimizationEnum.java
index 042822e..042822e 100644
--- a/src/net/sf/antcontrib/cpptasks/OptimizationEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/OptimizationEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/OutputTypeEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/OutputTypeEnum.java
index 873a99c..873a99c 100644
--- a/src/net/sf/antcontrib/cpptasks/OutputTypeEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/OutputTypeEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/PrecompileDef.java b/src/main/java/net/sf/antcontrib/cpptasks/PrecompileDef.java
index 4dd9831..4dd9831 100644
--- a/src/net/sf/antcontrib/cpptasks/PrecompileDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/PrecompileDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/PrecompileExceptDef.java b/src/main/java/net/sf/antcontrib/cpptasks/PrecompileExceptDef.java
index c6c7da7..c6c7da7 100644
--- a/src/net/sf/antcontrib/cpptasks/PrecompileExceptDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/PrecompileExceptDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/ProcessorDef.java b/src/main/java/net/sf/antcontrib/cpptasks/ProcessorDef.java
index 24c1a1f..24c1a1f 100644
--- a/src/net/sf/antcontrib/cpptasks/ProcessorDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ProcessorDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/ProcessorEnumValue.java b/src/main/java/net/sf/antcontrib/cpptasks/ProcessorEnumValue.java
index 9096183..9096183 100644
--- a/src/net/sf/antcontrib/cpptasks/ProcessorEnumValue.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ProcessorEnumValue.java
diff --git a/src/net/sf/antcontrib/cpptasks/ProcessorParam.java b/src/main/java/net/sf/antcontrib/cpptasks/ProcessorParam.java
index 1b0c613..1b0c613 100755
--- a/src/net/sf/antcontrib/cpptasks/ProcessorParam.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ProcessorParam.java
diff --git a/src/net/sf/antcontrib/cpptasks/RuntimeType.java b/src/main/java/net/sf/antcontrib/cpptasks/RuntimeType.java
index 6590098..6590098 100644
--- a/src/net/sf/antcontrib/cpptasks/RuntimeType.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/RuntimeType.java
diff --git a/src/net/sf/antcontrib/cpptasks/SourceHistory.java b/src/main/java/net/sf/antcontrib/cpptasks/SourceHistory.java
index 4ffd38f..4ffd38f 100644
--- a/src/net/sf/antcontrib/cpptasks/SourceHistory.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/SourceHistory.java
diff --git a/src/net/sf/antcontrib/cpptasks/SubsystemEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/SubsystemEnum.java
index 19dd207..19dd207 100644
--- a/src/net/sf/antcontrib/cpptasks/SubsystemEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/SubsystemEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/TargetDef.java b/src/main/java/net/sf/antcontrib/cpptasks/TargetDef.java
index 70263ad..70263ad 100644
--- a/src/net/sf/antcontrib/cpptasks/TargetDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/TargetDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/TargetHistory.java b/src/main/java/net/sf/antcontrib/cpptasks/TargetHistory.java
index b797170..b797170 100644
--- a/src/net/sf/antcontrib/cpptasks/TargetHistory.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/TargetHistory.java
diff --git a/src/net/sf/antcontrib/cpptasks/TargetHistoryTable.java b/src/main/java/net/sf/antcontrib/cpptasks/TargetHistoryTable.java
index bdab94c..bdab94c 100644
--- a/src/net/sf/antcontrib/cpptasks/TargetHistoryTable.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/TargetHistoryTable.java
diff --git a/src/net/sf/antcontrib/cpptasks/TargetInfo.java b/src/main/java/net/sf/antcontrib/cpptasks/TargetInfo.java
index 8fd5bb4..8fd5bb4 100644
--- a/src/net/sf/antcontrib/cpptasks/TargetInfo.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/TargetInfo.java
diff --git a/src/net/sf/antcontrib/cpptasks/TargetMatcher.java b/src/main/java/net/sf/antcontrib/cpptasks/TargetMatcher.java
index 9260f77..9260f77 100644
--- a/src/net/sf/antcontrib/cpptasks/TargetMatcher.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/TargetMatcher.java
diff --git a/src/net/sf/antcontrib/cpptasks/VersionInfo.java b/src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java
index 3e70707..3e70707 100644
--- a/src/net/sf/antcontrib/cpptasks/VersionInfo.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java
diff --git a/src/net/sf/antcontrib/cpptasks/WarningLevelEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/WarningLevelEnum.java
index 6ba8489..6ba8489 100644
--- a/src/net/sf/antcontrib/cpptasks/WarningLevelEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/WarningLevelEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/antlib.xml b/src/main/java/net/sf/antcontrib/cpptasks/antlib.xml
index 5f8af42..5f8af42 100644
--- a/src/net/sf/antcontrib/cpptasks/antlib.xml
+++ b/src/main/java/net/sf/antcontrib/cpptasks/antlib.xml
diff --git a/src/net/sf/antcontrib/cpptasks/apple/XcodeProjectWriter.java b/src/main/java/net/sf/antcontrib/cpptasks/apple/XcodeProjectWriter.java
index 7f21bec..7f21bec 100644
--- a/src/net/sf/antcontrib/cpptasks/apple/XcodeProjectWriter.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/apple/XcodeProjectWriter.java
diff --git a/src/net/sf/antcontrib/cpptasks/apple/package.html b/src/main/java/net/sf/antcontrib/cpptasks/apple/package.html
index 43a2ac3..43a2ac3 100644
--- a/src/net/sf/antcontrib/cpptasks/apple/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/apple/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java
index c7e12d5..c7e12d5 100644
--- a/src/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java
index 65c430f..65c430f 100644
--- a/src/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/arm/ADSLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLinker.java
index fda52fa..fda52fa 100644
--- a/src/net/sf/antcontrib/cpptasks/arm/ADSLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java
index fd9c657..fd9c657 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java
index a452b1b..a452b1b 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
index 75846a4..75846a4 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java
index 315761f..315761f 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java
index e0056c5..e0056c5 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java
index debfa2b..debfa2b 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/CBuilderXProjectWriter.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/CBuilderXProjectWriter.java
index dfe5ec6..dfe5ec6 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/CBuilderXProjectWriter.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/CBuilderXProjectWriter.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java
index 82767cb..82767cb 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java
index 5656af8..5656af8 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java
index ec3bc84..ec3bc84 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/package.html b/src/main/java/net/sf/antcontrib/cpptasks/borland/package.html
index a91e91f..a91e91f 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java
index 1595ae1..1595ae1 100644
--- a/src/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java
index 2488619..2488619 100644
--- a/src/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java
index c8930f9..c8930f9 100644
--- a/src/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java
index e61bd64..e61bd64 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java
index 9de9491..9de9491 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java
index d0cd77b..d0cd77b 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java
index 83c59f7..83c59f7 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java
index adafa08..adafa08 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java
index a8b7691..a8b7691 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java
index 38492ea..38492ea 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java
index 7b0eed2..7b0eed2 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
index f9e4761..f9e4761 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java
index f0aad67..f0aad67 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/Compiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/Compiler.java
index 48bc190..48bc190 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/Compiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/Compiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java
index 6aba345..6aba345 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/LinkType.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/LinkType.java
index 910c41a..910c41a 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/LinkType.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/LinkType.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/Linker.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/Linker.java
index 672a0e3..672a0e3 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/Linker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/Linker.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java
index ff7ac5d..ff7ac5d 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java
index 2af1a68..2af1a68 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java
index 3b66597..3b66597 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java
index f707dc5..f707dc5 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/Processor.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/Processor.java
index d6513f7..d6513f7 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/Processor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/Processor.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java
index 870fb33..870fb33 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java
index 9949856..9949856 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java
index 1281046..1281046 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
index 2502799..2502799 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
index 985dfcf..985dfcf 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
index c21a6f6..c21a6f6 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java
index bd63f42..bd63f42 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java
index 826074b..826074b 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java
index fa2e414..fa2e414 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java
index 8257c09..8257c09 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioProjectWriter.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioProjectWriter.java
index 94030fb..94030fb 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioProjectWriter.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioProjectWriter.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java
index 6f8360b..6f8360b 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java
index 898503e..898503e 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/package.html b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/package.html
index 46a31b4..46a31b4 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java
index 2e8d4af..2e8d4af 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
index ffeb6b2..ffeb6b2 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
index 999ccf7..999ccf7 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java
index 0485fba..0485fba 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java
index 0c6ae4b..0c6ae4b 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
index c4720c8..c4720c8 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java
index 058ef12..058ef12 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
index f3bc174..f3bc174 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/LdLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/LdLinker.java
index 2104e34..2104e34 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/LdLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/LdLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java
index 86a8ac7..86a8ac7 100755
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java
index c9d28d9..c9d28d9 100755
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java
index 4347211..4347211 100755
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java
index 8e35995..8e35995 100755
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java
index b332c64..b332c64 100755
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java
index 26abf8c..26abf8c 100755
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java
index 44dd968..44dd968 100755
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java
index 779fb3d..779fb3d 100755
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java
index d7dd3db..d7dd3db 100755
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java
index 8a7a26e..8a7a26e 100755
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java
index 45bbea9..45bbea9 100755
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java
index 0cc5fbf..0cc5fbf 100755
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java
index e556e6b..e556e6b 100644
--- a/src/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/hp/aCCLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/hp/aCCLinker.java
index 94f7fc0..94f7fc0 100644
--- a/src/net/sf/antcontrib/cpptasks/hp/aCCLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/hp/aCCLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java
index 56b7674..56b7674 100644
--- a/src/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java
index 59ad6a3..59ad6a3 100644
--- a/src/net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/ide/DebugDef.java b/src/main/java/net/sf/antcontrib/cpptasks/ide/DebugDef.java
index 8ddd04e..8ddd04e 100644
--- a/src/net/sf/antcontrib/cpptasks/ide/DebugDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ide/DebugDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/ide/ProjectDef.java b/src/main/java/net/sf/antcontrib/cpptasks/ide/ProjectDef.java
index df0177c..df0177c 100644
--- a/src/net/sf/antcontrib/cpptasks/ide/ProjectDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ide/ProjectDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/ide/ProjectWriter.java b/src/main/java/net/sf/antcontrib/cpptasks/ide/ProjectWriter.java
index c4c144d..c4c144d 100644
--- a/src/net/sf/antcontrib/cpptasks/ide/ProjectWriter.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ide/ProjectWriter.java
diff --git a/src/net/sf/antcontrib/cpptasks/ide/ProjectWriterEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/ide/ProjectWriterEnum.java
index e100dbc..e100dbc 100644
--- a/src/net/sf/antcontrib/cpptasks/ide/ProjectWriterEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ide/ProjectWriterEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/ide/package.html b/src/main/java/net/sf/antcontrib/cpptasks/ide/package.html
index ed0de56..ed0de56 100644
--- a/src/net/sf/antcontrib/cpptasks/ide/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ide/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java
index 12fd5bd..12fd5bd 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java
index 9bed915..9bed915 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java
index 9ed6393..9ed6393 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java
index d712e5b..d712e5b 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelProcessor.java
index ed7c61a..ed7c61a 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java
index 80ade19..80ade19 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java
index e9473d5..e9473d5 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java
index 66009f0..66009f0 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java
index 6344022..6344022 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/mozilla/XpidlCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/mozilla/XpidlCompiler.java
index 32eb9ec..32eb9ec 100644
--- a/src/net/sf/antcontrib/cpptasks/mozilla/XpidlCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/mozilla/XpidlCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/mozilla/package.html b/src/main/java/net/sf/antcontrib/cpptasks/mozilla/package.html
index 6be6dff..6be6dff 100644
--- a/src/net/sf/antcontrib/cpptasks/mozilla/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/mozilla/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCCompiler.java
index 4c36438..4c36438 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCLinker.java
index 93e65b4..93e65b4 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCompiler.java
index 4cf2d18..4cf2d18 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomFortranCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomFortranCompiler.java
index ca3abcb..ca3abcb 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomFortranCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomFortranCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomFortranLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomFortranLinker.java
index 82b6999..82b6999 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomFortranLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomFortranLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomLibrarian.java
index 848c395..848c395 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomLinker.java
index f0bbe3d..f0bbe3d 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomProcessor.java
index 5845776..5845776 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/package.html b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/package.html
index 3d9adab..3d9adab 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java
index 6b1895f..6b1895f 100644
--- a/src/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/os390/OS390Linker.java b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390Linker.java
index 9c4f845..9c4f845 100644
--- a/src/net/sf/antcontrib/cpptasks/os390/OS390Linker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390Linker.java
diff --git a/src/net/sf/antcontrib/cpptasks/os390/OS390Processor.java b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390Processor.java
index d3243fc..d3243fc 100644
--- a/src/net/sf/antcontrib/cpptasks/os390/OS390Processor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390Processor.java
diff --git a/src/net/sf/antcontrib/cpptasks/os400/IccCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/os400/IccCompiler.java
index 952d719..952d719 100644
--- a/src/net/sf/antcontrib/cpptasks/os400/IccCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/os400/IccCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/os400/IccLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/os400/IccLinker.java
index ea10bcc..ea10bcc 100644
--- a/src/net/sf/antcontrib/cpptasks/os400/IccLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/os400/IccLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/os400/IccProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/os400/IccProcessor.java
index f15aa8b..f15aa8b 100644
--- a/src/net/sf/antcontrib/cpptasks/os400/IccProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/os400/IccProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/package.html b/src/main/java/net/sf/antcontrib/cpptasks/package.html
index fba9d80..fba9d80 100644
--- a/src/net/sf/antcontrib/cpptasks/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/parser/AbstractParser.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/AbstractParser.java
index b9bca25..b9bca25 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/AbstractParser.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/AbstractParser.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/AbstractParserState.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/AbstractParserState.java
index b3e3307..b3e3307 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/AbstractParserState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/AbstractParserState.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/BranchState.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/BranchState.java
index 4b869e0..4b869e0 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/BranchState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/BranchState.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/CParser.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/CParser.java
index d10d889..d10d889 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/CParser.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/CParser.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java
index edcfe83..edcfe83 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/FilenameState.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/FilenameState.java
index f3a6193..f3a6193 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/FilenameState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/FilenameState.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/FortranParser.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/FortranParser.java
index d393e65..d393e65 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/FortranParser.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/FortranParser.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/LetterState.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/LetterState.java
index fc62f9b..fc62f9b 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/LetterState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/LetterState.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/Parser.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/Parser.java
index bf63ae7..bf63ae7 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/Parser.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/Parser.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/PostE.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/PostE.java
index d599f19..d599f19 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/PostE.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/PostE.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java
index f7cbcea..f7cbcea 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java
index 61c133d..61c133d 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/package.html b/src/main/java/net/sf/antcontrib/cpptasks/parser/package.html
index 1d7aa49..1d7aa49 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/platforms/WindowsPlatform.java b/src/main/java/net/sf/antcontrib/cpptasks/platforms/WindowsPlatform.java
index f16f94e..f16f94e 100644
--- a/src/net/sf/antcontrib/cpptasks/platforms/WindowsPlatform.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/platforms/WindowsPlatform.java
diff --git a/src/net/sf/antcontrib/cpptasks/platforms/package.html b/src/main/java/net/sf/antcontrib/cpptasks/platforms/package.html
index e054c41..e054c41 100644
--- a/src/net/sf/antcontrib/cpptasks/platforms/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/platforms/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java
index 4ac8ac1..4ac8ac1 100644
--- a/src/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/sun/C89Linker.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/C89Linker.java
index 6c41c89..6c41c89 100644
--- a/src/net/sf/antcontrib/cpptasks/sun/C89Linker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/C89Linker.java
diff --git a/src/net/sf/antcontrib/cpptasks/sun/C89Processor.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/C89Processor.java
index 343293a..343293a 100644
--- a/src/net/sf/antcontrib/cpptasks/sun/C89Processor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/C89Processor.java
diff --git a/src/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
index 2c37eff..2c37eff 100644
--- a/src/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java
index 47d2155..47d2155 100644
--- a/src/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java
index c844ac4..c844ac4 100644
--- a/src/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java
index c48815a..c48815a 100644
--- a/src/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java
index bb644a4..bb644a4 100644
--- a/src/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/trolltech/MetaObjectCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/MetaObjectCompiler.java
index 25651da..25651da 100644
--- a/src/net/sf/antcontrib/cpptasks/trolltech/MetaObjectCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/MetaObjectCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/trolltech/MetaObjectParser.java b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/MetaObjectParser.java
index e75a116..e75a116 100644
--- a/src/net/sf/antcontrib/cpptasks/trolltech/MetaObjectParser.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/MetaObjectParser.java
diff --git a/src/net/sf/antcontrib/cpptasks/trolltech/UserInterfaceCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/UserInterfaceCompiler.java
index cc4cf3b..cc4cf3b 100644
--- a/src/net/sf/antcontrib/cpptasks/trolltech/UserInterfaceCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/UserInterfaceCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/trolltech/UserInterfaceParser.java b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/UserInterfaceParser.java
index e3e309c..e3e309c 100644
--- a/src/net/sf/antcontrib/cpptasks/trolltech/UserInterfaceParser.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/UserInterfaceParser.java
diff --git a/src/net/sf/antcontrib/cpptasks/trolltech/package.html b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/package.html
index c12d506..c12d506 100644
--- a/src/net/sf/antcontrib/cpptasks/trolltech/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/types/CommandLineArgument.java b/src/main/java/net/sf/antcontrib/cpptasks/types/CommandLineArgument.java
index e428469..e428469 100644
--- a/src/net/sf/antcontrib/cpptasks/types/CommandLineArgument.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/CommandLineArgument.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/CompilerArgument.java b/src/main/java/net/sf/antcontrib/cpptasks/types/CompilerArgument.java
index 2137186..2137186 100644
--- a/src/net/sf/antcontrib/cpptasks/types/CompilerArgument.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/CompilerArgument.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java b/src/main/java/net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java
index 7bc22ee..7bc22ee 100644
--- a/src/net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/ConditionalPath.java b/src/main/java/net/sf/antcontrib/cpptasks/types/ConditionalPath.java
index ae45eaa..ae45eaa 100644
--- a/src/net/sf/antcontrib/cpptasks/types/ConditionalPath.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/ConditionalPath.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/DefineArgument.java b/src/main/java/net/sf/antcontrib/cpptasks/types/DefineArgument.java
index 5118e79..5118e79 100644
--- a/src/net/sf/antcontrib/cpptasks/types/DefineArgument.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/DefineArgument.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/DefineSet.java b/src/main/java/net/sf/antcontrib/cpptasks/types/DefineSet.java
index f3ab44b..f3ab44b 100644
--- a/src/net/sf/antcontrib/cpptasks/types/DefineSet.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/DefineSet.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/FlexLong.java b/src/main/java/net/sf/antcontrib/cpptasks/types/FlexLong.java
index f710aa3..f710aa3 100644
--- a/src/net/sf/antcontrib/cpptasks/types/FlexLong.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/FlexLong.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/IncludePath.java b/src/main/java/net/sf/antcontrib/cpptasks/types/IncludePath.java
index e4c8414..e4c8414 100644
--- a/src/net/sf/antcontrib/cpptasks/types/IncludePath.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/IncludePath.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/LibrarySet.java b/src/main/java/net/sf/antcontrib/cpptasks/types/LibrarySet.java
index acac911..acac911 100644
--- a/src/net/sf/antcontrib/cpptasks/types/LibrarySet.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/LibrarySet.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java
index c0af5f8..c0af5f8 100644
--- a/src/net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/LinkerArgument.java b/src/main/java/net/sf/antcontrib/cpptasks/types/LinkerArgument.java
index bee15cf..bee15cf 100644
--- a/src/net/sf/antcontrib/cpptasks/types/LinkerArgument.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/LinkerArgument.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/SystemIncludePath.java b/src/main/java/net/sf/antcontrib/cpptasks/types/SystemIncludePath.java
index 37a3e28..37a3e28 100644
--- a/src/net/sf/antcontrib/cpptasks/types/SystemIncludePath.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/SystemIncludePath.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java b/src/main/java/net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java
index 97c4fa2..97c4fa2 100644
--- a/src/net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/UndefineArgument.java b/src/main/java/net/sf/antcontrib/cpptasks/types/UndefineArgument.java
index aa958ef..aa958ef 100644
--- a/src/net/sf/antcontrib/cpptasks/types/UndefineArgument.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/UndefineArgument.java
diff --git a/src/cpptasks.mf b/src/main/resources/cpptasks.mf
index 8f3b6d0..8f3b6d0 100644
--- a/src/cpptasks.mf
+++ b/src/main/resources/cpptasks.mf
diff --git a/src/cpptasks.tasks b/src/main/resources/cpptasks.tasks
index 425935a..425935a 100644
--- a/src/cpptasks.tasks
+++ b/src/main/resources/cpptasks.tasks
diff --git a/src/cpptasks.types b/src/main/resources/cpptasks.types
index c37c17f..c37c17f 100644
--- a/src/cpptasks.types
+++ b/src/main/resources/cpptasks.types
diff --git a/samples/.cvsignore b/src/samples/.cvsignore
index 378eac2..378eac2 100644
--- a/samples/.cvsignore
+++ b/src/samples/.cvsignore
diff --git a/samples/blas.ant b/src/samples/blas.ant
index c1a28f5..c1a28f5 100644
--- a/samples/blas.ant
+++ b/src/samples/blas.ant
diff --git a/samples/check.ant b/src/samples/check.ant
index f0e1c14..f0e1c14 100644
--- a/samples/check.ant
+++ b/src/samples/check.ant
diff --git a/samples/cppunit.ant b/src/samples/cppunit.ant
index 9b0938b..9b0938b 100644
--- a/samples/cppunit.ant
+++ b/src/samples/cppunit.ant
diff --git a/samples/qtunit.ant b/src/samples/qtunit.ant
index fab89ed..fab89ed 100644
--- a/samples/qtunit.ant
+++ b/src/samples/qtunit.ant
diff --git a/samples/xercesc.ant b/src/samples/xercesc.ant
index b3072de..b3072de 100644
--- a/samples/xercesc.ant
+++ b/src/samples/xercesc.ant
diff --git a/samples/xpcom.ant b/src/samples/xpcom.ant
index b1da4b2..b1da4b2 100644
--- a/samples/xpcom.ant
+++ b/src/samples/xpcom.ant
diff --git a/test/junit/net/sf/antcontrib/cpptasks/MockBuildListener.java b/src/test/java/net/sf/antcontrib/cpptasks/MockBuildListener.java
index ffa6083..ffa6083 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/MockBuildListener.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/MockBuildListener.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/MockFileCollector.java b/src/test/java/net/sf/antcontrib/cpptasks/MockFileCollector.java
index d1768fd..d1768fd 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/MockFileCollector.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/MockFileCollector.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/TestAllClasses.java b/src/test/java/net/sf/antcontrib/cpptasks/TestAllClasses.java
index e8d7c33..e8d7c33 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/TestAllClasses.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/TestAllClasses.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/TestCCTask.java b/src/test/java/net/sf/antcontrib/cpptasks/TestCCTask.java
index 82faae2..82faae2 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/TestCCTask.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/TestCCTask.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/TestCUtil.java b/src/test/java/net/sf/antcontrib/cpptasks/TestCUtil.java
index 42b86d3..42b86d3 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/TestCUtil.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/TestCUtil.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/TestCompilerDef.java b/src/test/java/net/sf/antcontrib/cpptasks/TestCompilerDef.java
index 12e1967..12e1967 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/TestCompilerDef.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/TestCompilerDef.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/TestCompilerEnum.java b/src/test/java/net/sf/antcontrib/cpptasks/TestCompilerEnum.java
index 6fc72ba..6fc72ba 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/TestCompilerEnum.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/TestCompilerEnum.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/TestDependencyTable.java b/src/test/java/net/sf/antcontrib/cpptasks/TestDependencyTable.java
index 2a02a0b..cb7c55c 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/TestDependencyTable.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/TestDependencyTable.java
@@ -51,7 +51,7 @@ public class TestDependencyTable extends TestXMLConsumer {
             ParserConfigurationException, SAXException {
         String tmpDir = System.getProperty("java.io.tmpdir");
         try {
-            copyResourceToTmpDir("files/openshore/dependencies.xml",
+            copyResourceToTmpDir("openshore/dependencies.xml",
                     "dependencies.xml");
             DependencyTable dependencies = new DependencyTable(new File(tmpDir));
             dependencies.load();
@@ -68,7 +68,7 @@ public class TestDependencyTable extends TestXMLConsumer {
             ParserConfigurationException, SAXException {
         String tmpDir = System.getProperty("java.io.tmpdir");
         try {
-            copyResourceToTmpDir("files/xerces-c/dependencies.xml",
+            copyResourceToTmpDir("xerces-c/dependencies.xml",
                     "dependencies.xml");
             DependencyTable dependencies = new DependencyTable(new File(tmpDir));
             dependencies.load();
diff --git a/test/junit/net/sf/antcontrib/cpptasks/TestLinkerDef.java b/src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java
index 9387d5b..9387d5b 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/TestLinkerDef.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/TestLinkerEnum.java b/src/test/java/net/sf/antcontrib/cpptasks/TestLinkerEnum.java
index 77158d7..77158d7 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/TestLinkerEnum.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/TestLinkerEnum.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/TestOutputTypeEnum.java b/src/test/java/net/sf/antcontrib/cpptasks/TestOutputTypeEnum.java
index 61bb2b7..61bb2b7 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/TestOutputTypeEnum.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/TestOutputTypeEnum.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/TestProcessorDef.java b/src/test/java/net/sf/antcontrib/cpptasks/TestProcessorDef.java
index c4e2905..c4e2905 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/TestProcessorDef.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/TestProcessorDef.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/TestTargetHistoryTable.java b/src/test/java/net/sf/antcontrib/cpptasks/TestTargetHistoryTable.java
index 1b3a656..3aed27e 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/TestTargetHistoryTable.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/TestTargetHistoryTable.java
@@ -65,7 +65,7 @@ public class TestTargetHistoryTable extends TestXMLConsumer {
      */
     public void testLoadOpenshore() throws IOException {
         try {
-            copyResourceToTmpDir("files/openshore/history.xml", "history.xml");
+            copyResourceToTmpDir("openshore/history.xml", "history.xml");
             CCTask task = new CCTask();
             String tmpDir = System.getProperty("java.io.tmpdir");
             TargetHistoryTable history = new TargetHistoryTable(task, new File(
@@ -81,7 +81,7 @@ public class TestTargetHistoryTable extends TestXMLConsumer {
      */
     public void testLoadXerces() throws IOException {
         try {
-            copyResourceToTmpDir("files/xerces-c/history.xml", "history.xml");
+            copyResourceToTmpDir("xerces-c/history.xml", "history.xml");
             CCTask task = new CCTask();
             String tmpDir = System.getProperty("java.io.tmpdir");
             TargetHistoryTable history = new TargetHistoryTable(task, new File(
diff --git a/test/junit/net/sf/antcontrib/cpptasks/TestTargetInfo.java b/src/test/java/net/sf/antcontrib/cpptasks/TestTargetInfo.java
index 5851805..5851805 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/TestTargetInfo.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/TestTargetInfo.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/TestXMLConsumer.java b/src/test/java/net/sf/antcontrib/cpptasks/TestXMLConsumer.java
index 7c8c86f..7c8c86f 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/TestXMLConsumer.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/TestXMLConsumer.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/borland/TestBorlandCCompiler.java b/src/test/java/net/sf/antcontrib/cpptasks/borland/TestBorlandCCompiler.java
index ddafc5e..ddafc5e 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/borland/TestBorlandCCompiler.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/borland/TestBorlandCCompiler.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/compiler/TestAbstractCompiler.java b/src/test/java/net/sf/antcontrib/cpptasks/compiler/TestAbstractCompiler.java
index 5a1e66b..5a1e66b 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/compiler/TestAbstractCompiler.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/compiler/TestAbstractCompiler.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/compiler/TestAbstractLinker.java b/src/test/java/net/sf/antcontrib/cpptasks/compiler/TestAbstractLinker.java
index b444a0a..b444a0a 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/compiler/TestAbstractLinker.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/compiler/TestAbstractLinker.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/compiler/TestAbstractProcessor.java b/src/test/java/net/sf/antcontrib/cpptasks/compiler/TestAbstractProcessor.java
index f2c04a3..f2c04a3 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/compiler/TestAbstractProcessor.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/compiler/TestAbstractProcessor.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/compiler/TestCommandLineCompilerConfiguration.java b/src/test/java/net/sf/antcontrib/cpptasks/compiler/TestCommandLineCompilerConfiguration.java
index a22fa0d..a22fa0d 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/compiler/TestCommandLineCompilerConfiguration.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/compiler/TestCommandLineCompilerConfiguration.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/compiler/TestCompilerConfiguration.java b/src/test/java/net/sf/antcontrib/cpptasks/compiler/TestCompilerConfiguration.java
index a928ae4..a928ae4 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/compiler/TestCompilerConfiguration.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/compiler/TestCompilerConfiguration.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/compiler/TestLinkType.java b/src/test/java/net/sf/antcontrib/cpptasks/compiler/TestLinkType.java
index a7e3a45..a7e3a45 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/compiler/TestLinkType.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/compiler/TestLinkType.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/devstudio/TestDevStudioLinker.java b/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestDevStudioLinker.java
index 7fdaabe..7fdaabe 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/devstudio/TestDevStudioLinker.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestDevStudioLinker.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/devstudio/TestInstalledDevStudio.java b/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestInstalledDevStudio.java
index 3e29c91..3e29c91 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/devstudio/TestInstalledDevStudio.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestInstalledDevStudio.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/devstudio/TestInstalledDevStudioLinker.java b/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestInstalledDevStudioLinker.java
index 07f1339..07f1339 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/devstudio/TestInstalledDevStudioLinker.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestInstalledDevStudioLinker.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/gcc/TestAbstractArLibrarian.java b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractArLibrarian.java
index 0fc8449..0fc8449 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/gcc/TestAbstractArLibrarian.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractArLibrarian.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java
index 63996c5..63996c5 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/gcc/TestGccCCompiler.java b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestGccCCompiler.java
index 3abe409..3abe409 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/gcc/TestGccCCompiler.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestGccCCompiler.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/gcc/TestGccCompatibleCCompiler.java b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestGccCompatibleCCompiler.java
index 68fab2e..68fab2e 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/gcc/TestGccCompatibleCCompiler.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestGccCompatibleCCompiler.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/gcc/TestGccLinker.java b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestGccLinker.java
index ee3ad8b..ee3ad8b 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/gcc/TestGccLinker.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestGccLinker.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/package.html b/src/test/java/net/sf/antcontrib/cpptasks/package.html
index eba4e2c..eba4e2c 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/package.html
+++ b/src/test/java/net/sf/antcontrib/cpptasks/package.html
diff --git a/test/junit/net/sf/antcontrib/cpptasks/parser/TestAbstractParser.java b/src/test/java/net/sf/antcontrib/cpptasks/parser/TestAbstractParser.java
index 5f7eb2a..5f7eb2a 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/parser/TestAbstractParser.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/parser/TestAbstractParser.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/parser/TestCParser.java b/src/test/java/net/sf/antcontrib/cpptasks/parser/TestCParser.java
index cbecdfb..cbecdfb 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/parser/TestCParser.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/parser/TestCParser.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/parser/TestFortranParser.java b/src/test/java/net/sf/antcontrib/cpptasks/parser/TestFortranParser.java
index 8078331..8078331 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/parser/TestFortranParser.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/parser/TestFortranParser.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/parser/package.html b/src/test/java/net/sf/antcontrib/cpptasks/parser/package.html
index bfb9d6e..bfb9d6e 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/parser/package.html
+++ b/src/test/java/net/sf/antcontrib/cpptasks/parser/package.html
diff --git a/test/junit/net/sf/antcontrib/cpptasks/trolltech/TestMetaObjectCompiler.java b/src/test/java/net/sf/antcontrib/cpptasks/trolltech/TestMetaObjectCompiler.java
index 6d97c12..6d97c12 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/trolltech/TestMetaObjectCompiler.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/trolltech/TestMetaObjectCompiler.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/trolltech/TestMetaObjectParser.java b/src/test/java/net/sf/antcontrib/cpptasks/trolltech/TestMetaObjectParser.java
index 371bdf1..371bdf1 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/trolltech/TestMetaObjectParser.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/trolltech/TestMetaObjectParser.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/trolltech/package.html b/src/test/java/net/sf/antcontrib/cpptasks/trolltech/package.html
index bbdaa89..bbdaa89 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/trolltech/package.html
+++ b/src/test/java/net/sf/antcontrib/cpptasks/trolltech/package.html
diff --git a/test/junit/net/sf/antcontrib/cpptasks/types/TestDefineArgument.java b/src/test/java/net/sf/antcontrib/cpptasks/types/TestDefineArgument.java
index e5b53ee..e5b53ee 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/types/TestDefineArgument.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/types/TestDefineArgument.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/types/TestLibrarySet.java b/src/test/java/net/sf/antcontrib/cpptasks/types/TestLibrarySet.java
index 180f765..180f765 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/types/TestLibrarySet.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/types/TestLibrarySet.java
diff --git a/test/junit/net/sf/antcontrib/cpptasks/types/package.html b/src/test/java/net/sf/antcontrib/cpptasks/types/package.html
index e5efbc4..e5efbc4 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/types/package.html
+++ b/src/test/java/net/sf/antcontrib/cpptasks/types/package.html
diff --git a/test/junit/files/openshore/dependencies.xml b/src/test/resources/openshore/dependencies.xml
index 1644f84..1644f84 100644
--- a/test/junit/files/openshore/dependencies.xml
+++ b/src/test/resources/openshore/dependencies.xml
diff --git a/test/junit/files/openshore/history.xml b/src/test/resources/openshore/history.xml
index 19fe515..19fe515 100644
--- a/test/junit/files/openshore/history.xml
+++ b/src/test/resources/openshore/history.xml
diff --git a/test/junit/files/xerces-c/dependencies.xml b/src/test/resources/xerces-c/dependencies.xml
index f8d7324..f8d7324 100644
--- a/test/junit/files/xerces-c/dependencies.xml
+++ b/src/test/resources/xerces-c/dependencies.xml
diff --git a/test/junit/files/xerces-c/history.xml b/src/test/resources/xerces-c/history.xml
index 2e8a3c0..2e8a3c0 100644
--- a/test/junit/files/xerces-c/history.xml
+++ b/src/test/resources/xerces-c/history.xml