svn commit: r1727643 - /ofbiz/trunk/build.xml

[jl...@apache.org]

Author: jleroux
Date: Fri Jan 29 21:47:53 2016
New Revision: 1727643

URL: http://svn.apache.org/viewvc?rev=1727643&view=rev
Log:
Implements "Load JDBC drivers when creating tenant on PostgreSQL or mySQL" https://issues.apache.org/jira/browse/OFBIZ-6863

It's only a matter of calling respectively ant targets *download-PG-JDBC* and *download-mySQL-JDBC* when chaining *create-tenant-on-MySQL* or *create-tenant-on-PostgreSQL* from *create-tenant* main target

Modified:
    ofbiz/trunk/build.xml

Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1727643&r1=1727642&r2=1727643&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Fri Jan 29 21:47:53 2016
@@ -970,10 +970,11 @@ under the License.
             <param name="delegatorId" value="default#${tenantId}"/>
         </antcall>
     </target>
-    <!-- description="Creates tenant data and instance. Don't forget db driver(s) and already created DBs in function of the entityengine.xml datasource-names"
+    <!-- description="Creates tenant data and instance. Don't forget and already created DBs in function of the entityengine.xml datasource-names"
         sub-target of create-tenant, can't used alone => no description, to not clutter "ant -p" -->
     <target name="create-tenant-on-MySQL" depends="get-tenant-data" if="isMySQL">
         <echo message="Installing on MySQL"/>
+        <antcall target="download-mySQL-JDBC"/>
         <!-- Below code will handle the case of optional domain name. It will remove the TenantDomainName entry from tmpTenantData.xml file
             if domain name is empty, so that record would not get created. -->
         <copy file="${basedir}/framework/resources/templates/AdminNewTenantData-MySQL.xml" tofile="runtime/tmp/tmpTenantData.xml"/>
@@ -1007,7 +1008,7 @@ under the License.
             <param name="delegatorId" value="default#${tenantId}"/>
         </antcall>
     </target>
-    <!-- description="Creates tenant data and instance. Don't forget db driver(s) and already created DBs in function of the entityengine.xml datasource-names"
+    <!-- description="Creates tenant data and instance. Don't forget already created DBs in function of the entityengine.xml datasource-names"
         sub-target of create-tenant, can't used alone => no description, to not clutter "ant -p" -->
     <target name="create-tenant-on-Oracle" depends="get-tenant-data" if="isOracle">
         <echo message="Installing on Oracle"/>
@@ -1048,6 +1049,7 @@ under the License.
         sub-target of create-tenant, can't used alone => no description, to not clutter "ant -p" -->
     <target name="create-tenant-on-PostgreSQL" depends="get-tenant-data" if="isPostgreSQL">
         <echo message="Installing on PostgreSQL"/>
+        <antcall target="download-PG-JDBC"/>
         <!-- Below code will handle the case of optional domain name. It will remove the TenantDomainName entry from tmpTenantData.xml file
             if domain name is empty, so that record would not get created. -->
         <copy file="${basedir}/framework/resources/templates/AdminNewTenantData-PostgreSQL.xml" tofile="runtime/tmp/tmpTenantData.xml"/>