svn commit: r1090153 [4/20] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1090153 [4/20] - in /ofbiz/branches/jackrabbit2010
 
|
Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PriceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PriceForms.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PriceForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PriceForms.xml Fri Apr 8 08:07:00 2011 @@ -58,8 +58,14 @@ <field name="productPriceRuleId"><hidden/></field><!-- Users don't need this information there, the screen is already sufficiently complex! --> <field name="ruleName" title="${uiLabelMap.CommonName}"><text size="25"/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><text size="60"/></field> + <field name="isSale" title="${uiLabelMap.ProductSaleRule}"> + <drop-down> + <option key="Y" description="${uiLabelMap.CommonY}"/> + <option key="N" description="${uiLabelMap.CommonN}"/> + </drop-down> + </field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time type="timestamp"/></field> - <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time type="timestamp"/></field> + <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time type="timestamp"/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field> <field use-when="org.ofbiz.base.util.UtilValidate.isEmpty(productPriceConds) && org.ofbiz.base.util.UtilValidate.isEmpty(productPriceActions)" name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> @@ -74,12 +80,16 @@ <field name="productPriceCondSeqId"><hidden/></field><!-- Users don't need this information there, the screen is already sufficiently complex! --> <field name="inputParamEnumId" title="${uiLabelMap.ProductInput}"> <drop-down allow-empty="false" current="selected"> - <list-options list-name="inputParamEnums" key-name="enumId" description="${description}"/> + <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_IN_PARAM"/> + </entity-options> </drop-down> </field> <field name="operatorEnumId" title="${uiLabelMap.ProductOperator}"> <drop-down allow-empty="false" current="selected"> - <list-options list-name="condOperEnums" key-name="enumId" description="${description}"/> + <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_COND"/> + </entity-options> </drop-down> </field> <field use-when=""PRIP_QUANTITY".equals(inputParamEnumId) || "PRIP_LIST_PRICE".equals(inputParamEnumId)" @@ -104,15 +114,19 @@ <form name="AddProductPriceRulesCond" type="list" target="createProductPriceCond" title="" list-name="productPriceCondAdd" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> <field name="productPriceRuleId"><hidden/></field><!-- Users don't need this information there, the screen is already sufficiently complex! --> - <field name="new"><display default-value="${uiLabelMap.ProductPriceRulesNewCond}"/></field> + <field name="new" title="${uiLabelMap.CommonNew}"><display default-value="${uiLabelMap.ProductPriceRulesNewCond}"/></field> <field name="inputParamEnumId" title="${uiLabelMap.ProductInput}"> <drop-down allow-empty="false"> - <list-options list-name="inputParamEnums" key-name="enumId" description="${description}"/> + <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_IN_PARAM"/> + </entity-options> </drop-down> </field> <field name="operatorEnumId" title="${uiLabelMap.ProductOperator}"> <drop-down allow-empty="false"> - <list-options list-name="condOperEnums" key-name="enumId" description="${description}"/> + <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_COND"/> + </entity-options> </drop-down> </field> <field name="condValueInput" title="${uiLabelMap.ProductValue}"><text size="10"/></field> @@ -144,10 +158,10 @@ <form name="AddProductPriceRulesAction" type="list" target="createProductPriceAction" title="" list-name="productPriceActionAdd" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> <field name="productPriceRuleId"><hidden/></field><!-- Users don't need this information there, the screen is already sufficiently complex! --> - <field name="new"><display default-value="${uiLabelMap.ProductPriceRulesNewAction}"/></field> + <field name="new" title="${uiLabelMap.CommonNew}"><display default-value="${uiLabelMap.ProductPriceRulesNewAction}"/></field> <field name="productPriceActionTypeId" title="${uiLabelMap.ProductActionType}"> <drop-down allow-empty="false"> - <list-options list-name="productPriceActionTypes" key-name="productPriceActionTypeId" description="${description}"/> + <entity-options entity-name="ProductPriceActionType" description="${description}" key-field-name="productPriceActionTypeId"/> </drop-down> </field> <field name="amount" title="${uiLabelMap.ProductValue}"><text/></field> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductScreens.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductScreens.xml Fri Apr 8 08:07:00 2011 @@ -31,8 +31,6 @@ under the License. <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> - <set field="productName" from-field="product.productName"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -84,7 +82,6 @@ under the License. </link> <link target="ProductBarCode.pdf" target-window="_blank" text="${uiLabelMap.ProductBarcode}" style="buttontext"> <parameter param-name="productId"/> - <parameter param-name="productName"/> </link> <link target="javascript:expandAll(true);" text="${uiLabelMap.CommonExpandAll}" style="buttontext expand-all" url-mode="plain"/> @@ -232,6 +229,7 @@ under the License. <include-form name="UpdateProductPrice" location="component://product/widget/catalog/ProductForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PageTitleAddProductPrices}"> + <label style="h3" text="${uiLabelMap.ProductPricesWarning}"/> <include-form name="AddProductPrice" location="component://product/widget/catalog/ProductForms.xml"/> </screenlet> </decorator-section> @@ -367,7 +365,7 @@ under the License. <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditProductAssetUsage}"> - <include-form name="EditProductAssetUsage" location="component://product/widget/catalog/ProductForms.xml"/> + <include-form name="EditProductAssetUsage" location="component://product/widget/catalog/ProductForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PageTitleEditProductAssetUsage}"> <container> @@ -1264,7 +1262,8 @@ under the License. <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="productId" from-field="parameters.productId"/> - <set field="productName" from-field="parameters.productName"/> + <entity-one entity-name="Product" value-field="product" auto-field-map="true"/> + <set field="productName" from-field="product.productName" default-value="${product.internalName}"/> </actions> <widgets> <platform-specific> @@ -1334,7 +1333,7 @@ under the License. </widgets> </section> </screen> - + <screen name="BestSellingProducts"> <section> <actions> Modified: ofbiz/branches/jackrabbit20100709/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/build.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/build.xml (original) +++ ofbiz/branches/jackrabbit20100709/build.xml Fri Apr 8 08:07:00 2011 @@ -27,7 +27,7 @@ under the License. <property name="memory.initial.param" value="-Xms128M"/> <property name="memory.max.param" value="-Xmx512M"/> <property name="pos.memory.max.param" value="-Xmx512M"/> - <property name="memory.maxpermsize.param" value="-XX:MaxPermSize=128m"/> + <property name="memory.maxpermsize.param" value="-XX:MaxPermSize=512m"/> <available file="applications/build.xml" property="applications.present"/> <available file="specialpurpose/build.xml" property="specialpurpose.present"/> @@ -157,11 +157,11 @@ under the License. </fileset> </subant> - <subant target="clean" failonerror="${specialpurpose.present}" + <subant target="clean" failonerror="${specialpurpose.present}" description="Use failonerror=false in case the specialpurpose directory is not there"> <filelist dir="." files="specialpurpose/build.xml"/> </subant> - <subant target="clean" failonerror="${applications.present}" + <subant target="clean" failonerror="${applications.present}" description="Use failonerror=false in case the applications directory is not there"> <filelist dir="." files="applications/build.xml"/> </subant> @@ -283,7 +283,7 @@ under the License. <!-- WebSite Targets --> <!-- ================================================================== --> - <target name="build-website" + <target name="build-website" description="For committers : Update dtds and JavaDoc from OFBiz instance to site"> <antcall target="copy-dtds"/> <antcall target="docs"/> @@ -335,7 +335,7 @@ under the License. <!-- Start OFBiz --> <!-- ================================================================== --> - <target name="run" + <target name="run" description="This will start OFBiz"> <java jar="ofbiz.jar" fork="true"> <jvmarg value="${memory.initial.param}"/> @@ -343,7 +343,7 @@ under the License. <jvmarg value="${memory.maxpermsize.param}"/> </java> </target> - <target name="run-pos" + <target name="run-pos" description="Start the POS (Point of sale) system"> <java jar="ofbiz.jar" fork="true"> <jvmarg value="${memory.initial.param}"/> @@ -415,7 +415,7 @@ under the License. </java> </target> <target name="run-install-readers" depends="build" - description="This loads data using the command line argument 'data-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 data-readers that takes a comma separated list of readers (seed, seed-initial, demo, ext, ext-test, ext-demo). On Windows XP (at least) you need top wrap the parameters in double-quotes. For instance: ant run-install-readers "-Ddata-readers=seed,seed-initial,ext"'> <java jar="ofbiz.jar" fork="true" > <jvmarg value="${memory.initial.param}"/> <jvmarg value="${memory.max.param}"/> @@ -436,16 +436,16 @@ under the License. </java> </target> - <!-- ================================= - target: run-create-tenant + <!-- ================================= + target: run-create-tenant ================================= --> - <target name="run-create-tenant" + <target name="run-create-tenant" depends="create-tenant-on-Derby,create-tenant-on-MySQL,create-tenant-on-Oracle,create-tenant-on-PostgreSQL" description="Creates a new tenant in your environment, creates the delegator, loads initial data with admin-user and password (needs multitenant=Y in general.properties)"> <tstamp/> </target> - <!-- description="This creates entity Tenant and TenantDataSource in default, installs data in the delegator and creates the admin-user and password for the tenant" + <!-- description="This creates entity Tenant and TenantDataSource in default, installs data in the delegator and creates the admin-user and password for the tenant" sub-target of run-create-tenant, can't used alone => no description, to not clutter "ant -p" --> <target name="get-tenant-data"> <input addproperty="tenantId" message="Enter Id for the tenant: "/> @@ -473,7 +473,7 @@ under the License. </condition> <antcall target="tenant-data-entry"/> </target> - <!-- description="Creates tenant data and instance" + <!-- description="Creates tenant data and instance" sub-target of run-create-tenant, can't used alone => no description, to not clutter "ant -p" --> <target name="create-tenant-on-Derby" depends="get-tenant-data" if="isDerby"> <echo message="Installing on Derby"/> @@ -493,7 +493,7 @@ under the License. <param name="delegatorId" value="default#${tenantId}"/> </antcall> </target> - <!-- description="Creates tenant data and instance. Don't forget db driver(s) and already created DBs in function of the entityengine.xml datasource-names" + <!-- description="Creates tenant data and instance. Don't forget db driver(s) and already created DBs in function of the entityengine.xml datasource-names" sub-target of run-create-tenant, can't used alone => no description, to not clutter "ant -p" --> <target name="create-tenant-on-MySQL" depends="get-tenant-data" if="isMySQL"> <echo message="Installing on MySQL"/> @@ -516,7 +516,7 @@ under the License. <param name="delegatorId" value="default#${tenantId}"/> </antcall> </target> - <!-- description="Creates tenant data and instance. Don't forget db driver(s) and already created DBs in function of the entityengine.xml datasource-names" + <!-- description="Creates tenant data and instance. Don't forget db driver(s) and already created DBs in function of the entityengine.xml datasource-names" sub-target of run-create-tenant, can't used alone => no description, to not clutter "ant -p" --> <target name="create-tenant-on-Oracle" depends="get-tenant-data" if="isOracle"> <echo message="Installing on Oracle"/> @@ -539,7 +539,7 @@ under the License. <param name="delegatorId" value="default#${tenantId}"/> </antcall> </target> - <!-- description="Creates tenant data and instance. Don't forget db driver(s) and already created DBs in function of the entityengine.xml datasource-names" + <!-- description="Creates tenant data and instance. Don't forget db driver(s) and already created DBs in function of the entityengine.xml datasource-names" sub-target of run-create-tenant, can't used alone => no description, to not clutter "ant -p" --> <target name="create-tenant-on-PostgreSQL" depends="get-tenant-data" if="isPostgreSQL"> <echo message="Installing on PostgreSQL"/> @@ -577,7 +577,7 @@ under the License. <echo message="Please make sure that the driver of the platform is installed and that the databases have been created (Check names just above)"/> <echo>------------------------------------</echo> <input addproperty="continueYN" message="Continue Y or N" validargs="N,n,Y,y"/> - + </target> <target name="load-tenant-admin-user-login" description="Creates the admin login for the tenant with admin privileges, and a temporay password equal to 'ofbiz'. Password must be changed on first login"> @@ -650,7 +650,7 @@ under the License. <antcall target="load-admin-user-login"/> </target> - <target name="run-debug" depends="build" + <target name="run-debug" depends="build" description="Starts OFBiz in debugging mode"> <java jar="ofbiz.jar" fork="true"> <jvmarg value="${memory.initial.param}"/> @@ -663,12 +663,13 @@ under the License. </java> </target> <target name="run-tests" depends="download-cobertura, build" - description="Run OFBiz default tests, execute ant run-install before and see results in runtime/logs/test-results/html/all-tests.html"> + description="Run OFBiz default tests, execute ant run-install before and see results in runtime/logs/test-results/html/all-tests.html. You will need a valid Internet connection to download cobertura"> <java jar="ofbiz.jar" fork="true" resultproperty="test.result"> <jvmarg value="${memory.initial.param}"/> <jvmarg value="${memory.max.param}"/> <jvmarg value="${memory.maxpermsize.param}"/> <arg value="test"/> + <env key="LC_ALL" value="C"/> </java> <mkdir dir="runtime/logs/test-results/html"/> <junitreport todir="runtime/logs/test-results"> @@ -697,6 +698,7 @@ under the License. <arg value="testlist"/> <arg file="runtime/test-list-build.xml"/> <arg value="-ant"/> + <env key="LC_ALL" value="C"/> </java> </target> <target name="run-single-test" depends="download-cobertura, build" @@ -708,6 +710,7 @@ under the License. <arg value="test"/> <arg value="-component=${test.component}"/> <arg value="-case=${test.case}"/> + <env key="LC_ALL" value="C"/> </java> <delete dir="runtime/logs/test-results/${test.component}-${test.case}"/> <mkdir dir="runtime/logs/test-results/${test.component}-${test.case}"/> @@ -723,7 +726,7 @@ under the License. </fail> </target> <target name="run-single-test-suite" depends="download-cobertura, build" - description="Run a single test suite, syntax eg: ant run-single-test-suite -Dtest.component=mycomponent -Dtest.suiteName=mytests"> + description="Run a single test suite, syntax eg: ant run-single-test-suite -Dtest.component=mycomponent -Dtest.suiteName=mytests"> <java jar="ofbiz.jar" fork="true" resultproperty="test.result"> <jvmarg value="${memory.initial.param}"/> <jvmarg value="${memory.max.param}"/> @@ -731,6 +734,7 @@ under the License. <arg value="test"/> <arg value="-component=${test.component}"/> <arg value="-suitename=${test.suiteName}"/> + <env key="LC_ALL" value="C"/> </java> <fail message="Test run was unsuccessful"> <condition> @@ -740,13 +744,14 @@ under the License. </condition> </fail> </target> - <target name="run-test-list" depends="_setup-separated-test-run" + <target name="run-test-list" depends="_setup-separated-test-run" 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"> + <target name="cobertura-report" + description="generates a HTML code coverage report with cobertura, can be found in runtime/logs/cobertura-report"> <delete dir="runtime/logs/cobertura-report"/> <mkdir dir="runtime/logs/cobertura-report"/> <taskdef resource="tasks.properties"> @@ -773,38 +778,65 @@ under the License. </cobertura-report> </target> - <target name="sonar" depends="download-sonar-ant-task, sonar-init" + <target name="cobertura-report-xml" + description="generates a XML file from the cobertura report, this will be use by sonar"> + <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-merge datafile="runtime/logs/cobertura.dat"> + <fileset dir="runtime/logs"> + <include name="cobertura-base.dat"/> + <include name="cobertura-components.dat"/> + </fileset> + </cobertura-merge> + <cobertura-report format="xml" datafile="runtime/logs/cobertura.dat" destdir="runtime/logs/cobertura-report"> + <dirset dir="."> + <include name="*/*/src"/> + </dirset> + <include name="**/*.java"/> + </cobertura-report> + </target> + + <target name="sonar" depends="download-sonar-ant-task, sonar-init, cobertura-report-xml" description="Sonar code analysis. You need a Sonar instance running to use it. More info on http://www.sonarsource.org/"> <exec executable="svn" dir="." output="runtime/svninfo_tmp.xml"> <arg value="info"/> <arg value="--xml"/> </exec> <xmlproperty file="runtime/svninfo_tmp.xml"/> - <sonar:sonar workDir="." key="org.apache:ofbiz" version="${info.entry.commit(revision)}"> + <sonar:sonar workDir="runtime/sonar" key="org.apache:ofbiz" version="${info.entry.commit(revision)}"> <sources> <!--framework--> - <path location="applications/appserver/src" /> - <path location="applications/base/src" /> - <path location="applications/bi/src" /> - <path location="applications/catalina/src" /> - <path location="applications/common/src" /> - <path location="applications/datafile/src" /> - <path location="applications/entity/src" /> - <path location="applications/entityext/src" /> - <path location="applications/example/src" /> - <path location="applications/geronimo/src" /> - <path location="applications/guiapp/src" /> - <path location="applications/jetty/src" /> - <path location="applications/minilang/src" /> - <path location="applications/security/src" /> - <path location="applications/service/src" /> - <path location="applications/sql/src" /> - <path location="applications/start/src" /> - <path location="applications/testtools/src" /> - <path location="applications/webapp/src" /> - <path location="applications/webslinger/src" /> - <path location="applications/webtools/src" /> - <path location="applications/widget/src" /> + <path location="framework/appserver/src" /> + <path location="framework/base/src" /> + <path location="framework/bi/src" /> + <path location="framework/catalina/src" /> + <path location="framework/common/src" /> + <path location="framework/datafile/src" /> + <path location="framework/entity/src" /> + <path location="framework/entityext/src" /> + <path location="framework/example/src" /> + <path location="framework/geronimo/src" /> + <path location="framework/guiapp/src" /> + <path location="framework/jetty/src" /> + <path location="framework/minilang/src" /> + <path location="framework/security/src" /> + <path location="framework/service/src" /> + <path location="framework/sql/src" /> + <path location="framework/start/src" /> + <path location="framework/testtools/src" /> + <path location="framework/webapp/src" /> + <path location="framework/webslinger/src" /> + <path location="framework/webtools/src" /> + <path location="framework/widget/src" /> <!--applications--> <path location="applications/accounting/src" /> <path location="applications/commonext/src" /> @@ -828,7 +860,10 @@ under the License. <path location="specialpurpose/oagis/src" /> <path location="specialpurpose/pos/src" /> </sources> - <property key="sonar.dynamicAnalysis" value="false" /> + <property key="sonar.dynamicAnalysis" value="reuseReports" /> + <property key="sonar.cobertura.reportPath" value="runtime/logs/cobertura-report/coverage.xml"/> + <property key="sonar.java.source" value="1.6" /> + <property key="sonar.java.target" value="1.6" /> </sonar:sonar> </target> @@ -851,7 +886,7 @@ under the License. <!-- ================================================================== --> <!-- Create New Component. This target will create basic directory structure for an OFBiz component in hot-deploy directory. --> <!-- ================================================================== --> - + <target name="create-component" description="Creates the layout of an OFBiz component in the hot-deploy folder."> <input addproperty="component-name" message="Component name: (e.g. mycomponent) [Mandatory]"/> Modified: ofbiz/branches/jackrabbit20100709/framework/base/config/test-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/config/test-containers.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/config/test-containers.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/config/test-containers.xml Fri Apr 8 08:07:00 2011 @@ -220,11 +220,11 @@ under the License. </container> <!-- load JUnit test container --> + <!-- this is now run through the new testtools stuff <container name="junit-container" class="org.ofbiz.base.container.JunitContainer"> <property name="base-test" value="org.ofbiz.base.test.BaseUnitTests"/> - <!-- this is now run through the new testtools stuff <property name="entity-test" value="org.ofbiz.entity.test.EntityTestSuite"/> --> - <!-- this is now run through the new testtools stuff <property name="service-test" value="org.ofbiz.service.test.ServiceEngineTests"/> --> </container> + --> <container name="testtools-container" class="org.ofbiz.testtools.TestRunContainer"/> </ofbiz-containers> Added: ofbiz/branches/jackrabbit20100709/framework/base/lib/commons/commons-compress-1.1.jar URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/lib/commons/commons-compress-1.1.jar?rev=1090153&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/branches/jackrabbit20100709/framework/base/lib/commons/commons-compress-1.1.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/container/ContainerLoader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/container/ContainerLoader.java?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/container/ContainerLoader.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/container/ContainerLoader.java Fri Apr 8 08:07:00 2011 @@ -28,6 +28,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.ofbiz.base.start.Config; import org.ofbiz.base.start.Start; import org.ofbiz.base.start.StartupException; import org.ofbiz.base.start.StartupLoader; @@ -70,7 +71,7 @@ public class ContainerLoader implements /** * @see org.ofbiz.base.start.StartupLoader#load(Start.Config, String[]) */ - public synchronized void load(Start.Config config, String args[]) throws StartupException { + public synchronized void load(Config config, String args[]) throws StartupException { if (this.loaded || this.unloading) { return; } Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java Fri Apr 8 08:07:00 2011 @@ -522,7 +522,16 @@ public class DateTimeConverters implemen try { return new java.sql.Timestamp(df.parse(str).getTime()); } catch (ParseException e) { - throw new ConversionException(e); + // before throwing an exception, try a generic format first + df = DateFormat.getDateTimeInstance(); + if (timeZone != null) { + df.setTimeZone(timeZone); + } + try { + return new java.sql.Timestamp(df.parse(str).getTime()); + } catch (ParseException e2) { + throw new ConversionException(e); + } } } } Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/splash/SplashLoader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/splash/SplashLoader.java?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/splash/SplashLoader.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/splash/SplashLoader.java Fri Apr 8 08:07:00 2011 @@ -20,7 +20,7 @@ package org.ofbiz.base.splash; import java.awt.EventQueue; -import org.ofbiz.base.start.Start; +import org.ofbiz.base.start.Config; import org.ofbiz.base.start.StartupException; import org.ofbiz.base.start.StartupLoader; @@ -28,7 +28,7 @@ public class SplashLoader implements Sta public static final String module = SplashLoader.class.getName(); private static SplashScreen screen = null; - private Start.Config config = null; + private Config config = null; /** * Load a startup class @@ -38,7 +38,7 @@ public class SplashLoader implements Sta * @throws org.ofbiz.base.start.StartupException * */ - public void load(Start.Config config, String args[]) throws StartupException { + public void load(Config config, String args[]) throws StartupException { this.config = config; Thread t = new Thread(this); Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java Fri Apr 8 08:07:00 2011 @@ -49,6 +49,7 @@ import org.ofbiz.base.util.UtilObject; import org.ofbiz.base.util.UtilValidate; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; +import com.googlecode.concurrentlinkedhashmap.EvictionListener; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap.Builder; /** @@ -63,8 +64,8 @@ import com.googlecode.concurrentlinkedha * */ @SuppressWarnings("serial") -public class UtilCache<K, V> implements Serializable { - +public class UtilCache<K, V> implements Serializable, EvictionListener<Object, CacheLine<V>> { + public static final String module = UtilCache.class.getName(); /** A static Map to keep track of all of the UtilCache instances. */ @@ -143,6 +144,7 @@ public class UtilCache<K, V> implements } else { memoryTable = new Builder<Object, CacheLine<V>>() .maximumWeightedCapacity(maxMemSize) + .listener(this) .build(); } if (this.useFileSystemStore) { @@ -1027,4 +1029,9 @@ public class UtilCache<K, V> implements public static <K, V> UtilCache<K, V> findCache(String cacheName) { return (UtilCache<K, V>) UtilCache.utilCacheTable.get(cacheName); } + + @Override + public void onEviction(Object key, CacheLine<V> value) { + ExecutionPool.removePulse(value); + } } Modified: ofbiz/branches/jackrabbit20100709/framework/base/testdef/basetests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/testdef/basetests.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/testdef/basetests.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/testdef/basetests.xml Fri Apr 8 08:07:00 2011 @@ -29,9 +29,10 @@ <junit-test-suite class-name="org.ofbiz.base.util.collections.test.FlexibleMapAccessorTests"/> <junit-test-suite class-name="org.ofbiz.base.util.test.TimeDurationTests"/> <junit-test-suite class-name="org.ofbiz.base.util.cache.test.UtilCacheTests"/> - <junit-test-suite class-name="org.ofbiz.base.conversion.test.DateTimeTests.java"/> - <junit-test-suite class-name="org.ofbiz.base.conversion.test.MiscTests.java"/> + <junit-test-suite class-name="org.ofbiz.base.conversion.test.DateTimeTests"/> + <junit-test-suite class-name="org.ofbiz.base.conversion.test.MiscTests"/> <junit-test-suite class-name="org.ofbiz.base.concurrent.test.DepedencyPoolTests"/> + <junit-test-suite class-name="org.ofbiz.base.util.test.JSONTests"/> <junit-test-suite class-name="org.ofbiz.base.util.test.UtilIOTests"/> <junit-test-suite class-name="org.ofbiz.base.test.BaseUnitTests"/> </test-group> Modified: ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_CN.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_CN.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_CN.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_CN.xml Fri Apr 8 08:07:00 2011 @@ -24,40 +24,40 @@ under the License. See also: http://en.wikipedia.org/wiki/Province_of_China http://en.wikipedia.org/wiki/ISO_3166-2:CN --> - <Geo abbreviation="京" geoCode="11" geoId="CN-11" geoName="å京" geoTypeId="MUNICIPALITY"/> - <Geo abbreviation="æ¸" geoCode="50" geoId="CN-50" geoName="éåº" geoTypeId="MUNICIPALITY"/> - <Geo abbreviation="沪" geoCode="31" geoId="CN-31" geoName="ä¸æµ·" geoTypeId="MUNICIPALITY"/> - <Geo abbreviation="æ´¥" geoCode="12" geoId="CN-12" geoName="天津" geoTypeId="MUNICIPALITY"/> - <Geo abbreviation="é»" geoCode="23" geoId="CN-23" geoName="é»é¾æ±" geoTypeId="PROVINCE"/> - <Geo abbreviation="å" geoCode="22" geoId="CN-22" geoName="åæ" geoTypeId="PROVINCE"/> - <Geo abbreviation="è¾½" geoCode="21" geoId="CN-21" geoName="è¾½å®" geoTypeId="PROVINCE"/> - <Geo abbreviation="é" geoCode="63" geoId="CN-63" geoName="éæµ·" geoTypeId="PROVINCE"/> - <Geo abbreviation="ç" geoCode="62" geoId="CN-62" geoName="çè" geoTypeId="PROVINCE"/> - <Geo abbreviation="é" geoCode="61" geoId="CN-61" geoName="é西" geoTypeId="PROVINCE"/> - <Geo abbreviation="æ" geoCode="14" geoId="CN-14" geoName="山西" geoTypeId="PROVINCE"/> - <Geo abbreviation="å" geoCode="13" geoId="CN-13" geoName="æ²³å" geoTypeId="PROVINCE"/> - <Geo abbreviation="å·" geoCode="51" geoId="CN-51" geoName="åå·" geoTypeId="PROVINCE"/> - <Geo abbreviation="é" geoCode="42" geoId="CN-42" geoName="æ¹å" geoTypeId="PROVINCE"/> - <Geo abbreviation="豫" geoCode="41" geoId="CN-41" geoName="æ²³å" geoTypeId="PROVINCE"/> - <Geo abbreviation="é²" geoCode="37" geoId="CN-37" geoName="å±±ä¸" geoTypeId="PROVINCE"/> - <Geo abbreviation="ç" geoCode="34" geoId="CN-34" geoName="å®å¾½" geoTypeId="PROVINCE"/> - <Geo abbreviation="è" geoCode="32" geoId="CN-32" geoName="æ±è" geoTypeId="PROVINCE"/> - <Geo abbreviation="æ»" geoCode="53" geoId="CN-53" geoName="äºå" geoTypeId="PROVINCE"/> - <Geo abbreviation="é»" geoCode="52" geoId="CN-52" geoName="è´µå·" geoTypeId="PROVINCE"/> - <Geo abbreviation="æ¹" geoCode="43" geoId="CN-43" geoName="æ¹å" geoTypeId="PROVINCE"/> - <Geo abbreviation="èµ£" geoCode="36" geoId="CN-36" geoName="æ±è¥¿" geoTypeId="PROVINCE"/> - <Geo abbreviation="æµ" geoCode="33" geoId="CN-33" geoName="æµæ±" geoTypeId="PROVINCE"/> - <Geo abbreviation="ç¼" geoCode="46" geoId="CN-46" geoName="æµ·å" geoTypeId="PROVINCE"/> - <Geo abbreviation="粤" geoCode="44" geoId="CN-44" geoName="广ä¸" geoTypeId="PROVINCE"/> - <Geo abbreviation="é½" geoCode="35" geoId="CN-35" geoName="ç¦å»º" geoTypeId="PROVINCE"/> - <Geo abbreviation="å°" geoCode="71" geoId="CN-71" geoName="å°æ¹¾" geoTypeId="PROVINCE"/> - <Geo abbreviation="æ¡" geoCode="45" geoId="CN-45" geoName="广西" geoTypeId="REGION"/> - <Geo abbreviation="å èå¤" geoCode="15" geoId="CN-15" geoName="å èå¤" geoTypeId="REGION"/> - <Geo abbreviation="å®" geoCode="64" geoId="CN-64" geoName="å®å¤" geoTypeId="REGION"/> - <Geo abbreviation="æ°" geoCode="65" geoId="CN-65" geoName="æ°ç" geoTypeId="REGION"/> - <Geo abbreviation="è" geoCode="54" geoId="CN-54" geoName="西è" geoTypeId="REGION"/> - <Geo abbreviation="é¦æ¸¯" geoCode="91" geoId="CN-91" geoName="é¦æ¸¯" geoTypeId="REGION"/> - <Geo abbreviation="æ¾³é¨" geoCode="92" geoId="CN-92" geoName="æ¾³é¨" geoTypeId="REGION"/> + <Geo abbreviation="京" geoCode="11" geoId="CN-11" geoName="å京" geoTypeId="MUNICIPALITY" wellKnownText="Beijing"/> + <Geo abbreviation="æ¸" geoCode="50" geoId="CN-50" geoName="éåº" geoTypeId="MUNICIPALITY" wellKnownText="Chongqing"/> + <Geo abbreviation="沪" geoCode="31" geoId="CN-31" geoName="ä¸æµ·" geoTypeId="MUNICIPALITY" wellKnownText="Shanghai"/> + <Geo abbreviation="æ´¥" geoCode="12" geoId="CN-12" geoName="天津" geoTypeId="MUNICIPALITY" wellKnownText="Tianjin"/> + <Geo abbreviation="é»" geoCode="23" geoId="CN-23" geoName="é»é¾æ±" geoTypeId="PROVINCE" wellKnownText="Heilongjiang"/> + <Geo abbreviation="å" geoCode="22" geoId="CN-22" geoName="åæ" geoTypeId="PROVINCE" wellKnownText="Jilin"/> + <Geo abbreviation="è¾½" geoCode="21" geoId="CN-21" geoName="è¾½å®" geoTypeId="PROVINCE" wellKnownText="Liaoning"/> + <Geo abbreviation="é" geoCode="63" geoId="CN-63" geoName="éæµ·" geoTypeId="PROVINCE" wellKnownText="Qinghai"/> + <Geo abbreviation="ç" geoCode="62" geoId="CN-62" geoName="çè" geoTypeId="PROVINCE" wellKnownText="Gansu"/> + <Geo abbreviation="é" geoCode="61" geoId="CN-61" geoName="é西" geoTypeId="PROVINCE" wellKnownText="Shaanxi"/> + <Geo abbreviation="æ" geoCode="14" geoId="CN-14" geoName="山西" geoTypeId="PROVINCE" wellKnownText="Shanxi"/> + <Geo abbreviation="å" geoCode="13" geoId="CN-13" geoName="æ²³å" geoTypeId="PROVINCE" wellKnownText="Hebei"/> + <Geo abbreviation="å·" geoCode="51" geoId="CN-51" geoName="åå·" geoTypeId="PROVINCE" wellKnownText="Sichuan"/> + <Geo abbreviation="é" geoCode="42" geoId="CN-42" geoName="æ¹å" geoTypeId="PROVINCE" wellKnownText="Hubei"/> + <Geo abbreviation="豫" geoCode="41" geoId="CN-41" geoName="æ²³å" geoTypeId="PROVINCE" wellKnownText="Henan"/> + <Geo abbreviation="é²" geoCode="37" geoId="CN-37" geoName="å±±ä¸" geoTypeId="PROVINCE" wellKnownText="Shandong"/> + <Geo abbreviation="ç" geoCode="34" geoId="CN-34" geoName="å®å¾½" geoTypeId="PROVINCE" wellKnownText="Anhui"/> + <Geo abbreviation="è" geoCode="32" geoId="CN-32" geoName="æ±è" geoTypeId="PROVINCE" wellKnownText="Jiangsu"/> + <Geo abbreviation="æ»" geoCode="53" geoId="CN-53" geoName="äºå" geoTypeId="PROVINCE" wellKnownText="Yunnan"/> + <Geo abbreviation="é»" geoCode="52" geoId="CN-52" geoName="è´µå·" geoTypeId="PROVINCE" wellKnownText="Guizhou"/> + <Geo abbreviation="æ¹" geoCode="43" geoId="CN-43" geoName="æ¹å" geoTypeId="PROVINCE" wellKnownText="Hunan"/> + <Geo abbreviation="èµ£" geoCode="36" geoId="CN-36" geoName="æ±è¥¿" geoTypeId="PROVINCE" wellKnownText="Jiangxi"/> + <Geo abbreviation="æµ" geoCode="33" geoId="CN-33" geoName="æµæ±" geoTypeId="PROVINCE" wellKnownText="Zhejiang"/> + <Geo abbreviation="ç¼" geoCode="46" geoId="CN-46" geoName="æµ·å" geoTypeId="PROVINCE" wellKnownText="Hainan"/> + <Geo abbreviation="粤" geoCode="44" geoId="CN-44" geoName="广ä¸" geoTypeId="PROVINCE" wellKnownText="Guangdong"/> + <Geo abbreviation="é½" geoCode="35" geoId="CN-35" geoName="ç¦å»º" geoTypeId="PROVINCE" wellKnownText="Fujian"/> + <Geo abbreviation="å°" geoCode="71" geoId="CN-71" geoName="å°æ¹¾" geoTypeId="PROVINCE" wellKnownText="Taiwan"/> + <Geo abbreviation="æ¡" geoCode="45" geoId="CN-45" geoName="广西" geoTypeId="REGION" wellKnownText="Guangxi"/> + <Geo abbreviation="å èå¤" geoCode="15" geoId="CN-15" geoName="å èå¤" geoTypeId="REGION" wellKnownText="Inner Mongolia"/> + <Geo abbreviation="å®" geoCode="64" geoId="CN-64" geoName="å®å¤" geoTypeId="REGION" wellKnownText="Ningxia"/> + <Geo abbreviation="æ°" geoCode="65" geoId="CN-65" geoName="æ°ç" geoTypeId="REGION" wellKnownText="Xinjiang"/> + <Geo abbreviation="è" geoCode="54" geoId="CN-54" geoName="西è" geoTypeId="REGION" wellKnownText="Tibet"/> + <Geo abbreviation="é¦æ¸¯" geoCode="91" geoId="CN-91" geoName="é¦æ¸¯" geoTypeId="REGION" wellKnownText="Hong Kong"/> + <Geo abbreviation="æ¾³é¨" geoCode="92" geoId="CN-92" geoName="æ¾³é¨" geoTypeId="REGION" wellKnownText="Macau"/> <GeoAssoc geoId="CHN" geoIdTo="CN-11" geoAssocTypeId="REGIONS"/> <GeoAssoc geoId="CHN" geoIdTo="CN-50" geoAssocTypeId="REGIONS"/> Modified: ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/image/ImageTransform.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/image/ImageTransform.java?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/image/ImageTransform.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/image/ImageTransform.java Fri Apr 8 08:07:00 2011 @@ -117,8 +117,17 @@ public class ImageTransform { Map<String, Object> result = FastMap.newInstance(); /* DIMENSIONS from ImageProperties */ - defaultHeight = Double.parseDouble(dimensionMap.get(sizeType).get("height").toString()); - defaultWidth = Double.parseDouble(dimensionMap.get(sizeType).get("width").toString()); + // A missed dimension is authorized + if (dimensionMap.get(sizeType).containsKey("height")) { + defaultHeight = Double.parseDouble(dimensionMap.get(sizeType).get("height").toString()); + } else { + defaultHeight = -1; + } + if (dimensionMap.get(sizeType).containsKey("width")) { + defaultWidth = Double.parseDouble(dimensionMap.get(sizeType).get("width").toString()); + } else { + defaultWidth = -1; + } if (defaultHeight == 0.0 || defaultWidth == 0.0) { String errMsg = UtilProperties.getMessage(resource, "ImageTransform.one_default_dimension_is_null", locale) + " : defaultHeight = " + defaultHeight + " ; defaultWidth = " + defaultWidth; Debug.logError(errMsg, module); @@ -128,7 +137,23 @@ public class ImageTransform { /* SCALE FACTOR */ // find the right Scale Factor related to the Image Dimensions - if (imgHeight > imgWidth) { + if (defaultHeight == -1) { + scaleFactor = defaultWidth / imgWidth; + if (scaleFactor == 0.0) { + String errMsg = UtilProperties.getMessage(resource, "ImageTransform.width_scale_factor_is_null", locale) + " (defaultWidth = " + defaultWidth + "; imgWidth = " + imgWidth; + Debug.logError(errMsg, module); + result.put("errorMessage", errMsg); + return result; + } + } else if (defaultWidth == -1) { + scaleFactor = defaultHeight / imgHeight; + if (scaleFactor == 0.0) { + String errMsg = UtilProperties.getMessage(resource, "ImageTransform.height_scale_factor_is_null", locale) + " (defaultHeight = " + defaultHeight + "; imgHeight = " + imgHeight; + Debug.logError(errMsg, module); + result.put("errorMessage", errMsg); + return result; + } + } else if (imgHeight > imgWidth) { scaleFactor = defaultHeight / imgHeight; if (scaleFactor == 0.0) { String errMsg = UtilProperties.getMessage(resource, "ImageTransform.height_scale_factor_is_null", locale) + " (defaultHeight = " + defaultHeight + "; imgHeight = " + imgHeight; Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl Fri Apr 8 08:07:00 2011 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script> -<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.1.min.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.2.min.js</@ofbizContentUrl>"></script> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script> <div id="${chartId}Div" style="width:600px;height:300px;"></div> Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl Fri Apr 8 08:07:00 2011 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script> -<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.1.min.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.2.min.js</@ofbizContentUrl>"></script> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.pie.js</@ofbizContentUrl>"></script> Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl Fri Apr 8 08:07:00 2011 @@ -27,7 +27,7 @@ under the License. <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title>${title?if_exists}</title> - <script language="javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.1.min.js</@ofbizContentUrl>" type="text/javascript"></script> + <script language="javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.2.min.js</@ofbizContentUrl>" type="text/javascript"></script> <script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>" type="text/javascript"></script> <#if layoutSettings.javaScripts?has_content> <#--layoutSettings.javaScripts is a list of java scripts. --> Modified: ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml Fri Apr 8 08:07:00 2011 @@ -110,7 +110,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jquery.maskedinput-1.2.2.min.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.6.custom.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.11.custom.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/> @@ -127,7 +127,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="${localeJsFile}" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.1.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.2.min.js" global="true"/> <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/> @@ -275,8 +275,8 @@ under the License. </service> <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/> - <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/> - + <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/> + <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" default-value="component://common/webcommon/includes/messages.ftl"/> </actions> <widgets> @@ -349,14 +349,14 @@ under the License. <!-- jQuery part --> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.6.custom.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.11.custom.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/> <set field="initialLocale" type="String" value="${groovy:parameters?.userLogin?.lastLocale?.substring(0,2)}" default-value="${groovy:locale.toString()?.substring(0,2)?:'en'}"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-${initialLocale}.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.1.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.2.min.js" global="true"/> <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/> Propchange: ofbiz/branches/jackrabbit20100709/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 8 08:07:00 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/framework/common/widget/HelpScreens.xml:951708-952957 /ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml:952958-1044489 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1084618 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1090146 Modified: ofbiz/branches/jackrabbit20100709/framework/component-load.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/component-load.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/component-load.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/component-load.xml Fri Apr 8 08:07:00 2011 @@ -20,6 +20,7 @@ under the License. <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd"> + <load-component component-location="base"/> <load-component component-location="geronimo"/> <load-component component-location="sql"/> <load-component component-location="entity"/> Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java Fri Apr 8 08:07:00 2011 @@ -26,6 +26,7 @@ import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -41,6 +42,7 @@ import java.util.TreeSet; import java.util.Vector; import java.util.WeakHashMap; +import javax.xml.bind.DatatypeConverter; import javax.xml.parsers.ParserConfigurationException; import org.ofbiz.base.util.UtilGenerics; @@ -318,7 +320,19 @@ public class XmlSerializer { // - SQL Objects - if ("sql-Timestamp".equals(tagName)) { String valStr = element.getAttribute("value"); - return java.sql.Timestamp.valueOf(valStr); + /* + * sql-Timestamp is defined as xsd:dateTime in ModelService.getTypes(), + * so try to parse the value as xsd:dateTime first. + * Fallback is java.sql.Timestamp because it has been this way all the time. + */ + try { + Calendar cal = DatatypeConverter.parseDate(valStr); + return new java.sql.Timestamp(cal.getTimeInMillis()); + } + catch (Exception e) { + Debug.logWarning("sql-Timestamp does not conform to XML Schema definition, try java.sql.Timestamp format", module); + return java.sql.Timestamp.valueOf(valStr); + } } else if ("sql-Date".equals(tagName)) { String valStr = element.getAttribute("value"); return java.sql.Date.valueOf(valStr); @@ -469,4 +483,4 @@ public class XmlSerializer { } return formatter; } -} +} \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java Fri Apr 8 08:07:00 2011 @@ -65,6 +65,7 @@ public class TransactionUtil implements public static boolean debugResources = true; private static ThreadLocal<List<Transaction>> suspendedTxStack = new ThreadLocal<List<Transaction>>(); + private static ThreadLocal<List<Exception>> suspendedTxLocationStack = new ThreadLocal<List<Exception>>(); private static ThreadLocal<Exception> transactionBeginStack = new ThreadLocal<Exception>(); private static ThreadLocal<List<Exception>> transactionBeginStackSave = new ThreadLocal<List<Exception>>(); private static Map<Long, Exception> allThreadsTransactionBeginStack = Collections.<Long, Exception>synchronizedMap(FastMap.<Long, Exception>newInstance()); @@ -581,19 +582,29 @@ public class TransactionUtil implements } public static boolean suspendedTransactionsHeld() { List<Transaction> tl = suspendedTxStack.get(); - if (UtilValidate.isNotEmpty(tl)) { - return true; - } else { - return false; - } + return UtilValidate.isNotEmpty(tl); } - protected static void pushSuspendedTransaction(Transaction t) { + public static List<Transaction> getSuspendedTxStack() { List<Transaction> tl = suspendedTxStack.get(); if (tl == null) { tl = new LinkedList<Transaction>(); suspendedTxStack.set(tl); } + return tl; + } + public static List<Exception> getSuspendedTxLocationsStack() { + List<Exception> tl = suspendedTxLocationStack.get(); + if (tl == null) { + tl = new LinkedList<Exception>(); + suspendedTxLocationStack.set(tl); + } + return tl; + } + protected static void pushSuspendedTransaction(Transaction t) { + List<Transaction> tl = getSuspendedTxStack(); tl.add(0, t); + List<Exception> stls = getSuspendedTxLocationsStack(); + stls.add(0, new Exception("TX Suspend Location")); // save the current transaction start stamp pushTransactionStartStamp(t); } @@ -602,6 +613,8 @@ public class TransactionUtil implements if (UtilValidate.isNotEmpty(tl)) { // restore the transaction start stamp popTransactionStartStamp(); + List<Exception> stls = suspendedTxLocationStack.get(); + if (UtilValidate.isNotEmpty(stls)) stls.remove(0); return tl.remove(0); } else { return null; @@ -611,6 +624,8 @@ public class TransactionUtil implements List<Transaction> tl = suspendedTxStack.get(); if (UtilValidate.isNotEmpty(tl)) { tl.remove(t); + List<Exception> stls = suspendedTxLocationStack.get(); + if (UtilValidate.isNotEmpty(stls)) stls.remove(0); popTransactionStartStamp(t); } } Modified: ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/flot/flotPie.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/flot/flotPie.ftl?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/flot/flotPie.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/flot/flotPie.ftl Fri Apr 8 08:07:00 2011 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script> -<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.1.min.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.2.min.js</@ofbizContentUrl>"></script> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.pie.js</@ofbizContentUrl>"></script> Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js (original) +++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js Fri Apr 8 08:07:00 2011 @@ -121,7 +121,7 @@ function lookup_popup2(view_name) { if (this.args != null) { if (this.args.length > 2) { for (var i = 2; i < this.args.length; i++) { - argString += "&parm" + (i - 2) + "=" + this.args[i]; + argString += "&parm" + (i - 3) + "=" + this.args[i]; } } } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |