merge with dgoodwin's changes

36 files changed, 121 insertions, 137 deletions

diff --git a/proxy/code/src/com/redhat/rhn/common/cert/Certificate.java b/proxy/code/src/com/redhat/rhn/common/cert/Certificate.java
index 5c94214..e5adb5f 100644
--- a/proxy/code/src/com/redhat/rhn/common/cert/Certificate.java
+++ b/proxy/code/src/com/redhat/rhn/common/cert/Certificate.java
@@ -14,8 +14,6 @@
  */
 package com.redhat.rhn.common.cert;
 
-import com.redhat.rhn.common.cert.XmlTag;
-
 import java.security.SignatureException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/proxy/code/src/com/redhat/rhn/common/cert/ChannelFamilyDescriptor.java b/proxy/code/src/com/redhat/rhn/common/cert/ChannelFamilyDescriptor.java
index f9024ea..20facd3 100644
--- a/proxy/code/src/com/redhat/rhn/common/cert/ChannelFamilyDescriptor.java
+++ b/proxy/code/src/com/redhat/rhn/common/cert/ChannelFamilyDescriptor.java
@@ -14,7 +14,6 @@
  */
 package com.redhat.rhn.common.cert;
 
-import com.redhat.rhn.common.cert.XmlTag;
 
 /**
  * The entitlements for a channel family, consisting of the family name and a
diff --git a/proxy/code/src/com/redhat/rhn/common/cert/SimpleExtractor.java b/proxy/code/src/com/redhat/rhn/common/cert/SimpleExtractor.java
index e6240f6..3651ae9 100644
--- a/proxy/code/src/com/redhat/rhn/common/cert/SimpleExtractor.java
+++ b/proxy/code/src/com/redhat/rhn/common/cert/SimpleExtractor.java
@@ -19,7 +19,7 @@ import java.lang.reflect.InvocationTargetException;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.jdom.Element;
-import org.jdom.JDOMException; 
+import org.jdom.JDOMException;
 
 /**
  * SimpleExtractor.
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/AbstractHibernateRepository.java b/proxy/code/src/org/fedoraproject/candlepin/model/AbstractHibernateRepository.java
index 3e7af7b..2078fef 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/AbstractHibernateRepository.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/AbstractHibernateRepository.java
@@ -1,8 +1,6 @@
 package org.fedoraproject.candlepin.model;
 
 import java.io.Serializable;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
 
 import javax.persistence.EntityManager;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java b/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java
index 6bc0019..6869420 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java
@@ -36,6 +36,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
+
 import org.hibernate.annotations.ForeignKey;
 
 /**
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Entitlement.java b/proxy/code/src/org/fedoraproject/candlepin/model/Entitlement.java
index 3f7bb94..0ee2735 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/Entitlement.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/Entitlement.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
+
 import org.hibernate.annotations.ForeignKey;
 
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/EntitlementPool.java b/proxy/code/src/org/fedoraproject/candlepin/model/EntitlementPool.java
index 9619e2b..cf02fae 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/EntitlementPool.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/EntitlementPool.java
@@ -16,7 +16,6 @@ package org.fedoraproject.candlepin.model;
 
 import java.util.Date;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -29,6 +28,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
+
 import org.hibernate.annotations.ForeignKey;
 
 /**
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java b/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java
index fa939b7..5dac3b1 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java
@@ -14,15 +14,14 @@
  */
 package org.fedoraproject.candlepin.model;
 
-import org.fedoraproject.candlepin.util.MethodUtil;
-
-import org.apache.log4j.Logger;
-
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.log4j.Logger;
+import org.fedoraproject.candlepin.util.MethodUtil;
+
 /**
  * ObjectFactory is used to create and persist the data model.
  * @author mmccune
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Owner.java b/proxy/code/src/org/fedoraproject/candlepin/model/Owner.java
index 6367817..91959a5 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/Owner.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/Owner.java
@@ -24,7 +24,6 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Product.java b/proxy/code/src/org/fedoraproject/candlepin/model/Product.java
index 7eae3dd..07d7846 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/Product.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/Product.java
@@ -30,6 +30,7 @@ import javax.persistence.Table;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
+
 import org.hibernate.annotations.ForeignKey;
 
 /**
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java b/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java
index 589cdd0..9ff0ebb 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java
@@ -14,13 +14,13 @@
  */
 package org.fedoraproject.candlepin.model;
 
