Exclude hamcrest from builds, change output folders

diff --git a/.classpath b/.classpath
index d4bfd91a2fea1802ff5973dd5c44b587f07d7fd6..47505a647fb3faa07822801405bf07e5b9a0ee77 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -2,7 +2,7 @@
 <classpath>
     <classpathentry kind="src" path="src"/>
     <classpathentry kind="src" path="resources"/>
-    <classpathentry kind="src" path="tests"/>
+    <classpathentry kind="src" path="tests" output="bin/test-classes"/>
     <classpathentry kind="lib" path="ext/jcommander-1.17.jar" sourcepath="ext/src/jcommander-1.17-sources.jar" />
     <classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17-sources.jar" />
     <classpathentry kind="lib" path="ext/slf4j-api-1.6.6.jar" sourcepath="ext/src/slf4j-api-1.6.6-sources.jar" />
@@ -34,6 +34,6 @@
     <classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0-sources.jar" />
     <classpathentry kind="lib" path="ext/junit-4.10.jar" sourcepath="ext/src/junit-4.10-sources.jar" />
     <classpathentry kind="lib" path="ext/hamcrest-core-1.1.jar" />
-    <classpathentry kind="output" path="bin"/>
+    <classpathentry kind="output" path="bin/classes"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 </classpath>
\ No newline at end of file

diff --git a/build.xml b/build.xml
index 5ea612a92b481837d4e97a11d09614920c80f590..6ad0e46d31896c33c8d5538d1c3b268e7de597bd 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -195,6 +195,7 @@
                <copy todir="${project.deploy.dir}/ext">\r
                        <fileset dir="${basedir}/ext">\r
                                <exclude name="junit*.jar" />\r
+                               <exclude name="hamcrest*.jar" />\r
                                <exclude name="commons-net*.jar" />\r
                                <exclude name="*-sources.jar" />\r
                                <exclude name="*-javadoc.jar" />\r
@@ -416,6 +417,7 @@
                                <exclude name="jcommander*.jar" />\r
                                <exclude name="jetty*.jar" />\r
                                <exclude name="junit*.jar" />\r
+                               <exclude name="hamcrest*.jar" />\r
                                <exclude name="servlet*.jar" />\r
                                <exclude name="javax.servlet*.jar" />\r
                        </fileset>\r
@@ -555,6 +557,7 @@
                                <exclude name="jcommander*.jar" />\r
                                <exclude name="jetty*.jar" />\r
                                <exclude name="junit*.jar" />\r
+                               <exclude name="hamcrest*.jar" />\r
                                <exclude name="servlet*.jar" />\r
                                <exclude name="javax.servlet*.jar" />\r
                        </fileset>\r