Fix ant gen-schema to generate for PostgreSQL, not HSQLDB.

3 files changed, 24 insertions, 18 deletions

diff --git a/proxy/build.xml b/proxy/build.xml
index 6bac8d6..f1593cc 100644
--- a/proxy/build.xml
+++ b/proxy/build.xml
@@ -482,22 +482,9 @@ Running @{banner} ...
     <delete file="${megajar.jar}" />
     <jar destfile="${megajar.jar}">
       <fileset dir="${build.dir}/classes">
-        <!-- internal is not for publication; tlds go in META-INF;
-             html go as javadoc elsewhere -->
-        <exclude name="**/internal/**" />
-        <exclude name="**/*.tld" />
-        <exclude name="**/*.html" />
         <exclude name="**/test/*" />
         <exclude name="**/log4j.properties" />
-        <exclude name="**/*.conf" />
-        <exclude name="**/*.conf.rpmsave" />
-        <exclude name="**/test/validation/userCreateForm.xsd" />
       </fileset>
-      <!-- ugh, we can't flatten this like we would with a <copy> tag
-           or use a mapper, alas -->
-      <!-- metainf dir="${build.dir}/classes/com/redhat/rhn/frontend/taglibs">
-        <include name="*.tld" />
-      </metainf -->
     </jar>
   </target>
 
@@ -511,6 +498,9 @@ Running @{banner} ...
         <include name="log4j.properties" />
       </classes>
       <classes dir="${build.dir}/classes">
+        <include name="persistence.xml" />
+      </classes>
+      <classes dir="${build.dir}/classes">
         <include name="logging.properties" />
       </classes>
       <lib dir="${run.lib.dir}">
@@ -573,20 +563,22 @@ Running @{banner} ...
     </exec>
   </target>
 
-  <target name="gen-schema" depends="init-taskdefs" description="Generates database schema from Hibernate annotations.">
+  <target name="gen-schema" depends="init-taskdefs,all" description="Generates database schema from Hibernate annotations.">
     <property name="dir.genhbm" value="build/schemagen/" />
     <delete dir="${dir.genhbm}" />
     <mkdir dir="${dir.genhbm}" />
 
     <hibernatetool destdir="${dir.genhbm}">
+<!--
         <property key="hibernate.connection.driver_class" value="org.postgresql.Driver"/>
         <property key="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
+-->
 
         <classpath>
             <path location="build/classes"/>
         </classpath>
 
-        <jpaconfiguration persistenceunit="test"/>
+        <jpaconfiguration persistenceunit="production"/>
 
         <hbm2ddl export="false"
                  update="false"
diff --git a/proxy/code/src/META-INF/persistence.xml b/proxy/code/src/META-INF/persistence.xml
index 47559cb..ee53eba 100644
--- a/proxy/code/src/META-INF/persistence.xml
+++ b/proxy/code/src/META-INF/persistence.xml
@@ -6,16 +6,30 @@
     <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.connection.driver_class" value="org.hsqldb.jdbcDriver"/>
+            <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:unit-testing-jpa"/>
             <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
             <property name="hibernate.connection.username" value="sa"/>
             <property name="hibernate.connection.password" value=""/>
             <property name="hibernate.show_sql" value="true" />
 
         </properties>
+    </persistence-unit>
+
+    <persistence-unit name="production" transaction-type="RESOURCE_LOCAL">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
 
+        <properties>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
+            <property name="hibernate.connection.driver_class" value="org.postgresql.Driver"/>
+            <property name="hibernate.connection.url" value="jdbc:postgresql:candlepin"/>
+
+            <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+            <property name="hibernate.connection.username" value="sa"/>
+            <property name="hibernate.connection.password" value=""/>
+            <property name="hibernate.show_sql" value="true" />
+        </properties>
 
     </persistence-unit>
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/CertificateResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/CertificateResource.java
index f4f40b2..82ea14a 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/CertificateResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/CertificateResource.java
@@ -72,7 +72,7 @@ public class CertificateResource extends BaseResource {
             
             encodedCert = base64cert;
             String decoded = Base64.base64Decode(base64cert);
-            System.out.println(decoded);
+//            System.out.println(decoded);
             cert = CertificateFactory.read(decoded);
             
             addProducts(cert);