midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement Validator for beforeSaveProperties - ID: 2373679 

Joined build of base and looks
This commit is contained in:
Carlos Ruiz 2008-12-08 16:32:44 +00:00
parent e0558c54a6
commit 2ea263b989
7 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
JasperReports/build.xml
View File

@ -62,7 +62,6 @@
<pathelement path="../base/Base.jar"/> <pathelement path="../base/Base.jar"/>
<pathelement path="../extend/Extend.jar"/> <pathelement path="../extend/Extend.jar"/>
<pathelement path="../lib/CSTools.jar"/> <pathelement path="../lib/CSTools.jar"/>
<pathelement path="../looks/CLooks.jar"/>
<pathelement path="../lib/oracle.jar"/> <pathelement path="../lib/oracle.jar"/>
<pathelement path="../JasperReportsTools/lib/jasperreports-3.0.0.jar"/> <pathelement path="../JasperReportsTools/lib/jasperreports-3.0.0.jar"/>
<pathelement path="../JasperReportsTools/lib/commons-digester-1.7.jar"/> <pathelement path="../JasperReportsTools/lib/commons-digester-1.7.jar"/>

18
base/build.xml
View File

@ -13,6 +13,7 @@
<!-- set global properties for this build --> <!-- set global properties for this build -->
<property name="src" value="src"/> <property name="src" value="src"/>
<property name="looksSrc" value="../looks/src"/>
<property name="build.dir" value="build"/> <property name="build.dir" value="build"/>
<property name="dist.dir" value="."/> <property name="dist.dir" value="."/>
<property name="jar.path" value="../lib"/> <property name="jar.path" value="../lib"/>
@ -26,7 +27,6 @@
<pathelement path="${jar.path}/postgresql.jar"/> <pathelement path="${jar.path}/postgresql.jar"/>
<pathelement path="${jar.path}/jboss.jar"/> <pathelement path="${jar.path}/jboss.jar"/>
<pathelement path="${jar.path}/glassfish.jar"/> <pathelement path="${jar.path}/glassfish.jar"/>
<pathelement path="../looks/CLooks.jar"/>
<pathelement path="../tools/lib/junit.jar"/> <pathelement path="../tools/lib/junit.jar"/>
<pathelement path="../tools/lib/j2ee.jar"/> <pathelement path="../tools/lib/j2ee.jar"/>
<pathelement path="../tools/lib/jnlp.jar"/> <pathelement path="../tools/lib/jnlp.jar"/>
@ -54,6 +54,7 @@
<!-- compile the java code from ${src} into ${build.dir} --> <!-- compile the java code from ${src} into ${build.dir} -->
<javac fork="true" destdir="${build.dir}" deprecation="on" debug="on" memoryinitialsize="512m" memorymaximumsize="512m"> <javac fork="true" destdir="${build.dir}" deprecation="on" debug="on" memoryinitialsize="512m" memorymaximumsize="512m">
<src path="${src}"/> <src path="${src}"/>
<src path="${looksSrc}"/>
<src path="../glassfishfacet/src"/> <src path="../glassfishfacet/src"/>
<src path="../jbossfacet/src"/> <src path="../jbossfacet/src"/>
<classpath refid="project.class.path"/> <classpath refid="project.class.path"/>
@ -72,6 +73,20 @@
<exclude name="**/package.html"/> <exclude name="**/package.html"/>
</fileset> </fileset>
</copy> </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 login.conf -->
<copy todir="${build.dir}"> <copy todir="${build.dir}">
@ -95,7 +110,6 @@
<pathelement path="${classpath}"/> <pathelement path="${classpath}"/>
<pathelement path="${jar.path}/CCTools.jar"/> <pathelement path="${jar.path}/CCTools.jar"/>
<pathelement path="../base/build"/> <pathelement path="../base/build"/>
<pathelement path="../looks/CLooks.jar"/>
<pathelement path="../tools/lib/junit.jar"/> <pathelement path="../tools/lib/junit.jar"/>
<pathelement path="../adempiere/Adempiere/lib/Adempiere.jar" /> <pathelement path="../adempiere/Adempiere/lib/Adempiere.jar" />
<pathelement path="../adempiere/Adempiere/lib/jboss.jar" /> <pathelement path="../adempiere/Adempiere/lib/jboss.jar" />

3
client/build.xml
View File

@ -29,7 +29,6 @@
<pathelement path="../lib/patches.jar"/> <pathelement path="../lib/patches.jar"/>
<pathelement path="../lib/jcommon-1.0.14.jar"/> <pathelement path="../lib/jcommon-1.0.14.jar"/>
<pathelement path="../lib/jfreechart-1.0.11.jar"/> <pathelement path="../lib/jfreechart-1.0.11.jar"/>
<pathelement path="../looks/CLooks.jar"/>
<pathelement path="../extend/Extend.jar"/> <pathelement path="../extend/Extend.jar"/>
<pathelement path="../tools/lib/j2ee.jar"/> <pathelement path="../tools/lib/j2ee.jar"/>
<pathelement path="../tools/lib/swinglabs-0.8.0.jar"/> <pathelement path="../tools/lib/swinglabs-0.8.0.jar"/>
@ -49,7 +48,6 @@
targetfile="${dist.dir}/${jar.name}.jar"> targetfile="${dist.dir}/${jar.name}.jar">
<srcfiles dir="${src}" includes="**/*.java"/> <srcfiles dir="${src}" includes="**/*.java"/>
<srcfiles dir="..\base" includes="Base.jar"/> <srcfiles dir="..\base" includes="Base.jar"/>
<srcfiles dir="..\looks" includes="CLooks.jar"/>
<srcfiles dir="..\extend" includes="Extend.jar"/> <srcfiles dir="..\extend" includes="Extend.jar"/>
</uptodate> </uptodate>
</target> </target>
@ -99,7 +97,6 @@
duplicate="preserve" duplicate="preserve"
index="yes"> index="yes">
<fileset dir="../base/build" /> <fileset dir="../base/build" />
<fileset dir="../looks/build" />
<fileset dir="../extend/build" /> <fileset dir="../extend/build" />
<zipgroupfileset file="../JasperReports/CompiereJasper.jar"/> <zipgroupfileset file="../JasperReports/CompiereJasper.jar"/>
<manifest> <manifest>