-import org.apache.log4j.Logger;
-
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.log4j.Logger;
+
 
 /**
  * ProductFactory
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/User.java b/proxy/code/src/org/fedoraproject/candlepin/model/User.java
index dd67521..e1d0c4e 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/User.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/User.java
@@ -15,6 +15,7 @@
 package org.fedoraproject.candlepin.model;
 
 import java.util.Formatter;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -26,6 +27,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
+
 import org.hibernate.annotations.ForeignKey;
 
 /**
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java
index aedd2b3..d9a986f 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java
@@ -14,6 +14,8 @@
  */
 package org.fedoraproject.candlepin.model.test;
 
+import static org.junit.Assert.*;
+
 import java.util.Map;
 
 import javax.persistence.PersistenceException;
@@ -27,10 +29,8 @@ import org.fedoraproject.candlepin.model.Owner;
 import org.fedoraproject.candlepin.model.Product;
 import org.fedoraproject.candlepin.test.DatabaseTestFixture;
 import org.fedoraproject.candlepin.test.TestUtil;
-
 import org.junit.Before;
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java
index cf6cc5e..a2cd553 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java
@@ -1,17 +1,14 @@
 package org.fedoraproject.candlepin.model.test;
 
+import static org.junit.Assert.*;
+
 import java.util.List;
 
 import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
 
 import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.test.DatabaseTestFixture;
