OFBiz › OFBiz - Commits

svn commit: r889851 [14/17] - in /ofbiz/branches/addbirt: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/data/helpdata/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/fin...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

doogie-3

svn commit: r889851 [14/17] - in /ofbiz/branches/addbirt: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/data/helpdata/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/fin...

Propchange: ofbiz/branches/addbirt/applications/workeffort/config/WorkEffortUiLabels.xml
------------------------------------------------------------------------------
svn:eol-style = native

Modified: ofbiz/branches/addbirt/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/build.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/build.xml (original)
+++ ofbiz/branches/addbirt/build.xml Fri Dec 11 23:11:39 2009
@@ -22,7 +22,7 @@
<property name="site.dir" value="../site"/>
<property name="memory.initial.param" value="-Xms128M"/>
<property name="memory.max.param" value="-Xmx512M"/>
- <property name="memory.maxpermsize.param" value="-XX:MaxPermSize=128m"/>
+ <property name="memory.maxpermsize.param" value="-XX:MaxPermSize=128m"/>

<available file="applications/build.xml" property="applications.present"/>
<available file="specialpurpose/build.xml" property="specialpurpose.present"/>
@@ -44,13 +44,13 @@


<target name="refresh"
- description="Clean all and rebuild">
+ description="Clean all and rebuild">
<antcall target="clean-all"/>
<antcall target="build"/>
</target>

<target name="clean-all"
- description="Clean all DB, Catalina and caches data, logs, and runtime subdirectories and all specific files like .rej, .orig">
+ description="Clean all DB, Catalina and caches data, logs, and runtime subdirectories and all specific files like .rej, .orig">
<antcall target="clean-data"/>
<antcall target="clean-logs"/>
<antcall target="clean-output"/>
@@ -63,7 +63,7 @@
</target>

<target name="clean-data"
- description="Clean all DB data (Derby and HSQL) under runtime/data">
+ description="Clean all DB data (Derby and HSQL) under runtime/data">
<subant target="clean-data">
<filelist dir="." files="framework/build.xml"/>
</subant>
@@ -72,56 +72,56 @@
</target>

<target name="clean-logs"
- description="Clean all logs in runtime/logs">
+ description="Clean all logs in runtime/logs">
<subant target="clean-logs">
<filelist dir="." files="framework/build.xml"/>
</subant>
</target>

<target name="clean-output"
- description="Clean runtime/output directory">
+ description="Clean runtime/output directory">
<subant target="clean-output">
<filelist dir="." files="framework/build.xml"/>
</subant>
</target>

<target name="clean-xtra"
- description="Clean all other files like .rej, .orig, etc.">
+ description="Clean all other files like .rej, .orig, etc.">
<delete verbose="on">
<fileset dir="." includes="**/.nbattrs,**/*~,**/.#*,**/.DS_Store,**/*.rej,**/*.orig"/>
</delete>
</target>

<target name="clean-catalina"
- description="Clean Catalina data in runtime/catalina/work">
+ description="Clean Catalina data in runtime/catalina/work">
<subant target="clean-catalina">
<filelist dir="." files="framework/build.xml"/>
</subant>
</target>

<target name="clean-cache"
- description="Clean the UtilCache file if errors found with old objects in the cache (Java runtime error something like 'local class incompatible')">
+ description="Clean the UtilCache file if errors found with old objects in the cache (Java runtime error something like 'local class incompatible')">
<property file="framework/base/config/cache.properties"/>
<echo message="NOTICE: deleting ${cache.file.store}.db"/>
<delete file="${cache.file.store}.db" verbose="true"/>
</target>

<target name="clean-tempfiles"
- description="Remove files located in runtime/tempfiles (captcha, etc...)">
+ description="Remove files located in runtime/tempfiles (captcha, etc...)">
<subant target="clean-tempfiles">
<filelist dir="." files="framework/build.xml"/>
</subant>
</target>

<target name="download-selenium"
- description="Download the selenium files">
+ description="Download the selenium files">
<subant target="install-seleniumxml">
<filelist dir="." files="framework/testtools/build.xml"/>
</subant>
</target>

<target name="download-PG-JDBC"
- description="Download the PostgreSQL JDBC driver file">
+ description="Download the PostgreSQL JDBC driver file">
<subant target="install-PG-JDBC">
<filelist dir="." files="framework/entity/build.xml"/>
</subant>
@@ -231,26 +231,26 @@
<echo message="[docs] ========== Done Building (JavaDocs) =========="/>
</target>

- <target name="docs-all" depends="build,ofbiz-init"
- description="For committers : Build all javadoc into one tree for easier viewing by the community">
+ <target name="docs-all" depends="build,ofbiz-init"
+ description="For committers : Build all javadoc into one tree for easier viewing by the community">

<echo message="[docs-all] ========== Start Building (JavaDoc) =========="/>

<mkdir dir="${site.dir}/javadocs"/>
<javadoc packagenames="org.ofbiz.*"
- destdir="${site.dir}/javadocs"
- maxmemory="256M"
- windowtitle="Open for Business - API"
- useexternalfile="yes">
- <fileset dir="${basedir}" defaultexcludes="yes">
- <include name="**/*.java"/>
- <exclude name="**/ControlApplet.java"/>
- <exclude name="**/ShipmentScaleApplet.java"/>
- <exclude name="**/test/"/>
- </fileset>
- </javadoc>
+ destdir="${site.dir}/javadocs"
+ maxmemory="256M"
+ windowtitle="Open for Business - API"
+ useexternalfile="yes">
+ <fileset dir="${basedir}" defaultexcludes="yes">
+ <include name="**/*.java"/>
+ <exclude name="**/ControlApplet.java"/>
+ <exclude name="**/ShipmentScaleApplet.java"/>
+ <exclude name="**/test/"/>
+ </fileset>
+ </javadoc>

- <echo message="[docs-all] ========== Done Building (JavaDocs) =========="/>
+ <echo message="[docs-all] ========== Done Building (JavaDocs) =========="/>
</target>


@@ -270,7 +270,7 @@


<target name="build-website"
- description="For committers : Update dtds and JavaDoc from OFBiz intance to site">
+ description="For committers : Update dtds and JavaDoc from OFBiz intance to site">
<antcall target="copy-dtds"/>
<antcall target="docs"/>
<antcall target="copy-apis"/>
@@ -293,17 +293,17 @@
</target>

