put the tests back in .test package

19 files changed, 43 insertions, 40 deletions

diff --git a/proxy/build.xml b/proxy/build.xml
index 957164e..87a8fd3 100644
--- a/proxy/build.xml
+++ b/proxy/build.xml
@@ -392,12 +392,13 @@
            classpathref="buildjars" >
       <src>
         <path location="${build.dir}/src" />
-        <path location="code/src" />
+        <path location="${src.dir}/java" />
+        <path location="src/test/java" />
       </src>
     </javac>
 
     <copy toDir="${build.dir}/classes">
-      <fileset dir="${src.dir}/src">
+      <fileset dir="${src.dir}/java">
         <exclude name="**/*.java" />
         <exclude name="**/package.html" />
       </fileset>
@@ -447,7 +448,7 @@
   <!-- ================= Invoke tests ==================== -->
   <target name="invoke-tests-testcase" depends="check-testcase" if="testcase">
     <property name="testcaseorsubsystem" value="true" />
-    <run-junit include="**/test/${testcase}.class" banner="${testcase}"
+    <run-junit include="**/${testcase}.class" banner="${testcase}"
         testbuilddir="${build.dir}/classes"
         classpathid="tests.runpath" reportdir="${testresults.dir}"
         debug="${debug}"/>
@@ -455,7 +456,7 @@
 
   <target name="invoke-tests-subsystem" if="testsubsystem">
     <property name="testcaseorsubsystem" value="true" />
-    <run-junit include="**/${testsubsystem}/**/test/*Test.class"
+    <run-junit include="**/${testsubsystem}/**/*Test.class"
                 banner="all tests in ${testsubsystem} subsystem"
                 testbuilddir="${build.dir}/classes"
                 classpathid="tests.runpath" reportdir="${testresults.dir}"
@@ -466,7 +467,7 @@
     <!--
     <antcall target="checkstyle" />
     -->
-    <run-junit include="**/test/*Test.class"
+    <run-junit include="**/*Test.class"
                banner="all tests"
                testbuilddir="${build.dir}/classes"
                exclude="**/AuthenticationServiceTest.class"
@@ -509,8 +510,8 @@
 
   <target name="pack-webapp" depends="compile,pack-megajar">
     <mkdir dir="${build.dir}/webapp" />
-    <war destfile="${candlepin.war}" webxml="${src.dir}/webapp/WEB-INF/web.xml">
-      <fileset dir="${src.dir}/webapp">
+    <war destfile="${candlepin.war}" webxml="${src.dir}/resources/WEB-INF/web.xml">
+      <fileset dir="${src.dir}/resources">
         <exclude name="WEB-INF/web.xml"/>
       </fileset>
       <classes dir="${build.dir}/classes">
diff --git a/proxy/buildconf/build-utils.xml b/proxy/buildconf/build-utils.xml
index d1ccf04..be336d5 100644
--- a/proxy/buildconf/build-utils.xml
+++ b/proxy/buildconf/build-utils.xml
@@ -75,7 +75,7 @@ Running @{banner} ...
         <jvmarg value="-ea" />
         <jvmarg line="@{debug}" />
         <classpath refid="@{classpathid}" />
-        <formatter type="plain" />
+        <formatter type="xml" />
         <batchtest todir="@{reportdir}">
           <fileset dir="@{testbuilddir}">
             <include name="@{include}" />
diff --git a/proxy/buildconf/build.properties b/proxy/buildconf/build.properties
index f6e2b6c..e22e124 100644
--- a/proxy/buildconf/build.properties
+++ b/proxy/buildconf/build.properties
@@ -1,8 +1,8 @@
 candlepin.home=${basedir}
 
 custom.log4j=${user.home}/.log4j.properties
-src.dir=${candlepin.home}/code
-build.dir=${candlepin.home}/build
+src.dir=${candlepin.home}/src/main
+build.dir=${candlepin.home}/target
 lib.dir=${candlepin.home}/lib
 build.lib.dir=${build.dir}/build-lib
 
