Fixes issue 6366: compile.complete does not clean WebContent
authorJuan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
Sat, 06 Dec 2008 15:57:16 +0000
changeset 2242 1cc506109395
parent 2241 5240741744d8
child 2243 a659cdde462a
Fixes issue 6366: compile.complete does not clean WebContent
build.xml
src-diagnostics/src/org/openbravo/task/CheckDB.java
src/build.xml
--- a/build.xml	Sat Dec 06 00:51:44 2008 +0000
+++ b/build.xml	Sat Dec 06 15:57:16 2008 +0000
@@ -553,4 +553,29 @@
 	<target name="test">
 		  <echo message="testing..."/>
   </target>
+
+  <condition property="shell.extension" value="bin" else="exe">
+    <and>
+      <os family="unix"/>
+    </and>
+  </condition>
+
+  <target name="setup">
+  <echo message="Operating system: ${os.name}"/>
+    <echo message="Architecture: ${os.arch}"/>
+    <echo message="Downloading setup tool..."/>
+  <!--  <get src="http://dev.openbravo.com/svn/packaging/setup/trunk/output/setup-properties-linux.bin" dest="help/index.html"/>-->
+  <echo message="Go to config and run the setup tool"/>
+
+  </target>
+
+  <target name="setup.noos"  description="Setup properties">
+    <input message="Operating system? (linux, freebsd6, hpux, openbsd3, osx, solaris, windows)"
+      addproperty="OS"
+      defaultvalue="linux"/>
+    <echo message="Operating system: ${OS}"/>
+  </target>
+
+
+
 </project>
--- a/src-diagnostics/src/org/openbravo/task/CheckDB.java	Sat Dec 06 00:51:44 2008 +0000
+++ b/src-diagnostics/src/org/openbravo/task/CheckDB.java	Sat Dec 06 15:57:16 2008 +0000
@@ -23,6 +23,7 @@
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
@@ -194,6 +195,13 @@
                 try {
                     st = connSystem.prepareStatement("SELECT uuid_generate_v1()");
                     result = st.executeQuery();
+                    ResultSetMetaData md = result.getMetaData();
+                    int count = md.getColumnCount();
+                    while (result.next()) {
+                      for (int i=1; i<=count; i++) {
+                        System.out.println(result.getString(i));
+                      }
+                    }
                     result.close();
                     st.close();
                 } catch (final Exception e) { 
--- a/src/build.xml	Sat Dec 06 00:51:44 2008 +0000
+++ b/src/build.xml	Sat Dec 06 15:57:16 2008 +0000
@@ -104,16 +104,20 @@
 		</java>
 	</target>
 
-	<target name="clean" depends="trl.clean">
-		<property name="complete" value="true" />
-		<delete includeEmptyDirs="true" failonerror="false">
-			<fileset dir="${base.design}" />
-			<fileset dir="${build}" />
-			<fileset dir="${build.docs}" />
-			<fileset dir="${build.AD}" />
-			<fileset dir="${build.sqlc}" />
-		</delete>
-	</target>
+  <target name="clean" depends="trl.clean">
+    <property name="complete" value="true" />
+    <delete includeEmptyDirs="true" failonerror="false">
+      <fileset dir="${base.design}" />
+      <fileset dir="${build}" />
+      <fileset dir="${build.docs}" />
+      <fileset dir="${build.AD}" />
+      <fileset dir="${build.sqlc}" />
+      <fileset dir="${base.context}">
+        <exclude name=".svn" />
+        <exclude name="META-INF/MANIFEST.MF" />
+      </fileset>
+    </delete>
+  </target>
 
   <target name="sqlc" depends="copy.srcClient">
     <java classname="org.openbravo.data.Sqlc" fork="yes" jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}">