<target name="copy-dtds"
- description="For committers : Copy all dtds from OFBiz instance to website">
+ description="For committers : Copy all dtds from OFBiz instance to website">
<mkdir dir="${site.dir}/dtds"/>
<copy todir="${site.dir}/dtds" flatten="true" overwrite="true">
<fileset dir="${basedir}" includes="**/*.dtd"/>
<fileset dir="${basedir}" defaultexcludes="yes"> 
- <include name="**/*.xsd"/>
- <exclude name="**/002*.xsd"/>
- <exclude name="**/068*.xsd"/>
- <exclude name="**/161*.xsd"/>
- <exclude name="**/196*.xsd"/>
- <exclude name="**/197*.xsd"/>
+ <include name="**/*.xsd"/>
+ <exclude name="**/002*.xsd"/>
+ <exclude name="**/068*.xsd"/>
+ <exclude name="**/161*.xsd"/>
+ <exclude name="**/196*.xsd"/>
+ <exclude name="**/197*.xsd"/>
</fileset>
</copy>
</target>
@@ -322,15 +322,15 @@


<target name="run"
- description="This will start OFBiz">
+ description="This will start OFBiz">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
- <jvmarg value="${memory.maxpermsize.param}"/>
+ <jvmarg value="${memory.maxpermsize.param}"/>
</java>
</target>
<target name="run-pos"
- description="Start the POS (Point of sale) system">
+ description="Start the POS (Point of sale) system">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -339,7 +339,7 @@
</java>
</target>
<target name="run-install" depends="build"
- description="This loads all configured data; meant for generic OFBiz development, testing, demonstration, etc purposes">
+ description="This loads all configured data; meant for generic OFBiz development, testing, demonstration, etc purposes">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -348,7 +348,7 @@
</java>
</target>
<target name="run-install-seed" depends="build"
- description="This loads ONLY the seed data (not seed-initial, demo, ext* or anything else); meant for use after an update of the code to reload the seed data as it is generally maintained along with the code and needs to be in sync for operation">
+ description="This loads ONLY the seed data (not seed-initial, demo, ext* or anything else); meant for use after an update of the code to reload the seed data as it is generally maintained along with the code and needs to be in sync for operation">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -358,7 +358,7 @@
</java>
</target>
<target name="run-install-extseed" depends="build"
- description="This loads seed, seed-initial and ext data; meant for manual/generic testing, development, or going into production with a derived system based on stock OFBiz where the ext data basically replaces the demo data">
+ description="This loads seed, seed-initial and ext data; meant for manual/generic testing, development, or going into production with a derived system based on stock OFBiz where the ext data basically replaces the demo data">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -368,7 +368,7 @@
</java>
</target>
<target name="run-install-exttest" depends="build"
- description="This loads seed, seed-initial, ext and ext-test data; meant for automated testing with a derived system based on stock OFBiz">
+ description="This loads seed, seed-initial, ext and ext-test data; meant for automated testing with a derived system based on stock OFBiz">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -378,7 +378,7 @@
</java>
</target>
<target name="run-install-readers" depends="build"
- description="This loads data using the command line argument 'readers' that takes a comma separated list of readers (seed, seed-initial, demo, ext, ext-test, ext-demo)">
+ description="This loads data using the command line argument 'readers' that takes a comma separated list of readers (seed, seed-initial, demo, ext, ext-test, ext-demo)">
<java jar="ofbiz.jar" fork="true" >
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -388,7 +388,7 @@
</java>
</target>
<target name="run-install-file" depends="build"
- description="This loads data using the command line argument 'file' to load data from a given file">
+ description="This loads data using the command line argument 'file' to load data from a given file">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -399,7 +399,7 @@
</java>
</target>
<target name="load-admin-user-login"
- description="Creates a user login with admin privileges and a temporary password equal to 'ofbiz'; after a succesful login the user will be prompted for a new password. Example command for the userLogin 'admin': ./ant load-admin-user-login -DuserLoginId=admin">
+ description="Creates a user login with admin privileges and a temporary password equal to 'ofbiz'; after a succesful login the user will be prompted for a new password. Example command for the userLogin 'admin': ./ant load-admin-user-login -DuserLoginId=admin">
<fail message="userLoginId parameter is required. To add the parameter to the command for user admin: -DuserLoginId=admin">
<condition>
<not><isset property="userLoginId"/></not>
@@ -416,13 +416,13 @@
<delete file="runtime/tmp/tmpUserLogin.xml"/>
</target>
<target name="create-admin-user-login"
- description="Prompts for a user name, then creates a user login with admin privileges and a temporary password equal to 'ofbiz'. After a succesful login the user will be prompted for a new password.">
+ description="Prompts for a user name, then creates a user login with admin privileges and a temporary password equal to 'ofbiz'. After a succesful login the user will be prompted for a new password.">
<input addproperty="userLoginId" message="Enter user name (log in with the temporary password 'ofbiz'):"/>
<antcall target="load-admin-user-login"/>
</target>

<target name="run-debug" depends="build"
- description="Starts OFBiz in debugging mode">
+ description="Starts OFBiz in debugging mode">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -434,7 +434,7 @@
</java>
</target>
<target name="run-tests" depends="build"
- description="Run OFBiz default tests">
+ description="Run OFBiz default tests">
<java jar="ofbiz.jar" fork="true" resultproperty="test.result">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -456,27 +456,11 @@
</condition>
</fail>
</target>
- <target name="_save-runtime-data">
- <delete file="runtime/data.zip"/>
- <zip zipfile="runtime/data.zip" compress="no">
- <fileset dir="runtime/data"/>
- </zip>
- </target>
- <target name="_restore-runtime-data">
- <delete dir="runtime/data"/>
- <mkdir dir="runtime/data"/>
- <unzip src="runtime/data.zip" dest="runtime/data"/>
- </target>

