details: https://code.openbravo.com/erp/devel/pi/rev/09fcfec60e53 changeset: 27151:09fcfec60e53 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sun Jul 26 14:33:43 2015 +0200 summary: Issue 30426: Delete useless/broken OpenbravoDB eclipse project definition.
details: https://code.openbravo.com/erp/devel/pi/rev/749f6786ae20 changeset: 27152:749f6786ae20 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sun Jul 26 14:36:40 2015 +0200 summary: Fixed 30426: Cleanup src-db/build.xml to be only minimum needed. - remove 'doc' target as javadoc for those 4 unused classes is not useful - remove 'build' target calling doc as not referenced from main erp build.xml - Move content of build.jar target into jar target to simplify callign sequence from init compile, jar, build.jar to just init, compile, jar - Move explicit init target and move the 2 mkdir into compile itself to again simplify calling sequence further to compile, jar - Siplify classpath definition as it does not need anything from main erp source.path/lib details: https://code.openbravo.com/erp/devel/pi/rev/08f447bbcf10 changeset: 27153:08f447bbcf10 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sun Jul 26 14:55:07 2015 +0200 summary: Fixed 30427: Cleanup src-db/database/build-create.xml Remove unused preimport + postimport Remove prepare.database, inline content into caller Remove never parts of never completed DB2 port diffstat: src-db/.ant-targets-build.xml | 2 - src-db/.classpath | 7 ----- src-db/.project | 17 ------------ src-db/build.xml | 32 +++------------------- src-db/database/build-create.xml | 56 +-------------------------------------- 5 files changed, 7 insertions(+), 107 deletions(-) diffs (214 lines): diff -r 848b27695b57 -r 08f447bbcf10 src-db/.ant-targets-build.xml --- a/src-db/.ant-targets-build.xml Tue Jul 28 10:35:11 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -doc -docddl diff -r 848b27695b57 -r 08f447bbcf10 src-db/.classpath --- a/src-db/.classpath Tue Jul 28 10:35:11 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="lib/dbsourcemanager.jar"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff -r 848b27695b57 -r 08f447bbcf10 src-db/.project --- a/src-db/.project Tue Jul 28 10:35:11 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>OpenbravoDB</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff -r 848b27695b57 -r 08f447bbcf10 src-db/build.xml --- a/src-db/build.xml Tue Jul 28 10:35:11 2015 +0200 +++ b/src-db/build.xml Sun Jul 26 14:55:07 2015 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- ************************************************************************************ -* Copyright (C) 2001-2006 Openbravo S.L.U. +* Copyright (C) 2001-2015 Openbravo S.L.U. * Licensed under the Apache Software License version 2.0 * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software distributed @@ -14,31 +14,22 @@ <property name="build.db.classes" value="${basedir}/build/classes" /> <property name="build.db.lib" value="${basedir}/build/lib" /> - <property name="build.db.docs" value="${basedir}/docs" /> <property name="build.db.src" value="${basedir}/src" /> <path id="db.class.path"> <fileset dir="${basedir}/database/lib"> <include name="**/*.jar" /> </fileset> - <fileset dir="${base.lib}"> - <include name="**/*.jar" /> - </fileset> </path> - <target name="init"> - <mkdir dir="${build.db.classes}" /> - <mkdir dir="${build.db.lib}" /> - <mkdir dir="${build.db.docs}" /> - </target> - <target name="clean"> <delete dir="${build.db.classes}" failonerror="false" includeemptydirs="true" /> <delete dir="${build.db.lib}" failonerror="false" includeemptydirs="true" /> - <delete dir="${build.db.docs}" failonerror="false" includeemptydirs="true" /> </target> - <target name="compile" depends="init"> + <target name="compile"> + <mkdir dir="${build.db.classes}" /> + <mkdir dir="${build.db.lib}" /> <javac srcdir="${build.db.src}" destdir="${build.db.classes}" deprecation="on" encoding="UTF-8" fork="true" debug="true" debuglevel="lines,vars,source" includeantruntime="false"> <classpath refid="db.class.path" /> </javac> @@ -47,7 +38,7 @@ </copy> </target> - <target name="build.jar"> + <target name="jar" depends="compile"> <jar destfile="${build.db.lib}/dbmanager.jar"> <fileset dir="${build.db.classes}" /> <manifest> @@ -56,17 +47,4 @@ </jar> </target> - - <target name="doc" depends="init" description="Generate api"> - <javadoc packagenames="com.openbravo.*" sourcepath="${build.db.src}" destdir="${build.db.docs}" author="true" version="true" use="true" docencoding="UTF-8" encoding="UTF-8" failonerror="false" windowtitle="${ant.project.name}"> - <classpath refid="db.class.path" /> - </javadoc> - </target> - - <target name="jar" depends="compile, build.jar"> - </target> - - <target name="build" depends="jar, doc"> - </target> - </project> diff -r 848b27695b57 -r 08f447bbcf10 src-db/database/build-create.xml --- a/src-db/database/build-create.xml Tue Jul 28 10:35:11 2015 +0200 +++ b/src-db/database/build-create.xml Sun Jul 26 14:55:07 2015 +0200 @@ -12,7 +12,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2001-2011 Openbravo SLU + * All portions are Copyright (C) 2001-2015 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -48,10 +48,8 @@ <target name="create.database"> <antcall target="clean.database.${bbdd.rdbms}" /> - <antcall target="prepare.database" /> + <antcall target="${bbdd.rdbms}.structure" /> <antcall target="create.database.all" /> - <antcall target="database.preimport.${bbdd.rdbms}" /> - <antcall target="database.postimport.${bbdd.rdbms}" /> <antcall target="database.postcreate.${bbdd.rdbms}" /> <antcall target="update.dbupdate.timestamp" /> </target> @@ -98,31 +96,6 @@ </sql> </target> - <target name="clean.database.DB2"> - <sql driver="${bbdd.driver}" url="${bbdd.url}" userid="${bbdd.systemUser}" password="${bbdd.systemPassword}" onerror="continue" autocommit="true"> - <classpath> - <fileset dir="${base.lib}"> - <include name="**/*.jar"> - </include> - </fileset> - </classpath> - <transaction> - DROP TABLE ERRORSCH.ERRORTB; - </transaction> - </sql> - <sql driver="${bbdd.driver}" url="${bbdd.url}" userid="${bbdd.systemUser}" password="${bbdd.systemPassword}" onerror="continue" autocommit="true"> - <classpath> - <fileset dir="${base.lib}"> - <include name="**/*.jar"> - </include> - </fileset> - </classpath> - <transaction> - CALL SYSPROC.ADMIN_DROP_SCHEMA('${bbdd.user}', NULL, 'ERRORSCH', 'ERRORTB'); - </transaction> - </sql> - </target> - <target name="ORACLE.structure"> <sql driver="${bbdd.driver}" url="${bbdd.url}" userid="${bbdd.systemUser}" password="${bbdd.systemPassword}" delimiter="/"> <classpath> @@ -214,14 +187,6 @@ </sql> </target> - <target name="DB2.structure"> - </target> - - <target name="prepare.database"> - <antcall target="${bbdd.rdbms}.structure" /> - </target> - - <target name="create.database.all"> <createdatabase driver="${bbdd.driver}" url="${bbdd.owner.url}" user="${bbdd.user}" password="${bbdd.password}" model="model" object="${bbdd.object}" dropfirst="false" failonerror="false" verbosity="${bbdd.verbosity}" basedir="${base.db}/../.." modulesDir="${base.modules}/" dirFilter="*/src-db/database/model" filter="com.openbravo.db.OpenbravoMetadataFilter" input="src-db/database/sourcedata,modules/*/src-db/database/sourcedata"> </createdatabase> @@ -311,21 +276,6 @@ </sql> </target> - <target name="database.postcreate.DB2"> - </target> - - <target name="database.preimport.ORACLE"> - </target> - <target name="database.postimport.ORACLE"> - </target> - <target name="database.preimport.POSTGRE"> - </target> - <target name="database.postimport.POSTGRE"> - </target> - <target name="database.preimport.DB2"> - </target> - <target name="database.postimport.DB2"> - </target> <target name="database.poststructure.ORACLE"> <sql driver="${bbdd.driver}" url="${bbdd.owner.url}" userid="${bbdd.user}" password="${bbdd.password}" onerror="continue" autocommit="true"> <classpath> @@ -341,8 +291,6 @@ </target> <target name="database.poststructure.POSTGRE"> </target> - <target name="database.poststructure.DB2"> - </target> <target name="update.dbupdate.timestamp"> <sql driver="${bbdd.driver}" url="${bbdd.owner.url}" userid="${bbdd.user}" password="${bbdd.password}" onerror="continue" autocommit="true"> ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
