rename api -> resource package

23 files changed, 39 insertions, 34 deletions

diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/AuthHandler.java b/proxy/code/src/org/fedoraproject/candlepin/api/AuthHandler.java
deleted file mode 100644
index a3f3e33..0000000
--- a/proxy/code/src/org/fedoraproject/candlepin/api/AuthHandler.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.fedoraproject.candlepin.api;
-
-public class AuthHandler {
-
-}
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java b/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java
index 1363039..bd12e3d 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/ProductFactory.java
@@ -31,7 +31,7 @@ public class ProductFactory extends ObjectFactory {
     /**
      * Logger for this class
      */
-    private static final Logger log = Logger.getLogger(ProductFactory.class);
+    private static Logger log = Logger.getLogger(ProductFactory.class);
     
     private static ProductFactory instance = new ProductFactory();
     
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/User.java b/proxy/code/src/org/fedoraproject/candlepin/model/User.java
index 8960484..b5b1256 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/User.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/User.java
@@ -80,7 +80,11 @@ public class User extends BaseModel {
     public void setOwner(Owner owner) {
         this.owner = owner;
     }
-    
+   
+    /**
+     * Return string representation of the user object
+     * @return string representation of the user object
+     */
     public String toString() {
         return new Formatter().format("User :{login: %s, password: %s}",
                 login, password).toString();
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/ApiHandler.java b/proxy/code/src/org/fedoraproject/candlepin/resource/ApiHandler.java
index 0aec7c5..aa9fb14 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/ApiHandler.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/ApiHandler.java
@@ -1,4 +1,4 @@
-package org.fedoraproject.candlepin.api;
+package org.fedoraproject.candlepin.resource;
 
 import org.apache.log4j.Logger;
 import org.fedoraproject.candlepin.model.BaseModel;
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/AuthHandler.java b/proxy/code/src/org/fedoraproject/candlepin/resource/AuthHandler.java
new file mode 100644
index 0000000..ab78385
--- /dev/null
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/AuthHandler.java
@@ -0,0 +1,5 @@
+package org.fedoraproject.candlepin.resource;
+
+public class AuthHandler {
+
+}
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/AuthenticationException.java b/proxy/code/src/org/fedoraproject/candlepin/resource/AuthenticationException.java
index 8cd4ec6..c21778d 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/AuthenticationException.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/AuthenticationException.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.api;
+package org.fedoraproject.candlepin.resource;
 
 /**
  * @author mmccune
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/BaseApi.java b/proxy/code/src/org/fedoraproject/candlepin/resource/BaseApi.java
index 768b6ef..de437d0 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/BaseApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/BaseApi.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.api;
+package org.fedoraproject.candlepin.resource;
 
 import com.sun.jersey.api.representation.Form;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/ConsumerApi.java b/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerApi.java
index 269e80f..3d450be 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/ConsumerApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerApi.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.api;
+package org.fedoraproject.candlepin.resource;
 
 import org.fedoraproject.candlepin.model.BaseModel;
 import org.fedoraproject.candlepin.model.Consumer;
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/EntitlementApi.java b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementApi.java
index 8c22b6f..22b57d6 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/EntitlementApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementApi.java
@@ -12,12 +12,11 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.api;
+package org.fedoraproject.candlepin.resource;
 
 import com.sun.jersey.api.representation.Form;
 
 import org.apache.log4j.Logger;
-import org.fedoraproject.candlepin.api.cert.CertGenerator;
 import org.fedoraproject.candlepin.model.BaseModel;
 import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.Entitlement;
@@ -25,6 +24,7 @@ import org.fedoraproject.candlepin.model.EntitlementPool;
 import org.fedoraproject.candlepin.model.JsonTestObject;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.Product;
+import org.fedoraproject.candlepin.resource.cert.CertGenerator;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/EntitlementMatcher.java b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementMatcher.java
index ed949c6..3f21216 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/EntitlementMatcher.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementMatcher.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.api;
+package org.fedoraproject.candlepin.resource;
 
 import org.apache.log4j.Logger;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/EntitlementPoolApi.java b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolApi.java
index fec1236..4c2aab6 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/EntitlementPoolApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementPoolApi.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.api;
+package org.fedoraproject.candlepin.resource;
 
 import org.fedoraproject.candlepin.model.EntitlementPool;
 import org.fedoraproject.candlepin.model.ObjectFactory;
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/OwnerApi.java b/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerApi.java
index d6eeb20..c35d250 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/OwnerApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/OwnerApi.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.api;
+package org.fedoraproject.candlepin.resource;
 
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.Owner;
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/TestApi.java b/proxy/code/src/org/fedoraproject/candlepin/resource/TestApi.java
index f352c4d..c2b036c 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/TestApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/TestApi.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.api;
+package org.fedoraproject.candlepin.resource;
 
 import org.fedoraproject.candlepin.model.JsonTestObject;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/UserApi.java b/proxy/code/src/org/fedoraproject/candlepin/resource/UserApi.java
index e7641b8..b2c084f 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/UserApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/UserApi.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.api;
+package org.fedoraproject.candlepin.resource;
 
 import org.fedoraproject.candlepin.model.BaseModel;
 import org.fedoraproject.candlepin.model.ObjectFactory;
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/cert/CertGenerator.java b/proxy/code/src/org/fedoraproject/candlepin/resource/cert/CertGenerator.java
index 118f588..3a62a76 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/cert/CertGenerator.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/cert/CertGenerator.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.api.cert;
+package org.fedoraproject.candlepin.resource.cert;
 
 import org.bouncycastle.asn1.DEREncodable;
 import org.bouncycastle.asn1.DEREnumerated;
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/cert/test/CertTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/CertTest.java
index da9731e..58b834b 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/cert/test/CertTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/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.api.cert.test;
+package org.fedoraproject.candlepin.resource.cert.test;
 
 import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.DERSequence;
@@ -24,7 +24,8 @@ 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.api.cert.CertGenerator;
+
+import org.fedoraproject.candlepin.resource.cert.CertGenerator;
 
 import java.math.BigInteger;
 import java.security.KeyFactory;
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/test/ApiTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ApiTest.java
index ca88bd7..e8b1aa0 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/test/ApiTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ApiTest.java
@@ -1,14 +1,14 @@
 /**
  * 
  */
-package org.fedoraproject.candlepin.api.test;
+package org.fedoraproject.candlepin.resource.test;
 
-import org.fedoraproject.candlepin.api.ApiHandler;
-import org.fedoraproject.candlepin.api.OwnerApi;
 import org.fedoraproject.candlepin.model.BaseModel;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.Owner;
 import org.fedoraproject.candlepin.model.User;
+import org.fedoraproject.candlepin.resource.ApiHandler;
+import org.fedoraproject.candlepin.resource.OwnerApi;
 
 import junit.framework.TestCase;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/test/ConsumerApiTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerApiTest.java
index 2cc43b8..4104e51 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/test/ConsumerApiTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerApiTest.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.api.test;
+package org.fedoraproject.candlepin.resource.test;
 
-import org.fedoraproject.candlepin.api.ConsumerApi;
 import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.ConsumerInfo;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.test.TestUtil;
+import org.fedoraproject.candlepin.resource.ConsumerApi;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.WebResource;
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/test/EntitlementApiTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementApiTest.java
index 44f2131..260f49d 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/test/EntitlementApiTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementApiTest.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.api.test;
+package org.fedoraproject.candlepin.resource.test;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.WebResource;
@@ -20,12 +20,12 @@ import com.sun.jersey.api.client.config.ClientConfig;
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 import com.sun.jersey.api.representation.Form;
 
-import org.fedoraproject.candlepin.api.EntitlementApi;
 import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.EntitlementPool;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.Product;
 import org.fedoraproject.candlepin.model.test.TestUtil;
+import org.fedoraproject.candlepin.resource.EntitlementApi;
 
 import java.sql.Date;
 import java.util.ArrayList;
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/test/EntitlementMatcherTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java
index 9f25757..b34104e 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/test/EntitlementMatcherTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java
@@ -12,15 +12,15 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.api.test;
+package org.fedoraproject.candlepin.resource.test;
 
-import org.fedoraproject.candlepin.api.EntitlementMatcher;
 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.test.TestUtil;
+import org.fedoraproject.candlepin.resource.EntitlementMatcher;
 
 import java.util.List;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/test/TestApiTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestApiTest.java
index 6a3d0dc..bc65685 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/test/TestApiTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestApiTest.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.api.test;
+package org.fedoraproject.candlepin.resource.test;
 
 import org.fedoraproject.candlepin.model.JsonTestObject;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/test/UserApiTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserApiTest.java
index 35966dc..6f07267 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/test/UserApiTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserApiTest.java
@@ -12,11 +12,11 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.api.test;
+package org.fedoraproject.candlepin.resource.test;
 
-import org.fedoraproject.candlepin.api.UserApi;
 import org.fedoraproject.candlepin.model.User;
 import org.fedoraproject.candlepin.model.test.TestUtil;
+import org.fedoraproject.candlepin.resource.UserApi;
 
 import com.sun.jersey.api.representation.Form;
 
diff --git a/proxy/code/webapp/WEB-INF/web.xml b/proxy/code/webapp/WEB-INF/web.xml
index a6be3f9..ca517c4 100644
--- a/proxy/code/webapp/WEB-INF/web.xml
+++ b/proxy/code/webapp/WEB-INF/web.xml
@@ -28,7 +28,7 @@
     <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.api</param-value>
+      <param-value>org.fedoraproject.candlepin.resource</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
   </servlet>