Scarab commit: svn commit: r10128 - trunk: build src/conf/conf

Author: dabbous
Date: 2006-05-31 08:07:59-0700
New Revision: 10128

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

Log:
ant build now uses correctly the admin user when
creating a new database.
This patch solves issue SCB1669.


Modified: trunk/build/build.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/build/build.xml?view=diff&rev=10128&p1=trunk/build/build.xml&p2=trunk/build/build.xml&r1=10127&r2=10128
==============================================================================
--- trunk/build/build.xml	(original)
+++ trunk/build/build.xml	2006-05-31 08:07:59-0700
@@ -99,14 +99,20 @@
 
         Running with following options:
 
-        database type = ${scarab.database.type}
-        database name = ${scarab.database.name}
-        admin user    = ${scarab.user.username}
+        Scarab:
+        administrator = ${scarab.user.username}
+        
+        Scarab Database:
+        type          = ${scarab.database.type}
+        instance name = ${scarab.database.name}
         username      = ${scarab.database.username}
+        admin         = ${scarab.database.admin.username}
+		   
+        Database Connection:
         host          = ${scarab.database.host}
         port          = ${scarab.database.port}
         jdbc driver   = ${scarab.database.jdbc.driver}
-        database url  = ${scarab.database.url}
+        url           = ${scarab.database.url}
 
       </echo>
     </target>
@@ -377,8 +383,8 @@
        	    <property name="torque.dir"               value="../target/torque"/>
             <property name="torque.database.driver"   value="${scarab.database.jdbc.driver}"/>
             <property name="torque.database.url"      value="${scarab.database.url}"/>
-            <property name="torque.database.user"     value="${scarab.database.username}"/>
-            <property name="torque.database.password" value="${scarab.database.password}"/>
+            <property name="torque.database.user"     value="${scarab.database.admin.username}"/>
+            <property name="torque.database.password" value="${scarab.database.admin.password}"/>
             <property name="torque.saveException"     value="${torque.saveException}"/>
         </ant>
 
@@ -399,10 +405,6 @@
              target="create-db" 
         	 inheritAll="false"
         	 dir="${runtime.config.dir}">
-            <property name="torque.database.driver"   value="${scarab.database.jdbc.driver}"/>
-            <property name="torque.database.url"      value="${scarab.database.url}"/>
-            <property name="torque.database.user"     value="${scarab.database.username}"/>
-            <property name="torque.database.password" value="${scarab.database.password}"/>
         </ant>
     
     </target>
@@ -412,10 +414,6 @@
              target="migrate-from-b20" 
              inheritAll="false"
              dir="${runtime.config.dir}">
-            <property name="torque.database.driver"   value="${scarab.database.jdbc.driver}"/>
-            <property name="torque.database.url"      value="${scarab.database.url}"/>
-            <property name="torque.database.user"     value="${scarab.database.username}"/>
-            <property name="torque.database.password" value="${scarab.database.password}"/>
         </ant>        
     </target>
 
@@ -424,10 +422,6 @@
              target="migrate-from-b19" 
              inheritAll="false"
              dir="${runtime.config.dir}">
-            <property name="torque.database.driver"   value="${scarab.database.jdbc.driver}"/>
-            <property name="torque.database.url"      value="${scarab.database.url}"/>
-            <property name="torque.database.user"     value="${scarab.database.username}"/>
-            <property name="torque.database.password" value="${scarab.database.password}"/>
         </ant>        
     </target>
 
@@ -436,10 +430,6 @@
              target="migrate-from-a20" 
              inheritAll="false"
              dir="${runtime.config.dir}">
-            <property name="torque.database.driver"   value="${scarab.database.jdbc.driver}"/>
-            <property name="torque.database.url"      value="${scarab.database.url}"/>
-            <property name="torque.database.user"     value="${scarab.database.username}"/>
-            <property name="torque.database.password" value="${scarab.database.password}"/>
         </ant>        
     </target>
 
@@ -448,10 +438,6 @@
              target="create-anonymous"
              inheritAll="false"
              dir="${runtime.config.dir}">
-            <property name="torque.database.driver"   value="${scarab.database.jdbc.driver}"/>
-            <property name="torque.database.url"      value="${scarab.database.url}"/>
-            <property name="torque.database.user"     value="${scarab.database.username}"/>
-            <property name="torque.database.password" value="${scarab.database.password}"/>
         </ant>
     </target>
 

Modified: trunk/src/conf/conf/build.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/build.xml?view=diff&rev=10128&p1=trunk/src/conf/conf/build.xml&p2=trunk/src/conf/conf/build.xml&r1=10127&r2=10128
==============================================================================
--- trunk/src/conf/conf/build.xml	(original)
+++ trunk/src/conf/conf/build.xml	2006-05-31 08:07:59-0700
@@ -47,8 +47,8 @@
 	
     <property name="torque.database.driver"   value="${scarab.database.jdbc.driver}"/>
     <property name="torque.database.url"      value="${scarab.database.url}"/>
-    <property name="torque.database.user"     value="${scarab.database.username}"/>
-    <property name="torque.database.password" value="${scarab.database.password}"/>
+    <property name="torque.database.user"     value="${scarab.database.admin.username}"/>
+    <property name="torque.database.password" value="${scarab.database.admin.password}"/>
 	<property name="database.src.upgrade.dir" value="${database.src.sql.dir}/${scarab.database.type}/upgrade"/>
     
     <!-- Build classpath -->
@@ -76,19 +76,24 @@
 
         [${version}-${DSTAMP}${TSTAMP}]
 
-
         Running with following options:
 