<target name="_check-separated-tests-already-setup">
<available file="runtime/test-list-build.xml" property="_separated-tests-already-setup"/>
</target>
<target name="_setup-separated-test-run" depends="_check-separated-tests-already-setup" unless="_separated-tests-already-setup">
- <subant target="clean-data">
- <filelist dir="." files="framework/build.xml"/>
- </subant>
- <antcall target="run-install"/>
- <antcall target="_save-runtime-data"/>
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -487,8 +471,7 @@
</java>
</target>
<target name="run-single-test"
- description="Run a single test">
- <antcall target="_restore-runtime-data"/>
+ description="Run a single test">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -504,8 +487,7 @@
</move>
</target>
<target name="run-single-test-suite"
- description="Run a single test suite">
- <antcall target="_restore-runtime-data"/>
+ description="Run a single test suite">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -516,17 +498,36 @@
</java>
</target>
<target name="run-test-list" depends="_setup-separated-test-run"
- description="Run all configured tests, stopping/starting ofbiz between each test">
+ description="Run all configured tests, stopping/starting ofbiz between each test">
<delete dir="runtime/logs/test-results"/>
<ant antfile="runtime/test-list-build.xml" target="all-tests"/>
</target>

+ <target name="cobertura-report">
+ <delete dir="runtime/logs/cobertura-report"/>
+ <mkdir dir="runtime/logs/cobertura-report"/>
+ <taskdef resource="tasks.properties">
+ <classpath>
+ <fileset dir="framework/base/lib">
+ <include name="cobertura-1.9.3.jar" />
+ <include name="log4j-1.2.15.jar" />
+ <include name="scripting/asm*.jar" />
+ </fileset>
+ </classpath>
+ </taskdef>
+ <cobertura-report datafile="runtime/logs/cobertura.dat" destdir="runtime/logs/cobertura-report">
+ <fileset dir=".">
+ <include name="*/*/src/**/*.java"/>
+ </fileset>
+ </cobertura-report>
+ </target>
+




<target name="create-component"
- description="Creates the layout of an OFBiz component in the hot-deploy folder.">
+ description="Creates the layout of an OFBiz component in the hot-deploy folder.">
<input addproperty="component-name" message="Component name: "/>
<input addproperty="component-resource-name" message="Component resource name: "/>
<input addproperty="webapp-name" message="Webapp name: "/>

Modified: ofbiz/branches/addbirt/common.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/common.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/common.xml (original)
+++ ofbiz/branches/addbirt/common.xml Fri Dec 11 23:11:39 2009
@@ -27,6 +27,13 @@
<property name="lib.dir" value="lib"/>
<property name="build.dir" value="build"/>

+ <path id="test.class.path">
+ <path refid="local.class.path"/>
+ <pathelement location="${build.dir}/classes"/>
+ <pathelement location="config"/>
+ </path>
+ <filelist id="test.classes"/>
+



@@ -76,5 +83,20 @@
</jar>
</target>

+ <target name="tests" depends="jar">
+ <mkdir dir="${build.dir}/test-results"/>
+ <junit>
+ <classpath>
+ <path refid="junit.class.path"/>
+ <path refid="test.class.path"/>
+ </classpath>
+ <sysproperty key="ofbiz.home" value="${ofbiz.home.dir}"/>
+ <formatter usefile="false" type="plain"/>
+ <batchtest>
+ <filelist refid="test.classes"/>
+ </batchtest>
+ </junit>
+ </target>
+
<target name="all" depends="jar,docs"/>
</project>

Modified: ofbiz/branches/addbirt/framework/appserver/config/appserver.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/appserver/config/appserver.properties?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/appserver/config/appserver.properties (original)
+++ ofbiz/branches/addbirt/framework/appserver/config/appserver.properties Fri Dec 11 23:11:39 2009
@@ -18,7 +18,7 @@
# OFBiz Setup properties File
####

-######## Default WASCE/Geronimo Settings. Refer to the Guidelines in the OFBiz documentation : http://docs.ofbiz.org/x/Ah ########
+######## Default WASCE/Geronimo Settings. Refer to the Guidelines in the OFBiz documentation : http://cwiki.apache.org/confluence/x/IYBr ########
### Path to geronimo home (in other words, application server location).
# You may also use a GERONIMO_HOME env var, in such case let commented out here
### Linux

Modified: ofbiz/branches/addbirt/framework/appserver/templates/glassfish21/README
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/appserver/templates/glassfish21/README?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/appserver/templates/glassfish21/README (original)
+++ ofbiz/branches/addbirt/framework/appserver/templates/glassfish21/README Fri Dec 11 23:11:39 2009
@@ -80,8 +80,8 @@
References :

[1] : https://glassfish.dev.java.net/downloads/v2.1-b60e.html
-[2] : http://docs.ofbiz.org/display/OFBADMIN/Demo+and+Test+Setup+Guide (Building from SVN)
+[2] : http://cwiki.apache.org/confluence/confluence/display/OFBADMIN/Demo+and+Test+Setup+Guide (Building from SVN)
[3] : OFBIZ_HOME/framework/appserver/README
-[4] : http://docs.ofbiz.org/display/OFBTECH/Apache+OFBiz+Technical+Production+Setup+Guide (2.c. Database Setup)
-[5] : http://docs.ofbiz.org/display/OFBTECH/Apache+OFBiz+Technical+Production+Setup+Guide (2.d. Seed Data Loading)
+[4] : http://cwiki.apache.org/confluence/display/OFBTECH/Apache+OFBiz+Technical+Production+Setup+Guide (2.c. Database Setup)
+[5] : http://cwiki.apache.org/confluence/display/OFBTECH/Apache+OFBiz+Technical+Production+Setup+Guide (2.d. Seed Data Loading)

Modified: ofbiz/branches/addbirt/framework/appserver/templates/wasce2/README
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/appserver/templates/wasce2/README?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/appserver/templates/wasce2/README (original)
+++ ofbiz/branches/addbirt/framework/appserver/templates/wasce2/README Fri Dec 11 23:11:39 2009
@@ -101,7 +101,7 @@
But you can neglect and force stopping

*** Also beware, you can't have spaces in the path where the application server is installed ***
- And last but not least you may appreciate http://docs.ofbiz.org/display/OFBIZ/FAQ+-+Tips+-+Tricks+-+Cookbook+-+HowTo#FAQ-Tips-Tricks-Cookbook-HowTo-HowtouseRMIwithoutSSL
+ And last but not least you may appreciate http://cwiki.apache.org/confluence/display/OFBIZ/FAQ+-+Tips+-+Tricks+-+Cookbook+-+HowTo#FAQ-Tips-Tricks-Cookbook-HowTo-HowtouseRMIwithoutSSL
=======================================================================================================================================================