diff --git a/proxy/buildfile b/proxy/buildfile
index d522481..657dc82 100644
--- a/proxy/buildfile
+++ b/proxy/buildfile
@@ -27,8 +27,8 @@ BOUNCYCASTLE = group('bcprov', :under=>'org.bouncycastle', :version=>'1.43')
 
 #repositories.remote << "http://download.java.net/maven/2/"
 # Specify Maven 2.0 remote repositories here, like this:
-#repositories.remote << "http://www.ibiblio.org/maven2/"
 repositories.remote << "http://jmrodri.fedorapeople.org/ivy/candlepin"
+repositories.remote << "http://www.ibiblio.org/maven2/"
 #repositories.remote << "http://127.0.0.1/"
 
 desc "The Proxy project"
diff --git a/proxy/src/main/java/org/fedoraproject/candlepin/util/EntityManagerUtil.java b/proxy/src/main/java/org/fedoraproject/candlepin/util/EntityManagerUtil.java
index b17964e..97a4b48 100644
--- a/proxy/src/main/java/org/fedoraproject/candlepin/util/EntityManagerUtil.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/util/EntityManagerUtil.java
@@ -6,7 +6,7 @@ import javax.persistence.Persistence;
 
 public class EntityManagerUtil {
     
-    public static final String DEFAULT_PERSISTENCE_UNIT = "production";
+    public static final String DEFAULT_PERSISTENCE_UNIT = "test";
     public static final String PERSISTENCE_UNIT_PROPERTY = "persistenceUnit";
     public static final EntityManagerFactory emf = buildEntityManagerFactory();
     
diff --git a/proxy/code/webapp/WEB-INF/web.xml b/proxy/src/main/resources/WEB-INF/web.xml
index ca517c4..ca517c4 100644
--- a/proxy/code/webapp/WEB-INF/web.xml
+++ b/proxy/src/main/resources/WEB-INF/web.xml
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/model/ConsumerTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ConsumerTest.java
index f7b9506..ec057bb 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/model/ConsumerTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ConsumerTest.java
@@ -12,7 +12,9 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.model;
+package org.fedoraproject.candlepin.model.test;
+
+import static org.junit.Assert.assertEquals;
 
 import org.fedoraproject.candlepin.model.BaseModel;
 import org.fedoraproject.candlepin.model.Consumer;
@@ -20,7 +22,6 @@ import org.fedoraproject.candlepin.model.Owner;
 import org.fedoraproject.candlepin.model.Product;
 
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 
 
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/model/ConsumerTypeTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java
index 79bedcb..229644e 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/model/ConsumerTypeTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java
@@ -1,16 +1,16 @@
-package org.fedoraproject.candlepin.model;
+package org.fedoraproject.candlepin.model.test;
 
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
+import static org.junit.Assert.assertEquals;
 
 import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.util.EntityManagerUtil;
+
 import org.junit.Test;
-import static org.junit.Assert.*;
+
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
 
 public class ConsumerTypeTest {
 
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/model/ObjectFactoryTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java
index a015dc1..8bd66f1 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/model/ObjectFactoryTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java
@@ -12,7 +12,7 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.model;
+package org.fedoraproject.candlepin.model.test;
 
 import org.fedoraproject.candlepin.model.BaseModel;
 import org.fedoraproject.candlepin.model.ObjectFactory;
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/model/OwnerTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/OwnerTest.java
index 02874b1..abfce82 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/model/OwnerTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/OwnerTest.java
@@ -12,7 +12,7 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.model;
+package org.fedoraproject.candlepin.model.test;
 
 import org.fedoraproject.candlepin.model.BaseModel;
 import org.fedoraproject.candlepin.model.Consumer;
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/ProductTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ProductTest.java
index 42bfc79..318ea49 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ProductTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ProductTest.java
@@ -2,17 +2,18 @@ package org.fedoraproject.candlepin.model.test;
 
 import static org.junit.Assert.assertEquals;
 
+import org.fedoraproject.candlepin.model.Product;
+import org.fedoraproject.candlepin.util.EntityManagerUtil;
+
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.List;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.PersistenceException;
 
-import org.fedoraproject.candlepin.model.Product;
-import org.fedoraproject.candlepin.util.EntityManagerUtil;
-import org.junit.Before;
-import org.junit.Test;
-
 public class ProductTest {
     
     private EntityManager em;
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/model/TestUtil.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/TestUtil.java
index 443d4f8..b2e2ad3 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/model/TestUtil.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/TestUtil.java
@@ -12,7 +12,7 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.model;
+package org.fedoraproject.candlepin.model.test;
 
 import org.fedoraproject.candlepin.model.BaseModel;
 import org.fedoraproject.candlepin.model.Consumer;
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/resource/ApiTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/ApiTest.java
index ed57600..5b5b4e9 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/resource/ApiTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/ApiTest.java
@@ -12,7 +12,7 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.resource;
+package org.fedoraproject.candlepin.resource.test;
 
 import org.fedoraproject.candlepin.model.BaseModel;
 import org.fedoraproject.candlepin.model.ObjectFactory;
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/resource/ConsumerResourceTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
index 07b09b9..3c78078 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/resource/ConsumerResourceTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
@@ -12,13 +12,13 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.resource;
+package org.fedoraproject.candlepin.resource.test;
 
 import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.ConsumerInfo;
 import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.ObjectFactory;
-import org.fedoraproject.candlepin.model.TestUtil;
+import org.fedoraproject.candlepin.model.test.TestUtil;
 import org.fedoraproject.candlepin.resource.ConsumerResource;
 
 import com.sun.jersey.api.client.Client;
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/resource/EntitlementMatcherTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java
index 2948302..910eee0 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/resource/EntitlementMatcherTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java
@@ -12,14 +12,14 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.resource;
+package org.fedoraproject.candlepin.resource.test;
 
 import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.Product;
 import org.fedoraproject.candlepin.model.ProductFactory;
-import org.fedoraproject.candlepin.model.TestUtil;
+import org.fedoraproject.candlepin.model.test.TestUtil;
 import org.fedoraproject.candlepin.resource.EntitlementMatcher;
 
 import java.util.List;
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/resource/EntitlementResourceTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
index 92493d9..7d75d05 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/resource/EntitlementResourceTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
@@ -12,14 +12,14 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.resource;
+package org.fedoraproject.candlepin.resource.test;
 
 import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.EntitlementPool;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.Product;
-import org.fedoraproject.candlepin.model.TestUtil;
+import org.fedoraproject.candlepin.model.test.TestUtil;
 import org.fedoraproject.candlepin.resource.EntitlementResource;
 
 import com.sun.jersey.api.client.Client;
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/resource/TestResourceTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
index 7943cce..7fc3648 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/resource/TestResourceTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
@@ -12,7 +12,7 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.resource;
+package org.fedoraproject.candlepin.resource.test;
 
 import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.JsonTestObject;
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/resource/UserResourceTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/UserResourceTest.java
index 1b2b8fa..7ada16c 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/resource/UserResourceTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/UserResourceTest.java
@@ -12,7 +12,7 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.resource;
+package org.fedoraproject.candlepin.resource.test;
 
 import org.fedoraproject.candlepin.model.User;
 import org.fedoraproject.candlepin.resource.UserResource;
diff --git a/proxy/src/test/java/org/fedoraproject/candlepin/resource/cert/CertTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/cert/test/CertTest.java
index 5dea0a4..ff94fa9 100644
--- a/proxy/src/test/java/org/fedoraproject/candlepin/resource/cert/CertTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/cert/test/CertTest.java
@@ -12,7 +12,7 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.resource.cert;
+package org.fedoraproject.candlepin.resource.test.cert.test;
 
 import org.fedoraproject.candlepin.resource.cert.CertGenerator;