put the tests back in .test package

16 files changed, 30 insertions, 21 deletions

diff --git a/proxy/build.xml b/proxy/build.xml
index 0737d6d..ec73d08 100644
--- a/proxy/build.xml
+++ b/proxy/build.xml
@@ -407,12 +407,13 @@ Running @{banner} ...
            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>
@@ -454,7 +455,7 @@ Running @{banner} ...
   <!-- ================= 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}"/>
@@ -462,7 +463,7 @@ Running @{banner} ...
 
   <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}"
@@ -473,7 +474,7 @@ Running @{banner} ...
     <!--
     <antcall target="checkstyle" />
     -->
-    <run-junit include="**/test/*Test.class"
+    <run-junit include="**/*Test.class"
                banner="all tests"
                testbuilddir="${build.dir}/classes"
                exclude="**/AuthenticationServiceTest.class"
@@ -494,8 +495,8 @@ Running @{banner} ...
 
   <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.properties b/proxy/buildconf/build.properties
index a0eb0f0..586e299 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 61eb82a..7896caf 100644
--- a/proxy/src/main/java/org/fedoraproject/candlepin/util/EntityManagerUtil.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/util/EntityManagerUtil.java
@@ -20,7 +20,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 1466d45..1466d45 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 52ed50d..f35cead 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 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 afec5b2..4974c46 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,4 +1,4 @@
-package org.fedoraproject.candlepin.model;
+package org.fedoraproject.candlepin.model.test;
 
 import static org.junit.Assert.*;
 
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 5ef8fff..5186fb6 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 static org.junit.Assert.*;
 
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 6de47f0..f331d95 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 static org.junit.Assert.*;
 
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 3c24cbc..1558405 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,6 +2,12 @@ package org.fedoraproject.candlepin.model.test;
 
 import static org.junit.Assert.*;
 
+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;
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 7eec9bf..1b21324 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,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 static org.junit.Assert.*;
 
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 dff511d..4bb31b6 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,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 static org.junit.Assert.*;
 
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 04a4b56..a136a29 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,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 static org.junit.Assert.*;
 
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 01f0806..2a41973 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 static org.junit.Assert.*;
 
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 03acd18..94cf31d 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 static org.junit.Assert.*;
 
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 702446f..fd72bf9 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 java.math.BigInteger;
 import java.security.KeyFactory;