diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2009-11-06 11:24:52 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2009-11-06 11:24:52 -0400 |
| commit | ff9f17e9688afce7590f6b178ebc0f94ec12b98b (patch) | |
| tree | 8627b52246a3a80175b0c89834f8a51759ad6344 | |
| parent | eb8f9212dcb9b21a12b2ede169bfebd52b46fe76 (diff) | |
| download | candlepin-ff9f17e9688afce7590f6b178ebc0f94ec12b98b.tar.gz candlepin-ff9f17e9688afce7590f6b178ebc0f94ec12b98b.tar.xz candlepin-ff9f17e9688afce7590f6b178ebc0f94ec12b98b.zip | |
Fixes for schema generation.
(still not fully functional, just getting there)
| -rw-r--r-- | proxy/build.xml | 16 | ||||
| -rw-r--r-- | proxy/ivy.xml | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/proxy/build.xml b/proxy/build.xml index d2985f4..b2e666d 100644 --- a/proxy/build.xml +++ b/proxy/build.xml @@ -21,6 +21,10 @@ <path id="runjars"> <fileset dir="${run.lib.dir}" includes="**/*.jar" /> </path> + + <path id="libjars"> + <fileset dir="lib/" includes="**/*.jar" /> + </path> <path id="buildjars"> <path refid="testjars" /> @@ -592,15 +596,9 @@ <property name="dir.genhbm" value="genhbm-test" /> - <target name="gen_hibernate" > - <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask"> - <classpath> - <fileset refid="eclipse.lib" /> - <fileset refid="jdbc.lib" /> - <pathelement path="${dir.lib}" /> - <pathelement path="${basedir}" /> - </classpath> - </taskdef> + <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="libjars"/> + + <target name="gen-schema"> <delete dir="${dir.genhbm}" /> <mkdir dir="${dir.genhbm}" /> <hibernatetool destdir="${dir.genhbm}"> diff --git a/proxy/ivy.xml b/proxy/ivy.xml index 176553a..7dc2bc3 100644 --- a/proxy/ivy.xml +++ b/proxy/ivy.xml @@ -9,7 +9,7 @@ <!-- dependency org="candlepin" name="bcpg" rev="1.37" / --> <dependency org="candlepin" name="bcprov" rev="1.43" /> <!-- dependency org="candlepin" name="c3p0" rev="0.9.0" / --> - <!-- dependency org="candlepin" name="cglib" rev="2.1.3" / --> + <dependency org="candlepin" name="cglib" rev="2.2" /> <dependency org="candlepin" name="checkstyle" rev="4.1" /> <!-- dependency org="candlepin" name="commons-beanutils" rev="1.7.0" / --> <!-- dependency org="candlepin" name="commons-cli" rev="1.0" / --> @@ -21,7 +21,8 @@ <!-- dependency org="candlepin" name="commons-fileupload" rev="1.0" / --> <!-- dependency org="candlepin" name="commons-httpclient" rev="3.0" / --> <!-- dependency org="candlepin" name="commons-lang" rev="2.3" / --> - <!-- dependency org="candlepin" name="commons-logging" rev="1.0.4" / --> + <dependency org="candlepin" name="commons-logging" rev="1.1.1" /> + <dependency org="candlepin" name="postgresql" rev="8.4-701" /> <!-- dependency org="candlepin" name="commons-validator" rev="1.1.4" / --> <!-- dependency org="candlepin" name="concurrent" rev="1.3.2" / --> <dependency org="candlepin" name="dom4j" rev="1.6.1" /> @@ -35,6 +36,7 @@ <dependency org="candlepin" name="hibernate-annotations" rev="3.4.0" /> <dependency org="candlepin" name="hibernate-commons-annotations" rev="3.4.0" /> <dependency org="candlepin" name="hibernate-entitymanager" rev="3.4.0" /> + <dependency org="candlepin" name="hibernate-tools" rev="3.2.4" /> <dependency org="candlepin" name="ejb3-persistence" rev="3.4.0" /> <dependency org="candlepin" name="asm" rev="3.1" /> <dependency org="candlepin" name="jersey-core" rev="1.1.2-ea" /> |