2
extend/build.xml
View File

@ -23,7 +23,6 @@
<pathelement path="${jar.path}/CCTools.jar"/> <pathelement path="${jar.path}/CCTools.jar"/>
<pathelement path="${jar.path}/jboss.jar"/> <pathelement path="${jar.path}/jboss.jar"/>
<pathelement path="../base/build"/> <pathelement path="../base/build"/>
<pathelement path="../looks/CLooks.jar"/>
<pathelement path="../tools/lib/junit.jar"/> <pathelement path="../tools/lib/junit.jar"/>
<pathelement path="../adempiere/Adempiere/lib/Adempiere.jar" /> <pathelement path="../adempiere/Adempiere/lib/Adempiere.jar" />
</path> </path>
@ -77,7 +76,6 @@
<pathelement path="${classpath}"/> <pathelement path="${classpath}"/>
<pathelement path="${jar.path}/CCTools.jar"/> <pathelement path="${jar.path}/CCTools.jar"/>
<pathelement path="../base/build"/> <pathelement path="../base/build"/>
<pathelement path="../looks/CLooks.jar"/>
<pathelement path="../tools/lib/junit.jar"/> <pathelement path="../tools/lib/junit.jar"/>
<pathelement path="../adempiere/Adempiere/lib/Adempiere.jar" /> <pathelement path="../adempiere/Adempiere/lib/Adempiere.jar" />
<pathelement path="../adempiere/Adempiere/lib/jboss.jar" /> <pathelement path="../adempiere/Adempiere/lib/jboss.jar" />

4
looks/src/org/compiere/util/Ini.java
View File

@ -44,9 +44,7 @@ import javax.jnlp.UnavailableServiceException;
import org.adempiere.plaf.AdempiereLookAndFeel; import org.adempiere.plaf.AdempiereLookAndFeel;
import org.adempiere.plaf.AdempiereThemeInnova; import org.adempiere.plaf.AdempiereThemeInnova;
/* FR2373679 Validator for beforeSaveProperties
import org.compiere.model.ModelValidationEngine; import org.compiere.model.ModelValidationEngine;
*/
/** /**
* Load & Save INI Settings fopm property file * Load & Save INI Settings fopm property file
@ -239,12 +237,10 @@ public final class Ini implements Serializable
*/ */
public static void saveProperties (boolean tryUserHome) public static void saveProperties (boolean tryUserHome)
{ {
/* FR2373679 Validator for beforeSaveProperties
if (Ini.isClient() && DB.isConnected()) { if (Ini.isClient() && DB.isConnected()) {
// Call ModelValidators beforeSaveProperties // Call ModelValidators beforeSaveProperties
ModelValidationEngine.get().beforeSaveProperties(); ModelValidationEngine.get().beforeSaveProperties();
} }
*/
if (isWebStartClient()) if (isWebStartClient())
{ {

3
utils_dev/build.xml
View File

@ -18,7 +18,6 @@
</target> </target>
<target name="jar" depends="init"> <target name="jar" depends="init">
<ant inheritAll="false" dir="tools"/> <ant inheritAll="false" dir="tools"/>
<ant inheritAll="false" dir="looks"/>
<ant inheritAll="false" dir="base"/> <ant inheritAll="false" dir="base"/>
<ant inheritAll="false" dir="extend"/> <ant inheritAll="false" dir="extend"/>
<ant inheritAll="false" dir="client"/> <ant inheritAll="false" dir="client"/>
@ -37,7 +36,6 @@
</target> </target>
<target name="clean"> <target name="clean">
<ant inheritAll="false" dir="tools" target="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="base" target="clean"/>
<ant inheritAll="false" dir="extend" target="clean"/> <ant inheritAll="false" dir="extend" target="clean"/>
<ant inheritAll="false" dir="JasperReports" target="clean"/> <ant inheritAll="false" dir="JasperReports" target="clean"/>
@ -58,7 +56,6 @@
</target> </target>
<target name="update-adempiere-jar" depends="init"> <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="base" target="compile"/>
<ant inheritAll="false" dir="extend" target="compile"/> <ant inheritAll="false" dir="extend" target="compile"/>
<ant inheritAll="false" dir="client"/> <ant inheritAll="false" dir="client"/>

1
zkwebui/build.xml
View File

@ -25,7 +25,6 @@
<pathelement location="${basedir}/WEB-INF/classes"/> <pathelement location="${basedir}/WEB-INF/classes"/>
<pathelement location="${basedir}/WEB-INF/src"/> <pathelement location="${basedir}/WEB-INF/src"/>
<pathelement location="${Adempiere.dir}/../looks/build"/>
<pathelement location="${Adempiere.dir}/../base/build"/> <pathelement location="${Adempiere.dir}/../base/build"/>
<pathelement location="${Adempiere.dir}/../client/build"/> <pathelement location="${Adempiere.dir}/../client/build"/>
<pathelement location="${Adempiere.dir}/../JasperReports/build"/> <pathelement location="${Adempiere.dir}/../JasperReports/build"/>