Derby

Modified: ofbiz/branches/addbirt/framework/base/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/base/build.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/base/build.xml (original)
+++ ofbiz/branches/addbirt/framework/base/build.xml Fri Dec 11 23:11:39 2009
@@ -36,6 +36,11 @@
<fileset dir="../start/build/lib" includes="*.jar"/>
</path>

+ <filelist id="test.classes" dir="${src.dir}">
+ <file name="org/ofbiz/base/test/BaseUnitTests.java"/>
+ <file name="org/ofbiz/base/util/collections/test/GenericMapTest.java"/>
+ </filelist>
+



@@ -47,9 +52,15 @@
<available classname="javax.crypto.Cipher" classpathref="local.class.path"/>
</not>
</condition>
+ <condition property="exclude.cobertura" value="org/ofbiz/base/config/Cobertura*.java">
+ <not>
+ <available classname="net.sourceforge.cobertura.instrument.ClassInstrumenter" classpathref="local.class.path"/>
+ </not>
+ </condition>


<javac15 destdir="${build.dir}/classes" srcdir="${src.dir}">
+ <exclude name="${exclude.cobertura}"/>
<exclude name="${exclude.crypto}"/>
<exclude name="org/ofbiz/base/util/OfbizJsBsfEngine.java"/>
</javac15>

Modified: ofbiz/branches/addbirt/framework/base/config/test-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/base/config/test-containers.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/base/config/test-containers.xml (original)
+++ ofbiz/branches/addbirt/framework/base/config/test-containers.xml Fri Dec 11 23:11:39 2009
@@ -21,7 +21,10 @@
<ofbiz-containers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd">

- <container name="component-container" class="org.ofbiz.base.container.ComponentContainer"/>
+ <container name="component-container" class="org.ofbiz.base.container.ComponentContainer">
+ <property name="ofbiz.instrumenterClassName" value="org.ofbiz.base.config.CoberturaInstrumenter"/>
+ <property name="ofbiz.instrumenterFile" value="runtime/logs/cobertura.dat"/>
+ </container>


<container name="classloader-container" class="org.ofbiz.base.container.ClassLoaderContainer"/>

Modified: ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/container/ComponentContainer.java?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/container/ComponentContainer.java (original)
+++ ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/container/ComponentContainer.java Fri Dec 11 23:11:39 2009
@@ -49,6 +49,8 @@
protected Classpath classPath = new Classpath(System.getProperty("java.class.path"));
protected String configFileLocation = null;
private boolean loaded = false;
+ private String instrumenterClassName;
+ private String instrumenterFile;

/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String)
@@ -70,10 +72,22 @@
if (cc.getProperty("update-classpath") != null) {
updateClassPath = "true".equalsIgnoreCase(cc.getProperty("update-classpath").value);
}
+ String instrumenterClassName;
+ if (cc.getProperty("ofbiz.instrumenterClassName") != null) {
+ instrumenterClassName = cc.getProperty("ofbiz.instrumenterClassName").value;
+ } else {
+ instrumenterClassName = null;
+ }
+ String instrumenterFile;
+ if (cc.getProperty("ofbiz.instrumenterFile") != null) {
+ instrumenterFile = cc.getProperty("ofbiz.instrumenterFile").value;
+ } else {
+ instrumenterFile = null;
+ }

// load the components
try {
- loadComponents(loaderConfig, updateClassPath);
+ loadComponents(loaderConfig, updateClassPath, instrumenterClassName, instrumenterFile);
} catch (AlreadyLoadedException e) {
throw new ContainerException(e);
} catch (ComponentException e) {
@@ -89,6 +103,10 @@
}