-import org.fedoraproject.candlepin.util.EntityManagerUtil;
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 public class ConsumerTypeTest extends DatabaseTestFixture {
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/EntitlementPoolTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/EntitlementPoolTest.java
index 2391ce0..30057ef 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/EntitlementPoolTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/EntitlementPoolTest.java
@@ -14,16 +14,15 @@
  */
 package org.fedoraproject.candlepin.model.test;
 
+import static org.junit.Assert.*;
+
 import org.fedoraproject.candlepin.model.EntitlementPool;
 import org.fedoraproject.candlepin.model.Owner;
 import org.fedoraproject.candlepin.model.Product;
-
 import org.fedoraproject.candlepin.test.DatabaseTestFixture;
 import org.fedoraproject.candlepin.test.TestUtil;
-
 import org.junit.Before;
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 
 public class EntitlementPoolTest extends DatabaseTestFixture {
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java
index f0926ab..5186fb6 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java
@@ -14,14 +14,13 @@
  */
 package org.fedoraproject.candlepin.model.test;
 
-import org.fedoraproject.candlepin.model.ObjectFactory;
-import org.fedoraproject.candlepin.model.Owner;
-
+import static org.junit.Assert.*;
 
 import java.util.List;
 
+import org.fedoraproject.candlepin.model.ObjectFactory;
+import org.fedoraproject.candlepin.model.Owner;
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 /**
  * ObjectFactoryTest
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java
index 83e6299..ecce6ca 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java
@@ -14,6 +14,10 @@
  */
 package org.fedoraproject.candlepin.model.test;
 
+import static org.junit.Assert.*;
+
+import java.util.List;
+
 import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.EntitlementPool;
@@ -22,11 +26,7 @@ import org.fedoraproject.candlepin.model.Product;
 import org.fedoraproject.candlepin.model.User;
 import org.fedoraproject.candlepin.test.DatabaseTestFixture;
 import org.fedoraproject.candlepin.test.TestUtil;
-
-import java.util.List;
-
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 public class OwnerTest extends DatabaseTestFixture {
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/UserTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/UserTest.java
index 88af7ff..fb5829f 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/UserTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/UserTest.java
@@ -14,12 +14,12 @@
  */
 package org.fedoraproject.candlepin.model.test;
 
+import static org.junit.Assert.*;
+
 import org.fedoraproject.candlepin.model.Owner;
 import org.fedoraproject.candlepin.model.User;
 import org.fedoraproject.candlepin.test.DatabaseTestFixture;
-
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 public class UserTest extends DatabaseTestFixture {
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java
index f697d3a..89e79bd 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java
@@ -14,10 +14,6 @@
  */
 package org.fedoraproject.candlepin.resource;
 
-import org.fedoraproject.candlepin.model.ObjectFactory;
-
-import org.apache.log4j.Logger;
-
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -25,6 +21,9 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.apache.log4j.Logger;
+import org.fedoraproject.candlepin.model.ObjectFactory;
+
 
 /**
  * Base api gateway for all model objects.
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/CertificateResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/CertificateResource.java
index 82ea14a..e4e5138 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/CertificateResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/CertificateResource.java
@@ -14,18 +14,6 @@
  */
 package org.fedoraproject.candlepin.resource;
 
-import org.fedoraproject.candlepin.model.ObjectFactory;
-import org.fedoraproject.candlepin.model.Owner;
-import org.fedoraproject.candlepin.model.Pinsetter;
-import org.fedoraproject.candlepin.model.User;
-
-import com.redhat.rhn.common.cert.Certificate;
-import com.redhat.rhn.common.cert.CertificateFactory;
-import com.redhat.rhn.common.cert.ChannelFamilyDescriptor;
-import com.sun.jersey.core.util.Base64;
-
-import org.jdom.JDOMException;
-
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.Date;
@@ -39,6 +27,17 @@ import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import org.fedoraproject.candlepin.model.ObjectFactory;
+import org.fedoraproject.candlepin.model.Owner;
+import org.fedoraproject.candlepin.model.Pinsetter;
+import org.fedoraproject.candlepin.model.User;
+import org.jdom.JDOMException;
+
+import com.redhat.rhn.common.cert.Certificate;
+import com.redhat.rhn.common.cert.CertificateFactory;
+import com.redhat.rhn.common.cert.ChannelFamilyDescriptor;
+import com.sun.jersey.core.util.Base64;
+
 
 /**
  * CertificateResource
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java
index 0ae494c..3cfb5a6 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java
@@ -14,19 +14,10 @@
  */
 package org.fedoraproject.candlepin.resource;
 
-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.Product;
-
-import org.apache.log4j.Logger;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -34,6 +25,13 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.apache.log4j.Logger;
+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.Product;
+
 /**
  * API Gateway for Consumers
  */
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementMatcher.java b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementMatcher.java
index 9b7bbda..1c966a6 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementMatcher.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementMatcher.java
@@ -14,16 +14,15 @@
  */
 package org.fedoraproject.candlepin.resource;
 
+import java.util.List;
+
+import org.apache.log4j.Logger;
 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.apache.log4j.Logger;
-
-import java.util.List;
-
 /** 
  * EntitlementMatcher - initial class for matching products compatibility
  * with an entitlement.
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolResource.java
index 1e692fe..78ae406 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolResource.java
@@ -14,9 +14,6 @@
  */
 package org.fedoraproject.candlepin.resource;
 
-import org.fedoraproject.candlepin.model.EntitlementPool;
-import org.fedoraproject.candlepin.model.ObjectFactory;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,6 +22,9 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.fedoraproject.candlepin.model.EntitlementPool;
+import org.fedoraproject.candlepin.model.ObjectFactory;
+
 /**
  * API gateway for the EntitlementPool
  */
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java
index 3354782..e8de41c 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementResource.java
@@ -14,18 +14,6 @@
  */
 package org.fedoraproject.candlepin.resource;
 
-import org.fedoraproject.candlepin.model.Consumer;
-import org.fedoraproject.candlepin.model.Entitlement;
-import org.fedoraproject.candlepin.model.EntitlementPool;
-import org.fedoraproject.candlepin.model.ObjectFactory;
-import org.fedoraproject.candlepin.model.Product;
-import org.fedoraproject.candlepin.resource.cert.CertGenerator;
-import org.fedoraproject.candlepin.util.EntityManagerUtil;
-
-import com.sun.jersey.api.representation.Form;
-
-import org.apache.log4j.Logger;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -40,6 +28,17 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.apache.log4j.Logger;
+import org.fedoraproject.candlepin.model.Consumer;
+import org.fedoraproject.candlepin.model.Entitlement;
+import org.fedoraproject.candlepin.model.EntitlementPool;
+import org.fedoraproject.candlepin.model.ObjectFactory;
+import org.fedoraproject.candlepin.model.Product;
+import org.fedoraproject.candlepin.resource.cert.CertGenerator;
+import org.fedoraproject.candlepin.util.EntityManagerUtil;
+
+import com.sun.jersey.api.representation.Form;
+
 
 /**
  * REST api gateway for the User object.
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerResource.java
index b390a01..994d79d 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerResource.java
@@ -14,9 +14,6 @@
  */
 package org.fedoraproject.candlepin.resource;
 
-import org.fedoraproject.candlepin.model.ObjectFactory;
-import org.fedoraproject.candlepin.model.Owner;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,6 +22,9 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.fedoraproject.candlepin.model.ObjectFactory;
+import org.fedoraproject.candlepin.model.Owner;
+
 /**
  * Owner Resource
  */
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/ProductResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/ProductResource.java
index 1316230..e9f1543 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/ProductResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/ProductResource.java
@@ -14,9 +14,6 @@
  */
 package org.fedoraproject.candlepin.resource;
 
-import org.fedoraproject.candlepin.model.ObjectFactory;
-import org.fedoraproject.candlepin.model.Product;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,6 +22,9 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.fedoraproject.candlepin.model.ObjectFactory;
+import org.fedoraproject.candlepin.model.Product;
+
 
 /**
  * API Gateway into /product
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java
index 8d7c3d1..dca8188 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java
@@ -14,9 +14,6 @@
  */
 package org.fedoraproject.candlepin.resource;
 
-import org.fedoraproject.candlepin.model.ConsumerType;
-import org.fedoraproject.candlepin.model.JsonTestObject;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -24,6 +21,9 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.fedoraproject.candlepin.model.ConsumerType;
+import org.fedoraproject.candlepin.model.JsonTestObject;
+
 
 /**
  * TestResource - used to prototype RESTful things without mucking up real
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java
index 1dea70e..54b0162 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java
@@ -14,9 +14,6 @@
  */
 package org.fedoraproject.candlepin.resource;
 
-import org.fedoraproject.candlepin.model.ObjectFactory;
-import org.fedoraproject.candlepin.model.User;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,6 +26,9 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.fedoraproject.candlepin.model.ObjectFactory;
+import org.fedoraproject.candlepin.model.User;
+
 
 /**
  * REST api gateway for the User object.
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/cert/CertGenerator.java b/proxy/code/src/org/fedoraproject/candlepin/resource/cert/CertGenerator.java
index e33ffeb..52608f1 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/cert/CertGenerator.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/cert/CertGenerator.java
@@ -14,16 +14,6 @@
  */
 package org.fedoraproject.candlepin.resource.cert;
 
-import org.bouncycastle.asn1.DEREncodable;
-import org.bouncycastle.asn1.DEREnumerated;
-import org.bouncycastle.asn1.misc.NetscapeCertType;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
-
 import java.math.BigInteger;
 import java.security.KeyFactory;
 import java.security.PrivateKey;
@@ -36,6 +26,16 @@ import java.util.Date;
 import java.util.Hashtable;
 import java.util.Vector;
 
+import org.bouncycastle.asn1.DEREncodable;
+import org.bouncycastle.asn1.DEREnumerated;
+import org.bouncycastle.asn1.misc.NetscapeCertType;
+import org.bouncycastle.asn1.x509.GeneralName;
+import org.bouncycastle.asn1.x509.GeneralNames;
+import org.bouncycastle.asn1.x509.X509Extensions;
+import org.bouncycastle.jce.X509Principal;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.x509.X509V3CertificateGenerator;
+
 /**
  * CertGenerator - util class for generating a cert
  * @version $Rev$
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/CertTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/CertTest.java
index 9aff520..182b359 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/CertTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/CertTest.java
@@ -14,19 +14,6 @@
  */
 package org.fedoraproject.candlepin.resource.cert.test;
 
-import org.fedoraproject.candlepin.resource.cert.CertGenerator;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.x509.AttributeCertificateHolder;
-import org.bouncycastle.x509.AttributeCertificateIssuer;
-import org.bouncycastle.x509.X509Attribute;
-import org.bouncycastle.x509.X509V2AttributeCertificate;
-import org.bouncycastle.x509.X509V2AttributeCertificateGenerator;
-import org.bouncycastle.x509.examples.AttrCertExample;
-
 import java.math.BigInteger;
 import java.security.KeyFactory;
 import java.security.KeyStore;
@@ -38,6 +25,17 @@ import java.security.spec.RSAPrivateCrtKeySpec;
 import java.security.spec.RSAPublicKeySpec;
 import java.util.Date;
 
+import org.bouncycastle.asn1.ASN1EncodableVector;
+import org.bouncycastle.asn1.DERSequence;
+import org.bouncycastle.asn1.x509.GeneralName;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.x509.AttributeCertificateHolder;
+import org.bouncycastle.x509.AttributeCertificateIssuer;
+import org.bouncycastle.x509.X509Attribute;
+import org.bouncycastle.x509.X509V2AttributeCertificate;
+import org.bouncycastle.x509.X509V2AttributeCertificateGenerator;
+import org.bouncycastle.x509.examples.AttrCertExample;
+import org.fedoraproject.candlepin.resource.cert.CertGenerator;
 import org.junit.Test;
 
 /**
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java
index b5bac0e..4bb31b6 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java
@@ -14,6 +14,10 @@
  */
 package org.fedoraproject.candlepin.resource.test;
 
+import static org.junit.Assert.*;
+
+import java.util.List;
+
 import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.ObjectFactory;
@@ -21,11 +25,7 @@ import org.fedoraproject.candlepin.model.Product;
 import org.fedoraproject.candlepin.model.ProductFactory;
 import org.fedoraproject.candlepin.resource.EntitlementMatcher;
 import org.fedoraproject.candlepin.test.TestUtil;
-
-import java.util.List;
-
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 /**
  * EntitlementMatcherTest
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
index 4f9a09f..d00931d 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
@@ -14,6 +14,12 @@
  */
 package org.fedoraproject.candlepin.resource.test;
 
+import static org.junit.Assert.*;
+
+import java.sql.Date;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.EntitlementPool;
@@ -23,6 +29,8 @@ import org.fedoraproject.candlepin.model.Product;
 import org.fedoraproject.candlepin.resource.EntitlementResource;
 import org.fedoraproject.candlepin.test.DatabaseTestFixture;
 import org.fedoraproject.candlepin.test.TestUtil;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.WebResource;
@@ -30,14 +38,6 @@ import com.sun.jersey.api.client.config.ClientConfig;
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 import com.sun.jersey.api.representation.Form;
 
-import java.sql.Date;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
 
 /**
  * ConsumerResourceTest
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
index 6e2dcc3..e8ef83e 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
@@ -14,21 +14,21 @@
  */
 package org.fedoraproject.candlepin.resource.test;
 
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.JsonTestObject;
 import org.fedoraproject.candlepin.resource.TestResource;
+import org.junit.Test;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.api.client.config.ClientConfig;
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
 
 /**
  * TestResourceTest
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserResourceTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserResourceTest.java
index 7ada16c..94cf31d 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserResourceTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserResourceTest.java
@@ -14,13 +14,13 @@
  */
 package org.fedoraproject.candlepin.resource.test;
 
-import org.fedoraproject.candlepin.model.User;
-import org.fedoraproject.candlepin.resource.UserResource;
+import static org.junit.Assert.*;
 
 import java.util.List;
 
+import org.fedoraproject.candlepin.model.User;
+import org.fedoraproject.candlepin.resource.UserResource;
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 
 /**
diff --git a/proxy/code/src/org/fedoraproject/candlepin/test/TestUtil.java b/proxy/code/src/org/fedoraproject/candlepin/test/TestUtil.java
index a7b21c0..4c5aba1 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/test/TestUtil.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/test/TestUtil.java
@@ -15,7 +15,6 @@
 package org.fedoraproject.candlepin.test;
 
 import java.sql.Date;
-
 import java.util.Calendar;
 import java.util.Random;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/util/MethodUtil.java b/proxy/code/src/org/fedoraproject/candlepin/util/MethodUtil.java
index dc808f7..a1aafee 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/util/MethodUtil.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/util/MethodUtil.java
@@ -15,12 +15,12 @@
 
 package org.fedoraproject.candlepin.util;
 
-import org.apache.log4j.Logger;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import org.apache.log4j.Logger;
+
 /**
  * A simple class that assists with method invocation.  We should just use 
  * the jakarta-commons MethodUtils class, but that class can't deal with