[validate] cleanup of the build.xml files
authorAntonio Moreno <antonio.moreno@openbravo.com>
Tue, 30 Mar 2010 17:34:16 +0200
changeset 6896 3a18b70881ad
parent 6895 a4d9cecda6bb
child 6897 d6f0fa8b4070
[validate] cleanup of the build.xml files
src-util/buildvalidation/build.xml
src-util/diagnostic/.classpath
src-util/diagnostic/.project
src-util/diagnostic/.settings/.jsdtscope
src-util/diagnostic/.settings/org.eclipse.jdt.core.prefs
src-util/diagnostic/.settings/org.eclipse.jst.common.project.facet.core.prefs
src-util/diagnostic/.settings/org.eclipse.wst.common.component
src-util/diagnostic/.settings/org.eclipse.wst.common.project.facet.core.xml
src-util/diagnostic/.settings/org.eclipse.wst.jsdt.ui.superType.container
src-util/diagnostic/.settings/org.eclipse.wst.jsdt.ui.superType.name
src-util/diagnostic/WebContent/META-INF/MANIFEST.MF
src-util/diagnostic/WebContent/WEB-INF/web.xml
src-util/diagnostic/build-create.xml
src-util/diagnostic/build.xml
src-util/diagnostic/build/.keep
src-util/diagnostic/check-ob-perms.sh
src-util/diagnostic/config/diagnostics.properties
src-util/diagnostic/config/log4j.properties
src-util/diagnostic/src/Test.java
src-util/diagnostic/src/org/openbravo/check/Check.java
src-util/diagnostic/src/org/openbravo/task/CheckDB.java
src-util/diagnostic/src/org/openbravo/task/CheckEnvironmentVariables.java
src-util/diagnostic/src/org/openbravo/task/CheckJVMVersion.java
src-util/diagnostic/src/org/openbravo/task/CheckMemory.java
src-util/diagnostic/src/org/openbravo/task/CheckTomcatAntExecution.java
src-util/diagnostic/src/org/openbravo/task/CheckTomcatFilePermissions.java
src-util/diagnostic/src/org/openbravo/task/CheckTomcatMemory.java
src-util/diagnostic/src/org/openbravo/task/CheckTomcatVersion.java
src-util/diagnostic/src/org/openbravo/task/CheckX.java
src-util/diagnostic/src/org/openbravo/task/CompareVersion.java
src-util/diagnostic/src/org/openbravo/utils/PropertiesManager.java
src-util/diagnostic/src/org/openbravo/utils/ServerConnection.java
src-util/diagnostic/src/org/openbravo/utils/Version.java
src-util/modulescript/build.xml
--- a/src-util/buildvalidation/build.xml	Tue Mar 30 17:24:56 2010 +0200
+++ b/src-util/buildvalidation/build.xml	Tue Mar 30 17:34:16 2010 +0200
@@ -13,36 +13,24 @@
  * and  limitations under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2005-2009 Openbravo SL 
+ * All portions are Copyright (C) 2010 Openbravo SL 
  * All Rights Reserved. 
  * Contributor(s): Openbravo S.L.
  ************************************************************************
 -->
-<!--
-List of targets:
 
-init: creates the needed folders.
-clean: removes all the created files and folders.
-sqlc: generates java files from xsql's files.
-compileSqlc: compile the java files generated from xsql's files.
-compile: compile the java files of the project.
-build.jar: generates the jar file in the lib folder.
-build: compile the project, including the xsql's files and generates the jar and doc.
-doc: generates the api for the project.
--->
 <project name="openbravo-pre-install" default="compile" basedir=".">
-  <property name="build.pre" value="${basedir}/build/classes" />
-  <property name="build.pre.sqlc" value="${basedir}/build/javasqlc" />
-  <property name="build.pre.src" value="${basedir}/src/" />
+  <property name="build.pre" value="build/classes" />
+  <property name="build.pre.sqlc" value="build/javasqlc" />
+  <property name="build.pre.src" value="src" />
   <property name="main.dir" value="${basedir}/../.." />
 
   <path id="pre.class.path">
-    <pathelement path="../src-core/build/classes" />
     <pathelement path="build/classes" />
     <dirset dir="${base.modules}">
       <include name="*/build/classes/" />
     </dirset>
-    <pathelement path="config"/>
+    <pathelement path="${base.src}"/>
     <fileset dir="${base.lib}">
       <include name="**/*.jar" />
     </fileset>
@@ -54,13 +42,14 @@
   <condition property="checkCore">
     <equals arg1="${module}" arg2="org.openbravo" />
   </condition>
+
   <target name="init">
     <mkdir dir="${build.pre}" />
     <mkdir dir="${build.pre.sqlc}" />
     <mkdir dir="${build.pre.sqlc}/src" />
-    <mkdir dir="${main.dir}/modules/${module}/build/" />
-    <mkdir dir="${main.dir}/modules/${module}/build/javasqlc" />
-    <mkdir dir="${main.dir}/modules/${module}/build/classes" />
+    <mkdir dir="${base.modules}/${module}/build/" />
+    <mkdir dir="${base.modules}/${module}/build/javasqlc" />
+    <mkdir dir="${base.modules}/${module}/build/classes" />
   </target>
 
   <target name="clean">
