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

Author: jleroux
Date: Wed Feb  9 09:37:15 2011
New Revision: 1068811

URL: http://svn.apache.org/viewvc?rev=1068811&view=rev
Log:
Following r1065144 <<A slightly modified patch from Pierre Smits "Enhancement to create new tenants easier" (https://issues.apache.org/jira/browse/OFBIZ-3971) - OFBIZ-3971>> here is a modified build.xml file with better "ant -p" rendering (less cluttered)

Modified:
    ofbiz/trunk/build.xml

Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1068811&r1=1068810&r2=1068811&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Wed Feb  9 09:37:15 2011
@@ -425,12 +425,13 @@ under the License.
          ================================= -->
     <target name="run-create-tenant"
         depends="create-tenant-on-Derby,create-tenant-on-MySQL,create-tenant-on-Oracle,create-tenant-on-PostgreSQL"
-        description="This build script creates a new tenant in your environment, creates the delegator, and loads initial data (needs multitenant=Y in general.properties)">
+        description="Creates a new tenant in your environment, creates the delegator, loads initial data with admin-user and password (needs multitenant=Y in general.properties)">
         <tstamp/>
     </target>
 
-    <target name="get-tenant-data"
-        description="This creates entity Tenant and TenantDataSource in default, installs data in the delegator and creates the admin-user and password for the tenant">
+    <!-- description="This creates entity Tenant and TenantDataSource in default, installs data in the delegator and creates the admin-user and password for the tenant"  
+        sub-target of run-create-tenant, can't used alone => no description, to not clutter "ant -p" -->
+    <target name="get-tenant-data">
         <input addproperty="tenantId" message="Enter Id for the tenant: "/>
         <input addproperty="tenantName" message="Enter name for tenant: "/>
         <input addproperty="data-readers" message="Enter data to install.
@@ -456,8 +457,9 @@ under the License.
         </condition>
         <antcall target="tenant-data-entry"/>
     </target>
-    <target name="create-tenant-on-Derby" depends="get-tenant-data"
-        description="Creates tenant data and instance" if="isDerby">
+    <!-- description="Creates tenant data and instance"  
+        sub-target of run-create-tenant, can't used alone => no description, to not clutter "ant -p" -->
+    <target name="create-tenant-on-Derby" depends="get-tenant-data" if="isDerby">
         <echo message="Installing on Derby"/>
         <copy file="${basedir}/framework/resources/templates/AdminNewTenantData-Derby.xml" tofile="runtime/tmp/tmpTenantData.xml">
             <filterset>
@@ -475,8 +477,9 @@ under the License.
             <param name="delegatorId" value="default#${tenantId}"/>
         </antcall>
     </target>
-    <target name="create-tenant-on-MySQL" depends="get-tenant-data"
-        description="Creates tenant data and instance. Don't forget db driver(s) and already created DBs in function of the entityengine.xml datasource-names" if="isMySQL">
+    <!-- description="Creates tenant data and instance. Don't forget db driver(s) and already created DBs in function of the entityengine.xml datasource-names"  
+        sub-target of run-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"/>
         <copy file="${basedir}/framework/resources/templates/AdminNewTenantData-MySQL.xml" tofile="runtime/tmp/tmpTenantData.xml">
             <filterset>
@@ -497,8 +500,9 @@ under the License.
             <param name="delegatorId" value="default#${tenantId}"/>
         </antcall>
     </target>
-    <target name="create-tenant-on-Oracle" depends="get-tenant-data"
-        description="Creates tenant data and instance. Don't forget db driver(s) and already created DBs in function of the entityengine.xml datasource-names" if="isOracle">
+    <!-- description="Creates tenant data and instance. Don't forget db driver(s) and already created DBs in function of the entityengine.xml datasource-names"  
+        sub-target of run-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"/>
         <copy file="${basedir}/framework/resources/templates/AdminNewTenantData-Oracle.xml" tofile="runtime/tmp/tmpTenantData.xml">
             <filterset>
@@ -519,8 +523,9 @@ under the License.
             <param name="delegatorId" value="default#${tenantId}"/>
         </antcall>
     </target>
-    <target name="create-tenant-on-PostgreSQL" depends="get-tenant-data"
-        description="Creates tenant data and instance. Don't forget db driver(s) and already created DBs in function of the entityengine.xml datasource-names" if="isPostgreSQL">
+    <!-- description="Creates tenant data and instance. Don't forget db driver(s) and already created DBs in function of the entityengine.xml datasource-names"  
+        sub-target of run-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"/>
         <copy file="${basedir}/framework/resources/templates/AdminNewTenantData-PostgreSQL.xml" tofile="runtime/tmp/tmpTenantData.xml">
             <filterset>
@@ -541,8 +546,8 @@ under the License.
             <param name="delegatorId" value="default#${tenantId}"/>
         </antcall>
     </target>
-    <target name="tenant-data-entry"
-        description="displays tenant data">
+    <!-- description="displays tenant data"  sub-target of get-tenant-data, can't used alone => no description, to not clutter "ant -p" -->
+    <target name="tenant-data-entry">
         <echo>------------------------------------</echo>
         <echo message="tenantId = ${tenantId}"/>
         <echo>tenantName = ${tenantName}</echo>