Scarab commit: svn commit: r10656 - trunk/src/conf/conf/build.xml

Author: jhoech
Date: 2008-12-04 02:07:28-0800
New Revision: 10656

Modified:
   trunk/src/conf/conf/build.xml

Log:
SCB2698 - possibility for skipping the default data script added to ant build

Modified: trunk/src/conf/conf/build.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/build.xml?view=diff&pathrev=10656&r1=10655&r2=10656
==============================================================================
--- trunk/src/conf/conf/build.xml	(original)
+++ trunk/src/conf/conf/build.xml	2008-12-04 02:07:28-0800
@@ -21,6 +21,7 @@
     <property file="defaultCustom.properties" />
 
     <property name="skip.seed.data" value="false"/>
+    <property name="skip.default.data" value="false"/>
     <property name="skip.jira.templates.data" value="false"/>
 
     <path id="classpath">
@@ -39,6 +40,7 @@
         jdbc driver           = ${scarab.database.jdbc.driver}
         skip jira templates   = ${skip.jira.templates.data}
         skip sample data      = ${skip.seed.data}
+        skip default data      = ${skip.default.data}
       </echo>
     </target>
 
@@ -79,6 +81,11 @@
            <not><istrue value="${skip.seed.data}"/></not>
         </condition>
         <property name="optional.scarab-sample-data.sql" value=""/>
+        
+        <condition property="optional.scarab-default-data.sql" value="scarab-default-data.sql">
+           <not><istrue value="${skip.default.data}"/></not>
+        </condition>
+        <property name="optional.scarab-default-data.sql" value=""/>
 
         <concat destfile="${sql.current.dir}/populate-database.sql">
            <filelist dir="${sql.current.dir}"
@@ -90,7 +97,7 @@
                             scarab-id-table-init.sql
                             scarab-security.sql
                             scarab-required-data.sql
-                            scarab-default-data.sql
+                            ${optional.scarab-default-data.sql}
                             scarab-anonymous.sql
                             ${optional.scarab-jira-templates-data.sql}
                             ${optional.scarab-sample-data.sql}

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=979441