From 2ea263b98914d62f70b9557f1866ff522bb9c8a3 Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Mon, 8 Dec 2008 16:32:44 +0000
Subject: [PATCH] Implement Validator for beforeSaveProperties - ID: 2373679
 Joined build of base and looks

---
 JasperReports/build.xml              |  1 -
 base/build.xml                       | 34 ++++++++++++++++++++--------
 client/build.xml                     |  3 ---
 extend/build.xml                     |  2 --
 looks/src/org/compiere/util/Ini.java |  4 ----
 utils_dev/build.xml                  |  5 +---
 zkwebui/build.xml                    |  3 +--
 7 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/JasperReports/build.xml b/JasperReports/build.xml
index a6329073be..88fd0bc16b 100644
--- a/JasperReports/build.xml
+++ b/JasperReports/build.xml
@@ -62,7 +62,6 @@
 	      <pathelement path="../base/Base.jar"/>
 	      <pathelement path="../extend/Extend.jar"/>
 	      <pathelement path="../lib/CSTools.jar"/>
-	      <pathelement path="../looks/CLooks.jar"/>
 	      <pathelement path="../lib/oracle.jar"/>
 		  <pathelement path="../JasperReportsTools/lib/jasperreports-3.0.0.jar"/>
 	      <pathelement path="../JasperReportsTools/lib/commons-digester-1.7.jar"/>
diff --git a/base/build.xml b/base/build.xml
index 88c6f0ceb1..066d476849 100644
--- a/base/build.xml
+++ b/base/build.xml
@@ -13,6 +13,7 @@
 
   <!-- set global properties for this build -->
   <property name="src" value="src"/>
+  <property name="looksSrc" value="../looks/src"/>
   <property name="build.dir" value="build"/>
   <property name="dist.dir" value="."/>
   <property name="jar.path" value="../lib"/>
@@ -25,8 +26,7 @@
     <pathelement path="${jar.path}/oracle.jar"/>
     <pathelement path="${jar.path}/postgresql.jar"/>
     <pathelement path="${jar.path}/jboss.jar"/>
-  	<pathelement path="${jar.path}/glassfish.jar"/>
-    <pathelement path="../looks/CLooks.jar"/>
+    <pathelement path="${jar.path}/glassfish.jar"/>
     <pathelement path="../tools/lib/junit.jar"/>
     <pathelement path="../tools/lib/j2ee.jar"/>
     <pathelement path="../tools/lib/jnlp.jar"/>
@@ -54,6 +54,7 @@
     <!-- compile the java code from ${src} into ${build.dir} -->
     <javac fork="true" destdir="${build.dir}" deprecation="on" debug="on" memoryinitialsize="512m" memorymaximumsize="512m">
       <src path="${src}"/>
+      <src path="${looksSrc}"/>
       <src path="../glassfishfacet/src"/>
       <src path="../jbossfacet/src"/>
       <classpath refid="project.class.path"/>
@@ -72,13 +73,27 @@
         <exclude name="**/package.html"/>
       </fileset>
     </copy>
-  	
-  	<!-- copy login.conf -->
-  	<copy todir="${build.dir}">
-  	    <fileset dir="../glassfishfacet/src">
-  	    	<include name="**/glassfish/login.conf"/>
-  		</fileset>
-  	</copy>
+    <!-- copy all image & sound files from looksSrc to the build directory -->
+    <copy todir="${build.dir}">
+      <fileset dir="${looksSrc}">
+        <include name="**/images/*"/>
+        <include name="**/*.gif"/>
+        <include name="**/*.jpg"/>
+        <include name="**/*.png"/>
+        <include name="**/*.wav"/>
+        <include name="**/*.htm"/>
+        <include name="**/*.html"/>
+        <include name="**/*.properties"/>
+        <exclude name="**/package.html"/>
+      </fileset>
+    </copy>
+
+    <!-- copy login.conf -->
+    <copy todir="${build.dir}">
+      <fileset dir="../glassfishfacet/src">
+      	<include name="**/glassfish/login.conf"/>
+  	</fileset>
+    </copy>
   </target>
 
 
@@ -95,7 +110,6 @@
     <pathelement path="${classpath}"/>
     <pathelement path="${jar.path}/CCTools.jar"/>
     <pathelement path="../base/build"/>
-    <pathelement path="../looks/CLooks.jar"/>
     <pathelement path="../tools/lib/junit.jar"/>
     <pathelement path="../adempiere/Adempiere/lib/Adempiere.jar" />
     <pathelement path="../adempiere/Adempiere/lib/jboss.jar" />
diff --git a/client/build.xml b/client/build.xml
index 34bef43305..efbf72895b 100644
--- a/client/build.xml
+++ b/client/build.xml
@@ -29,7 +29,6 @@
     <pathelement path="../lib/patches.jar"/>
     <pathelement path="../lib/jcommon-1.0.14.jar"/>
     <pathelement path="../lib/jfreechart-1.0.11.jar"/>
-    <pathelement path="../looks/CLooks.jar"/>
     <pathelement path="../extend/Extend.jar"/>
     <pathelement path="../tools/lib/j2ee.jar"/>
   	<pathelement path="../tools/lib/swinglabs-0.8.0.jar"/>  	
@@ -49,7 +48,6 @@
 		targetfile="${dist.dir}/${jar.name}.jar">
       <srcfiles dir="${src}" includes="**/*.java"/>
       <srcfiles dir="..\base" includes="Base.jar"/>