-        database name = ${scarab.database.name}
-        database type = ${scarab.database.type}
-        jdbc driver   = ${scarab.database.jdbc.driver}
-        database url  = ${scarab.database.url}
+        Scarab:
+        administrator = ${scarab.user.username}
+        
+        Scarab Database:
+        type          = ${scarab.database.type}
+        instance name = ${scarab.database.name}
+        username      = ${scarab.database.username}
+		admin         = ${scarab.database.admin.username}
+		   
+		Database Connection:
         host          = ${scarab.database.host}
         port          = ${scarab.database.port}
-        username      = ${scarab.database.username}
-        admin user    = ${scarab.user.username}
-
-</echo>
+        jdbc driver   = ${scarab.database.jdbc.driver}
+        url           = ${scarab.database.url}
+		  		  
+      </echo>
     </target>
 
 
@@ -262,8 +267,8 @@
         <sql
             driver="${scarab.database.jdbc.driver}"
             url="${scarab.database.url}"
-            userid="${scarab.database.username}"
-            password="${scarab.database.password}">
+            userid="${scarab.database.admin.username}"
+            password="${scarab.database.admin.password}">
             <classpath refid="classpath"/>
         CREATE TABLE scarab_test (
           scarab_test integer
@@ -375,15 +380,15 @@
         	dbtype   : [${scarab.database.type}]
         	url      : [${scarab.database.url}]
             driver   : [${scarab.database.jdbc.driver}]
-            userid   : [${scarab.database.username}]
-            password : [${scarab.database.password}]
+            userid   : [${scarab.database.admin.username}]
+            password : [${scarab.database.admin.password}]
         </echo>
 
     	<sql
             driver="${scarab.database.jdbc.driver}"
             url="${scarab.database.url}"
-            userid="${scarab.database.username}"
-            password="${scarab.database.password}">
+            userid="${scarab.database.admin.username}"
+            password="${scarab.database.admin.password}">
             <classpath refid="classpath"/>
             <transaction src="${database.instance.sql.dir}/${scarab.database.type}/prepare-${scarab.database.type}-dummy-tables.sql"/>
             <transaction src="${database.instance.sql.dir}/${scarab.database.type}/standard-${scarab.database.type}-init.sql"/>
@@ -405,8 +410,8 @@
         <sql
             driver="${scarab.database.jdbc.driver}"
             url="${scarab.database.url}"
-            userid="${scarab.database.username}"
-            password="${scarab.database.password}">
+            userid="${scarab.database.admin.username}"
+            password="${scarab.database.admin.password}">
             <classpath refid="classpath"/>
             <transaction src="${database.instance.sql.dir}/${project}-anonymous.sql"/>
         </sql>
@@ -419,8 +424,8 @@
         <sql
             driver="${scarab.database.jdbc.driver}"
             url="${scarab.database.url}"
-            userid="${scarab.database.username}"
-            password="${scarab.database.password}">
+            userid="${scarab.database.admin.username}"
+            password="${scarab.database.admin.password}">
             <classpath refid="classpath"/>
             <transaction src="${database.instance.sql.dir}/${project}-jira-templates-data.sql"/>
         </sql>
@@ -442,8 +447,8 @@
         <sql
             driver="${scarab.database.jdbc.driver}"
             url="${scarab.database.url}"
-            userid="${scarab.database.username}"
-            password="${scarab.database.password}">
+            userid="${scarab.database.admin.username}"
+            password="${scarab.database.admin.password}">
             <classpath refid="classpath"/>
             <transaction src="${database.instance.sql.dir}/${scarab.database.type}/standard-${scarab.database.type}-init.sql"/>
             <transaction src="${seed.data.sql}"/>
@@ -469,8 +474,8 @@
         <sql
             driver="${scarab.database.jdbc.driver}"
             url="${scarab.database.url}"
-            userid="${scarab.database.username}"
-            password="${scarab.database.password}"
+            userid="${scarab.database.admin.username}"
+            password="${scarab.database.admin.password}"
 	        onerror="continue">
             <classpath refid="classpath"/>
 	        <transaction src="${database.instance.upgrade.dir}/${scarab.database.type}-upgrade-1.0b20-1.0b21-1.sql"/>
@@ -486,8 +491,8 @@
         <sql
             driver="${scarab.database.jdbc.driver}"
             url="${scarab.database.url}"
-            userid="${scarab.database.username}"
-            password="${scarab.database.password}"
+            userid="${scarab.database.admin.username}"
+            password="${scarab.database.admin.password}"
 	        onerror="continue">
             <classpath refid="classpath"/>
 	        <transaction src="${database.instance.upgrade.dir}/${scarab.database.type}-upgrade-1.0a20-1.0b20-1.sql"/>
@@ -498,8 +503,8 @@
         <sql
             driver="${scarab.database.jdbc.driver}"
             url="${scarab.database.url}"
-            userid="${scarab.database.username}"
-            password="${scarab.database.password}"
+            userid="${scarab.database.admin.username}"
+            password="${scarab.database.admin.password}"
 	        onerror="continue">
             <classpath refid="classpath"/>
 	        <transaction src="${database.instance.upgrade.dir}/${scarab.database.type}-upgrade-1.0b19-1.0b20-1.sql"/>
@@ -516,8 +521,8 @@
         <sql
             driver="${scarab.database.jdbc.driver}"
             url="${scarab.database.url}"
-            userid="${scarab.database.username}"
-            password="${scarab.database.password}"
+            userid="${scarab.database.admin.username}"
+            password="${scarab.database.admin.password}"
 	        onerror="continue">
             <classpath refid="classpath"/>
 	        <transaction src="${database.instance.upgrade.dir}/${scarab.database.type}-upgrade-1.0b19-1.0a20-1.sql"/>