svn commit: r1229278 [1/4] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1229278 [1/4] - in /ofbiz/branches/jackrabbit2010
 
|
Author: sascharodekamp
Date: Mon Jan 9 17:59:01 2012 New Revision: 1229278 URL: http://svn.apache.org/viewvc?rev=1229278&view=rev Log: Update the Jackrabbit branch with the current trunk version to keep the branch up to date Added: ofbiz/branches/jackrabbit20100709/applications/content/lib/dom4j-1.6.1.jar - copied unchanged from r1229273, ofbiz/trunk/applications/content/lib/dom4j-1.6.1.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/lucene-core-3.5.0.jar - copied unchanged from r1229273, ofbiz/trunk/applications/content/lib/lucene-core-3.5.0.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/poi-3.8-beta5-20111217.jar - copied unchanged from r1229273, ofbiz/trunk/applications/content/lib/poi-3.8-beta5-20111217.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/poi-ooxml-3.8-beta5-20111217.jar - copied unchanged from r1229273, ofbiz/trunk/applications/content/lib/poi-ooxml-3.8-beta5-20111217.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/poi-ooxml-schemas-3.8-beta5-20111217.jar - copied unchanged from r1229273, ofbiz/trunk/applications/content/lib/poi-ooxml-schemas-3.8-beta5-20111217.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/poi-scratchpad-3.8-beta5-20111217.jar - copied unchanged from r1229273, ofbiz/trunk/applications/content/lib/poi-scratchpad-3.8-beta5-20111217.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/tika-core-1.0.jar - copied unchanged from r1229273, ofbiz/trunk/applications/content/lib/tika-core-1.0.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/tika-parsers-1.0.jar - copied unchanged from r1229273, ofbiz/trunk/applications/content/lib/tika-parsers-1.0.jar ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/tagsearch.ftl - copied unchanged from r1229273, ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/tagsearch.ftl ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/ProductTagTest.xml - copied unchanged from r1229273, ofbiz/trunk/applications/product/script/org/ofbiz/product/test/ProductTagTest.xml ofbiz/branches/jackrabbit20100709/applications/product/testdef/ProductTagTest.xml - copied unchanged from r1229273, ofbiz/trunk/applications/product/testdef/ProductTagTest.xml ofbiz/branches/jackrabbit20100709/framework/base/lib/ant-1.8.2.jar - copied unchanged from r1229273, ofbiz/trunk/framework/base/lib/ant-1.8.2.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/ant-junit-1.8.2.jar - copied unchanged from r1229273, ofbiz/trunk/framework/base/lib/ant-junit-1.8.2.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/ant-launcher-1.8.2.jar - copied unchanged from r1229273, ofbiz/trunk/framework/base/lib/ant-launcher-1.8.2.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/ant-trax-1.8.0.jar - copied unchanged from r1229273, ofbiz/trunk/framework/base/lib/ant-trax-1.8.0.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/ant/ant-apache-bsf-1.8.2.jar - copied unchanged from r1229273, ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.8.2.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/ant/ant-nodeps-1.8.1.jar - copied unchanged from r1229273, ofbiz/trunk/framework/base/lib/ant/ant-nodeps-1.8.1.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-7.0.23.annotations-api.jar - copied unchanged from r1229273, ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.23.annotations-api.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-7.0.23.el-api.jar - copied unchanged from r1229273, ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.23.el-api.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-7.0.23.jsp-api.jar - copied unchanged from r1229273, ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.23.jsp-api.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-7.0.23.servlet-api.jar - copied unchanged from r1229273, ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.23.servlet-api.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.23.catalina-ant.jar - copied unchanged from r1229273, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.23.catalina-ant.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.23.catalina-ha.jar - copied unchanged from r1229273, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.23.catalina-ha.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.23.catalina-tribes.jar - copied unchanged from r1229273, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.23.catalina-tribes.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.23.catalina.jar - copied unchanged from r1229273, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.23.catalina.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.23.jasper-el.jar - copied unchanged from r1229273, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.23.jasper-el.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.23.jasper.jar - copied unchanged from r1229273, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.23.jasper.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.23.tomcat-api.jar - copied unchanged from r1229273, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.23.tomcat-api.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.23.tomcat-coyote.jar - copied unchanged from r1229273, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.23.tomcat-coyote.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.23.tomcat-dbcp.jar - copied unchanged from r1229273, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.23.tomcat-dbcp.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.23.tomcat-i18n-es.jar - copied unchanged from r1229273, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.23.tomcat-i18n-es.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.23.tomcat-i18n-fr.jar - copied unchanged from r1229273, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.23.tomcat-i18n-fr.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.23.tomcat-i18n-ja.jar - copied unchanged from r1229273, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.23.tomcat-i18n-ja.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.23.tomcat-juli-adapters.jar - copied unchanged from r1229273, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.23.tomcat-juli-adapters.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.23.tomcat-juli.jar - copied unchanged from r1229273, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.23.tomcat-juli.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.23.tomcat-util.jar - copied unchanged from r1229273, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.23.tomcat-util.jar ofbiz/branches/jackrabbit20100709/framework/jetty/lib/ant-1.8.2.jar - copied unchanged from r1229273, ofbiz/trunk/framework/jetty/lib/ant-1.8.2.jar ofbiz/branches/jackrabbit20100709/framework/service/data/ServiceSeedData.xml - copied unchanged from r1229273, ofbiz/trunk/framework/service/data/ServiceSeedData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/README - copied unchanged from r1229273, ofbiz/trunk/specialpurpose/ecommerce/README ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/ - copied from r1229273, ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/PopularTags.groovy - copied unchanged from r1229273, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/PopularTags.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/populartags.ftl - copied unchanged from r1229273, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/populartags.ftl Removed: ofbiz/branches/jackrabbit20100709/applications/content/lib/lucene-core-3.0.3.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/metadata-extractor-2.4.0-beta-1.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/poi-3.7.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/poi-ooxml-3.7.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/poi-ooxml-schemas-3.7.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/poi-scratchpad-3.7.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/ant-1.7.1.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/ant-junit-1.7.1.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/ant-launcher-1.7.1.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/ant-trax-1.7.1.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/ant/ant-nodeps-1.7.1.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-7.0.22.annotations-api.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-7.0.22.el-api.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-7.0.22.jsp-api.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-7.0.22.servlet-api.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22-tomcat-juli-adapters.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22-tomcat-juli.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.catalina-ant.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.catalina-ha.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.catalina-tribes.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.catalina.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.jasper-el.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.jasper.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.tomcat-api.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.tomcat-coyote.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.tomcat-dbcp.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.tomcat-i18n-es.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.tomcat-i18n-fr.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.tomcat-i18n-ja.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.tomcat-util.jar ofbiz/branches/jackrabbit20100709/framework/jetty/lib/ant-1.6.5.jar ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/event/DojoJSONServiceEventHandler.java ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/event/JSONJavaEventHandler.java ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceEventHandler.java ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceMultiEventHandler.java ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/CategoryDetail.groovy Modified: ofbiz/branches/jackrabbit20100709/ (props changed) ofbiz/branches/jackrabbit20100709/.classpath ofbiz/branches/jackrabbit20100709/LICENSE ofbiz/branches/jackrabbit20100709/ant.bat ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml ofbiz/branches/jackrabbit20100709/applications/accounting/data/DemoGlSetupData.xml ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/search/SearchWorker.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/test/LuceneTests.java ofbiz/branches/jackrabbit20100709/applications/order/ofbiz-component.xml ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/images/js/order.js ofbiz/branches/jackrabbit20100709/applications/party/ofbiz-component.xml ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel_old.xml ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel_shipment.xml ofbiz/branches/jackrabbit20100709/applications/product/ofbiz-component.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/UpgradeServices.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/product/ProductServices.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/GroupOrderTest.xml ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services_upgrade.xml ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/KeywordIndex.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductEvents.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductSearch.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/ImageFrame.ftl ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/imagemanagement/ImageWatermark.ftl ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogMenus.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ImageManagementForms.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ImageManagementScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductForms.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductScreens.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/config/WorkEffortUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/data/WorkEffortDemoData.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/data/WorkEffortTypeData.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/script/isCalOwner.groovy ofbiz/branches/jackrabbit20100709/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/servicedef/services.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java ofbiz/branches/jackrabbit20100709/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/CreateUrlParam.groovy ofbiz/branches/jackrabbit20100709/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy ofbiz/branches/jackrabbit20100709/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy ofbiz/branches/jackrabbit20100709/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy ofbiz/branches/jackrabbit20100709/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl ofbiz/branches/jackrabbit20100709/applications/workeffort/webapp/workeffort/calendar/day.ftl ofbiz/branches/jackrabbit20100709/applications/workeffort/webapp/workeffort/calendar/month.ftl ofbiz/branches/jackrabbit20100709/applications/workeffort/webapp/workeffort/calendar/week.ftl ofbiz/branches/jackrabbit20100709/applications/workeffort/widget/CalendarForms.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/widget/CalendarScreens.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/applyOfbizPatchesAndHotDeploy.sh ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/ObjectType.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilIO.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml ofbiz/branches/jackrabbit20100709/framework/common/data/CommonTypeData.xml ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/common-controller.xml ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/framework/entity/config/entityengine.xml ofbiz/branches/jackrabbit20100709/framework/entity/dtd/entity-config.xsd ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericEntity.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/config/EntityConfigUtil.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/selectall.js ofbiz/branches/jackrabbit20100709/framework/resources/templates/build.xml ofbiz/branches/jackrabbit20100709/framework/service/data/ServiceDemoData.xml ofbiz/branches/jackrabbit20100709/framework/service/ofbiz-component.xml ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java ofbiz/branches/jackrabbit20100709/framework/widget/templates/xmlFormMacroLibrary.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/build.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/config/EcommerceUiLabels.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/config/ecommerce.properties ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoProduct.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/NewCustomer.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/login.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CatalogScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/build.xml ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/CatalogScreens.xml Propchange: ofbiz/branches/jackrabbit20100709/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 9 17:59:01 2012 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4:951708-952957 /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:962442-1222180 +/ofbiz/trunk:962442-1229275 Modified: ofbiz/branches/jackrabbit20100709/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/.classpath?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/.classpath (original) +++ ofbiz/branches/jackrabbit20100709/.classpath Mon Jan 9 17:59:01 2012 @@ -4,20 +4,23 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="applications/content/lib/fontbox-1.4.0.jar"/> <classpathentry kind="lib" path="applications/content/lib/jempbox-1.4.0.jar"/> - <classpathentry kind="lib" path="applications/content/lib/lucene-core-3.0.3.jar"/> - <classpathentry kind="lib" path="applications/content/lib/metadata-extractor-2.4.0-beta-1.jar"/> + <classpathentry kind="lib" path="applications/content/lib/lucene-core-3.5.0.jar"/> <classpathentry kind="lib" path="applications/content/lib/pdfbox-1.4.0.jar"/> - <classpathentry kind="lib" path="applications/content/lib/poi-3.7.jar"/> - <classpathentry kind="lib" path="applications/content/lib/poi-ooxml-3.7.jar"/> - <classpathentry kind="lib" path="applications/content/lib/poi-scratchpad-3.7.jar"/> + <classpathentry kind="lib" path="applications/content/lib/dom4j-1.6.1.jar"/> + <classpathentry kind="lib" path="applications/content/lib/poi-3.8-beta5-20111217.jar"/> + <classpathentry kind="lib" path="applications/content/lib/poi-ooxml-3.8-beta5-20111217.jar"/> + <classpathentry kind="lib" path="applications/content/lib/poi-ooxml-schemas-3.8-beta5-20111217.jar"/> + <classpathentry kind="lib" path="applications/content/lib/poi-scratchpad-3.8-beta5-20111217.jar"/> + <classpathentry kind="lib" path="applications/content/lib/tika-core-1.0.jar"/> + <classpathentry kind="lib" path="applications/content/lib/tika-parsers-1.0.jar"/> <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/> <classpathentry kind="lib" path="applications/product/lib/dozer-4.2.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant-1.7.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant-junit-1.7.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant-launcher-1.7.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant-trax-1.7.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant/ant-apache-bsf-1.7.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.7.1.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ant-1.8.2.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ant-junit-1.8.2.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ant-launcher-1.8.2.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ant-trax-1.8.0.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ant/ant-apache-bsf-1.8.2.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.8.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/avalon-util-exception-1.0.0.jar"/> @@ -88,10 +91,10 @@ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.22.annotations-api.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.22.el-api.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.22.jsp-api.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.22.servlet-api.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.23.annotations-api.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.23.el-api.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.23.jsp-api.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.23.servlet-api.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/antlr-2.7.6.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/asm-3.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/asm-analysis-3.2.jar"/> @@ -122,18 +125,18 @@ <classpathentry kind="lib" path="framework/birt/lib/scriptapi.jar"/> <classpathentry kind="lib" path="framework/birt/lib/viewservlets.jar"/> <classpathentry kind="lib" path="framework/catalina/lib/ecj-3.7.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22-tomcat-juli-adapters.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22-tomcat-juli.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.catalina-ant.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.catalina-ha.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.catalina-tribes.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.catalina.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.jasper-el.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.jasper.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.tomcat-coyote.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.tomcat-dbcp.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.tomcat-api.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.tomcat-util.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.23.tomcat-juli-adapters.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.23.tomcat-juli.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.23.catalina-ant.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.23.catalina-ha.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.23.catalina-tribes.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.23.catalina.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.23.jasper-el.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.23.jasper.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.23.tomcat-coyote.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.23.tomcat-dbcp.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.23.tomcat-api.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.23.tomcat-util.jar"/> <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.3-20091113-r835956.jar"/> <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/> Modified: ofbiz/branches/jackrabbit20100709/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/LICENSE?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/LICENSE (original) +++ ofbiz/branches/jackrabbit20100709/LICENSE Mon Jan 9 17:59:01 2012 @@ -11,12 +11,12 @@ For additional details, see the NOTICE f http://cwiki.apache.org/confluence/display/OFBADMIN/Libraries+Included+in+OFBiz ========================================================================= The following libraries are licensed under the Apache License Version 2.0: -ofbiz/trunk/framework/base/lib/ant-launcher-1.7.1.jar -ofbiz/trunk/framework/base/lib/ant-1.7.1.jar -ofbiz/trunk/framework/base/lib/ant-junit-1.7.1.jar -ofbiz/trunk/framework/base/lib/ant-trax-1.7.1.jar -ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar -ofbiz/trunk/framework/base/lib/ant/ant-nodeps-1.7.1.jar +ofbiz/trunk/framework/base/lib/ant-launcher-1.8.2.jar +ofbiz/trunk/framework/base/lib/ant-1.8.2.jar +ofbiz/trunk/framework/base/lib/ant-junit-1.8.2.jar +ofbiz/trunk/framework/base/lib/ant-trax-1.8.0.jar +ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.8.2.jar +ofbiz/trunk/framework/base/lib/ant/ant-nodeps-1.8.1.jar ofbiz/trunk/framework/base/lib/avalon-framework-4.2.0.jar ofbiz/trunk/framework/base/lib/avalon-util-exception-1.0.0.jar ofbiz/trunk/framework/base/lib/batik-all-1.7.jar @@ -65,10 +65,10 @@ ofbiz/trunk/framework/base/lib/j2eespecs ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar -ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.32-annotations-api.jar -ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.32-el-api.jar -ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.32-jsp-api.jar -ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.32-servlet-api.jar +ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.23.annotations-api.jar +ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.23.el-api.jar +ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.23.jsp-api.jar +ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.23.servlet-api.jar ofbiz/trunk/framework/base/lib/scripting/bsf-2.4.0.jar ofbiz/trunk/framework/base/lib/scripting/jakarta-oro-2.0.8.jar ofbiz/trunk/framework/base/lib/scripting/groovy-all-1.7.7.jar @@ -76,19 +76,25 @@ ofbiz/trunk/framework/base/lib/scripting ofbiz/trunk/framework/base/lib/xmlrpc-client-3.1.2.jar ofbiz/trunk/framework/base/lib/xmlrpc-common-3.1.2.jar ofbiz/trunk/framework/base/lib/xmlrpc-server-3.1.2.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-catalina-ha.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-catalina-tribes.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-catalina.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-jasper-el.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-jasper.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-tomcat-coyote.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-tomcat-dbcp.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-tomcat-juli.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-tomcat-juli-adapters.jar +ofbiz/framework/catalina/lib/tomcat-7.0.23.tomcat-util.jar +ofbiz/framework/catalina/lib/tomcat-7.0.23.tomcat-i18n-es.jar +ofbiz/framework/catalina/lib/tomcat-7.0.23.catalina-ant.jar +ofbiz/framework/catalina/lib/tomcat-7.0.23.catalina.jar +ofbiz/framework/catalina/lib/tomcat-7.0.23.jasper-el.jar +ofbiz/framework/catalina/lib/tomcat-7.0.23.tomcat-juli.jar +ofbiz/framework/catalina/lib/tomcat-7.0.23.tomcat-i18n-ja.jar +ofbiz/framework/catalina/lib/tomcat-7.0.23.catalina-tribes.jar +ofbiz/framework/catalina/lib/tomcat-7.0.23.tomcat-dbcp.jar +ofbiz/framework/catalina/lib/tomcat-7.0.23.tomcat-juli-adapters.jar +ofbiz/framework/catalina/lib/tomcat-7.0.23.tomcat-i18n-fr.jar +ofbiz/framework/catalina/lib/tomcat-7.0.23.tomcat-coyote.jar +ofbiz/framework/catalina/lib/tomcat-7.0.23.catalina-ha.jar +ofbiz/framework/catalina/lib/tomcat-7.0.23.tomcat-api.jar +ofbiz/framework/catalina/lib/tomcat-7.0.23.jasper.jar ofbiz/trunk/framework/entity/lib/commons-dbcp-1.3-20091113-r835956.jar ofbiz/trunk/framework/entity/lib/jdbc/derby-10.8.2.2.jar ofbiz/trunk/framework/entity/lib/jdbc/derbytools-10.8.2.2.jar -ofbiz/trunk/framework/jetty/lib/ant-1.6.5.jar +ofbiz/trunk/framework/jetty/lib/ant-1.8.2.jar ofbiz/trunk/framework/jetty/lib/jasper-compiler-5.5.15.jar ofbiz/trunk/framework/jetty/lib/jasper-compiler-jdt-5.5.15.jar ofbiz/trunk/framework/jetty/lib/jasper-runtime-5.5.15.jar @@ -159,14 +165,17 @@ ofbiz/trunk/framework/webslinger/lib/web ofbiz/trunk/framework/webslinger/lib/webslinger-launcher-20091211-3897-7ab22baea4b6.jar ofbiz/trunk/applications/content/lib/fontbox-1.4.0.jar ofbiz/trunk/applications/content/lib/jempbox-1.4.0.jar -ofbiz/trunk/applications/content/lib/lucene-core-3.0.3.jar -ofbiz/trunk/applications/content/lib/metadata-extractor-2.4.0.jar +ofbiz/trunk/applications/content/lib/lucene-core-3.5.0.jar ofbiz/trunk/applications/content/lib/pdfbox-1.4.0.jar +ofbiz/trunk/applications/content/lib/poi-3.8-beta5-20111217.jar +ofbiz/trunk/applications/content/lib/poi-ooxml-3.8-beta5-20111217.jar +ofbiz/trunk/applications/content/lib/poi-ooxml-schemas-3.8-beta5-20111217.jar +ofbiz/trunk/applications/content/lib/poi-scratchpad-3.8-beta5-20111217.jar ofbiz/trunk/applications/content/lib/poi-3.7.jar ofbiz/trunk/applications/content/lib/poi-ooxml-3.7.jar ofbiz/trunk/applications/content/lib/poi-scratchpad-3.7.jar -ofbiz/trunk/applications/content/lib/tika-core-0.9.jar -ofbiz/trunk/applications/content/lib/tika-parsers-0.9.jar +ofbiz/trunk/applications/content/lib/tika-core-1.0.jar +ofbiz/trunk/applications/content/lib/tika-parsers-1.0.jar ofbiz/trunk/applications/product/lib/dozer-4.2.1.jar ofbiz/trunk/applications/product/lib/watermarker-0.0.4.jar ofbiz/trunk/specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar @@ -495,6 +504,7 @@ The JDOM License ========================================================================= The following libraries distributed with Apache OFBiz are licensed under the BSD License: +ofbiz/trunk/applications/content/lib/dom4j-1.6.1.jar ofbiz/trunk/framework/base/lib/antisamy-bin.1.2.jar ofbiz/trunk/framework/base/lib/freemarker-2.3.10.jar ofbiz/trunk/framework/base/lib/hamcrest-all-1.2.jar @@ -2471,7 +2481,7 @@ ofbiz/trunk/framework/birt/lib/platform/ ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.runtime.compatibility.registry_3.3.0.v20100520-1800/runtime_registry_compatibility.jar ofbiz/trunk/framework/birt/lib/platform/plugins/org.mozilla.rhino_1.7.1.v20090608/lib/js.jar ofbiz/trunk/framework/birt/lib/platform/plugins/org.w3c.sac_1.3.0.v20090608/lib/flute.jar -ofbiz/trunk/framework/catalina/lib/ecj-3.3.1.jar +ofbiz/trunk/framework/catalina/lib/ecj-7.jar ========================================================================= Eclipse Public License - v 1.0 Modified: ofbiz/branches/jackrabbit20100709/ant.bat URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/ant.bat?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/ant.bat (original) +++ ofbiz/branches/jackrabbit20100709/ant.bat Mon Jan 9 17:59:01 2012 @@ -19,5 +19,5 @@ REM # under the License. REM ##################################################################### ECHO ON -"%JAVA_HOME%\bin\java" -jar framework/base/lib/ant-launcher-1.7.1.jar -lib framework/base/lib/ant %1 %2 %3 %4 %5 %6 +"%JAVA_HOME%\bin\java" -jar framework/base/lib/ant-launcher-1.8.2.jar -lib framework/base/lib/ant %1 %2 %3 %4 %5 %6 Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml Mon Jan 9 17:59:01 2012 @@ -3919,6 +3919,30 @@ <value xml:lang="zh">ä¾åºåé¢ä»æ¬¾</value> <value xml:lang="zh_TW">ä¾æåé ä»æ¬¾</value> </property> + <property key="RateType.description.AVERAGE_PAY_RATE"> + <value xml:lang="en">Average Pay Rate</value> + <value xml:lang="fr">Prix moyen</value> + </property> + <property key="RateType.description.DISCOUNTED"> + <value xml:lang="en">Discounted Rate</value> + <value xml:lang="fr">Réduit</value> + </property> + <property key="RateType.description.HIGH_PAY_RATE"> + <value xml:lang="en">Highest Pay Rate</value> + <value xml:lang="fr">Prix haut</value> + </property> + <property key="RateType.description.LOW_PAY_RATE"> + <value xml:lang="en">Lowest Pay Rate</value> + <value xml:lang="fr">Prix bas</value> + </property> + <property key="RateType.description.OVERTIME"> + <value xml:lang="en">Overtime Rate</value> + <value xml:lang="fr">Majoré</value> + </property> + <property key="RateType.description.STANDARD"> + <value xml:lang="en">Standard Rate</value> + <value xml:lang="fr">Standard</value> + </property> <property key="TaxAuthorityAssocType.description.COLLECT_AGENT"> <value xml:lang="en">Collection Agent</value> <value xml:lang="fr">Agent percepteur</value> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/data/DemoGlSetupData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/data/DemoGlSetupData.xml?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/data/DemoGlSetupData.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/data/DemoGlSetupData.xml Mon Jan 9 17:59:01 2012 @@ -398,7 +398,7 @@ under the License. <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6012" periodTypeId="FISCAL_QUARTER" fromDate="2010-04-01" thruDate="2010-07-01" isClosed="N" periodNum="3" periodName="2010/Q2" parentPeriodId="6010"/> <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6013" periodTypeId="FISCAL_QUARTER" fromDate="2010-07-01" thruDate="2010-10-01" isClosed="N" periodNum="4" periodName="2010/Q3" parentPeriodId="6010"/> <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6014" periodTypeId="FISCAL_QUARTER" fromDate="2010-10-01" thruDate="2011-01-01" isClosed="N" periodNum="5" periodName="2010/Q4" parentPeriodId="6010"/> - <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6015" periodTypeId="FISCAL_YEAR" fromDate="2011-01-01" thruDate="2012-01-01" isClosed="N" periodNum="1" periodName="2011"/> + <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6015" periodTypeId="FISCAL_YEAR" fromDate="2011-01-01" thruDate="2020-01-01" isClosed="N" periodNum="1" periodName="2011-2020"/> <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6016" periodTypeId="FISCAL_QUARTER" fromDate="2011-01-01" thruDate="2011-04-01" isClosed="N" periodNum="2" periodName="2011/Q1" parentPeriodId="6015"/> <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6017" periodTypeId="FISCAL_QUARTER" fromDate="2011-04-01" thruDate="2011-07-01" isClosed="N" periodNum="3" periodName="2011/Q2" parentPeriodId="6015"/> <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6018" periodTypeId="FISCAL_QUARTER" fromDate="2011-07-01" thruDate="2011-10-01" isClosed="N" periodNum="4" periodName="2011/Q3" parentPeriodId="6015"/> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml Mon Jan 9 17:59:01 2012 @@ -3904,7 +3904,7 @@ under the License. </view-entity> <entity entity-name="RateType" package-name="org.ofbiz.accounting.rate" - title="Rate Type Entity"> + title="Rate Type Entity" default-resource-name="AccountingEntityLabels"> <field name="rateTypeId" type="id-ne"></field> <field name="description" type="description"></field> <prim-key field="rateTypeId"/> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml Mon Jan 9 17:59:01 2012 @@ -176,10 +176,20 @@ under the License. <entity-one entity-name="UserLogin" value-field="userLogin"> <field-map field-name="userLoginId" value="system"/> </entity-one> + + <now-timestamp field="nowTimestamp"/> + <set field="findCustomTimePeriodsMap.userLogin" from-field="userLogin"/> + <set field="findCustomTimePeriodsMap.findDate" from-field="nowTimestamp" type="Timestamp"/> + <set field="findCustomTimePeriodsMap.organizationPartyId" value="Company"/> + <call-service service-name="findCustomTimePeriods" in-map-name="findCustomTimePeriodsMap"> + <result-to-field result-name="customTimePeriodList"/> + </call-service> + <first-from-list list="customTimePeriodList" entry="customTimePeriod"/> + <set field="getAcctgTransEntriesAndTransTotalMap.userLogin" from-field="userLogin"/> <set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId" value="Company"/> - <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" value="2011-01-01 16:55:01.0" type="Timestamp"/> - <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" value="2011-12-31 16:55:01.0" type="Timestamp"/> + <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" from-field="customTimePeriod.fromDate" type="Timestamp"/> + <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" from-field="customTimePeriod.thruDate" type="Timestamp"/> <set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="210000"/> <call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap"> <result-to-field result-name="debitTotal" field="payableDebitTotal"/> @@ -244,10 +254,20 @@ under the License. <entity-one entity-name="UserLogin" value-field="userLogin"> <field-map field-name="userLoginId" value="system"/> </entity-one> + + <now-timestamp field="nowTimestamp"/> + <set field="findCustomTimePeriodsMap.userLogin" from-field="userLogin"/> + <set field="findCustomTimePeriodsMap.findDate" from-field="nowTimestamp" type="Timestamp"/> + <set field="findCustomTimePeriodsMap.organizationPartyId" value="Company"/> + <call-service service-name="findCustomTimePeriods" in-map-name="findCustomTimePeriodsMap"> + <result-to-field result-name="customTimePeriodList"/> + </call-service> + <first-from-list list="customTimePeriodList" entry="customTimePeriod"/> + <set field="getAcctgTransEntriesAndTransTotalMap.userLogin" from-field="userLogin"/> <set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId" value="Company"/> - <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" value="2011-01-01 16:55:01.0" type="Timestamp"/> - <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" value="2011-12-31 16:55:01.0" type="Timestamp"/> + <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" from-field="customTimePeriod.fromDate" type="Timestamp"/> + <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" from-field="customTimePeriod.thruDate" type="Timestamp"/> <set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="210000"/> <call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap"> <result-to-field result-name="debitTotal" field="payableDebitTotal"/> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml Mon Jan 9 17:59:01 2012 @@ -348,10 +348,20 @@ under the License. <entity-one entity-name="UserLogin" value-field="userLogin"> <field-map field-name="userLoginId" value="system"/> </entity-one> + + <now-timestamp field="nowTimestamp"/> + <set field="findCustomTimePeriodsMap.userLogin" from-field="userLogin"/> + <set field="findCustomTimePeriodsMap.findDate" from-field="nowTimestamp" type="Timestamp"/> + <set field="findCustomTimePeriodsMap.organizationPartyId" value="Company"/> + <call-service service-name="findCustomTimePeriods" in-map-name="findCustomTimePeriodsMap"> + <result-to-field result-name="customTimePeriodList"/> + </call-service> + <first-from-list list="customTimePeriodList" entry="customTimePeriod"/> + <set field="getAcctgTransEntriesAndTransTotalMap.userLogin" from-field="userLogin"/> <set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId" value="Company"/> - <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" value="2011-01-01 16:55:01.0" type="Timestamp"/> - <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" value="2011-12-31 16:55:01.0" type="Timestamp"/> + <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" from-field="customTimePeriod.fromDate" type="Timestamp"/> + <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" from-field="customTimePeriod.thruDate" type="Timestamp"/> <set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="120000"/> <call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap"> <result-to-field result-name="debitTotal" field="receivableDebitTotal"/> @@ -420,10 +430,20 @@ under the License. <entity-one entity-name="UserLogin" value-field="userLogin"> <field-map field-name="userLoginId" value="system"/> </entity-one> + + <now-timestamp field="nowTimestamp"/> + <set field="findCustomTimePeriodsMap.userLogin" from-field="userLogin"/> + <set field="findCustomTimePeriodsMap.findDate" from-field="nowTimestamp" type="Timestamp"/> + <set field="findCustomTimePeriodsMap.organizationPartyId" value="Company"/> + <call-service service-name="findCustomTimePeriods" in-map-name="findCustomTimePeriodsMap"> + <result-to-field result-name="customTimePeriodList"/> + </call-service> + <first-from-list list="customTimePeriodList" entry="customTimePeriod"/> + <set field="getAcctgTransEntriesAndTransTotalMap.userLogin" from-field="userLogin"/> <set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId" value="Company"/> - <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" value="2011-01-01 16:55:01.0" type="Timestamp"/> - <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" value="2011-12-31 16:55:01.0" type="Timestamp"/> + <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" from-field="customTimePeriod.fromDate" type="Timestamp"/> + <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" from-field="customTimePeriod.thruDate" type="Timestamp"/> <set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="210000"/> <call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap"> <result-to-field result-name="debitTotal" field="payableDebitTotal"/> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl Mon Jan 9 17:59:01 2012 @@ -61,7 +61,7 @@ function getInvoiceRunningTotal() { type: 'POST', data: jQuery('#listPurchaseInvoices').serialize(), async: false, - succes: function(data) { + success: function(data) { jQuery('#showInvoiceRunningTotal').html(data.invoiceRunningTotal); } }); Modified: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/search/SearchWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/search/SearchWorker.java?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/search/SearchWorker.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/search/SearchWorker.java Mon Jan 9 17:59:01 2012 @@ -39,9 +39,11 @@ import org.ofbiz.entity.GenericValue; import org.ofbiz.service.LocalDispatcher; import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; @@ -132,16 +134,21 @@ public class SearchWorker { } // Now create IndexWriter writer = null; + long savedWriteLockTimeout = IndexWriterConfig.getDefaultWriteLockTimeout(); + Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_34); + IndexWriterConfig conf = new IndexWriterConfig(Version.LUCENE_34, analyzer); + try { - writer = new IndexWriter(directory, new StandardAnalyzer(Version.LUCENE_30), false, IndexWriter.MaxFieldLength.UNLIMITED); - } catch (Exception e) { - writer = new IndexWriter(directory, new StandardAnalyzer(Version.LUCENE_30), true, IndexWriter.MaxFieldLength.UNLIMITED); + IndexWriterConfig.setDefaultWriteLockTimeout(2000); + writer = new IndexWriter(directory, conf); + } finally { + IndexWriterConfig.setDefaultWriteLockTimeout(savedWriteLockTimeout); } for (GenericValue gv : contentList) { indexContent(dispatcher, delegator, context, gv, writer); } - writer.optimize(); + writer.forceMerge(1); writer.close(); } @@ -173,17 +180,30 @@ public class SearchWorker { public static void indexContent(LocalDispatcher dispatcher, Delegator delegator, Map<String, Object> context, GenericValue content, String path) throws Exception { Directory directory = FSDirectory.open(new File(getIndexPath(path))); + long savedWriteLockTimeout = IndexWriterConfig.getDefaultWriteLockTimeout(); + Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_35); + IndexWriterConfig conf = new IndexWriterConfig(Version.LUCENE_35, analyzer); IndexWriter writer = null; try { - writer = new IndexWriter(directory, new StandardAnalyzer(Version.LUCENE_30), false, IndexWriter.MaxFieldLength.UNLIMITED); + try { + IndexWriterConfig.setDefaultWriteLockTimeout(2000); + writer = new IndexWriter(directory, conf); + } finally { + IndexWriterConfig.setDefaultWriteLockTimeout(savedWriteLockTimeout); + } if (Debug.infoOn()) Debug.logInfo("Used old directory:" + directory.toString(), module); } catch (FileNotFoundException e) { - writer = new IndexWriter(directory, new StandardAnalyzer(Version.LUCENE_30), true, IndexWriter.MaxFieldLength.UNLIMITED); + try { + IndexWriterConfig.setDefaultWriteLockTimeout(2000); + writer = new IndexWriter(directory, conf); + } finally { + IndexWriterConfig.setDefaultWriteLockTimeout(savedWriteLockTimeout); + } if (Debug.infoOn()) Debug.logInfo("Created new directory:" + directory.toString(), module); } indexContent(dispatcher, delegator, context, content, writer); - writer.optimize(); + writer.forceMerge(1); writer.close(); } @@ -211,14 +231,19 @@ public class SearchWorker { public static void indexDataResource(Delegator delegator, Map<String, Object> context, String id, String path) throws Exception { Directory directory = FSDirectory.open(new File(getIndexPath(path))); + long savedWriteLockTimeout = IndexWriterConfig.getDefaultWriteLockTimeout(); + Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_35); + IndexWriterConfig conf = new IndexWriterConfig(Version.LUCENE_35, analyzer); IndexWriter writer = null; + try { - writer = new IndexWriter(directory, new StandardAnalyzer(Version.LUCENE_30), false, IndexWriter.MaxFieldLength.UNLIMITED); - } catch (FileNotFoundException e) { - writer = new IndexWriter(directory, new StandardAnalyzer(Version.LUCENE_30), true, IndexWriter.MaxFieldLength.UNLIMITED); + IndexWriterConfig.setDefaultWriteLockTimeout(2000); + writer = new IndexWriter(directory, conf); + } finally { + IndexWriterConfig.setDefaultWriteLockTimeout(savedWriteLockTimeout); } indexDataResource(delegator, context, id, writer); - writer.optimize(); + writer.forceMerge(1); writer.close(); } Modified: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/test/LuceneTests.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/test/LuceneTests.java?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/test/LuceneTests.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/test/LuceneTests.java Mon Jan 9 17:59:01 2012 @@ -33,8 +33,8 @@ import org.apache.lucene.search.BooleanC import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; -import org.apache.lucene.search.Searcher; import org.apache.lucene.search.TopScoreDocCollector; +import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.util.Version; import org.ofbiz.base.util.UtilGenerics; @@ -73,14 +73,21 @@ public class LuceneTests extends OFBizTe } public void testSearchTermHand() throws Exception { + Directory directory = FSDirectory.open(new File(SearchWorker.getIndexPath(null))); + IndexReader r = null; + try { + r = IndexReader.open(directory, false); + } catch (Exception e) { + // ignore + } + BooleanQuery combQuery = new BooleanQuery(); String queryLine = "hand"; - IndexReader reader = IndexReader.open(FSDirectory.open(new File(SearchWorker.getIndexPath(null))), true); - Searcher searcher = new IndexSearcher(reader); - Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_30); + IndexSearcher searcher = new IndexSearcher(r); + Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_35); - QueryParser parser = new QueryParser(Version.LUCENE_30, "content", analyzer); + QueryParser parser = new QueryParser(Version.LUCENE_35, "content", analyzer); Query query = parser.parse(queryLine); combQuery.add(query, BooleanClause.Occur.MUST); Modified: ofbiz/branches/jackrabbit20100709/applications/order/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/ofbiz-component.xml?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/ofbiz-component.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/ofbiz-component.xml Mon Jan 9 17:59:01 2012 @@ -59,6 +59,7 @@ under the License. <webapp name="order" title="Order" + description="OrderComponentDescription" server="default-server" location="webapp/ordermgr" base-permission="OFBTOOLS,ORDERMGR" Modified: ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml Mon Jan 9 17:59:01 2012 @@ -436,4 +436,8 @@ under the License. <condition field-name="orderTypeId" operator="equals" value="SALES_ORDER"/> <action service="checkOrderItemForProductGroupOrder" mode="sync"/> </eca> + <eca service="changeOrderStatus" event="commit"> + <condition field-name="statusId" operator="equals" value="ORDER_CANCELLED"/> + <action service="checkOrderItemForProductGroupOrder" mode="sync"/> + </eca> </service-eca> Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java Mon Jan 9 17:59:01 2012 @@ -4964,7 +4964,6 @@ public class OrderServices { sci.setAssociatedOrderId(orderId); sci.setAssociatedOrderItemSeqId(item.getString("orderItemSeqId")); sci.setOrderItemAssocTypeId("DROP_SHIPMENT"); - // TODO: we should consider also the ship group in the association between sales and purchase orders } catch (Exception e) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "OrderOrderCreatingDropShipmentsError", @@ -4980,11 +4979,12 @@ public class OrderServices { cart.setDefaultCheckoutOptions(dispatcher); // the shipping address is the one of the customer cart.setShippingContactMechId(shipGroup.getString("contactMechId")); + // associate ship groups of sales and purchase orders + ShoppingCart.CartShipInfo cartShipInfo = cart.getShipGroups().get(0); + cartShipInfo.setAssociatedShipGroupSeqId(shipGroup.getString("shipGroupSeqId")); // create the order CheckOutHelper coh = new CheckOutHelper(dispatcher, delegator, cart); coh.createOrder(userLogin); - - // TODO: associate the new purchase order with the sales order (ship group) } else { // if there are no items to drop ship, then clear out the supplier partyId Debug.logWarning("No drop ship items found for order [" + shipGroup.getString("orderId") + "] and ship group [" + shipGroup.getString("shipGroupSeqId") + "] and supplier party [" + shipGroup.getString("supplierPartyId") + "]. Supplier party information will be cleared for this ship group", module); Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Mon Jan 9 17:59:01 2012 @@ -4044,36 +4044,39 @@ public class ShoppingCart implements Ite public List<GenericValue> makeAllOrderItemAssociations() { List<GenericValue> allOrderItemAssociations = new LinkedList<GenericValue>(); - for (ShoppingCartItem item : cartLines) { - String requirementId = item.getRequirementId(); - if (requirementId != null) { - try { - List<GenericValue> commitments = getDelegator().findByAnd("OrderRequirementCommitment", UtilMisc.toMap("requirementId", requirementId)); - // TODO: multiple commitments for the same requirement are still not supported - GenericValue commitment = EntityUtil.getFirst(commitments); - if (commitment != null) { - GenericValue orderItemAssociation = getDelegator().makeValue("OrderItemAssoc"); - orderItemAssociation.set("orderId", commitment.getString("orderId")); - orderItemAssociation.set("orderItemSeqId", commitment.getString("orderItemSeqId")); - orderItemAssociation.set("shipGroupSeqId", "_NA_"); - orderItemAssociation.set("toOrderItemSeqId", item.getOrderItemSeqId()); - orderItemAssociation.set("toShipGroupSeqId", "_NA_"); - orderItemAssociation.set("orderItemAssocTypeId", "PURCHASE_ORDER"); - allOrderItemAssociations.add(orderItemAssociation); + for (CartShipInfo csi : shipInfo) { + Set<ShoppingCartItem> items = csi.getShipItems(); + for (ShoppingCartItem item : items) { + String requirementId = item.getRequirementId(); + if (requirementId != null) { + try { + List<GenericValue> commitments = getDelegator().findByAnd("OrderRequirementCommitment", UtilMisc.toMap("requirementId", requirementId)); + // TODO: multiple commitments for the same requirement are still not supported + GenericValue commitment = EntityUtil.getFirst(commitments); + if (commitment != null) { + GenericValue orderItemAssociation = getDelegator().makeValue("OrderItemAssoc"); + orderItemAssociation.set("orderId", commitment.getString("orderId")); + orderItemAssociation.set("orderItemSeqId", commitment.getString("orderItemSeqId")); + orderItemAssociation.set("shipGroupSeqId", "_NA_"); + orderItemAssociation.set("toOrderItemSeqId", item.getOrderItemSeqId()); + orderItemAssociation.set("toShipGroupSeqId", "_NA_"); + orderItemAssociation.set("orderItemAssocTypeId", "PURCHASE_ORDER"); + allOrderItemAssociations.add(orderItemAssociation); + } + } catch (GenericEntityException e) { + Debug.logError(e, "Unable to load OrderRequirementCommitment records for requirement ID : " + requirementId, module); } - } catch (GenericEntityException e) { - Debug.logError(e, "Unable to load OrderRequirementCommitment records for requirement ID : " + requirementId, module); } - } - if (item.getAssociatedOrderId() != null && item.getAssociatedOrderItemSeqId() != null) { - GenericValue orderItemAssociation = getDelegator().makeValue("OrderItemAssoc"); - orderItemAssociation.set("orderId", item.getAssociatedOrderId()); - orderItemAssociation.set("orderItemSeqId", item.getAssociatedOrderItemSeqId()); - orderItemAssociation.set("shipGroupSeqId", "_NA_"); - orderItemAssociation.set("toOrderItemSeqId", item.getOrderItemSeqId()); - orderItemAssociation.set("toShipGroupSeqId", "_NA_"); - orderItemAssociation.set("orderItemAssocTypeId", item.getOrderItemAssocTypeId()); - allOrderItemAssociations.add(orderItemAssociation); + if (item.getAssociatedOrderId() != null && item.getAssociatedOrderItemSeqId() != null) { + GenericValue orderItemAssociation = getDelegator().makeValue("OrderItemAssoc"); + orderItemAssociation.set("orderId", item.getAssociatedOrderId()); + orderItemAssociation.set("orderItemSeqId", item.getAssociatedOrderItemSeqId()); + orderItemAssociation.set("shipGroupSeqId", csi.getAssociatedShipGroupSeqId() != null ? csi.getAssociatedShipGroupSeqId() : "_NA_"); + orderItemAssociation.set("toOrderItemSeqId", item.getOrderItemSeqId()); + orderItemAssociation.set("toShipGroupSeqId", csi.getShipGroupSeqId() != null ? csi.getShipGroupSeqId() : "_NA_"); + orderItemAssociation.set("orderItemAssocTypeId", item.getOrderItemAssocTypeId()); + allOrderItemAssociations.add(orderItemAssociation); + } } } return allOrderItemAssociations; @@ -4446,6 +4449,7 @@ public class ShoppingCart implements Ite public Timestamp shipBeforeDate = null; public Timestamp shipAfterDate = null; private String shipGroupSeqId = null; + private String associatedShipGroupSeqId = null; public String vendorPartyId = null; public String productStoreShipMethId = null; public Map<String, Object> attributes = FastMap.newInstance(); @@ -4480,6 +4484,11 @@ public class ShoppingCart implements Ite this.shipGroupSeqId = shipGroupSeqId; } + public String getAssociatedShipGroupSeqId() { return associatedShipGroupSeqId; } + public void setAssociatedShipGroupSeqId(String shipGroupSeqId) { + this.associatedShipGroupSeqId = shipGroupSeqId; + } + public String getFacilityId() { return facilityId; } public void setFacilityId(String facilityId) { this.facilityId = facilityId; Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy Mon Jan 9 17:59:01 2012 @@ -18,7 +18,7 @@ */ /* - * NOTE: This script is also referenced by the ecommerce's screens and + * NOTE: This script is also referenced by the webpos and ecommerce's screens and * should not contain order component's specific code. */ Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy Mon Jan 9 17:59:01 2012 @@ -662,4 +662,19 @@ if (product) { if("ASSET_USAGE".equals(productTypeId) || "ASSET_USAGE_OUT_IN".equals(productTypeId)){ context.startDate = UtilDateTime.addDaysToTimestamp(UtilDateTime.nowTimestamp(), 1).toString().substring(0,10); // should be tomorrow. } + + // get product tags + productKeywords = delegator.findByAnd("ProductKeyword", ["productId": productId, "keywordTypeId" : "KWT_TAG", "statusId" : "KW_APPROVED"]); + keywordMap = [:]; + if (productKeywords) { + for (productKeyword in productKeywords) { + keywordConds = [EntityCondition.makeCondition("keyword", EntityOperator.EQUALS, productKeyword.keyword), + EntityCondition.makeCondition("keywordTypeId", EntityOperator.EQUALS, "KWT_TAG"), + EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "KW_APPROVED")]; + keywordCond = EntityCondition.makeCondition(keywordConds, EntityOperator.AND); + productKeyWordCount = delegator.findCountByCondition("ProductKeyword", keywordCond, null, null); + keywordMap.put(productKeyword.keyword,productKeyWordCount); + } + context.productTags = keywordMap; + } } Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/images/js/order.js URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/images/js/order.js?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/images/js/order.js (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/images/js/order.js Mon Jan 9 17:59:01 2012 @@ -22,7 +22,7 @@ function markOrderViewed() { url: 'markOrderViewed', type: "POST", data: jQuery('#orderViewed').serialize(), - succes: function(data) { + success: function(data) { jQuery("#isViewed").fadeOut('fast'); jQuery("#viewed").fadeIn('fast'); } Modified: ofbiz/branches/jackrabbit20100709/applications/party/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/ofbiz-component.xml?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/ofbiz-component.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/ofbiz-component.xml Mon Jan 9 17:59:01 2012 @@ -43,6 +43,7 @@ under the License. <webapp name="party" title="Party" + description="PartyComponentDescription" server="default-server" location="webapp/partymgr" base-permission="OFBTOOLS,PARTYMGR" Modified: ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java Mon Jan 9 17:59:01 2012 @@ -19,15 +19,19 @@ package org.ofbiz.party.contact; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Map; import javax.servlet.ServletRequest; + import javolution.util.FastList; import javolution.util.FastMap; +import org.ofbiz.base.util.Assert; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; @@ -941,4 +945,54 @@ public class ContactMechWorker { // nothing found, return null return null; } + + /** + * Returns a <b>PostalAddress</b> <code>GenericValue</code> as a URL encoded <code>String</code>. + * + * @param postalAddress A <b>PostalAddress</b> <code>GenericValue</code>. + * @return A URL encoded <code>String</code>. + * @throws GenericEntityException + * @throws UnsupportedEncodingException + */ + public static String urlEncodePostalAddress(GenericValue postalAddress) throws GenericEntityException, UnsupportedEncodingException { + Assert.notNull("postalAddress", postalAddress); + if (!"PostalAddress".equals(postalAddress.getEntityName())) { + throw new IllegalArgumentException("postalAddress argument is not a PostalAddress entity"); + } + StringBuilder sb = new StringBuilder(); + if (postalAddress.get("address1") != null) { + sb.append(postalAddress.get("address1")); + } + if (postalAddress.get("address2") != null) { + sb.append(", ").append(postalAddress.get("address2")); + } + if (postalAddress.get("city") != null) { + sb.append(", ").append(postalAddress.get("city")); + } + if (postalAddress.get("stateProvinceGeoId") != null) { + GenericValue geoValue = postalAddress.getRelatedOne("StateProvinceGeo"); + if (geoValue != null) { + sb.append(", ").append(geoValue.get("geoName")); + } + } else if (postalAddress.get("countyGeoId") != null) { + GenericValue geoValue = postalAddress.getRelatedOne("CountyGeo"); + if (geoValue != null) { + sb.append(", ").append(geoValue.get("geoName")); + } + } + if (postalAddress.get("postalCode") != null) { + sb.append(", ").append(postalAddress.get("postalCode")); + } + if (postalAddress.get("countryGeoId") != null) { + GenericValue geoValue = postalAddress.getRelatedOne("CountryGeo"); + if (geoValue != null) { + sb.append(", ").append(geoValue.get("geoName")); + } + } + String postalAddressString = sb.toString().trim(); + while (postalAddressString.contains(" ")) { + postalAddressString = postalAddressString.replace(" ", " "); + } + return URLEncoder.encode(postalAddressString, "UTF-8"); + } } Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml Mon Jan 9 17:59:01 2012 @@ -1459,6 +1459,34 @@ <value xml:lang="zh">å±é©å</value> <value xml:lang="zh_TW">å±éªå</value> </property> + <property key="ProductFeature.description.TEXT_BLACK"> + <value xml:lang="en">Black</value> + <value xml:lang="fr">Noir</value> + </property> + <property key="ProductFeature.description.TEXT_BLUE"> + <value xml:lang="en">Blue</value> + <value xml:lang="fr">Bleu</value> + </property> + <property key="ProductFeature.description.TEXT_GRAY"> + <value xml:lang="en">Gray</value> + <value xml:lang="fr">Gris</value> + </property> + <property key="ProductFeature.description.TEXT_GREEN"> + <value xml:lang="en">Green</value> + <value xml:lang="fr">Vert</value> + </property> + <property key="ProductFeature.description.TEXT_RED"> + <value xml:lang="en">Red</value> + <value xml:lang="fr">Rouge</value> + </property> + <property key="ProductFeature.description.TEXT_YELLOW"> + <value xml:lang="en">Yellow</value> + <value xml:lang="fr">Jaune</value> + </property> + <property key="ProductFeature.description.TEXT_WHITE"> + <value xml:lang="en">White</value> + <value xml:lang="fr">Blanc</value> + </property> <property key="ProductFeatureApplType.description.DISTINGUISHING_FEAT"> <value xml:lang="de">Unterscheidendes Merkmal</value> <value xml:lang="en">Distinguishing</value> Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml Mon Jan 9 17:59:01 2012 @@ -3453,6 +3453,9 @@ <value xml:lang="zh">å ³é®å</value> <value xml:lang="zh_TW">ééµå</value> </property> + <property key="FormFieldTitle_keywordType"> + <value xml:lang="en">Keyword Type</value> + </property> <property key="FormFieldTitle_lastPrice"> <value xml:lang="de">Letzter Preis</value> <value xml:lang="en">Last Price</value> @@ -4759,7 +4762,7 @@ <value xml:lang="de">Wiederholungszähler</value> <value xml:lang="en">Repeat Count</value> <value xml:lang="es">Contador de repeticiones</value> - <value xml:lang="fr">Répétition de compte</value> + <value xml:lang="fr">Nbr. de répétition</value> <value xml:lang="it">Ripeti Conteggio</value> <value xml:lang="ro">Repeta Contorizarea</value> <value xml:lang="ru">ÐолиÑеÑÑво повÑоÑов</value> @@ -5816,12 +5819,12 @@ <value xml:lang="en">Image Management Application</value> <value xml:lang="th">à¹à¸à¸£à¹à¸à¸£à¸¡à¸à¸±à¸à¸à¸²à¸£à¸£à¸¹à¸à¸ าà¸</value> </property> - <property key="ImageManamentApprove"> + <property key="ImageManagementApprove"> <value xml:lang="de">Bestätigen</value> <value xml:lang="en">Approve</value> <value xml:lang="th">à¸à¸à¸¸à¸¡à¸±à¸à¸´</value> </property> - <property key="ImageManamentApprovedDate"> + <property key="ImageManagementApprovedDate"> <value xml:lang="en">Approved Date</value> <value xml:lang="th">วัà¸à¸à¸µà¹à¸à¸à¸¸à¸¡à¸±à¸à¸´</value> </property> @@ -5982,6 +5985,10 @@ <value xml:lang="en">Watermark</value> <value xml:lang="th">ลายà¸à¹à¸³</value> </property> + <property key="ImageManagementWatermarkingLocation"> + <value xml:lang="en">Click directly on the image to adjust the location of the watermark</value> + <value xml:lang="fr">Cliquer directement sur l'image pour positionner le filigrane</value> + </property> <property key="ImageManagementWelcomeMessage"> <value xml:lang="en">Welcome to the Image Management</value> <value xml:lang="th">ยิà¸à¸à¸µà¸à¹à¸à¸à¸£à¸±à¸à¸ªà¸¹à¹à¸£à¸à¸à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸£à¸¹à¸à¸ าà¸</value> @@ -7433,6 +7440,9 @@ <value xml:lang="zh">ç¼è¾äº§å订é èµæº</value> <value xml:lang="zh_TW">編輯ç¢åè¨é±è³æº</value> </property> + <property key="PageTitleEditProductTags"> + <value xml:lang="en">Edit Product Tags</value> + </property> <property key="PageTitleEditProductWorkEffort"> <value xml:lang="de">Produkt Arbeitseinsatz bearbeiten</value> <value xml:lang="en">Edit Product Work Effort</value> @@ -19765,6 +19775,9 @@ <value xml:lang="zh">产ååºéºç½ç«</value> <value xml:lang="zh_TW">ç¢åååºç¶²ç«</value> </property> + <property key="ProductProductTaggedWith"> + <value xml:lang="en">Product tagged with</value> + </property> <property key="ProductProductType"> <value xml:lang="de">Produkttyp</value> <value xml:lang="en">Product Type</value> @@ -23712,6 +23725,12 @@ <value xml:lang="fr">Assoc.</value> <value xml:lang="it">TD</value> </property> + <property key="ProductTag"> + <value xml:lang="en">Tag</value> + </property> + <property key="ProductTags"> + <value xml:lang="en">Tags</value> + </property> <property key="ProductTargetProductCategory"> <value xml:lang="de">Ziel Produktkategorie</value> <value xml:lang="en">Target Product Category</value> Modified: ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml?rev=1229278&r1=1229277&r2=1229278&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml Mon Jan 9 17:59:01 2012 @@ -1485,6 +1485,7 @@ under the License. <entity entity-name="ProductFeature" package-name="org.ofbiz.product.feature" + default-resource-name="ProductEntityLabels" title="Product Feature Entity"> <field name="productFeatureId" type="id-ne"></field> <field name="productFeatureTypeId" type="id-ne"></field> @@ -3079,39 +3080,28 @@ under the License. <key-map field-name="productId"/> </view-link> </view-entity> - <entity entity-name="ProductKeyword" package-name="org.ofbiz.product.product" title="Product Keyword Entity" never-cache="true"> + <entity entity-name="ProductKeyword" table-name="PRODUCT_KEYWORD_NEW" + package-name="org.ofbiz.product.product" title="Product Keyword Entity" never-cache="true"> <field name="productId" type="id-ne"></field> <field name="keyword" type="short-varchar"></field> + <field name="keywordTypeId" type="id-ne"></field> <field name="relevancyWeight" type="numeric"></field> + <field name="statusId" type="id-ne"></field> <prim-key field="productId"/> <prim-key field="keyword"/> - <relation type="one" fk-name="PROD_KWD_PROD" rel-entity-name="Product"> + <prim-key field="keywordTypeId"/> + <relation type="one" fk-name="PROD_KWD_PROD_NEW" rel-entity-name="Product"> <key-map field-name="productId"/> </relation> - <index name="PROD_KWD_KWD"> - <index-field name="keyword"/> - </index> - </entity> - <entity entity-name="OldProductKeywordResult" table-name="PRODUCT_KEYWORD_RESULT" - package-name="org.ofbiz.product.product" - never-cache="true" - title="Product Keyword Result Entity"> - <field name="productKeywordResultId" type="id-ne"></field> - <field name="visitId" type="id"></field> - <field name="productCategoryId" type="id"></field> - <field name="searchString" type="short-varchar"></field> - <field name="intraKeywordOperator" type="very-short"></field> - <field name="anyPrefix" type="indicator"></field> - <field name="anySuffix" type="indicator"></field> - <field name="removeStems" type="indicator"></field> - <field name="numResults" type="numeric"></field> - <prim-key field="productKeywordResultId"/> - <relation type="one" fk-name="PROD_KWDRES_VST" rel-entity-name="Visit"> - <key-map field-name="visitId"/> + <relation type="one" fk-name="PROD_KWD_TYPE" rel-entity-name="Enumeration"> + <key-map field-name="keywordTypeId" rel-field-name="enumId"/> </relation> - <relation type="one-nofk" rel-entity-name="ProductCategory"> - <key-map field-name="productCategoryId"/> + <relation type="one" fk-name="PROD_KWD_STTS" rel-entity-name="StatusItem"> + <key-map field-name="statusId"/> </relation> + <index name="PROD_KWD_KWD_NEW"> + <index-field name="keyword"/> + </index> </entity> <entity entity-name="ProductMeter" package-name="org.ofbiz.product.product" title="Product Meter Entity"> <field name="productId" type="id-ne"></field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |