brought in changes from master

32 files changed, 10 insertions, 77 deletions

diff --git a/proxy/buildfile b/proxy/buildfile
index c0bb3d8..e5a2e93 100644
--- a/proxy/buildfile
+++ b/proxy/buildfile
@@ -39,6 +39,7 @@ BOUNCYCASTLE = group('bcprov', 'bcpg', :under=>'org.bouncycastle', :version=>'1.
 GUICE =  [group('guice', 'guice-assistedinject', 'guice-multibindings', 'guice-servlet', 'guice-throwingproviders', :under=>'com.google.guice', :version=>'2.0'),
            'com.wideplay.warp:warp-persist:jar:2.0-20090214',
            'com.sun.jersey:jersey-guice:jar:1.1.4.1',
+           'aopalliance:aopalliance:jar:1.0',
            'javax.servlet:servlet-api:jar:2.5']
 
 
@@ -62,18 +63,15 @@ define "candlepin" do
   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, GUICE
-  test.with COMMONS, DB, JERSEY, JUNIT, LOG4J, HIBERNATE, BOUNCYCASTLE, JDOM, DOM4J, HSQLDB, GUICE
-
-  javadoc projects
-  package :war
 
-  #define "fbuild" do
-  #end
-
-  #define "code" do
-  #end
+  compile.with COMMONS, DB, JERSEY, LOG4J, HIBERNATE, BOUNCYCASTLE, JDOM, GUICE  
+  test.setup do |task|
+    filter('src/test/java').exclude('*.java').into('target/test/classes').run 
+  	filter('src/main/webapp/META-INF').into('target/classes/META-INF').run
+  end
+  test.teardown { rm_rf 'target/classes/META-INF' }
+  test.with COMMONS, DB, JERSEY, JUNIT, LOG4J, HIBERNATE, BOUNCYCASTLE, JDOM, DOM4J, HSQLDB, GUICE
 
+  #javadoc projects
+  package(:war)
 end
diff --git a/proxy/code/src/org/fedoraproject/candlepin/guice/JPAInitializer.java b/proxy/src/main/java/org/fedoraproject/candlepin/guice/JPAInitializer.java
index ab98d3b..ab98d3b 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/guice/JPAInitializer.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/guice/JPAInitializer.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/guice/JerseyGuiceConfiguration.java b/proxy/src/main/java/org/fedoraproject/candlepin/guice/JerseyGuiceConfiguration.java
index 55b64f2..55b64f2 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/guice/JerseyGuiceConfiguration.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/guice/JerseyGuiceConfiguration.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/AbstractHibernateCurator.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/AbstractHibernateCurator.java
index 38500c8..38500c8 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/AbstractHibernateCurator.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/AbstractHibernateCurator.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Certificate.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/Certificate.java
index 4938f87..4938f87 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/Certificate.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/Certificate.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/CertificateCurator.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/CertificateCurator.java
index 0d1e209..0d1e209 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/CertificateCurator.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/CertificateCurator.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerCurator.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/ConsumerCurator.java
index 8569a1b..8569a1b 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerCurator.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/ConsumerCurator.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerInfoCurator.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/ConsumerInfoCurator.java
index c861d23..c861d23 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerInfoCurator.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/ConsumerInfoCurator.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerTypeCurator.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/ConsumerTypeCurator.java
index 3c8f859..3c8f859 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerTypeCurator.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/ConsumerTypeCurator.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/EntitlementCurator.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/EntitlementCurator.java
index eeb987a..eeb987a 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/EntitlementCurator.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/EntitlementCurator.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/EntitlementPoolCurator.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/EntitlementPoolCurator.java
index 524f6ad..524f6ad 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/EntitlementPoolCurator.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/EntitlementPoolCurator.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/OwnerCurator.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/OwnerCurator.java
index 422e2ad..422e2ad 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/OwnerCurator.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/OwnerCurator.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Persisted.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/Persisted.java
index 8accf5a..8accf5a 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/Persisted.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/Persisted.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ProductCurator.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/ProductCurator.java
index 9bd2144..9bd2144 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ProductCurator.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/ProductCurator.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/UserCurator.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/UserCurator.java
index 07c8893..07c8893 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/UserCurator.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/model/UserCurator.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/util/Util.java b/proxy/src/main/java/org/fedoraproject/candlepin/util/Util.java
index 3dd59f0..3dd59f0 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/util/Util.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/util/Util.java
diff --git a/proxy/src/main/resources/META-INF/persistence.xml b/proxy/src/main/webapp/META-INF/persistence.xml
index 9c49dd9..9c49dd9 100644
--- a/proxy/src/main/resources/META-INF/persistence.xml
+++ b/proxy/src/main/webapp/META-INF/persistence.xml
diff --git a/proxy/src/main/resources/WEB-INF/web.xml b/proxy/src/main/webapp/WEB-INF/web.xml
index 1466d45..1466d45 100644
--- a/proxy/src/main/resources/WEB-INF/web.xml
+++ b/proxy/src/main/webapp/WEB-INF/web.xml
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/CertificateTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/CertificateTest.java
index fbcb191..fbcb191 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/CertificateTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/CertificateTest.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/EntitlementPoolTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/EntitlementPoolTest.java
index 3279216..3279216 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/EntitlementPoolTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/EntitlementPoolTest.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/UserTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/UserTest.java
index 4e8ea1d..4e8ea1d 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/UserTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/test/UserTest.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/CandlepinTestingModule.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/CandlepinTestingModule.java
index 96e9f2f..96e9f2f 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/CandlepinTestingModule.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/CandlepinTestingModule.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/CertificateResourceTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/CertificateResourceTest.java
index f835046..f835046 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/CertificateResourceTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/CertificateResourceTest.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/spacewalk-public.cert b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/spacewalk-public.cert
index 4d63ab3..4d63ab3 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/spacewalk-public.cert
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/test/spacewalk-public.cert
diff --git a/proxy/code/src/org/fedoraproject/candlepin/test/DatabaseTestFixture.java b/proxy/src/test/java/org/fedoraproject/candlepin/test/DatabaseTestFixture.java
index 289d9bb..289d9bb 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/test/DatabaseTestFixture.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/test/DatabaseTestFixture.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/test/TestUtil.java b/proxy/src/test/java/org/fedoraproject/candlepin/test/TestUtil.java
index 21b005e..21b005e 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/test/TestUtil.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/test/TestUtil.java
diff --git a/proxy/src/test/resources/META-INF/persistence.xml b/proxy/src/test/resources/META-INF/persistence.xml
deleted file mode 100644
index 2ecd9fd..0000000
--- a/proxy/src/test/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<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
deleted file mode 100644
index ca517c4..0000000
--- a/proxy/src/test/resources/WEB-INF/web.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<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>
diff --git a/proxy/code/webapp/certs/certificates.readme b/proxy/src/test/resources/certs/certificates.readme
index 0039145..0039145 100644
--- a/proxy/code/webapp/certs/certificates.readme
+++ b/proxy/src/test/resources/certs/certificates.readme
diff --git a/proxy/code/webapp/certs/rest_api_test.jks b/proxy/src/test/resources/certs/rest_api_test.jks
index b055808..b055808 100644
--- a/proxy/code/webapp/certs/rest_api_test.jks
+++ b/proxy/src/test/resources/certs/rest_api_test.jks
diff --git a/proxy/code/webapp/certs/rest_client_test.p12 b/proxy/src/test/resources/certs/rest_client_test.p12
index f2d100e..f2d100e 100644
--- a/proxy/code/webapp/certs/rest_client_test.p12
+++ b/proxy/src/test/resources/certs/rest_client_test.p12
diff --git a/proxy/code/webapp/certs/server.xml b/proxy/src/test/resources/certs/server.xml
index 85ab0e1..85ab0e1 100644
--- a/proxy/code/webapp/certs/server.xml
+++ b/proxy/src/test/resources/certs/server.xml