Fixed issue 12645. Removed the dependency from the DalInitializingTask in update.database.
authorAntonio Moreno <antonio.moreno@openbravo.com>
Thu, 11 Mar 2010 10:05:56 +0100
changeset 6668 82888a87033f
parent 6667 99e483f330ea
child 6669 974f31c82180
Fixed issue 12645. Removed the dependency from the DalInitializingTask in update.database.
build.xml
src-db/database/build.xml
src-db/database/lib/dbsourcemanager.jar
--- a/build.xml	Wed Mar 10 17:52:00 2010 +0100
+++ b/build.xml	Thu Mar 11 10:05:56 2010 +0100
@@ -441,8 +441,7 @@
                   stableDBdir="${stableDBdir}"
                   testDBdir="${base.src.db}/database"
                   verbosity="${bbdd.verbosity}"
-                  userId="0" adminMode="true" 
-                  propertiesFile="${base.config}/Openbravo.properties"/>    
+    />    
   </target>
 
   <target name="export.sample.data" depends="code.rev">
--- a/src-db/database/build.xml	Wed Mar 10 17:52:00 2010 +0100
+++ b/src-db/database/build.xml	Thu Mar 11 10:05:56 2010 +0100
@@ -56,9 +56,6 @@
   <taskdef name="alterscript" classname="org.openbravo.ddlutils.task.AlterXML2SQL">
     <classpath refid="runtime-classpath" />
   </taskdef>
-  <taskdef name="exportdatabase" classname="org.openbravo.ddlutils.task.ExportDatabase">
-    <classpath refid="runtime-classpath" />
-  </taskdef>
   <taskdef name="exportconfigscript" classname="org.openbravo.ddlutils.task.ExportConfigScript">
     <classpath refid="runtime-classpath" />
   </taskdef>
@@ -136,10 +133,13 @@
   </target>
 
   <target name="update.database.script">
-    <alterscript driver="${bbdd.driver}" url="${bbdd.owner.url}" user="${bbdd.user}" password="${bbdd.password}" excludeobjects="com.openbravo.db.OpenbravoExcludeFilter"  model="model/" filter="com.openbravo.db.OpenbravoMetadataFilter"  input="sourcedata" object="${bbdd.object}" failonerror="false" verbosity="${bbdd.verbosity}"  basedir="${base.modules}/" dirFilter="*/src-db/database/model" datadir="${base.modules}/" dataFilter="*/src-db/database/sourcedata" userId="0" adminMode="true" propertiesFile="${base.config}/Openbravo.properties" force="${force}" onlyIfModified="${onlyIfModified}" output="${bbdd.outputscript}" />
+    <alterscript driver="${bbdd.driver}" url="${bbdd.owner.url}" user="${bbdd.user}" password="${bbdd.password}" excludeobjects="com.openbravo.db.OpenbravoExcludeFilter"  model="model/" filter="com.openbravo.db.OpenbravoMetadataFilter"  input="sourcedata" object="${bbdd.object}" failonerror="false" verbosity="${bbdd.verbosity}"  basedir="${base.modules}/" dirFilter="*/src-db/database/model" datadir="${base.modules}/" dataFilter="*/src-db/database/sourcedata" force="${force}" onlyIfModified="${onlyIfModified}" output="${bbdd.outputscript}" />
   </target>
 
   <target name="export.database.structure">
+      <taskdef name="exportdatabase" classname="org.openbravo.ddlutils.task.ExportDatabase">
+        <classpath refid="runtime-classpath" />
+      </taskdef>
       <exportdatabase driver="${bbdd.driver}" url="${bbdd.owner.url}" user="${bbdd.user}" password="${bbdd.password}" excludeobjects="com.openbravo.db.OpenbravoExcludeFilter" model="model" moduledir="${base.modules}" verbosity="${bbdd.verbosity}" output="sourcedata" codeRevision="${code.revision}" userId="0" adminMode="true" propertiesFile="${base.config}/Openbravo.properties" force="${force}" validateModel="${validate.model}" testAPI="${isMinorVersion}" datasetList="AD,ADRD" rd="${rd}" />
       <antcall target="update.dbupdate.timestamp" />
   </target>
Binary file src-db/database/lib/dbsourcemanager.jar has changed