@@ -96,49 +85,21 @@
   <target name="compileSqlc" depends="sqlc">
   </target>
 
-
   <target name="javacCore" if="checkCore">
     <javac srcdir="${main.dir}" includes="src-util/buildvalidation/src/**/*.java" destdir="${build.pre}" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
       <classpath refid="pre.class.path" />
     </javac>
   </target>
+
   <target name="javacModule" unless="checkCore">
-    <javac srcdir="${main.dir}" includes="modules/${module}/src-util/buildvalidation/**/*.java" destdir="${main.dir}/modules/${module}/build/classes" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+    <javac srcdir="${main.dir}" includes="modules/${module}/src-util/buildvalidation/**/*.java" destdir="${base.modules}/${module}/build/classes" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
       <classpath refid="pre.class.path" />
     </javac>
   </target>
   
   <target name="compile" depends="checkmodule,compileSqlc,javacCore,javacModule">
-    <copy todir="${build.pre}" encoding="UTF-8">
-      <fileset dir="${build.pre.src}" includes="**/*xml" />
-      <fileset dir="${build.pre.src}" includes="**/*html" />
-    </copy>
-    <copy todir="${build.pre}" encoding="UTF-8">
-      <fileset dir="${base.modules}">
-          <include name="*/src-buildvalidation/**/*" />
-          <exclude name="*/src-buildvalidation/**/*.java" />
-          <exclude name="*/src-buildvalidation/**/*.xsql" />
-      </fileset>
-      <mapper type="regexp" from="(.*\${file.separator}src-buildvalidation/)(.*)" to="\2" />
-    </copy>
   </target>
 
-  <target name="build.jar">
-    <jar destfile="${build.pre.lib}/openbravo-pre.jar">
-      <fileset dir="${build.pre}" />
-      <manifest>
-        <attribute name="Built-By" value="Openbravo S.L." />
-        <!--section name="common/class1.class">
-        <attribute name="Sealed" value="false"/>
-      </section-->
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="build" depends="compile, build.jar">
-  </target>
-
-  
   <target name="validate" >
     <taskdef name="ValidationHandler" classname="org.openbravo.buildvalidation.ValidationHandler" onerror="failall">
       <classpath refid="pre.class.path" />
--- a/src-util/modulescript/build.xml	Tue Mar 30 17:24:56 2010 +0200
+++ b/src-util/modulescript/build.xml	Tue Mar 30 17:34:16 2010 +0200
@@ -13,36 +13,24 @@
  * and  limitations under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2005-2009 Openbravo SL 
+ * All portions are Copyright (C) 2010 Openbravo SL 
  * All Rights Reserved. 
  * Contributor(s): Openbravo S.L.
  ************************************************************************
 -->
-<!--
-List of targets:
 
-init: creates the needed folders.
-clean: removes all the created files and folders.
-sqlc: generates java files from xsql's files.
-compileSqlc: compile the java files generated from xsql's files.
-compile: compile the java files of the project.
-build.jar: generates the jar file in the lib folder.
-build: compile the project, including the xsql's files and generates the jar and doc.
-doc: generates the api for the project.
--->
 <project name="openbravo-pre-install" default="compile" basedir=".">
-  <property name="build.pre" value="${basedir}/build/classes" />
-  <property name="build.pre.sqlc" value="${basedir}/build/javasqlc" />
-  <property name="build.pre.src" value="${basedir}/src/" />
+  <property name="build.pre" value="build/classes" />
+  <property name="build.pre.sqlc" value="build/javasqlc" />
+  <property name="build.pre.src" value="src" />
   <property name="main.dir" value="${basedir}/../.." />
 
   <path id="pre.class.path">
-    <pathelement path="../src-core/build/classes" />
     <pathelement path="build/classes" />
     <dirset dir="${base.modules}">
       <include name="*/build/classes/" />
     </dirset>
-    <pathelement path="config"/>
+    <pathelement path="${base.src}"/>
     <fileset dir="${base.lib}">
       <include name="**/*.jar" />
     </fileset>
@@ -54,13 +42,14 @@
   <condition property="checkCore">
     <equals arg1="${module}" arg2="org.openbravo" />
   </condition>
+
   <target name="init">
     <mkdir dir="${build.pre}" />
     <mkdir dir="${build.pre.sqlc}" />
     <mkdir dir="${build.pre.sqlc}/src" />
-    <mkdir dir="${main.dir}/modules/${module}/build/" />
-    <mkdir dir="${main.dir}/modules/${module}/build/javasqlc" />
-    <mkdir dir="${main.dir}/modules/${module}/build/classes" />
+    <mkdir dir="${base.modules}/${module}/build/" />
+    <mkdir dir="${base.modules}/${module}/build/javasqlc" />
+    <mkdir dir="${base.modules}/${module}/build/classes" />
   </target>
 
   <target name="clean">