reorganize the tree for use with buildr

40 files changed, 62 insertions, 10 deletions

diff --git a/proxy/buildfile b/proxy/buildfile
new file mode 100644
index 0000000..d522481
--- /dev/null
+++ b/proxy/buildfile
@@ -0,0 +1,52 @@
+# 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.2.4.1',
+             'org.objectweb.asm:asm:jar:3.1',
+             'org.objectweb.asm:asm:jar:3.1']
+BOUNCYCASTLE = group('bcprov', :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://www.ibiblio.org/maven2/"
+repositories.remote << "http://jmrodri.fedorapeople.org/ivy/candlepin"
+#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'
+  compile.with JERSEY, JUNIT, LOG4J, HIBERNATE, BOUNCYCASTLE # Add classpath dependencies
+  test.with JERSEY, JUNIT, LOG4J, HIBERNATE, BOUNCYCASTLE # Add classpath dependencies
+  javadoc projects
+  package :war
+
+  #define "fbuild" do
+  #end
+
+  #define "code" do
+  #end
+
+end
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/Consumer.java
index df85599..df85599 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 4debd36..4debd36 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 a9c7671..a9c7671 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 438b923..438b923 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 3c5e117..3c5e117 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 040ab59..040ab59 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 5dac3b1..5dac3b1 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 2b702ad..2b702ad 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/Product.java b/proxy/src/main/java/org/fedoraproject/candlepin/model/Product.java
index b1b8ad1..b1b8ad1 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 9ff0ebb..9ff0ebb 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 10bfcea..10bfcea 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/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 73a6c7a..73a6c7a 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 020dcf0..020dcf0 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 1c966a6..1c966a6 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 78ae406..78ae406 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 b224ab5..b224ab5 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 994d79d..994d79d 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 ce961b5..ce961b5 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 0c2f26f..0c2f26f 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 52608f1..52608f1 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 61eb82a..61eb82a 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/util/EntityManagerUtil.java
+++ b/proxy/src/main/java/org/fedoraproject/candlepin/util/EntityManagerUtil.java
diff --git a/proxy/code/src/org/fedoraproject/candlepin/util/MethodUtil.java b/proxy/src/main/java/org/fedoraproject/candlepin/util/MethodUtil.java
index a1aafee..a1aafee 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 9c49dd9..9c49dd9 100644
--- a/proxy/code/src/META-INF/persistence.xml
+++ b/proxy/src/main/resources/META-INF/persistence.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/ConsumerTest.java
index d528e3b..52ed50d 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/ConsumerTest.java
@@ -12,7 +12,7 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.model.test;
+package org.fedoraproject.candlepin.model;
 
 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/ConsumerTypeTest.java
index 4974c46..afec5b2 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/ConsumerTypeTest.java
@@ -1,4 +1,4 @@
-package org.fedoraproject.candlepin.model.test;
+package org.fedoraproject.candlepin.model;
 
 import static org.junit.Assert.*;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/ObjectFactoryTest.java
index 5186fb6..5ef8fff 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/ObjectFactoryTest.java
@@ -12,7 +12,7 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.model.test;
+package org.fedoraproject.candlepin.model;
 
 import static org.junit.Assert.*;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/model/OwnerTest.java
index f331d95..6de47f0 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/model/OwnerTest.java
@@ -12,7 +12,7 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.model.test;
+package org.fedoraproject.candlepin.model;
 
 import static org.junit.Assert.*;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/ConsumerResourceTest.java
index 1b21324..7eec9bf 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/ConsumerResourceTest.java
@@ -12,7 +12,7 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.resource.test;
+package org.fedoraproject.candlepin.resource;
 
 import static org.junit.Assert.*;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/EntitlementMatcherTest.java
index 4bb31b6..dff511d 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/EntitlementMatcherTest.java
@@ -12,7 +12,7 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.resource.test;
+package org.fedoraproject.candlepin.resource;
 
 import static org.junit.Assert.*;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/EntitlementResourceTest.java
index a136a29..04a4b56 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/EntitlementResourceTest.java
@@ -12,7 +12,7 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.resource.test;
+package org.fedoraproject.candlepin.resource;
 
 import static org.junit.Assert.*;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/TestResourceTest.java
index 2a41973..01f0806 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/TestResourceTest.java
@@ -12,7 +12,7 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.resource.test;
+package org.fedoraproject.candlepin.resource;
 
 import static org.junit.Assert.*;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserResourceTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/UserResourceTest.java
index 94cf31d..03acd18 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserResourceTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/UserResourceTest.java
@@ -12,7 +12,7 @@
  * granted to use or replicate Red Hat trademarks that are incorporated
  * in this software or its documentation.
  */
-package org.fedoraproject.candlepin.resource.test;
+package org.fedoraproject.candlepin.resource;
 
 import static org.junit.Assert.*;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/CertTest.java b/proxy/src/test/java/org/fedoraproject/candlepin/resource/cert/CertTest.java
index 2ccb0f5..702446f 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/CertTest.java
+++ b/proxy/src/test/java/org/fedoraproject/candlepin/resource/cert/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.cert;
 
 import java.math.BigInteger;
 import java.security.KeyFactory;