details: https://code.openbravo.com/erp/devel/pi/rev/775ccd9fca46 changeset: 28828:775ccd9fca46 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Mar 21 09:22:39 2016 +0100 summary: Fixes issue 32460: Improves log. Supports true, yes and on literals
If modulescripts are skipped, it is shown in hte log. Also now it is possible to use 'yes', 'true' and 'on' as the property value to specify that the modulescripts should be exec uted, as it is defined in the standard (see [1]). Also the execute.modulescripts property is now defined only once in the build.xml. [1] https://ant.apache.org/manual/develop.html diffstat: src-db/database/build.xml | 17 +---------------- src-db/database/lib/dbsourcemanager.jar | 0 2 files changed, 1 insertions(+), 16 deletions(-) diffs (50 lines): diff -r c5a9d7bf8b79 -r 775ccd9fca46 src-db/database/build.xml --- a/src-db/database/build.xml Fri Mar 18 13:01:38 2016 +0100 +++ b/src-db/database/build.xml Mon Mar 21 09:22:39 2016 +0100 @@ -28,6 +28,7 @@ <project name="openbravo" basedir="."> <property environment="env" /> <property name="forcedRecreation" value=""/> + <property name="execute.modulescripts" value="true"/> <condition property="bbdd.owner.url" value="${bbdd.url}/${bbdd.sid}" else="${bbdd.url}"> <and> <equals arg1="${bbdd.rdbms}" arg2="POSTGRE" /> @@ -71,11 +72,6 @@ </target> <target name="update.database"> - <condition property="execute.modulescripts" value="true"> - <not> - <isset property="execute.modulescripts"/> - </not> - </condition> <alterdatabasedataall 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}" forcedRecreation="${forcedRecreation}" executeModuleScripts="${execute.modulescripts}"/> <antcall target="database.postupdate.${bbdd.rdbms}" /> <antcall target="update.dbupdate.timestamp" /> @@ -83,12 +79,6 @@ <target name="update.database.java"> - <condition property="execute.modulescripts" value="yes"> - <not> - <isset property="execute.modulescripts"/> - </not> - </condition> - <echo message="execute.modulescripts :${execute.modulescripts}"/> <java classname="org.openbravo.ddlutils.task.AlterDatabaseJava" failonerror="true" fork="true" maxmemory="${build.maxmemory}"> <arg value="${bbdd.driver}"/> <arg value="${bbdd.owner.url}"/> @@ -179,11 +169,6 @@ </target> <target name="import.sample.data"> - <condition property="execute.modulescripts" value="true"> - <not> - <isset property="execute.modulescripts"/> - </not> - </condition> <taskdef name="importsampledata" classname="org.openbravo.ddlutils.task.ImportSampledata"> <classpath refid="runtime-classpath" /> </taskdef> diff -r c5a9d7bf8b79 -r 775ccd9fca46 src-db/database/lib/dbsourcemanager.jar Binary file src-db/database/lib/dbsourcemanager.jar has changed ------------------------------------------------------------------------------ Transform Data into Opportunity. Accelerate data analysis in your applications with Intel Data Analytics Acceleration Library. Click to learn more. http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140 _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
