Author: erwan
Date: Sun Dec 19 18:14:50 2010
New Revision: 1050927
URL: http://svn.apache.org/viewvc?rev=1050927&view=rev
Log:
Using ivy for downloading PostgreSQL driver
Modified:
ofbiz/trunk/build.xml
ofbiz/trunk/framework/entity/build.xml
ofbiz/trunk/ivy.xml
Modified: ofbiz/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1050927&r1=1050926&r2=1050927&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Sun Dec 19 18:14:50 2010
@@ -128,13 +128,6 @@ under the License.
</subant>
</target>
- <target name="download-PG-JDBC"
- description="Download the PostgreSQL JDBC driver file">
- <subant target="install-PG-JDBC">
- <filelist dir="." files="framework/entity/build.xml"/>
- </subant>
- </target>
-
<target name="tests" depends="ofbiz-init">
<subant target="tests">
<filelist dir="." files="framework/build.xml"/>
@@ -580,6 +573,10 @@ under the License.
<ivy:retrieve pattern="framework/base/lib/[artifact]-[revision].[ext]"
conf="cobertura"/>
</target>
+ <target name="download-PG-JDBC" depends="ivy-init">
+ <ivy:retrieve
pattern="framework/entity/lib/jdbc/[artifact]-[revision].[ext]"
conf="postgres"/>
+ </target>
+
<!-- ================================================================== -->
<!-- Create New Component. This target will create basic directory
structure for an OFBiz component in hot-deploy directory. -->
<!-- ================================================================== -->
Modified: ofbiz/trunk/framework/entity/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/build.xml?rev=1050927&r1=1050926&r2=1050927&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/build.xml (original)
+++ ofbiz/trunk/framework/entity/build.xml Sun Dec 19 18:14:50 2010
@@ -55,8 +55,4 @@ under the License.
</test-jar>
</target>
- <target name="install-PG-JDBC" description="download the JDBC driver for
PostgreSQL">
- <get
src="http://jdbc.postgresql.org/download/postgresql-9.0-801.jdbc4.jar";
- dest="lib/jdbc/postgresql-9.0-801.jdbc4.jar" usetimestamp="true" />
- </target>
</project>
Modified: ofbiz/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/ivy.xml?rev=1050927&r1=1050926&r2=1050927&view=diff
==============================================================================
--- ofbiz/trunk/ivy.xml (original)
+++ ofbiz/trunk/ivy.xml Sun Dec 19 18:14:50 2010
@@ -26,9 +26,11 @@
</info>
<configurations>
<conf name="cobertura" description="downloads cobertura 1.9.3 (GPL2.0)
http://cobertura.sourceforge.net/"/>
+ <conf name="postgres" description="downloads the postgres JDBC
driver"/>
</configurations>
<dependencies>
<dependency org="net.sourceforge.cobertura" name="cobertura"
rev="1.9.3" conf="cobertura->default"/>
+ <dependency org="postgresql" name="postgresql" rev="9.0-801.jdbc4"
conf="postgres->default"/>
<!--Exclusions for cobertura-->
<exclude module="oro" conf="cobertura"/>
