61 files changed, 162 insertions, 25 deletions
diff --git a/proxy/build.xml b/proxy/build.xml
index 358108f..c0a48eb 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 8e383f9..6a88f85 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
new file mode 100644
index 0000000..a84aa3c
--- /dev/null
+++ b/proxy/buildfile
@@ -0,0 +1,69 @@
+# Generated by Buildr 1.3.5, change to your liking
+# Version number for this release
+VERSION_NUMBER = "1.0.0"
+# Group identifier for your projects
+GROUP = "candlepin"
+COPYRIGHT = ""
+
+#AXIS2 = 'candlepin:axis2:jar:1.2'
+#AXIS2 = 'org.apache.axis2:axis2:jar:1.2'
+JERSEY = [group('jersey-core', 'jersey-json', 'jersey-server', 'jersey-client', :under=>'com.sun.jersey', :version=>'1.1.2-ea'),
+        'javax.persistence:persistence-api:jar:1.0.2' ,
+        'org.codehaus:jettison:jar:1.1',
+        'org.apache:xalan-j2:jar:2.6.0',
+        'javax.ws:jsr311-api:jar:1.1' ]
+JUNIT = 'junit:junit:jar:4.5'
+LOG4J = 'log4j:log4j:jar:1.2.14'
+HIBERNATE = ['org.hibernate:hibernate3:jar:3.3.2',
+             'org.hibernate:hibernate-annotations:jar:3.4.0',
+             'org.hibernate:hibernate-commons-annotations:jar:3.4.0',
+             'org.hibernate:hibernate-entitymanager:jar:3.4.0',
+             'org.hibernate:hibernate-tools:jar:3.2.4',
+             'antlr:antlr:jar:2.7.6',
+             'org.objectweb.asm:asm:jar:3.1',
+             'net.sf.cglib:cglib:jar:2.2',
+             'javassist:javassist:jar:3.9.0.GA',
+             'javax.transaction:jta:jar:1.1',
+             'org.slf4j:slf4j-api:jar:1.5.8',
+             'org.slf4j:slf4j-simple:jar:1.5.8' ]
+DB = 'org.postgresql:postgresql:jar:8.4-701'
+COMMONS = ['org.apache.commons:commons-collections:jar:3.1',
+           'org.apache.commons:commons-logging:jar:1.1.1',
+           'org.apache.commons:commons-beanutils:jar:1.7.0']
+JDOM = 'org.jdom:jdom:jar:1.0'
+BOUNCYCASTLE = group('bcprov', 'bcpg', :under=>'org.bouncycastle', :version=>'1.43')
+
+
+# causes GET /org/apache/axis2/axis2/1.2/axis2-1.2.jar
+# we want GET /candlepin/axis2-1.2.jar
+
+#OPENJPA = ['org.apache.openjpa:openjpa-all:jar:0.9.7',
+#  'net.sourceforge.serp:serp:jar:1.12.0']
+
+
+#repositories.remote << "http://download.java.net/maven/2/"
+# Specify Maven 2.0 remote repositories here, like this:
+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"
+define "candlepin" do
+
+  project.version = VERSION_NUMBER
+  project.group = GROUP
+  manifest["Implementation-Vendor"] = COPYRIGHT
+  compile.options.target = '1.5'
+  # Add classpath dependencies
+  compile.with COMMONS, DB, JERSEY, JUNIT, LOG4J, HIBERNATE, BOUNCYCASTLE, JDOM
+  test.with COMMONS, DB, JERSEY, JUNIT, LOG4J, HIBERNATE, BOUNCYCASTLE, JDOM # Add classpath dependencies
+  javadoc projects
+  package :war
+
+  #define "fbuild" do
+  #end
+
+  #define "code" do
+  #end
+
+end
diff --git a/proxy/code/src/com/redhat/rhn/common/cert/Certificate.java b/proxy/src/main/java/com/redhat/rhn/common/cert/Certificate.java
index 5c94214..5c94214 100644
--- a/proxy/code/src/com/redhat/rhn/common/cert/Certificate.java
+++ b/proxy/src/main/java/com/redhat/rhn/common/cert/Certificate.java
diff --git a/proxy/code/src/com/redhat/rhn/common/cert/CertificateFactory.java b/proxy/src/main/java/com/redhat/rhn/common/cert/CertificateFactory.java
index b5b1229..b5b1229 100644
--- a/proxy/code/src/com/redhat/rhn/common/cert/CertificateFactory.java
+++ b/proxy/src/main/java/com/redhat/rhn/common/cert/CertificateFactory.java
diff --git a/proxy/code/src/com/redhat/rhn/common/cert/ChannelFamilyDescriptor.java b/proxy/src/main/java/com/redhat/rhn/common/cert/ChannelFamilyDescriptor.java
index f9024ea..f9024ea 100644
--- a/proxy/code/src/com/redhat/rhn/common/cert/ChannelFamilyDescriptor.java
+++ b/proxy/src/main/java/com/redhat/rhn/common/cert/ChannelFamilyDescriptor.java
diff --git a/proxy/code/src/com/redhat/rhn/common/cert/ChannelFamilyExtractor.java b/proxy/src/main/java/com/redhat/rhn/common/cert/ChannelFamilyExtractor.java
index eea8ee4..eea8ee4 100644
--- a/proxy/code/src/com/redhat/rhn/common/cert/ChannelFamilyExtractor.java
+++ b/proxy/src/main/java/com/redhat/rhn/common/cert/ChannelFamilyExtractor.java
diff --git a/proxy/code/src/com/redhat/rhn/common/cert/FieldExtractor.java b/proxy/src/main/java/com/redhat/rhn/common/cert/FieldExtractor.java
index 25265b4..25265b4 100644
--- a/proxy/code/src/com/redhat/rhn/common/cert/FieldExtractor.java
+++ b/proxy/src/main/java/com/redhat/rhn/common/cert/FieldExtractor.java
diff --git a/proxy/code/src/com/redhat/rhn/common/cert/PublicKeyRing.java b/proxy/src/main/java/com/redhat/rhn/common/cert/PublicKeyRing.java
index b7b808a..b7b808a 100644
--- a/proxy/code/src/com/redhat/rhn/common/cert/PublicKeyRing.java
+++ b/proxy/src/main/java/com/redhat/rhn/common/cert/PublicKeyRing.java
diff --git a/proxy/code/src/com/redhat/rhn/common/cert/RhnSecurityProvider.java b/proxy/src/main/java/com/redhat/rhn/common/cert/RhnSecurityProvider.java
index e2df174..e2df174 100644
--- a/proxy/code/src/com/redhat/rhn/common/cert/RhnSecurityProvider.java
+++ b/proxy/src/main/java/com/redhat/rhn/common/cert/RhnSecurityProvider.java
diff --git a/proxy/code/src/com/redhat/rhn/common/cert/SimpleExtractor.java b/proxy/src/main/java/com/redhat/rhn/common/cert/SimpleExtractor.java
index e6240f6..e6240f6 100644
--- a/proxy/code/src/com/redhat/rhn/common/cert/SimpleExtractor.java
+++ b/proxy/src/main/java/com/redhat/rhn/common/cert/SimpleExtractor.java
diff --git a/proxy/code/src/com/redhat/rhn/common/cert/XmlTag.java b/proxy/src/main/java/com/redhat/rhn/common/cert/XmlTag.java
index e503462..e503462 100644
--- a/proxy/code/src/com/redhat/rhn/common/cert/XmlTag.java
+++ b/proxy/src/main/java/com/redhat/rhn/common/cert/XmlTag.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/BaseModel.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/BaseModel.java
index fafe205..fafe205 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/BaseModel.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/BaseModel.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/Consumer.java
index 242a6a0..242a6a0 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/Consumer.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerInfo.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/ConsumerInfo.java
index cfc7d16..cfc7d16 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerInfo.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/ConsumerInfo.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerType.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/ConsumerType.java
index a8f18fe..a8f18fe 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerType.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/ConsumerType.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Entitlement.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/Entitlement.java
index edc77d1..edc77d1 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/Entitlement.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/Entitlement.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/EntitlementPool.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/EntitlementPool.java
index d4cf900..d4cf900 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/EntitlementPool.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/EntitlementPool.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/JsonTestObject.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/JsonTestObject.java
index fb44d11..fb44d11 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/JsonTestObject.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/JsonTestObject.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/ObjectFactory.java
index 7d2e27b..7d2e27b 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/ObjectFactory.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Owner.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/Owner.java
index 8bc43de..8bc43de 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/Owner.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/Owner.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Pinsetter.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/Pinsetter.java
index f95b1cc..f95b1cc 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/Pinsetter.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/Pinsetter.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Product.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/Product.java
index 1ff6e1d..1ff6e1d 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/Product.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/Product.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/ProductFactory.java
index 8b686f6..8b686f6 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/ProductFactory.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/User.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/User.java
index cbe2395..cbe2395 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/User.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/User.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/ApiHandler.java b/proxy/src/main/java/org/fedoraproject/candlepin/resource/ApiHandler.java
index e1ad297..e1ad297 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/ApiHandler.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/resource/ApiHandler.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/AuthenticationException.java b/proxy/src/main/java/org/fedoraproject/candlepin/resource/AuthenticationException.java
index 8d3692a..8d3692a 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/AuthenticationException.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/resource/AuthenticationException.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java b/proxy/src/main/java/org/fedoraproject/candlepin/resource/BaseResource.java
index ec21fe2..ec21fe2 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/resource/BaseResource.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java b/proxy/src/main/java/org/fedoraproject/candlepin/resource/ConsumerResource.java
index 718da5d..718da5d 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/resource/ConsumerResource.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementMatcher.java b/proxy/src/main/java/org/fedoraproject/candlepin/resource/EntitlementMatcher.java
index fbfd12c..fbfd12c 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementMatcher.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/resource/EntitlementMatcher.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolResource.java b/proxy/src/main/java/org/fedoraproject/candlepin/resource/EntitlementPoolResource.java
index 1e692fe..1e692fe 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolResource.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/resource/EntitlementPoolResource.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java b/proxy/src/main/java/org/fedoraproject/candlepin/resource/EntitlementResource.java
index 27887f6..27887f6 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/resource/EntitlementResource.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerResource.java b/proxy/src/main/java/org/fedoraproject/candlepin/resource/OwnerResource.java
index b390a01..b390a01 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerResource.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/resource/OwnerResource.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java b/proxy/src/main/java/org/fedoraproject/candlepin/resource/TestResource.java
index 14ba04f..14ba04f 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/resource/TestResource.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java b/proxy/src/main/java/org/fedoraproject/candlepin/resource/UserResource.java
index e41744f..e41744f 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/resource/UserResource.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/cert/CertGenerator.java b/proxy/src/main/java/org/fedoraproject/candlepin/resource/cert/CertGenerator.java
index e33ffeb..e33ffeb 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/cert/CertGenerator.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/resource/cert/CertGenerator.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/util/EntityManagerUtil.java b/proxy/src/main/java/org/fedoraproject/candlepin/util/EntityManagerUtil.java
index b17964e..97a4b48 100644
--- a/proxy/code/src/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/src/org/fedoraproject/candlepin/util/MethodUtil.java b/proxy/src/main/java/org/fedoraproject/candlepin/util/MethodUtil.java
index dc808f7..dc808f7 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/util/MethodUtil.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/util/MethodUtil.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/util/TranslationException.java b/proxy/src/main/java/org/fedoraproject/candlepin/util/TranslationException.java
index 89d3fe9..89d3fe9 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/util/TranslationException.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/util/TranslationException.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/util/Translations.java b/proxy/src/main/java/org/fedoraproject/candlepin/util/Translations.java
index 6511dcd..6511dcd 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/util/Translations.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/util/Translations.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/util/Translator.java b/proxy/src/main/java/org/fedoraproject/candlepin/util/Translator.java
index 0a76685..0a76685 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/util/Translator.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/util/Translator.java
diff --git a/proxy/code/src/META-INF/persistence.xml b/proxy/src/main/resources/META-INF/persistence.xml
index 2ecd9fd..2ecd9fd 100644
--- a/proxy/code/src/META-INF/persistence.xml
+++ b/proxy/src/main/resources/META-INF/persistence.xml
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/code/src/log4j.properties b/proxy/src/main/resources/log4j.properties
index fa3d128..fa3d128 100644
--- a/proxy/code/src/log4j.properties
+++ b/proxy/src/main/resources/log4j.properties
diff --git a/proxy/code/src/logging.properties b/proxy/src/main/resources/logging.properties
index 6af7b9f..6af7b9f 100644
--- a/proxy/code/src/logging.properties
+++ b/proxy/src/main/resources/logging.properties
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ConsumerTest.java
index 99d4242..ec057bb 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ConsumerTest.java
@@ -14,13 +14,14 @@
  */
 package org.fedoraproject.candlepin.model.test;
 