public synchronized void loadComponents(String loaderConfig, boolean updateClasspath) throws AlreadyLoadedException, ComponentException {
+ loadComponents(loaderConfig, updateClasspath, null, null);
+ }
+
+ public synchronized void loadComponents(String loaderConfig, boolean updateClasspath, String instrumenterClassName, String instrumenterFile) throws AlreadyLoadedException, ComponentException {
// set the loaded list; and fail if already loaded
//if (loadedComponents == null) {
// loadedComponents = new LinkedList();
@@ -118,6 +136,7 @@

// set the new classloader/classpath on the current thread
if (updateClasspath) {
+ classPath.instrument(instrumenterFile, instrumenterClassName);
System.setProperty("java.class.path", classPath.toString());
ClassLoader cl = classPath.getClassLoader();
Thread.currentThread().setContextClassLoader(cl);

Modified: ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/util/ObjectType.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/util/ObjectType.java?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/util/ObjectType.java (original)
+++ ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/util/ObjectType.java Fri Dec 11 23:11:39 2009
@@ -763,12 +763,15 @@
if (value instanceof CharSequence) return UtilValidate.isEmpty((CharSequence) value);

// These types would flood the log
+ // Number covers: BigDecimal, BigInteger, Byte, Double, Float, Integer, Long, Short
if (value instanceof Boolean) return false;
- if (value instanceof Integer) return false;
- if (value instanceof java.math.BigDecimal) return false;
+ if (value instanceof Number) return false;
+ if (value instanceof Character) return false;
if (value instanceof java.sql.Timestamp) return false;

- Debug.logWarning("In ObjectType.isEmpty(Object value) returning false for " + value.getClass() + " Object.", module);
+ if (Debug.verboseOn()) {
+ Debug.logVerbose("In ObjectType.isEmpty(Object value) returning false for " + value.getClass() + " Object.", module);
+ }
return false;
}

Modified: ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/util/UtilHttp.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/util/UtilHttp.java?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/util/UtilHttp.java (original)
+++ ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/util/UtilHttp.java Fri Dec 11 23:11:39 2009
@@ -53,6 +53,7 @@
import javolution.util.FastList;
import javolution.util.FastMap;

+import org.apache.commons.lang.RandomStringUtils;
import org.owasp.esapi.errors.EncodingException;

/**
@@ -1318,4 +1319,35 @@
}
return rowCount;
}
+
+ public static String stashParameterMap(HttpServletRequest request) {
+ HttpSession session = request.getSession();
+ Map<String, Map<String, Object>> paramMapStore = UtilGenerics.checkMap(session.getAttribute("_PARAM_MAP_STORE_"));
+ if (paramMapStore == null) {
+ paramMapStore = FastMap.newInstance();
+ session.setAttribute("_PARAM_MAP_STORE_", paramMapStore);
+ }
+ Map<String, Object> parameters = UtilHttp.getParameterMap(request);
+ String paramMapId = RandomStringUtils.randomAlphanumeric(10);
+ paramMapStore.put(paramMapId, parameters);
+ return paramMapId;
+ }
+
+ public static void restoreStashedParameterMap(HttpServletRequest request, String paramMapId) {
+ HttpSession session = request.getSession();
+ Map<String, Map<String, Object>> paramMapStore = UtilGenerics.checkMap(session.getAttribute("_PARAM_MAP_STORE_"));
+ if (paramMapStore != null) {
+ Map<String, Object> paramMap = paramMapStore.get(paramMapId);
+ if (paramMap != null) {
+ paramMapStore.remove(paramMapId);
+ for (Map.Entry<String, Object> paramEntry : paramMap.entrySet()) {
+ if (request.getAttribute(paramEntry.getKey()) != null) {
+ Debug.logWarning("Skipped loading parameter [" + paramEntry.getKey() + "] because it would have overwritten a request attribute" , module);
+ continue;
+ }
+ request.setAttribute(paramEntry.getKey(), paramEntry.getValue());
+ }
+ }
+ }
+ }
}

Modified: ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java (original)
+++ ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java Fri Dec 11 23:11:39 2009
@@ -19,10 +19,12 @@
package org.ofbiz.base.util.collections;

import java.io.Serializable;
+import java.util.ConcurrentModificationException;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;

import org.ofbiz.base.util.Appender;
@@ -33,10 +35,28 @@
private static final AtomicReferenceFieldUpdater<GenericMap, Set> keySetUpdater = AtomicReferenceFieldUpdater.newUpdater(GenericMap.class, Set.class, "keySet");
private static final AtomicReferenceFieldUpdater<GenericMap, Set> entrySetUpdater = AtomicReferenceFieldUpdater.newUpdater(GenericMap.class, Set.class, "entrySet");
private static final AtomicReferenceFieldUpdater<GenericMap, Collection> valuesUpdater = AtomicReferenceFieldUpdater.newUpdater(GenericMap.class, Collection.class, "values");
+ private static final AtomicIntegerFieldUpdater<GenericMap> modCountUpdater = AtomicIntegerFieldUpdater.newUpdater(GenericMap.class, "modCount");

private volatile Set<K> keySet;
private volatile Set<Map.Entry<K, V>> entrySet;
private volatile Collection<V> values;
+ private volatile int modCount;
+
+ public int getModCount() {
+ return modCount;
+ }
+
+ protected void incrementModCount() {
+ modCountUpdater.getAndIncrement(this);
+ }
+
+ public final void clear() {
+ if (isEmpty()) return;
+ incrementModCount();
+ clearInternal();
+ }
+
+ protected abstract void clearInternal();

public boolean containsValue(Object value) {
return values().contains(value);
@@ -91,6 +111,19 @@

protected abstract V get(Object key, boolean noteAccess);

+ protected abstract class GenericMapIterator<DEST> extends IteratorWrapper<DEST, Map.Entry<K, V>> {
+ private final int currentModCount = getModCount();
+
+ protected GenericMapIterator(boolean noteAccess) {
+ super(iterator(noteAccess));
+ }
+
+ protected boolean isValid(Map.Entry<K, V> src) {
+ if (currentModCount != getModCount()) throw new ConcurrentModificationException();
+ return true;
+ }
+ }
+
public final Set<Map.Entry<K, V>> entrySet() {
if (entrySet == null) {
entrySetUpdater.compareAndSet(this, null, new GenericMapEntrySet<K, V, GenericMap<K, V>>(this) {
@@ -99,7 +132,17 @@
}

public Iterator<Map.Entry<K, V>> iterator(boolean noteAccess) {
- return GenericMap.this.iterator(noteAccess);
+ return new GenericMapIterator<Map.Entry<K, V>>(noteAccess) {
+ protected void noteRemoval(Map.Entry<K, V> dest, Map.Entry<K, V> src) {
+ // No need to note the remove, the wrapped iterator does that for us
+ // evictionPolicy.remove(evictionDeque, dest);
+ // if (diskStore != null) diskStore.remove(dest);
+ }
+
+ protected Map.Entry<K, V> convert(Map.Entry<K, V> src) {
+ return src;
+ }
+ };
}
});
}
@@ -116,7 +159,7 @@
}

public Iterator<K> iterator(boolean noteAccess) {
- return new IteratorWrapper<K, Map.Entry<K, V>>(GenericMap.this.iterator(noteAccess)) {
+ return new GenericMapIterator<K>(noteAccess) {
protected void noteRemoval(K dest, Map.Entry<K, V> src) {
// No need to note the remove, the wrapped iterator does that for us
// evictionPolicy.remove(evictionDeque, dest);
@@ -137,7 +180,7 @@
if (values == null) {
valuesUpdater.compareAndSet(this, null, new GenericMapValues<K, V, GenericMap<K, V>>(this) {
public Iterator<V> iterator(boolean noteAccess) {
- return new IteratorWrapper<V, Map.Entry<K, V>>(GenericMap.this.iterator(noteAccess)) {
+ return new GenericMapIterator<V>(noteAccess) {
protected void noteRemoval(V dest, Map.Entry<K, V> src) {
// No need to note the remove, the wrapped iterator does that for us
// evictionPolicy.remove(evictionDeque, src.getKey());
@@ -154,11 +197,19 @@
return values;
}

- public void putAll(Map<? extends K, ? extends V> map) {
+ public final V remove(Object key) {
+ return removeInternal(key, true);
+ }
+
+ protected abstract V removeInternal(Object key, boolean incrementModCount);
+
+ public final void putAll(Map<? extends K, ? extends V> map) {
putAllInternal(map);
}

private <KE extends K, VE extends V> void putAllInternal(Map<KE, VE> map) {
+ if (map.isEmpty()) return;
+ incrementModCount();
Iterator<Map.Entry<KE, VE>> it;
if (map instanceof GenericMap) {
GenericMap<KE, VE> otherMap = UtilGenerics.cast(map);
@@ -166,10 +217,10 @@
} else {
it = map.entrySet().iterator();
}
- putAll(it);
+ putAllIterator(it);
}

- protected abstract <KE extends K, VE extends V> void putAll(Iterator<Map.Entry<KE, VE>> it);
+ protected abstract <KE extends K, VE extends V> void putAllIterator(Iterator<Map.Entry<KE, VE>> it);

public String toString() {
StringBuilder sb = new StringBuilder();

Modified: ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/util/collections/IteratorWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/util/collections/IteratorWrapper.java?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/util/collections/IteratorWrapper.java (original)
+++ ofbiz/branches/addbirt/framework/base/src/org/ofbiz/base/util/collections/IteratorWrapper.java Fri Dec 11 23:11:39 2009
@@ -23,6 +23,7 @@

public abstract class IteratorWrapper<DEST, SRC> implements Iterator<DEST> {
private final Iterator<? extends SRC> it;
+ private boolean nextCalled;
private DEST lastDest;
private SRC lastSrc;

@@ -31,18 +32,25 @@
}

public boolean hasNext() {
- return it.hasNext();
+ if (nextCalled) return true;
+ if (!it.hasNext()) return false;
+ do {
+ lastSrc = it.next();
+ if (isValid(lastSrc)) {
+ nextCalled = true;
+ lastDest = convert(lastSrc);
+ return true;
+ }
+ } while (it.hasNext());
+ return false;
}

public DEST next() {
- try {
- lastSrc = it.next();
- return lastDest = convert(lastSrc);
- } catch (NoSuchElementException e) {
- lastDest = null;
- lastSrc = null;
- throw e;
+ if (!nextCalled) {
+ if (!hasNext()) throw new NoSuchElementException();
}
+ nextCalled = false;
+ return lastDest;
}

public void remove() {
@@ -56,6 +64,10 @@
}
}

+ protected boolean isValid(SRC src) {
+ return true;
+ }
+
protected abstract void noteRemoval(DEST dest, SRC src);
protected abstract DEST convert(SRC src);
}

Modified: ofbiz/branches/addbirt/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/common/config/CommonEntityLabels.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/branches/addbirt/framework/common/config/CommonEntityLabels.xml Fri Dec 11 23:11:39 2009
@@ -13776,7 +13776,8 @@
<value xml:lang="th">à¹à¸£à¸µà¸¢à¸¥ à¸à¸²à¸à¸²à¸£à¹</value>
<value xml:lang="zh">å¡å¡å°éäºå°</value>
</property>
- <property key="Uom.description.RMB">
+ 
+ 
<property key="Uom.description.ROL">
<value xml:lang="de">Leu RumÃ¤nien</value>
<value xml:lang="en">Romanian Leu</value>
@@ -15068,4 +15069,19 @@
<value xml:lang="th">à¸à¹à¸³à¸«à¸à¸±à¸</value>
<value xml:lang="zh">éé</value>
</property>
+ <property key="VisualTheme.description.BIZZNESS_TIME">
+ <value xml:lang="en">It's bizzness, it's bizzness time. I couldn't have said it better myself. This theme gets down</value>
+ </property>
+ <property key="VisualTheme.description.BLUELIGHT">
+ <value xml:lang="en">BlueLight Theme: Breadcrumbs, drop-down menus and rounded corners</value>
+ </property>
+ <property key="VisualTheme.description.DROPPINGCRUMBS">
+ <value xml:lang="en">Dropping Crumbs: Includes a drop down menu embedded in the breadcrumbs bar</value>
+ </property>
+ <property key="VisualTheme.description.FLAT_GREY">
+ <value xml:lang="en">Flat Grey - Old OFBiz Standard Floating Layout</value>
+ </property>
+ <property key="VisualTheme.description.MULTIFLEX">
+ <value xml:lang="en">Alternative VisualTheme for Ecommerce</value>
+ </property>
</resource>

Modified: ofbiz/branches/addbirt/framework/common/config/CommonHelpUrls.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/common/config/CommonHelpUrls.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/common/config/CommonHelpUrls.xml (original)
+++ ofbiz/branches/addbirt/framework/common/config/CommonHelpUrls.xml Fri Dec 11 23:11:39 2009
@@ -20,7 +20,7 @@
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<property key="Prefix">
- <value xml:lang="en">http://docs.ofbiz.org/display/OFBENDUSER/</value> 
+ <value xml:lang="en">http://cwiki.apache.org/confluence/display/OFBENDUSER/</value> 


Modified: ofbiz/branches/addbirt/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/common/config/CommonUiLabels.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/branches/addbirt/framework/common/config/CommonUiLabels.xml Fri Dec 11 23:11:39 2009
@@ -56,7 +56,7 @@
<value xml:lang="de">VermÃ¶gensverwaltung</value>
<value xml:lang="en">Asset Maint</value>
<value xml:lang="es">Manten. Activos</value>
- <value xml:lang="fr">Maint. immo.</value>
+ <value xml:lang="fr">Maintenance</value>
<value xml:lang="hi_IN">à¤¸à¤à¤ªà¤¤à¥à¤¤à¤¿ à¤à¤¾ à¤°à¤à¤°à¤à¤¾à¤µ</value>
<value xml:lang="it">Gestione cespiti</value>
<value xml:lang="th">à¸à¸²à¸£à¸£à¸±à¸à¸©à¸²à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸</value>
@@ -456,7 +456,7 @@
<value xml:lang="es">y</value>
<value xml:lang="fr">et</value>
<value xml:lang="hi_IN">à¤à¤°</value>
- <value xml:lang="it">E</value>
+ <value xml:lang="it">e</value>
<value xml:lang="nl">En</value>
<value xml:lang="pt">E</value>
<value xml:lang="ro">si</value>
@@ -892,7 +892,7 @@
<value xml:lang="es">Conectar</value>
<value xml:lang="fr">vous connecter</value>
<value xml:lang="hi_IN">à¤²à¥à¤à¤à¤¨</value>
- <value xml:lang="it">Login</value>
+ <value xml:lang="it">Accedi</value>
<value xml:lang="nl">Login</value>
<value xml:lang="pt">Login</value>
<value xml:lang="pt_PT">Iniciar</value>
@@ -3705,7 +3705,7 @@
<value xml:lang="es">Conectar</value>
<value xml:lang="fr">Connexion</value>
<value xml:lang="hi_IN">à¤²à¥à¤à¤à¤¨</value>
- <value xml:lang="it">Login</value>
+ <value xml:lang="it">Accedi</value>
<value xml:lang="nl">Login</value>
<value xml:lang="pt">Login</value>
<value xml:lang="pt_PT">Iniciar</value>
@@ -3723,7 +3723,7 @@
<value xml:lang="es">ConÃ©ctese aquÃ</value>
<value xml:lang="fr">Connectez vous ici</value>
<value xml:lang="hi_IN">à¤¯à¤¹à¤¾à¤ à¤¸à¥ à¤ªà¥à¤°à¤µà¥à¤¶ à¤à¤°à¥à¤</value>
- <value xml:lang="it">log in qui</value>
+ <value xml:lang="it">accedi da qui</value>
<value xml:lang="nl">Hier Inloggen</value>
<value xml:lang="pt">log in aqui</value>
<value xml:lang="pt_PT">Inicie Aqui</value>
@@ -4935,7 +4935,7 @@
<value xml:lang="es">O</value>
<value xml:lang="fr">Ou</value>
<value xml:lang="hi_IN">à¤¯à¤¾</value>
- <value xml:lang="it">O</value>
+ <value xml:lang="it">o</value>
<value xml:lang="nl">OF</value>
<value xml:lang="pt">OU</value>
<value xml:lang="ro">O</value>
@@ -9269,7 +9269,7 @@
<value xml:lang="es">Entrada</value>
<value xml:lang="fr">Connexion</value>
<value xml:lang="hi_IN">à¤²à¥à¤à¤à¤¨</value>
- <value xml:lang="it">Login</value>
+ <value xml:lang="it">Accedi</value>
<value xml:lang="ja">ãã°ã¤ã³</value>
<value xml:lang="nl">Aanmelden</value>
<value xml:lang="pt_BR">Entrada</value>

Modified: ofbiz/branches/addbirt/framework/common/data/CurrencyData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/common/data/CurrencyData.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/common/data/CurrencyData.xml (original)
+++ ofbiz/branches/addbirt/framework/common/data/CurrencyData.xml Fri Dec 11 23:11:39 2009
@@ -142,7 +142,7 @@
<Uom abbreviation="PLZ" description="Poland" uomId="PLZ" uomTypeId="CURRENCY_MEASURE"/>
<Uom abbreviation="PYG" description="Paraguayan Guarani" uomId="PYG" uomTypeId="CURRENCY_MEASURE"/>
<Uom abbreviation="QAR" description="Qatar Riyal" uomId="QAR" uomTypeId="CURRENCY_MEASURE"/>
- <Uom abbreviation="RMB" description="Chinese Renminbi Yuan" uomId="RMB" uomTypeId="CURRENCY_MEASURE"/>
+ 
<Uom abbreviation="ROL" description="Romanian Leu" uomId="ROL" uomTypeId="CURRENCY_MEASURE"/>
<Uom abbreviation="RUR" description="Russian Rouble" uomId="RUR" uomTypeId="CURRENCY_MEASURE"/>
<Uom abbreviation="RWF" description="Rwanda Franc" uomId="RWF" uomTypeId="CURRENCY_MEASURE"/>

Modified: ofbiz/branches/addbirt/framework/common/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/common/entitydef/entitymodel.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/common/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/addbirt/framework/common/entitydef/entitymodel.xml Fri Dec 11 23:11:39 2009
@@ -540,7 +540,7 @@
other data types by specifying a java data type in the userPrefDataType field.
</description>
<field name="userLoginId" type="id-vlong-ne"></field>
- <field name="userPrefTypeId" type="id-ne"><description>A unique identifier for this preference</description></field>
+ <field name="userPrefTypeId" type="id-long-ne"><description>A unique identifier for this preference</description></field>
<field name="userPrefGroupTypeId" type="id-long"><description>Used to assemble groups of preferences</description></field>
<field name="userPrefValue" type="value"><description>Contains the value of this preference</description></field>
<field name="userPrefDataType" type="id-long"><description>The java data type of this preference (empty = java.lang.String)</description></field>
@@ -574,6 +574,7 @@

<entity entity-name="VisualTheme"
package-name="org.ofbiz.common.theme"
+ default-resource-name="CommonEntityLabels"
title="Defines a Visual Theme">
<description>The VisualTheme entity contains one entry per visual theme.</description>
<field name="visualThemeId" type="id-ne"></field>

Modified: ofbiz/branches/addbirt/framework/common/webcommon/WEB-INF/common-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/common/webcommon/WEB-INF/common-controller.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/common/webcommon/WEB-INF/common-controller.xml (original)
+++ ofbiz/branches/addbirt/framework/common/webcommon/WEB-INF/common-controller.xml Fri Dec 11 23:11:39 2009
@@ -116,6 +116,12 @@
<response name="error" type="request" value="main"/>
</request-map>

+ <request-map uri="ajaxSetUserPreference">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="setUserPreference"/>
+ <response name="success" type="none"/>
+ </request-map>
+
<request-map uri="ajaxAutocompleteOptions">
<security https="true" auth="true"/>
<response name="success" type="view" value="ajaxAutocompleteOptions"/>

Modified: ofbiz/branches/addbirt/framework/common/webcommon/includes/listVisualThemes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/common/webcommon/includes/listVisualThemes.ftl?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/common/webcommon/includes/listVisualThemes.ftl (original)
+++ ofbiz/branches/addbirt/framework/common/webcommon/includes/listVisualThemes.ftl Fri Dec 11 23:11:39 2009
@@ -45,7 +45,7 @@
<input type="hidden" name="userPrefTypeId" value="VISUAL_THEME"/>
<input type="hidden" name="userPrefValue" value="${visualTheme.visualThemeId}"/>
</form>
- <a href="javascript:document.SetUserPreferences_${visualTheme.visualThemeId}.submit()">${visualTheme.description}</a>
+ <a href="javascript:document.SetUserPreferences_${visualTheme.visualThemeId}.submit()">${visualTheme.get("description", locale)?default(visualTheme.visualThemeId)}</a>
</td>
<td>
<#if visualTheme.visualThemeId == visualThemeId>${uiLabelMap.CommonVisualThemeSelected}<#else> </#if>

Modified: ofbiz/branches/addbirt/framework/common/webcommon/includes/lookup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/common/webcommon/includes/lookup.ftl?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/common/webcommon/includes/lookup.ftl (original)
+++ ofbiz/branches/addbirt/framework/common/webcommon/includes/lookup.ftl Fri Dec 11 23:11:39 2009
@@ -18,6 +18,7 @@
-->

<#assign docLangAttr = locale.toString()?replace("_", "-")>
+<#assign initialLocale = locale.toString()>
<#assign langDir = "ltr">
<#if "ar.iw"?contains(docLangAttr?substring(0, 2))>
<#assign langDir = "rtl">
@@ -30,7 +31,8 @@
<script language="javascript" src="<@ofbizContentUrl>/images/prototypejs/scriptaculous.js</@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@ofbizContentUrl>/images/fieldlookup.js</@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>" type="text/javascript"></script>
- <script language="javascript" src="<@ofbizContentUrl>/images/calendar_date_select.js</@ofbizContentUrl>" type="text/javascript"></script>
+ <script language="javascript" src="<@ofbizContentUrl>/images/calendarDateSelect/calendar_date_select.js</@ofbizContentUrl>" type="text/javascript"></script>
+ <script language="javascript" src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale!initialLocale}.js</@ofbizContentUrl>" type="text/javascript"></script>
<#if layoutSettings.javaScripts?has_content>
<#--layoutSettings.javaScripts is a list of java scripts. -->
<#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->

Modified: ofbiz/branches/addbirt/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/common/widget/CommonScreens.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/branches/addbirt/framework/common/widget/CommonScreens.xml Fri Dec 11 23:11:39 2009
@@ -112,13 +112,15 @@

<screen name="GlobalDecorator">
<section>
- <actions>
+ <actions>

<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/scriptaculous.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/prototype.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/calendar_date_select.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/calendar_date_select.js" global="true"/>
+ <set field="initialLocale" type="String" value="${parameters.userLogin.lastLocale}" default-value="${groovy:locale.toString()}"/>
+ <set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/locale/${initialLocale}.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/GooglemapMarkers.js" global="true"/>
<set field="layoutSettings.commonHeaderImageLinkUrl" from-field="layoutSettings.commonHeaderImageLinkUrl" default-value="main" global="true"/>
<set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="BIZZNESS_TIME" global="true"/>
@@ -289,7 +291,9 @@
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/calendar_date_select.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/calendar_date_select.js" global="true"/>
+ <set field="initialLocale" type="String" value="${parameters.userLogin.lastLocale}" default-value="${groovy:locale.toString()}"/>
+ <set field="layoutSettings.javaScripts[]" value="/images/calendarDateSelect/locale/${initialLocale}.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/GooglemapSimple.js" global="true"/>

<set field="layoutSettings.shortcutIcon" value="/images/ofbiz.ico" global="true"/>

Modified: ofbiz/branches/addbirt/framework/common/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/common/widget/LookupForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/common/widget/LookupForms.xml (original)
+++ ofbiz/branches/addbirt/framework/common/widget/LookupForms.xml Fri Dec 11 23:11:39 2009
@@ -35,7 +35,7 @@
<field name="geoSecCode" title="${uiLabelMap.CommonSegmentGroupGeoSecCode}"><text-find/></field>
<field name="geoAbbr" title="${uiLabelMap.CommonSegmentGroupGeoAbbr}"><text-find/></field>
<field name="noConditionFind"><hidden value="Y"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="listLookupGeo" list-name="listIt" target="" title="" type="list" paginate-target="LookupGeo">
<actions>

Modified: ofbiz/branches/addbirt/framework/entity/documents/EntityEngine.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/entity/documents/EntityEngine.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/entity/documents/EntityEngine.xml (original)
+++ ofbiz/branches/addbirt/framework/entity/documents/EntityEngine.xml Fri Dec 11 23:11:39 2009
@@ -40,7 +40,7 @@
<section>
<title>Entity overview.</title>
<para>
- <link xl:href="http://docs.ofbiz.org/display/OFBTECH/General+Entity+Overview">Entity overview (to be converted)</link>
+ <link xl:href="http://cwiki.apache.org/confluence/display/OFBTECH/General+Entity+Overview">Entity overview (to be converted)</link>
</para>

</section>

Modified: ofbiz/branches/addbirt/framework/example/widget/example/ExampleFeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/example/widget/example/ExampleFeatureForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/example/widget/example/ExampleFeatureForms.xml (original)
+++ ofbiz/branches/addbirt/framework/example/widget/example/ExampleFeatureForms.xml Fri Dec 11 23:11:39 2009
@@ -25,7 +25,7 @@
<field name="noConditionFind"><hidden value="Y"/></field>
<field name="exampleFeatureId" title="${uiLabelMap.ExampleExampleFeatureId}"><text-find/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>
- <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>

@@ -139,7 +139,7 @@
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"/>
<field name="noConditionFind"><hidden value="Y"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
</form>

<form name="LookupListExampleFeature" list-name="listIt" title="" type="list"

Modified: ofbiz/branches/addbirt/framework/example/widget/example/ExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/example/widget/example/ExampleForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/example/widget/example/ExampleForms.xml (original)
+++ ofbiz/branches/addbirt/framework/example/widget/example/ExampleForms.xml Fri Dec 11 23:11:39 2009
@@ -37,7 +37,7 @@
<entity-options description="${description}" key-field-name="statusId" entity-name="ExampleStatusItem"/>
</drop-down>
</field>
- <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>

<form name="ListExamples" type="list" list-name="listIt" paginate-target="FindExample" default-entity-name="Example" separate-columns="true"