-      <srcfiles dir="..\looks" includes="CLooks.jar"/>
       <srcfiles dir="..\extend" includes="Extend.jar"/>
     </uptodate>
   </target>
@@ -99,7 +97,6 @@
 	  duplicate="preserve"
 	  index="yes">
 	  <fileset dir="../base/build" />
-	  <fileset dir="../looks/build" />
 	  <fileset dir="../extend/build" />
       <zipgroupfileset file="../JasperReports/CompiereJasper.jar"/>
 	  <manifest>
diff --git a/extend/build.xml b/extend/build.xml
index 26c9edf5d0..5d747d7724 100644
--- a/extend/build.xml
+++ b/extend/build.xml
@@ -23,7 +23,6 @@
     <pathelement path="${jar.path}/CCTools.jar"/>
 	<pathelement path="${jar.path}/jboss.jar"/>
     <pathelement path="../base/build"/>
-    <pathelement path="../looks/CLooks.jar"/>
     <pathelement path="../tools/lib/junit.jar"/>
     <pathelement path="../adempiere/Adempiere/lib/Adempiere.jar" />
   </path>
@@ -77,7 +76,6 @@
     <pathelement path="${classpath}"/>
     <pathelement path="${jar.path}/CCTools.jar"/>
     <pathelement path="../base/build"/>
-    <pathelement path="../looks/CLooks.jar"/>
     <pathelement path="../tools/lib/junit.jar"/>
     <pathelement path="../adempiere/Adempiere/lib/Adempiere.jar" />
     <pathelement path="../adempiere/Adempiere/lib/jboss.jar" />
diff --git a/looks/src/org/compiere/util/Ini.java b/looks/src/org/compiere/util/Ini.java
index fc95c15ffa..356c277c57 100644
--- a/looks/src/org/compiere/util/Ini.java
+++ b/looks/src/org/compiere/util/Ini.java
@@ -44,9 +44,7 @@ import javax.jnlp.UnavailableServiceException;
 
 import org.adempiere.plaf.AdempiereLookAndFeel;
 import org.adempiere.plaf.AdempiereThemeInnova;
-/* FR2373679 Validator for beforeSaveProperties
 import org.compiere.model.ModelValidationEngine;
-*/
 
 /**
  *	Load & Save INI Settings fopm property file
@@ -239,12 +237,10 @@ public final class Ini implements Serializable
 	 */
 	public static void saveProperties (boolean tryUserHome)
 	{
-		/* FR2373679 Validator for beforeSaveProperties
 		if (Ini.isClient() && DB.isConnected()) {
 			// Call ModelValidators beforeSaveProperties
 			ModelValidationEngine.get().beforeSaveProperties();
 		}
-		*/
 
 		if (isWebStartClient())
 		{
diff --git a/utils_dev/build.xml b/utils_dev/build.xml
index 8c1cb29154..ad3347605d 100644
--- a/utils_dev/build.xml
+++ b/utils_dev/build.xml
@@ -18,7 +18,6 @@
 	</target>
 	<target name="jar" depends="init">
 		<ant inheritAll="false" dir="tools"/>
-		<ant inheritAll="false" dir="looks"/>
 		<ant inheritAll="false" dir="base"/>
 		<ant inheritAll="false" dir="extend"/>
 		<ant inheritAll="false" dir="client"/>
@@ -37,7 +36,6 @@
 	</target>	
 	<target name="clean">
 		<ant inheritAll="false" dir="tools" target="clean"/>
-		<ant inheritAll="false" dir="looks" target="clean"/>
 		<ant inheritAll="false" dir="base" target="clean"/>
 		<ant inheritAll="false" dir="extend" target="clean"/>
 		<ant inheritAll="false" dir="JasperReports" target="clean"/>
@@ -58,7 +56,6 @@
   </target>
 
     <target name="update-adempiere-jar" depends="init">
-		<ant inheritAll="false" dir="looks" target="looksCompile"/>
 		<ant inheritAll="false" dir="base" target="compile"/>
 		<ant inheritAll="false" dir="extend" target="compile"/>
 		<ant inheritAll="false" dir="client"/>
@@ -175,4 +172,4 @@
 	<!-- ================================================ -->
 	<target name="transfer" depends="complete" description="Transfer to Distribution media">
 	</target>
-</project>
\ No newline at end of file
+</project>
diff --git a/zkwebui/build.xml b/zkwebui/build.xml
index 3600207fdc..d00e46153c 100644
--- a/zkwebui/build.xml
+++ b/zkwebui/build.xml
@@ -25,7 +25,6 @@
 	  	<pathelement location="${basedir}/WEB-INF/classes"/>
 	  	<pathelement location="${basedir}/WEB-INF/src"/>
 		
-		<pathelement location="${Adempiere.dir}/../looks/build"/>
 		<pathelement location="${Adempiere.dir}/../base/build"/>
 		<pathelement location="${Adempiere.dir}/../client/build"/>
 		<pathelement location="${Adempiere.dir}/../JasperReports/build"/>
@@ -82,4 +81,4 @@
 		
 		<copy file="${dist.dir}/${war.name}.war" tofile="../lib/${war.name}.war"/>
 	</target>
-</project>
\ No newline at end of file
+</project>