+import static org.junit.Assert.assertEquals;
+
 import org.fedoraproject.candlepin.model.BaseModel;
 import org.fedoraproject.candlepin.model.Consumer;
 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/code/src/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java
index 5ab52e0..229644e 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java
@@ -1,16 +1,16 @@
 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/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java
index 8bd66f1..8bd66f1 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/OwnerTest.java
index abfce82..abfce82 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/OwnerTest.java
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/code/src/org/fedoraproject/candlepin/model/test/TestUtil.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/TestUtil.java
index b2e2ad3..b2e2ad3 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/TestUtil.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/TestUtil.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ApiTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/ApiTest.java
index 5b5b4e9..5b5b4e9 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ApiTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/ApiTest.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
index 3c78078..3c78078 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java
index 910eee0..910eee0 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
index 7d75d05..7d75d05 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
index 7fc3648..7fc3648 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserResourceTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/UserResourceTest.java
index 7ada16c..7ada16c 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserResourceTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/UserResourceTest.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/CertTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/cert/test/CertTest.java
index 9aff520..ff94fa9 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/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.test;
+package org.fedoraproject.candlepin.resource.test.cert.test;
 
 import org.fedoraproject.candlepin.resource.cert.CertGenerator;
 
diff --git a/proxy/src/test/resources/META-INF/persistence.xml b/proxy/src/test/resources/META-INF/persistence.xml
new file mode 100644
index 0000000..2ecd9fd
--- /dev/null
+++ b/proxy/src/test/resources/META-INF/persistence.xml
@@ -0,0 +1,20 @@
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+    version="1.0">
+
+    <persistence-unit name="test" transaction-type="RESOURCE_LOCAL">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+        <properties>
+            <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:unit-testing-jpa"/>
+            <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+            <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+            <property name="hibernate.connection.username" value="sa"/>
+            <property name="hibernate.connection.password" value=""/>
+        </properties>
+
+
+    </persistence-unit>
+
+</persistence>
diff --git a/proxy/src/test/resources/WEB-INF/web.xml b/proxy/src/test/resources/WEB-INF/web.xml
new file mode 100644
index 0000000..ca517c4
--- /dev/null
+++ b/proxy/src/test/resources/WEB-INF/web.xml
@@ -0,0 +1,45 @@
+<web-app xmlns= "http://java.sun.com/xml/ns/j2ee"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+     version="2.4">
+  <!--
+   =======================================================================
+                             FILTERS
+   =======================================================================
+   -->
+  <!--
+   =======================================================================
+                             FILTER MAPPINGS
+   =======================================================================
+   -->
+  <!--
+   =======================================================================
+                             LISTENERS
+   =======================================================================
+   -->
+  <!--
+   =======================================================================
+                             SERVLETS
+   =======================================================================
+   -->
+  <servlet>
+    <servlet-name>Jersey Web Application</servlet-name>
+    <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
+    <init-param>
+      <!-- this is a semi-colon separated list of package names -->
+      <param-name>com.sun.jersey.config.property.packages</param-name>
+      <param-value>org.fedoraproject.candlepin.resource</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <!--
+   =======================================================================
+                             SERVLET MAPPINGS
+   =======================================================================
+   -->
+  <servlet-mapping>
+    <servlet-name>Jersey Web Application</servlet-name>
+    <url-pattern>/*</url-pattern>
+  </servlet-mapping>
+</web-app>