svn commit: r960512 [3/7] - in /ofbiz/branches/jquery: ./ applications/accounting/config
Locked
svn commit: r960512 [3/7] - in /ofbiz/branches/jquery: ./ applications/accounting/config
 
|
Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/web.xml (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/web.xml Mon Jul 5 10:07:56 2010 @@ -60,7 +60,7 @@ under the License. </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> </init-param> <init-param> <param-name>errorCode</param-name> Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/find/keywordsearchbox.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/find/keywordsearchbox.ftl?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/find/keywordsearchbox.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/find/keywordsearchbox.ftl Mon Jul 5 10:07:56 2010 @@ -41,7 +41,7 @@ under the License. </div> <div> <label for="keywordSearchCategoryId">${uiLabelMap.ProductCategoryId}:</label> - <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="keywordsearchform" name="SEARCH_CATEGORY_ID" id="keywordSearchCategoryId" fieldFormName="LookupProduct"/> + <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="keywordsearchform" name="SEARCH_CATEGORY_ID" id="keywordSearchCategoryId" fieldFormName="LookupProductCategory"/> </div> <div> <label for="keywordSearchCointains">${uiLabelMap.CommonNoContains}</label> @@ -71,7 +71,7 @@ under the License. <fieldset> <input type="hidden" name="viewSize" value="20" /> <input type="hidden" name="viewIndex" value="1" /> - <@htmlTemplate.lookupField value="${requestParameters.productId?if_exists}" formName="productjumpform" name="productId" id="productJumpFormProductId" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField value="${requestParameters.productId?if_exists}" formName="productjumpform" name="productId" id="productJumpFormProductId" fieldFormName="LookupProduct"/> <select name="DUMMYPAGE" id="dummyPage" onchange="submitProductJump()"> <option value="<@ofbizUrl>EditProduct</@ofbizUrl>">-${uiLabelMap.ProductProductJump}-</option> <option value="<@ofbizUrl>EditProductQuickAdmin</@ofbizUrl>">${uiLabelMap.ProductQuickAdmin}</option> Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductFeatures.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductFeatures.ftl?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductFeatures.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductFeatures.ftl Mon Jul 5 10:07:56 2010 @@ -30,6 +30,7 @@ under the License. <tr class="header-row"> <td><b>${uiLabelMap.CommonId}</b></td> <td><b>${uiLabelMap.CommonDescription}</b></td> + <td><b>${uiLabelMap.ProductUomId}</b></td> <td><b>${uiLabelMap.ProductType}</b></td> <td><b>${uiLabelMap.ProductCategory}</b></td> <td><b>${uiLabelMap.CommonFromDate}</b></td> @@ -38,6 +39,9 @@ under the License. </tr> <#assign rowClass = "2"> <#list productFeatureAndAppls as productFeatureAndAppl> + <#if productFeatureAndAppl.uomId?exists> + <#assign curProductFeatureUom = delegator.findOne("Uom",{"uomId",productFeatureAndAppl.uomId}, true)> + </#if> <#assign curProductFeatureType = productFeatureAndAppl.getRelatedOneCache("ProductFeatureType")> <#assign curProductFeatureApplType = productFeatureAndAppl.getRelatedOneCache("ProductFeatureApplType")> <#assign curProductFeatureCategory = (productFeatureAndAppl.getRelatedOneCache("ProductFeatureCategory")?if_exists)> @@ -49,6 +53,7 @@ under the License. <a href="<@ofbizUrl>EditFeature?productFeatureId=${(productFeatureAndAppl.productFeatureId)?if_exists}</@ofbizUrl>" class="buttontext"> ${(productFeatureAndAppl.productFeatureId)?if_exists}</a></td> <td>${(productFeatureAndAppl.get("description",locale))?if_exists}</td> + <td><#if productFeatureAndAppl.uomId?exists>${curProductFeatureUom.abbreviation!}</#if></td> <td>${(curProductFeatureType.get("description",locale))?default((productFeatureAndAppl.productFeatureTypeId)?if_exists)}</td> <td><a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${(productFeatureAndAppl.productFeatureCategoryId)?if_exists}&productId=${(productFeatureAndAppl.productId)?if_exists}</@ofbizUrl>" class="buttontext"> ${(curProductFeatureCategory.description)?if_exists} Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy Mon Jul 5 10:07:56 2010 @@ -116,6 +116,7 @@ if (shipmentId) { context.shipmentPackageRouteSegList = shipmentPackageRouteSegList; } +weightPackageSession.setShipmentId(shipmentId) weightPackageSession.setPrimaryShipGroupSeqId(shipGroupSeqId); weightPackageSession.setPrimaryOrderId(orderId); weightPackageSession.setPicklistBinId(picklistBinId); Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/web.xml (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/web.xml Mon Jul 5 10:07:56 2010 @@ -65,7 +65,7 @@ under the License. </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css:/ShippingAPI.dll</param-value> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css:/ShippingAPI.dll</param-value> </init-param> <init-param> <param-name>errorCode</param-name> Modified: ofbiz/branches/jquery/applications/product/widget/catalog/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/ProductForms.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/ProductForms.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/ProductForms.xml Mon Jul 5 10:07:56 2010 @@ -493,12 +493,12 @@ under the License. <field name="comments" ><textarea/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="UpdateProductCategoryMemeber" type="list" target="updateProductToCategory" title="" list-name="productCategoryMembers" + <form name="UpdateProductCategoryMember" type="list" target="updateProductToCategory" title="" list-name="productCategoryMembers" odd-row-style="alternate-row" default-table-style="basic-table"> <auto-fields-service service-name="updateProductToCategory"/> <field name="productId"><hidden/></field> <field name="productCategoryId" title="${uiLabelMap.ProductCategory_Id}"> - <display-entity entity-name="ProductCategory" also-hidden="true" description="${description}"> + <display-entity entity-name="ProductCategory" also-hidden="true" description="${categoryName}"> <sub-hyperlink target="EditCategory" description="${productCategoryId}" link-style="buttontext"><parameter param-name="productCategoryId"/></sub-hyperlink> </display-entity> </field> Modified: ofbiz/branches/jquery/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/ProductScreens.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/ProductScreens.xml Mon Jul 5 10:07:56 2010 @@ -181,7 +181,7 @@ under the License. <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditProductCategories}"> - <include-form name="UpdateProductCategoryMemeber" location="component://product/widget/catalog/ProductForms.xml"/> + <include-form name="UpdateProductCategoryMember" location="component://product/widget/catalog/ProductForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PageTitleAddProductCategories}"> <include-form name="AddProductCategoryMember" location="component://product/widget/catalog/ProductForms.xml"/> Modified: ofbiz/branches/jquery/applications/product/widget/catalog/ProductStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/ProductStoreForms.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/ProductStoreForms.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/ProductStoreForms.xml Mon Jul 5 10:07:56 2010 @@ -322,6 +322,7 @@ <sort-field name="reserveInventory"/> <sort-field name="reserveOrderEnumId"/> <sort-field name="balanceResOnOrderCreation"/> + <sort-field name="showOutOfStockProducts"/> </field-group> <field-group title="${uiLabelMap.CommonShoppingCart}" collapsible="true" initially-collapsed="true"> <sort-field name="viewCartOnAdd"/> @@ -340,6 +341,7 @@ </field-group> <field-group title="${uiLabelMap.CommonPayments}" collapsible="true" initially-collapsed="true"> <sort-field name="payToPartyId"/> + <sort-field name="storeCreditAccountEnumId"/> <sort-field name="manualAuthIsCapture"/> <sort-field name="retryFailedAuths"/> <sort-field name="daysToCancelNonPay"/> Modified: ofbiz/branches/jquery/applications/workeffort/webapp/ical/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/webapp/ical/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/webapp/ical/WEB-INF/web.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/webapp/ical/WEB-INF/web.xml Mon Jul 5 10:07:56 2010 @@ -54,7 +54,7 @@ under the License. </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> </init-param> <init-param> <param-name>errorCode</param-name> Modified: ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/WEB-INF/web.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/WEB-INF/web.xml Mon Jul 5 10:07:56 2010 @@ -65,7 +65,7 @@ under the License. </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> </init-param> <init-param> <param-name>errorCode</param-name> Modified: ofbiz/branches/jquery/common.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/common.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/common.xml (original) +++ ofbiz/branches/jquery/common.xml Mon Jul 5 10:07:56 2010 @@ -156,7 +156,7 @@ under the License. <include name="*.jar"/> </fileset> </cobertura-instrument> - <run-junit build.jar="${build.dir}/cobertura-lib/${name}.jar"/> + <run-junit build.jar="${build.dir}/cobertura-lib/${name}.jar" build-test.jar="${build.dir}/cobertura-lib/${name}-test.jar"/> <delete dir="${build.dir}/test-results/cobertura-report"/> <mkdir dir="${build.dir}/test-results/cobertura-report"/> <cobertura-report datafile="${build.dir}/test-results/cobertura.dat" destdir="${build.dir}/test-results/cobertura-report"> Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java Mon Jul 5 10:07:56 2010 @@ -23,7 +23,7 @@ public class DependencyPoolTests extends public void testDependencyPool() throws Exception { // always use more threads than cpus, so that the single-cpu case can be tested ScheduledExecutorService executor = ExecutionPool.getNewOptimalExecutor(getName()); - DependencyPool pool = new DependencyPool(executor); + DependencyPool<Integer, TestItem, String> pool = new DependencyPool<Integer, TestItem, String>(executor); int itemSize = 100, depMax = 5, subMax = 3; List<TestItem> items = new ArrayList<TestItem>(itemSize); List<TestItem> previousItems = new ArrayList<TestItem>(itemSize); @@ -70,13 +70,13 @@ OUTER: } private static class TestItem implements DependencyPool.Item<TestItem, Integer, String> { - private final DependencyPool pool; + private final DependencyPool<Integer, TestItem, String> pool; private final Integer key; private final String result; private final Collection<Integer> dependencies; private final Collection<TestItem> subItems; - protected TestItem(DependencyPool pool, Integer key, String result, Collection<Integer> dependencies, Collection<TestItem> subItems) { + protected TestItem(DependencyPool<Integer, TestItem, String> pool, Integer key, String result, Collection<Integer> dependencies, Collection<TestItem> subItems) { this.pool = pool; this.key = key; this.result = result; Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java Mon Jul 5 10:07:56 2010 @@ -22,14 +22,9 @@ import java.text.DateFormat; import java.text.NumberFormat; import java.text.ParseException; import java.util.Date; -import java.util.List; import java.util.Locale; -import java.util.Set; import java.util.TimeZone; -import javolution.util.FastList; -import javolution.util.FastSet; - import org.ofbiz.base.util.TimeDuration; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilValidate; Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/test/ComparableRangeTests.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/test/ComparableRangeTests.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/test/ComparableRangeTests.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/test/ComparableRangeTests.java Mon Jul 5 10:07:56 2010 @@ -21,6 +21,7 @@ package org.ofbiz.base.lang.test; import org.ofbiz.base.test.GenericTestCaseBase; import org.ofbiz.base.lang.ComparableRange; import org.ofbiz.base.lang.SourceMonitored; +import org.ofbiz.base.util.UtilGenerics; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; @@ -79,7 +80,7 @@ public class ComparableRangeTests extend assertFalse(label + ":a-d equals null", all.equals(null)); ClassCastException caught = null; try { - ((Comparable) first).compareTo(ComparableRangeTests.class); + UtilGenerics.<Comparable<Object>>cast(first).compareTo(ComparableRangeTests.class); } catch (ClassCastException e) { caught = e; } finally { Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/test/GenericTestCaseBase.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/test/GenericTestCaseBase.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/test/GenericTestCaseBase.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/test/GenericTestCaseBase.java Mon Jul 5 10:07:56 2010 @@ -303,7 +303,7 @@ OUTER: } public static <T> List<T> list(T... list) { - return Arrays.asList(list); + return new ArrayList<T>(Arrays.asList(list)); } public static <T> Set<T> set(T value) { Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java Mon Jul 5 10:07:56 2010 @@ -361,11 +361,11 @@ public final class UtilIO { out.close(); } - private static boolean encodeObject(Writer writer, Object value, boolean allowJsonResolve) throws Exception { - Converter converter = Converters.getConverter(value.getClass(), String.class); + private static <T> boolean encodeObject(Writer writer, T value, boolean allowJsonResolve) throws Exception { + Converter<T, String> converter = UtilGenerics.cast(Converters.getConverter(value.getClass(), String.class)); if (converter != null) { Class clz = converter.getSourceClass(); - String str = (String) converter.convert(value); + String str = converter.convert(value); if (clz != null) { writer.write(clz.getName()); } else { Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilMisc.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilMisc.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilMisc.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilMisc.java Mon Jul 5 10:07:56 2010 @@ -1006,14 +1006,12 @@ public class UtilMisc { } } + /** @deprecated use Thread.sleep() */ + @Deprecated public static void staticWait(long timeout) throws InterruptedException { - new UtilMiscWaiter().safeWait(timeout); - } - protected static class UtilMiscWaiter { - public synchronized void safeWait(long timeout) throws InterruptedException { - this.wait(timeout); - } + Thread.sleep(timeout); } + public static void copyFile(File sourceLocation , File targetLocation) throws IOException { if (sourceLocation.isDirectory()) { throw new IOException("File is a directory, not a file, cannot copy") ; Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilProperties.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilProperties.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilProperties.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilProperties.java Mon Jul 5 10:07:56 2010 @@ -896,9 +896,6 @@ public class UtilProperties implements S UtilResourceBundle bundle = bundleCache.get(resourceName); if (bundle == null) { synchronized (bundleCache) { - if (bundle != null) { - return bundle; - } double startTime = System.currentTimeMillis(); FastList<Locale> candidateLocales = (FastList<Locale>) getCandidateLocales(locale); UtilResourceBundle parentBundle = null; Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java Mon Jul 5 10:07:56 2010 @@ -44,6 +44,7 @@ import jdbm.htree.HTree; import org.ofbiz.base.concurrent.ExecutionPool; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.ObjectType; +import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilObject; import org.ofbiz.base.util.UtilValidate; @@ -459,7 +460,7 @@ public class UtilCache<K, V> implements } else { hitCount.incrementAndGet(); } - memoryTable.put(nulledKey, createCacheLine((K) key, value, expireTimeNanos)); + memoryTable.put(nulledKey, createCacheLine(UtilGenerics.<K>cast(key), value, expireTimeNanos)); return value; } else { missCountNotFound.incrementAndGet(); @@ -595,7 +596,7 @@ public class UtilCache<K, V> implements Debug.logError(e, module); } } - noteRemoval((K) key, existingCacheLine.getValue()); + noteRemoval(UtilGenerics.<K>cast(key), existingCacheLine.getValue()); } /** Removes all elements from this cache */ @@ -747,7 +748,7 @@ public class UtilCache<K, V> implements /** Sets the expire time for the cache elements. * If 0, elements never expire. - * @param expireTime The expire time for the cache elements + * @param expireTimeMillis The expire time for the cache elements */ public void setExpireTime(long expireTimeMillis) { // if expire time was <= 0 and is now greater, fill expire table now @@ -869,7 +870,7 @@ public class UtilCache<K, V> implements keys = memoryTable.keySet(); } } - return Collections.unmodifiableSet((Set<? extends K>) keys); + return Collections.unmodifiableSet(UtilGenerics.<Set<? extends K>>cast(keys)); } public Collection<? extends CacheLine<V>> getCacheLineValues() { Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java Mon Jul 5 10:07:56 2010 @@ -237,12 +237,12 @@ public class FlexibleStringExpanderTests } @SuppressWarnings("unchecked") - public static class SpecialNumberToString extends AbstractConverter { + public static class SpecialNumberToString extends AbstractConverter<SpecialNumber, String> { public SpecialNumberToString() { super(SpecialNumber.class, String.class); } - public Object convert(Object obj) throws ConversionException { + public String convert(SpecialNumber obj) throws ConversionException { throw new NullPointerException(); } } Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java Mon Jul 5 10:07:56 2010 @@ -178,7 +178,7 @@ public class FreeMarkerWorker { cachedTemplates.remove(templateLocation); } } - + public static Environment renderTemplateFromString(String templateString, String templateLocation, Map<String, Object> context, Appendable outWriter) throws TemplateException, IOException { Template template = cachedTemplates.get(templateLocation); if (template == null) { @@ -401,14 +401,14 @@ public class FreeMarkerWorker { } Map<String, ?> ctx = null; if (ctxObj instanceof BeanModel) { - ctx = UtilGenerics.cast(((BeanModel)ctxObj).getWrappedObject()); - returnObj = ctx.get(key); + ctx = UtilGenerics.cast(((BeanModel) ctxObj).getWrappedObject()); + returnObj = ctx.get(key); } /* try { - Map templateContext = (Map)FreeMarkerWorker.getWrappedObject("context", env); + Map templateContext = (Map) FreeMarkerWorker.getWrappedObject("context", env); if (templateContext != null) { - returnObj = (String)templateContext.get(key); + returnObj = (String) templateContext.get(key); } } catch (ClassCastException e2) { //return null; @@ -426,7 +426,7 @@ public class FreeMarkerWorker { } else if (o instanceof SimpleScalar) { returnObj = o.toString(); } else if (o instanceof BeanModel) { - returnObj = ((BeanModel)o).getWrappedObject(); + returnObj = ((BeanModel) o).getWrappedObject(); } return returnObj; @@ -468,10 +468,11 @@ public class FreeMarkerWorker { //Map saveMap = new HashMap(); for (String key: saveKeyNames) { Object o = context.get(key); - if (o instanceof Map) + if (o instanceof Map) { o = UtilMisc.makeMapWritable(UtilGenerics.checkMap(o)); - else if (o instanceof List) + } else if (o instanceof List) { o = UtilMisc.makeListWritable(UtilGenerics.checkList(o)); + } saveMap.put(key, o); } } @@ -480,10 +481,11 @@ public class FreeMarkerWorker { Map<String, Object> saveMap = FastMap.newInstance(); for (String key: saveKeyNames) { Object o = context.get(key); - if (o instanceof Map) + if (o instanceof Map) { o = UtilMisc.makeMapWritable(UtilGenerics.checkMap(o)); - else if (o instanceof List) + } else if (o instanceof List) { o = UtilMisc.makeListWritable(UtilGenerics.checkList(o)); + } saveMap.put(key, o); } return saveMap; @@ -495,9 +497,7 @@ public class FreeMarkerWorker { String key = entry.getKey(); Object o = entry.getValue(); if (o instanceof Map) { - Map<Object, Object> map = FastMap.newInstance(); - map.putAll(UtilGenerics.checkMap(o)); - context.put(key, map); + context.put(key, UtilMisc.makeMapWritable(UtilGenerics.checkMap(o))); } else if (o instanceof List) { List<Object> list = new ArrayList<Object>(); list.addAll(UtilGenerics.checkList(o)); @@ -525,8 +525,9 @@ public class FreeMarkerWorker { ctx.put(key, null); } else { Object unwrappedObj = unwrap(obj); - if (unwrappedObj == null) + if (unwrappedObj == null) { unwrappedObj = obj; + } ctx.put(key, unwrappedObj.toString()); } } else { @@ -599,13 +600,16 @@ public class FreeMarkerWorker { public int hashCode() { return templateLocation.hashCode(); } + @Override public boolean equals(Object obj) { return obj instanceof FlexibleTemplateSource && obj.hashCode() == this.hashCode(); } + public String getTemplateLocation() { return templateLocation; } + public long getLastModified() { return createdDate.getTime(); } @@ -619,14 +623,17 @@ public class FreeMarkerWorker { public Object findTemplateSource(String name) throws IOException { return new FlexibleTemplateSource(name); } + public long getLastModified(Object templateSource) { FlexibleTemplateSource fts = (FlexibleTemplateSource) templateSource; return fts.getLastModified(); } + public Reader getReader(Object templateSource, String encoding) throws IOException { FlexibleTemplateSource fts = (FlexibleTemplateSource) templateSource; return makeReader(fts.getTemplateLocation()); } + public void closeTemplateSource(Object templateSource) throws IOException { // do nothing } @@ -657,8 +664,8 @@ public class FreeMarkerWorker { } } } - + public static String encodeDoubleQuotes(String htmlString) { return htmlString.replaceAll("\"", "\\\\\""); - } + } } Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/UtilObjectTests.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/UtilObjectTests.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/UtilObjectTests.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/UtilObjectTests.java Mon Jul 5 10:07:56 2010 @@ -226,7 +226,7 @@ public class UtilObjectTests extends Gen assertNull("parse empty array", UtilObject.getObject(new byte[0])); // simulate a ClassNotFoundException - Object groovySerializable = GroovyUtil.eval("class foo implements java.io.Serializable { }; return new foo()", new HashMap()); + Object groovySerializable = GroovyUtil.eval("class foo implements java.io.Serializable { }; return new foo()", new HashMap<String, Object>()); byte[] groovySerializableBytes = UtilObject.getBytes(groovySerializable); assertNotNull("groovySerializableBytes", groovySerializableBytes); assertNull("groovyDeserializable", UtilObject.getObject(groovySerializableBytes)); Modified: ofbiz/branches/jquery/framework/bi/webapp/bi/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/bi/webapp/bi/WEB-INF/web.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/bi/webapp/bi/WEB-INF/web.xml (original) +++ ofbiz/branches/jquery/framework/bi/webapp/bi/WEB-INF/web.xml Mon Jul 5 10:07:56 2010 @@ -54,7 +54,7 @@ </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> </init-param> <init-param> <param-name>errorCode</param-name> Modified: ofbiz/branches/jquery/framework/common/config/CommonEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/config/CommonEntityLabels.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/config/CommonEntityLabels.xml (original) +++ ofbiz/branches/jquery/framework/common/config/CommonEntityLabels.xml Mon Jul 5 10:07:56 2010 @@ -15311,7 +15311,7 @@ <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> + <value xml:lang="en">Dropping Crumbs: Evolution of Blue-Light, 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> @@ -15319,4 +15319,7 @@ <property key="VisualTheme.description.MULTIFLEX"> <value xml:lang="en">Alternative VisualTheme for Ecommerce</value> </property> + <property key="VisualTheme.description.TOMAHAWK"> + <value xml:lang="en">Tomahawk: the evolution of the Dropping Crumbs theme</value> + </property> </resource> Modified: ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml Mon Jul 5 10:07:56 2010 @@ -250,7 +250,7 @@ <value xml:lang="de">Neu hinzufügen</value> <value xml:lang="en">Add New</value> <value xml:lang="es">Crear nuevo</value> - <value xml:lang="fr">Ajouter un nouveau</value> + <value xml:lang="fr">Ajouter</value> <value xml:lang="hi_IN">नया à¤à¥à¤¡à¤¼à¥à¤</value> <value xml:lang="it">Aggiungi nuovo</value> <value xml:lang="nl">Toevoegen nieuwe</value> @@ -1836,6 +1836,10 @@ <value xml:lang="zh">æ¥</value> <value xml:lang="zh_CN">天æ°</value> </property> + <property key="CommonDeactivate"> + <value xml:lang="en">Deactivate, set thruDate to Now</value> + <value xml:lang="fr">Désactiver, mettre la date du jour comme date de fin</value> + </property> <property key="CommonDebit"> <value xml:lang="ar">دÙÙ</value> <value xml:lang="de">Belastung</value> @@ -4051,7 +4055,7 @@ <value xml:lang="fr">Messages</value> <value xml:lang="hi_IN">à¤à¤¬à¤°à¥à¤</value> <value xml:lang="it">Messaggi</value> - <value xml:lang="nl">Berichten</value> + <value xml:lang="nl">Berichten</value> <value xml:lang="ro">Mesaje </value> <value xml:lang="ru">СообÑениÑ</value> <value xml:lang="th">à¸à¹à¸à¸à¸§à¸²à¸¡</value> @@ -4595,6 +4599,10 @@ <value xml:lang="th">à¹à¸¡à¹à¸¡à¸µà¸£à¸«à¸±à¸ªà¹à¸à¸£à¸©à¸à¸µà¸¢à¹</value> <value xml:lang="zh">没æé®æ¿å°å</value> </property> + <property key="CommonNoStatesProvinces"> + <value xml:lang="en">No States/Provinces exist: _NA_</value> + <value xml:lang="fr">Aucun état ou province: _NA_</value> + </property> <property key="CommonNoTaskAssigned"> <value xml:lang="ar">Ùا Ù Ùا٠ØاÙÙØ© تستÙجب Ø¥Ùت٠ا٠ÙÙ </value> <value xml:lang="de">Zur Zeit sind keine Aufgabe vorhanden.</value> Modified: ofbiz/branches/jquery/framework/common/data/CommonTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/data/CommonTypeData.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/data/CommonTypeData.xml (original) +++ ofbiz/branches/jquery/framework/common/data/CommonTypeData.xml Mon Jul 5 10:07:56 2010 @@ -80,7 +80,9 @@ under the License. <GeoAssocType geoAssocTypeId="GROUP_MEMBER" description="Geo Group Member"/> <GeoAssocType geoAssocTypeId="REGIONS" description="For a region of a larger Geo, i.e. states, counties, provinces..."/> + <GeoAssocType geoAssocTypeId="COUNTY_CITY" description="City in a county"/> <GeoAssocType geoAssocTypeId="COUNTY_SEAT" description="Administrative Main City of a County"/> + <GeoAssocType geoAssocTypeId="POSTAL_CODE" description="Postal code associated to a GeoType"/> <!-- sync status --> <StatusType description="Synchronize" hasTable="N" parentTypeId="" statusTypeId="SYNCHRONIZE_STATUS"/> Modified: ofbiz/branches/jquery/framework/common/data/GeoData_FR.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/data/GeoData_FR.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/data/GeoData_FR.xml (original) +++ ofbiz/branches/jquery/framework/common/data/GeoData_FR.xml Mon Jul 5 10:07:56 2010 @@ -38,6 +38,7 @@ under the License. <Geo abbreviation="CHM" geoCode="17" geoId="FR-17" geoName="Charente-Maritime" geoTypeId="COUNTY"/> <Geo abbreviation="CHE" geoCode="18" geoId="FR-18" geoName="Cher" geoTypeId="COUNTY"/> <Geo abbreviation="COR" geoCode="19" geoId="FR-19" geoName="Corrèze" geoTypeId="COUNTY"/> + <Geo abbreviation="COS" geoCode="20" geoId="FR-20" geoName="Corse" geoTypeId="COUNTY"/> <Geo abbreviation="CDS" geoCode="2A" geoId="FR-2A" geoName="Corse-du-Sud" geoTypeId="COUNTY"/> <Geo abbreviation="HCO" geoCode="2B" geoId="FR-2B" geoName="Haute-Corse" geoTypeId="COUNTY"/> <Geo abbreviation="COO" geoCode="21" geoId="FR-21" geoName="Côte-d'Or" geoTypeId="COUNTY"/> @@ -115,6 +116,8 @@ under the License. <Geo abbreviation="SSD" geoCode="93" geoId="FR-93" geoName="Seine-Saint-Denis" geoTypeId="COUNTY"/> <Geo abbreviation="VDM" geoCode="94" geoId="FR-94" geoName="Val-de-Marne" geoTypeId="COUNTY"/> <Geo abbreviation="VDO" geoCode="95" geoId="FR-95" geoName="Val-d'Oise" geoTypeId="COUNTY"/> + <Geo abbreviation="REU" geoCode="97" geoId="FR-97" geoName="Réunion" geoTypeId="COUNTY"/> + <Geo abbreviation="MON" geoCode="98" geoId="FR-98" geoName="Monaco" geoTypeId="COUNTY"/> <Geo abbreviation="BEB" geoCode="BEB" geoId="FR-BEB01" geoName="Bourg-en-Bresse" geoTypeId="COUNTY_CITY"/> <Geo abbreviation="LAO" geoCode="LAO" geoId="FR-LAO02" geoName="Laon" geoTypeId="COUNTY_CITY"/> Modified: ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/CommonServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/CommonServices.xml (original) +++ ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/CommonServices.xml Mon Jul 5 10:07:56 2010 @@ -229,4 +229,14 @@ under the License. </iterate> <field-to-result field="themeResources"/> </simple-method> + + <simple-method method-name="updateNote" short-description="Update a note"> + <entity-one entity-name="NoteData" value-field="noteData"> + <field-map field-name="noteId" from-field="parameters.noteId"/> + </entity-one> + <set-nonpk-fields map="parameters" value-field="noteData"/> + <store-value value-field="noteData"/> + <field-to-result field="noteData.noteId" result-name="noteId"/> + </simple-method> + </simple-methods> Modified: ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/email/EmailServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/email/EmailServices.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/email/EmailServices.xml (original) +++ ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/email/EmailServices.xml Mon Jul 5 10:07:56 2010 @@ -57,7 +57,9 @@ under the License. <set field="emailParams.sendBcc" from-field="emailTemplateSetting.bccAddress"/> <set field="emailParams.subject" from-field="emailTemplateSetting.subject"/> <set field="emailParams.contentType" from-field="emailTemplateSetting.contentType" default-value="text/html"/> - + <if-not-empty field="parameters.custRequestId"> + <set field="emailParams.bodyParameters.custRequestId" from-field="parameters.custRequestId"/> + </if-not-empty> <!-- copy the incoming parameter fields AFTER setting the ones from EmailTemplateSetting so they can override things like subject, sendFrom, etc --> <set-service-fields service-name="sendMailFromScreen" map="parameters" to-map="emailParams"/> <call-service service-name="sendMailFromScreen" in-map-name="emailParams"> Modified: ofbiz/branches/jquery/framework/common/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/servicedef/services.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/servicedef/services.xml (original) +++ ofbiz/branches/jquery/framework/common/servicedef/services.xml Mon Jul 5 10:07:56 2010 @@ -48,14 +48,21 @@ under the License. </service> <service name="createNote" engine="java" - location="org.ofbiz.common.CommonServices" invoke="createNote"> + location="org.ofbiz.common.CommonServices" invoke="createNote"> <description>Create a new note record</description> <attribute name="partyId" type="String" mode="INOUT" optional="true"/> <attribute name="noteName" type="String" mode="IN" optional="true"/> <attribute name="note" type="String" mode="IN" allow-html="safe"/> <attribute name="noteId" type="String" mode="OUT"/> </service> - + + <service name="updateNote" engine="simple" default-entity-name="NoteData" + location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="updateNote"> + <description>Update a note record</description> + <auto-attributes include="pk" mode="INOUT" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> + </service> + <service name="adjustDebugLevels" engine="java" location="org.ofbiz.common.CommonServices" invoke="adjustDebugLevels" auth="true"> <description>Sets/Updates cached debugging levels</description> Modified: ofbiz/branches/jquery/framework/common/servicedef/services_email.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/servicedef/services_email.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/servicedef/services_email.xml (original) +++ ofbiz/branches/jquery/framework/common/servicedef/services_email.xml Mon Jul 5 10:07:56 2010 @@ -43,6 +43,7 @@ under the License. <attribute name="messageId" type="String" mode="INOUT" optional="true"/> <attribute name="emailType" type="String" mode="INOUT" optional="true"/> <attribute name="orderId" type="String" mode="INOUT" optional="true"/> + <attribute name="custRequestId" type="String" mode="INOUT" optional="true"/> <attribute name="messageWrapper" type="org.ofbiz.service.mail.MimeMessageWrapper" mode="OUT" optional="true"/><!-- mail can be disabled in general.properties so no output --> <!-- used for parsing and ECAs --> <attribute name="communicationEventId" type="String" mode="INOUT" optional="true"/> Modified: ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/email/EmailServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/email/EmailServices.java?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/email/EmailServices.java (original) +++ ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/email/EmailServices.java Mon Jul 5 10:07:56 2010 @@ -431,6 +431,7 @@ public class EmailServices { partyId = (String) bodyParameters.get("partyId"); } String orderId = (String) bodyParameters.get("orderId"); + String custRequestId = (String) bodyParameters.get("custRequestId"); bodyParameters.put("communicationEventId", serviceContext.get("communicationEventId")); NotificationServices.setBaseUrl(dctx.getDelegator(), webSiteId, bodyParameters); @@ -567,6 +568,9 @@ public class EmailServices { if (UtilValidate.isNotEmpty(orderId)) { serviceContext.put("orderId", orderId); } + if (UtilValidate.isNotEmpty(custRequestId)) { + serviceContext.put("custRequestId", custRequestId); + } if (Debug.verboseOn()) Debug.logVerbose("sendMailFromScreen sendMail context: " + serviceContext, module); @@ -593,6 +597,9 @@ public class EmailServices { if (UtilValidate.isNotEmpty(orderId)) { result.put("orderId", orderId); } + if (UtilValidate.isNotEmpty(custRequestId)) { + result.put("custRequestId", custRequestId); + } return result; } Modified: ofbiz/branches/jquery/framework/common/webcommon/includes/flotrCharts/Pie.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/includes/flotrCharts/Pie.ftl?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/webcommon/includes/flotrCharts/Pie.ftl (original) +++ ofbiz/branches/jquery/framework/common/webcommon/includes/flotrCharts/Pie.ftl Mon Jul 5 10:07:56 2010 @@ -26,7 +26,7 @@ under the License. <script type="text/javascript"> document.observe('dom:loaded', function(){ - var dataAsText = '${dataText}'; + var dataAsText = '${StringUtil.wrapString(dataText)}'; var chartData = []; chartData = dataAsText.split(','); var allData = []; Modified: ofbiz/branches/jquery/framework/common/webcommon/includes/lookup.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/includes/lookup.ftl?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/webcommon/includes/lookup.ftl (original) +++ ofbiz/branches/jquery/framework/common/webcommon/includes/lookup.ftl Mon Jul 5 10:07:56 2010 @@ -32,7 +32,7 @@ under the License. <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/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> + <script language="javascript" src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${(parameters.userLogin.lastLocale?substring(0,2))!initialLocale?substring(0,2)!'en'}.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/jquery/framework/common/webcommon/includes/messages.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/includes/messages.ftl?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/webcommon/includes/messages.ftl (original) +++ ofbiz/branches/jquery/framework/common/webcommon/includes/messages.ftl Mon Jul 5 10:07:56 2010 @@ -37,7 +37,7 @@ under the License. <#-- display the error messages --> <#if (errorMessage?has_content || errorMessageList?has_content)> - <div class="content-messages errorMessage"> + <div id="content-messages" class="content-messages errorMessage" onclick="document.getElementById('content-messages').parentNode.removeChild(this)"> <p>${uiLabelMap.CommonFollowingErrorsOccurred}:</p> <#if errorMessage?has_content> <p>${errorMessage}</p> @@ -52,7 +52,7 @@ under the License. <#-- display the event messages --> <#if (eventMessage?has_content || eventMessageList?has_content)> - <div class="content-messages eventMessage"> + <div id="content-messages" class="content-messages eventMessage" onclick="document.getElementById('content-messages').parentNode.removeChild(this)"> <p>${uiLabelMap.CommonFollowingOccurred}:</p> <#if eventMessage?has_content> <p>${eventMessage}</p> Modified: ofbiz/branches/jquery/framework/entity/config/entityengine.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/config/entityengine.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/config/entityengine.xml (original) +++ ofbiz/branches/jquery/framework/entity/config/entityengine.xml Mon Jul 5 10:07:56 2010 @@ -94,7 +94,6 @@ access. For a detailed description see t <field-type name="hsql" loader="fieldfile" location="fieldtypehsql.xml"/> <field-type name="derby" loader="fieldfile" location="fieldtypederby.xml"/> - <field-type name="cloudscape" loader="fieldfile" location="fieldtypecloudscape.xml"/> <field-type name="daffodil" loader="fieldfile" location="fieldtypedaffodil.xml"/> <field-type name="axion" loader="fieldfile" location="fieldtypeaxion.xml"/> <field-type name="mysql" loader="fieldfile" location="fieldtypemysql.xml"/> @@ -247,27 +246,6 @@ access. For a detailed description see t <!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/DerbyDataSource" isolation-level="ReadCommitted"/> --> </datasource> - <datasource name="localcloudscape" - helper-class="org.ofbiz.entity.datasource.GenericHelperDAO" - field-type-name="cloudscape" - check-on-start="true" - add-missing-on-start="true"> - <read-data reader-name="seed"/> - <read-data reader-name="seed-initial"/> - <read-data reader-name="demo"/> - <read-data reader-name="ext"/> - <inline-jdbc - jdbc-driver="COM.cloudscape.core.JDBCDriver" - jdbc-uri="jdbc:cloudscape:../../data/ofbiz; create=true" - jdbc-username="ofbiz" - jdbc-password="ofbiz" - isolation-level="ReadCommitted" - pool-minsize="2" - pool-maxsize="250" - time-between-eviction-runs-millis="600000"/> - <!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/CloudscapeDataSource" isolation-level="Serializable"/> --> - </datasource> - <datasource name="localdaffodil" helper-class="org.ofbiz.entity.datasource.GenericHelperDAO" field-type-name="daffodil" @@ -619,7 +597,7 @@ access. For a detailed description see t field-type-name="advantage" check-on-start="true" add-missing-on-start="true" - check-indices-on-start="true" + check-indices-on-start="false" use-foreign-keys="false" use-foreign-key-indices="true" join-style="ansi-no-parenthesis" Modified: ofbiz/branches/jquery/framework/entity/dtd/fieldtypemodel.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/dtd/fieldtypemodel.xsd?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/dtd/fieldtypemodel.xsd (original) +++ ofbiz/branches/jquery/framework/entity/dtd/fieldtypemodel.xsd Mon Jul 5 10:07:56 2010 @@ -30,26 +30,101 @@ under the License. <!-- ================= Children of fieldtypemodel =================== --> <xs:element name="field-type-def"> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="validate"/> - </xs:sequence> <xs:attributeGroup ref="attlist.field-type-def"/> </xs:complexType> </xs:element> - <!-- ================= Children of field-type-def =================== --> <xs:attributeGroup name="attlist.field-type-def"> <xs:attribute type="xs:string" name="type" use="required"/> <xs:attribute type="xs:string" name="sql-type" use="required"/> <xs:attribute type="xs:string" name="sql-type-alias"/> - <xs:attribute type="xs:string" name="java-type" use="required"/> - </xs:attributeGroup> - <xs:element name="validate"> - <xs:complexType> - <xs:attributeGroup ref="attlist.validate"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.validate"> - <xs:attribute type="xs:string" name="method" use="required"/> - <xs:attribute type="xs:string" name="class" default="org.ofbiz.base.util.UtilValidate"/> + <xs:attribute name="java-type" use="required"> + <xs:annotation><xs:documentation> + The java-type attribute must contain a Java data type + recognized by the JDBC driver (ResultSet getXxx methods + or PreparedStatement setXxx methods). + </xs:documentation></xs:annotation> + <!-- Developers Note: SQL type to Java type mapping taken from + http://java.sun.com/j2se/1.4.2/docs/guide/jdbc/getstart/mapping.html --> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="byte[]"> + <xs:annotation><xs:documentation> + Use with BLOB, BINARY, VARBINARY, and LONGVARBINARY SQL types + </xs:documentation></xs:annotation> + </xs:enumeration> + <xs:enumeration value="Boolean"> + <xs:annotation><xs:documentation> + Use with BIT and BOOLEAN SQL types + </xs:documentation></xs:annotation> + </xs:enumeration> + <xs:enumeration value="Double"> + <xs:annotation><xs:documentation> + Use with DOUBLE and FLOAT SQL types + </xs:documentation></xs:annotation> + </xs:enumeration> + <xs:enumeration value="Float"> + <xs:annotation><xs:documentation> + Use with REAL SQL type + </xs:documentation></xs:annotation> + </xs:enumeration> + <xs:enumeration value="Integer"> + <xs:annotation><xs:documentation> + Use with INTEGER SQL type + </xs:documentation></xs:annotation> + </xs:enumeration> + <xs:enumeration value="Long"> + <xs:annotation><xs:documentation> + Use with BIGINT SQL type + </xs:documentation></xs:annotation> + </xs:enumeration> + <xs:enumeration value="Object"> + <xs:annotation><xs:documentation> + Use with BLOB and LONGVARBINARY SQL types + </xs:documentation></xs:annotation> + </xs:enumeration> + <xs:enumeration value="Short"> + <xs:annotation><xs:documentation> + Use with SMALLINT and TINYINT SQL types + </xs:documentation></xs:annotation> + </xs:enumeration> + <xs:enumeration value="String"> + <xs:annotation><xs:documentation> + Use with CLOB, CHAR, VARCHAR, + and LONGVARCHAR SQL types + </xs:documentation></xs:annotation> + </xs:enumeration> + <xs:enumeration value="java.math.BigDecimal"> + <xs:annotation><xs:documentation> + Use with DECIMAL and NUMERIC SQL types + </xs:documentation></xs:annotation> + </xs:enumeration> + <xs:enumeration value="java.sql.Blob"> + <xs:annotation><xs:documentation> + Use with BLOB SQL type + </xs:documentation></xs:annotation> + </xs:enumeration> + <xs:enumeration value="java.sql.Clob"> + <xs:annotation><xs:documentation> + Use with CLOB SQL type + </xs:documentation></xs:annotation> + </xs:enumeration> + <xs:enumeration value="java.sql.Date"> + <xs:annotation><xs:documentation> + Use with DATE SQL type + </xs:documentation></xs:annotation> + </xs:enumeration> + <xs:enumeration value="java.sql.Time"> + <xs:annotation><xs:documentation> + Use with TIME SQL type + </xs:documentation></xs:annotation> + </xs:enumeration> + <xs:enumeration value="java.sql.Timestamp"> + <xs:annotation><xs:documentation> + Use with TIMESTAMP SQL type + </xs:documentation></xs:annotation> + </xs:enumeration> + </xs:restriction> + </xs:simpleType> + </xs:attribute> </xs:attributeGroup> </xs:schema> Modified: ofbiz/branches/jquery/framework/entity/entitydef/entitymodel_test.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/entitydef/entitymodel_test.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/entitydef/entitymodel_test.xml (original) +++ ofbiz/branches/jquery/framework/entity/entitydef/entitymodel_test.xml Mon Jul 5 10:07:56 2010 @@ -75,13 +75,34 @@ under the License. ========================================================== --> <entity entity-name="TestBlob" package-name="org.ofbiz.entity.test" - title="Entity for testing the blob type"> + title="Entity for testing the blob type (Deprecated)"> + <description>Deprecated - use TestFieldType instead</description> <field name="testBlobId" type="id-ne"/> <field name="testBlobField" type="blob"/> <prim-key field="testBlobId"/> </entity> <!-- ========================================================= - Testing Node entity : hierachy of nodes having + An entity for testing the field data types + ========================================================== --> + <entity entity-name="TestFieldType" + package-name="org.ofbiz.entity.test" + title="Entity for testing the field data types"> + <description>An entity for testing the field data types</description> + <field name="testFieldTypeId" type="id-ne"/> + <field name="blobField" type="blob"/> + <field name="byteArrayField" type="byte-array"/> + <field name="objectField" type="object"/> + <field name="dateField" type="date"/> + <field name="timeField" type="time"/> + <field name="dateTimeField" type="date-time"/> + <field name="fixedPointField" type="fixed-point"/> + <field name="floatingPointField" type="floating-point"/> + <field name="numericField" type="numeric"/> + <field name="clobField" type="very-long"/> + <prim-key field="testFieldTypeId"/> + </entity> + <!-- ========================================================= + Testing Node entity : hierarchy of nodes having 'testing node member' as potential members ========================================================= --> <entity entity-name="TestingNode" Modified: ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypeadvantage.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypeadvantage.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypeadvantage.xml (original) +++ ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypeadvantage.xml Mon Jul 5 10:07:56 2010 @@ -25,40 +25,43 @@ under the License. <!-- ===================== field-type-def ==================== --> <!-- General Types --> - <field-type-def type="blob" sql-type="Blob" java-type="java.sql.Blob"></field-type-def> - - <field-type-def type="date-time" sql-type="TimeStamp" java-type="java.sql.Timestamp"></field-type-def> - <field-type-def type="date" sql-type="Date" java-type="java.sql.Date"></field-type-def> - <field-type-def type="time" sql-type="Time" java-type="java.sql.Time"></field-type-def> - - <field-type-def type="currency-amount" sql-type="Money" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="currency-precise" sql-type="Double" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="fixed-point" sql-type="Double" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="floating-point" sql-type="Double" java-type="Double"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="numeric" sql-type="Integer" java-type="Long"><validate method="isSignedLong"/></field-type-def> - - <field-type-def type="id" sql-type="Char(20)" java-type="String"></field-type-def> - <field-type-def type="id-long" sql-type="Char(60)" java-type="String"></field-type-def> - <field-type-def type="id-vlong" sql-type="Char(255)" java-type="String"></field-type-def> - - <field-type-def type="indicator" sql-type="Char(1)" java-type="String"></field-type-def> - <field-type-def type="very-short" sql-type="Char(10)" java-type="String"></field-type-def> - <field-type-def type="short-varchar" sql-type="Char(60)" java-type="String"></field-type-def> - <field-type-def type="long-varchar" sql-type="Char(255)" java-type="String"></field-type-def> - <field-type-def type="very-long" sql-type="Memo" java-type="String"></field-type-def> - - <field-type-def type="comment" sql-type="Char(255)" java-type="String"></field-type-def> - <field-type-def type="description" sql-type="Char(255)" java-type="String"></field-type-def> - <field-type-def type="name" sql-type="Char(100)" java-type="String"></field-type-def> - <field-type-def type="value" sql-type="Char(255)" java-type="String"></field-type-def> + <field-type-def type="blob" sql-type="Blob" java-type="java.sql.Blob"/> + <field-type-def type="byte-array" sql-type="Blob" java-type="byte[]"/> + <field-type-def type="object" sql-type="Blob" java-type="Object"/> + + <field-type-def type="date-time" sql-type="TimeStamp" java-type="java.sql.Timestamp"/> + <field-type-def type="date" sql-type="Date" java-type="java.sql.Date"/> + <field-type-def type="time" sql-type="Time" java-type="java.sql.Time"/> + + <!-- Advantage numeric fields are 2 bytes longer than the intended precision - to hold the sign and decimal point. --> + <field-type-def type="currency-amount" sql-type="Numeric(20,2)" java-type="java.math.BigDecimal"/> + <field-type-def type="currency-precise" sql-type="Numeric(20,3)" java-type="java.math.BigDecimal"/> + <field-type-def type="fixed-point" sql-type="Numeric(20,6)" java-type="java.math.BigDecimal"/> + <field-type-def type="floating-point" sql-type="Double" java-type="Double"/> + <field-type-def type="numeric" sql-type="Numeric(20,0)" java-type="Long"/> + + <field-type-def type="id" sql-type="Char(20)" java-type="String"/> + <field-type-def type="id-long" sql-type="Char(60)" java-type="String"/> + <field-type-def type="id-vlong" sql-type="Char(255)" java-type="String"/> + + <field-type-def type="indicator" sql-type="Char(1)" java-type="String"/> + <field-type-def type="very-short" sql-type="Char(10)" java-type="String"/> + <field-type-def type="short-varchar" sql-type="Char(60)" java-type="String"/> + <field-type-def type="long-varchar" sql-type="Char(255)" java-type="String"/> + <field-type-def type="very-long" sql-type="Memo" java-type="String"/> + + <field-type-def type="comment" sql-type="Char(255)" java-type="String"/> + <field-type-def type="description" sql-type="Char(255)" java-type="String"/> + <field-type-def type="name" sql-type="Char(100)" java-type="String"/> + <field-type-def type="value" sql-type="Char(255)" java-type="String"/> <!-- Specialized Types --> - <field-type-def type="credit-card-number" sql-type="Char(255)" java-type="String"><validate method="isAnyCard"/></field-type-def> - <field-type-def type="credit-card-date" sql-type="Char(20)" java-type="String"><validate method="isDateAfterToday"/></field-type-def> - <field-type-def type="email" sql-type="Char(255)" java-type="String"><validate method="isEmail"/></field-type-def> - <field-type-def type="url" sql-type="Char(255)" java-type="String"></field-type-def> - <field-type-def type="id-ne" sql-type="Char(20)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-long-ne" sql-type="Char(60)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-vlong-ne" sql-type="Char(255)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="tel-number" sql-type="Char(60)" java-type="String"><validate method="isInternationalPhoneNumber"/></field-type-def> + <field-type-def type="credit-card-number" sql-type="Char(255)" java-type="String"/> + <field-type-def type="credit-card-date" sql-type="Char(20)" java-type="String"/> + <field-type-def type="email" sql-type="Char(255)" java-type="String"/> + <field-type-def type="url" sql-type="Char(255)" java-type="String"/> + <field-type-def type="id-ne" sql-type="Char(20)" java-type="String"/> + <field-type-def type="id-long-ne" sql-type="Char(60)" java-type="String"/> + <field-type-def type="id-vlong-ne" sql-type="Char(255)" java-type="String"/> + <field-type-def type="tel-number" sql-type="Char(60)" java-type="String"/> </fieldtypemodel> Modified: ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypeaxion.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypeaxion.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypeaxion.xml (original) +++ ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypeaxion.xml Mon Jul 5 10:07:56 2010 @@ -22,42 +22,44 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd"> <!-- ===================== field-type-def ==================== --> <!-- General Types --> - <field-type-def type="blob" sql-type="BLOB" java-type="java.sql.Blob"></field-type-def> - - <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"></field-type-def> - <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> - <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> - - <field-type-def type="currency-amount" sql-type="NUMBER(18,2)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="currency-precise" sql-type="NUMBER(18,3)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="fixed-point" sql-type="NUMBER(18,6)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="floating-point" sql-type="FLOAT" java-type="Double"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="numeric" sql-type="NUMBER(20,0)" java-type="Long"><validate method="isSignedLong"/></field-type-def> - - <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"></field-type-def> - <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"></field-type-def> - <field-type-def type="id-vlong" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - - <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"></field-type-def> - <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"></field-type-def> - <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"></field-type-def> - <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="very-long" sql-type="CLOB" java-type="String"></field-type-def> - - <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"></field-type-def> - <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"></field-type-def> + <field-type-def type="blob" sql-type="BLOB" java-type="java.sql.Blob"/> + <field-type-def type="byte-array" sql-type="BLOB" java-type="byte[]"/> + <field-type-def type="object" sql-type="BLOB" java-type="Object"/> + + <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"/> + <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"/> + <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"/> + + <field-type-def type="currency-amount" sql-type="NUMBER(18,2)" java-type="java.math.BigDecimal"/> + <field-type-def type="currency-precise" sql-type="NUMBER(18,3)" java-type="java.math.BigDecimal"/> + <field-type-def type="fixed-point" sql-type="NUMBER(18,6)" java-type="java.math.BigDecimal"/> + <field-type-def type="floating-point" sql-type="FLOAT" java-type="Double"/> + <field-type-def type="numeric" sql-type="NUMBER(20,0)" java-type="Long"/> + + <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="id-vlong" sql-type="VARCHAR(255)" java-type="String"/> + + <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"/> + <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"/> + <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="very-long" sql-type="CLOB" java-type="String"/> + + <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="name" sql-type="VARCHAR(100)" java-type="String"/> + <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"/> <!-- Specialized Types --> - <field-type-def type="credit-card-number" sql-type="VARCHAR(255)" java-type="String"><validate method="isAnyCard"/></field-type-def> - <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"><validate method="isDateAfterToday"/></field-type-def> - <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"><validate method="isEmail"/></field-type-def> - <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"></field-type-def> - <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"><validate method="isInternationalPhoneNumber"/></field-type-def> + <field-type-def type="credit-card-number" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"/> + <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"/> + <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" java-type="String"/> + <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"/> </fieldtypemodel> Modified: ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypedaffodil.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypedaffodil.xml?rev=960512&r1=960511&r2=960512&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypedaffodil.xml (original) +++ ofbiz/branches/jquery/framework/entity/fieldtype/fieldtypedaffodil.xml Mon Jul 5 10:07:56 2010 @@ -22,40 +22,42 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/fieldtypemodel.xsd"> <!-- ===================== field-type-def ==================== --> <!-- General Types --> - <field-type-def type="blob" sql-type="BLOB" java-type="java.sql.Blob"></field-type-def> - - <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"></field-type-def> - <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> - <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> - - <field-type-def type="currency-amount" sql-type="NUMBER(18,2)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="currency-precise" sql-type="NUMBER(18,3)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="fixed-point" sql-type="NUMBER(18,6)" java-type="java.math.BigDecimal"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="floating-point" sql-type="NUMBER(18,6)" java-type="Double"><validate method="isSignedDouble"/></field-type-def> - <field-type-def type="numeric" sql-type="NUMBER(20,0)" java-type="Long"><validate method="isSignedLong"/></field-type-def> - - <field-type-def type="id" sql-type="VARCHAR2(20)" java-type="String"></field-type-def> - <field-type-def type="id-long" sql-type="VARCHAR2(60)" java-type="String"></field-type-def> - <field-type-def type="id-vlong" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> - - <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"></field-type-def> - <field-type-def type="very-short" sql-type="VARCHAR2(10)" java-type="String"></field-type-def> - <field-type-def type="short-varchar" sql-type="VARCHAR2(60)" java-type="String"></field-type-def> - <field-type-def type="long-varchar" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> - <field-type-def type="very-long" sql-type="CLOB" java-type="String"></field-type-def> - - <field-type-def type="comment" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> - <field-type-def type="description" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> - <field-type-def type="name" sql-type="VARCHAR2(100)" java-type="String"></field-type-def> - <field-type-def type="value" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> + <field-type-def type="blob" sql-type="BLOB" java-type="java.sql.Blob"/> + <field-type-def type="byte-array" sql-type="BLOB" java-type="byte[]"/> + <field-type-def type="object" sql-type="BLOB" java-type="Object"/> + + <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"/> + <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"/> + <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"/> + + <field-type-def type="currency-amount" sql-type="NUMBER(18,2)" java-type="java.math.BigDecimal"/> + <field-type-def type="currency-precise" sql-type="NUMBER(18,3)" java-type="java.math.BigDecimal"/> + <field-type-def type="fixed-point" sql-type="NUMBER(18,6)" java-type="java.math.BigDecimal"/> + <field-type-def type="floating-point" sql-type="NUMBER(18,6)" java-type="Double"/> + <field-type-def type="numeric" sql-type="NUMBER(20,0)" java-type="Long"/> + + <field-type-def type="id" sql-type="VARCHAR2(20)" java-type="String"/> + <field-type-def type="id-long" sql-type="VARCHAR2(60)" java-type="String"/> + <field-type-def type="id-vlong" sql-type="VARCHAR2(255)" java-type="String"/> + + <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"/> + <field-type-def type="very-short" sql-type="VARCHAR2(10)" java-type="String"/> + <field-type-def type="short-varchar" sql-type="VARCHAR2(60)" java-type="String"/> + <field-type-def type="long-varchar" sql-type="VARCHAR2(255)" java-type="String"/> + <field-type-def type="very-long" sql-type="CLOB" java-type="String"/> + + <field-type-def type="comment" sql-type="VARCHAR2(255)" java-type="String"/> + <field-type-def type="description" sql-type="VARCHAR2(255)" java-type="String"/> + <field-type-def type="name" sql-type="VARCHAR2(100)" java-type="String"/> + <field-type-def type="value" sql-type="VARCHAR2(255)" java-type="String"/> <!-- Specialized Types --> - <field-type-def type="credit-card-number" sql-type="VARCHAR2(255)" java-type="String"><validate method="isAnyCard"/></field-type-def> - <field-type-def type="credit-card-date" sql-type="VARCHAR2(20)" java-type="String"><validate method="isDateAfterToday"/></field-type-def> - <field-type-def type="email" sql-type="VARCHAR2(255)" java-type="String"><validate method="isEmail"/></field-type-def> - <field-type-def type="url" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> - <field-type-def type="id-ne" sql-type="VARCHAR2(20)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-long-ne" sql-type="VARCHAR2(60)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="id-vlong-ne" sql-type="VARCHAR2(255)" java-type="String"><validate method="isNotEmpty"/></field-type-def> - <field-type-def type="tel-number" sql-type="VARCHAR2(60)" java-type="String"><validate method="isInternationalPhoneNumber"/></field-type-def> + <field-type-def type="credit-card-number" sql-type="VARCHAR2(255)" java-type="String"/> + <field-type-def type="credit-card-date" sql-type="VARCHAR2(20)" java-type="String"/> + <field-type-def type="email" sql-type="VARCHAR2(255)" java-type="String"/> + <field-type-def type="url" sql-type="VARCHAR2(255)" java-type="String"/> + <field-type-def type="id-ne" sql-type="VARCHAR2(20)" java-type="String"/> + <field-type-def type="id-long-ne" sql-type="VARCHAR2(60)" java-type="String"/> + <field-type-def type="id-vlong-ne" sql-type="VARCHAR2(255)" java-type="String"/> + <field-type-def type="tel-number" sql-type="VARCHAR2(60)" java-type="String"/> </fieldtypemodel> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |