svn commit: r1173274 [1/13] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1173274 [1/13] - in /ofbiz/branches/jackrabbit2010
 
|
Author: sascharodekamp
Date: Tue Sep 20 17:46:13 2011 New Revision: 1173274 URL: http://svn.apache.org/viewvc?rev=1173274&view=rev Log: Update the Jackrabbit branch with the current trunk version to keep the branch up to date Added: ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/test/InvoicePerShipmentTests.xml - copied unchanged from r1173263, ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/InvoicePerShipmentTests.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/LookupForms.xml - copied unchanged from r1173263, ofbiz/trunk/applications/content/widget/LookupForms.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/cms/CMSForms.xml - copied unchanged from r1173263, ofbiz/trunk/applications/content/widget/cms/CMSForms.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/contentsetup/ContentSetupForms.xml - copied unchanged from r1173263, ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/datasetup/DataSetupForms.xml - copied unchanged from r1173263, ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/layout/LayoutForms.xml - copied unchanged from r1173263, ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/survey/ - copied from r1173263, ofbiz/trunk/applications/content/widget/survey/ ofbiz/branches/jackrabbit20100709/applications/content/widget/survey/SurveyForms.xml - copied unchanged from r1173263, ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/website/ - copied from r1173263, ofbiz/trunk/applications/content/widget/website/ ofbiz/branches/jackrabbit20100709/applications/content/widget/website/WebSiteForms.xml - copied unchanged from r1173263, ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml ofbiz/branches/jackrabbit20100709/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml - copied unchanged from r1173263, ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml ofbiz/branches/jackrabbit20100709/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java - copied unchanged from r1173263, ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/actions/ - copied from r1173263, ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/ ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/actions/category/ - copied from r1173263, ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/ ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy - copied unchanged from r1173263, ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/category/ - copied from r1173263, ofbiz/trunk/applications/humanres/webapp/humanres/humanres/category/ ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl - copied unchanged from r1173263, ofbiz/trunk/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/emplposition/ - copied from r1173263, ofbiz/trunk/applications/humanres/webapp/humanres/humanres/emplposition/ ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/emplposition/editemplposition.ftl - copied unchanged from r1173263, ofbiz/trunk/applications/humanres/webapp/humanres/humanres/emplposition/editemplposition.ftl ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/emplposition/editperson.ftl - copied unchanged from r1173263, ofbiz/trunk/applications/humanres/webapp/humanres/humanres/emplposition/editperson.ftl ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/emplposition/removeemplposition.ftl - copied unchanged from r1173263, ofbiz/trunk/applications/humanres/webapp/humanres/humanres/emplposition/removeemplposition.ftl ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/internalorg/ - copied from r1173263, ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/ ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/internalorg/editinternalorg.ftl - copied unchanged from r1173263, ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/editinternalorg.ftl ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl - copied unchanged from r1173263, ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml - copied unchanged from r1173263, ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-6.0.33.annotations-api.jar - copied unchanged from r1173263, ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.33.annotations-api.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-6.0.33.el-api.jar - copied unchanged from r1173263, ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.33.el-api.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-6.0.33.jsp-api.jar - copied unchanged from r1173263, ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.33.jsp-api.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-6.0.33.servlet-api.jar - copied unchanged from r1173263, ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.33.servlet-api.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33-tomcat-juli-adapters.jar - copied unchanged from r1173263, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.33-tomcat-juli-adapters.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33-tomcat-juli.jar - copied unchanged from r1173263, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.33-tomcat-juli.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.catalina-ant.jar - copied unchanged from r1173263, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.33.catalina-ant.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.catalina-ha.jar - copied unchanged from r1173263, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.33.catalina-ha.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.catalina-tribes.jar - copied unchanged from r1173263, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.33.catalina-tribes.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.catalina.jar - copied unchanged from r1173263, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.33.catalina.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.jasper-el.jar - copied unchanged from r1173263, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.33.jasper-el.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.jasper.jar - copied unchanged from r1173263, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.33.jasper.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.tomcat-coyote.jar - copied unchanged from r1173263, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.33.tomcat-coyote.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.tomcat-dbcp.jar - copied unchanged from r1173263, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.33.tomcat-dbcp.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.tomcat-i18n-es.jar - copied unchanged from r1173263, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.33.tomcat-i18n-es.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.tomcat-i18n-fr.jar - copied unchanged from r1173263, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.33.tomcat-i18n-fr.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.tomcat-i18n-ja.jar - copied unchanged from r1173263, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.33.tomcat-i18n-ja.jar ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_CA.xml - copied unchanged from r1173263, ofbiz/trunk/framework/common/data/GeoData_CA.xml ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_CHE.xml - copied unchanged from r1173263, ofbiz/trunk/framework/common/data/GeoData_CHE.xml ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/jquery-1.6.2.js - copied unchanged from r1173263, ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.6.2.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/jquery-1.6.2.min.js - copied unchanged from r1173263, ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.6.2.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/localization/messages_th.js - copied unchanged from r1173263, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/localization/messages_th.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/localization/messages_vi.js - copied unchanged from r1173263, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/validate/localization/messages_vi.js ofbiz/branches/jackrabbit20100709/framework/testtools/lib/org.springframework.core-3.1.0.M2.jar - copied unchanged from r1173263, ofbiz/trunk/framework/testtools/lib/org.springframework.core-3.1.0.M2.jar ofbiz/branches/jackrabbit20100709/framework/testtools/lib/org.springframework.test-3.1.0.M2.jar - copied unchanged from r1173263, ofbiz/trunk/framework/testtools/lib/org.springframework.test-3.1.0.M2.jar ofbiz/branches/jackrabbit20100709/framework/testtools/lib/org.springframework.web-3.1.0.M2.jar - copied unchanged from r1173263, ofbiz/trunk/framework/testtools/lib/org.springframework.web-3.1.0.M2.jar ofbiz/branches/jackrabbit20100709/svnUpHotdeploy.bat - copied unchanged from r1173263, ofbiz/trunk/svnUpHotdeploy.bat Removed: ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/cms/CMSForms.xml ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/contentsetup/ContentSetupForms.xml ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/datasetup/ ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/layout/LayoutForms.xml ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/lookup/LookupForms.xml ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/survey/SurveyForms.xml ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteForms.xml ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/newnote.ftl ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-6.0.32-annotations-api.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-6.0.32-el-api.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-6.0.32-jsp-api.jar ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-6.0.32-servlet-api.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.32-catalina-ha.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.32-catalina-tribes.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.32-catalina.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.32-jasper-el.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.32-jasper.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.32-tomcat-coyote.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.32-tomcat-dbcp.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.32-tomcat-juli-adapters.jar ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.32-tomcat-juli.jar Modified: ofbiz/branches/jackrabbit20100709/ (props changed) ofbiz/branches/jackrabbit20100709/.classpath ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingConfig.properties ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/secas_ledger.xml ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_invoice.xml ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java ofbiz/branches/jackrabbit20100709/applications/accounting/testdef/invoicetests.xml ofbiz/branches/jackrabbit20100709/applications/commonext/data/SetupData.xml ofbiz/branches/jackrabbit20100709/applications/commonext/ofbiz-component.xml ofbiz/branches/jackrabbit20100709/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/applications/commonext/widget/ofbizsetup/SetupForms.xml ofbiz/branches/jackrabbit20100709/applications/content/config/ContentUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/content/data/ContentHelpData.xml ofbiz/branches/jackrabbit20100709/applications/content/data/ContentTypeData.xml ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/ContentManagementWorker.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentServices.java ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/LookupScreens.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/SurveyScreens.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/cms/CMSScreens.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentForms.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentMenus.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/contentsetup/ContentSetupScreens.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/datasetup/DataResourceSetupScreens.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/layout/LayoutScreens.xml ofbiz/branches/jackrabbit20100709/applications/humanres/build.xml ofbiz/branches/jackrabbit20100709/applications/humanres/config/HumanResUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/humanres/data/HumanResHelpData.xml ofbiz/branches/jackrabbit20100709/applications/humanres/data/HumanResTypeData.xml ofbiz/branches/jackrabbit20100709/applications/humanres/data/helpdata/HELP_HR_main.xml ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/applications/humanres/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/applications/humanres/widget/EmplPositionScreens.xml ofbiz/branches/jackrabbit20100709/applications/humanres/widget/GlobalHRSettingScreens.xml ofbiz/branches/jackrabbit20100709/applications/humanres/widget/HumanresMenus.xml ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/EmplPositionForms.xml ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/GlobalHRSettingForms.xml ofbiz/branches/jackrabbit20100709/applications/manufacturing/data/ManufacturingData.xml ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/JobshopScreens.xml ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/ReportScreens.xml ofbiz/branches/jackrabbit20100709/applications/marketing/config/MarketingUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/marketing/data/MarketingTypeData.xml ofbiz/branches/jackrabbit20100709/applications/marketing/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml ofbiz/branches/jackrabbit20100709/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml ofbiz/branches/jackrabbit20100709/applications/marketing/servicedef/services.xml ofbiz/branches/jackrabbit20100709/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java ofbiz/branches/jackrabbit20100709/applications/marketing/webapp/marketing/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/marketing/webapp/marketing/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/applications/marketing/webapp/sfa/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/marketing/webapp/sfa/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListForms.xml ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListMenus.xml ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListScreens.xml ofbiz/branches/jackrabbit20100709/applications/marketing/widget/sfa/OpportunityScreens.xml ofbiz/branches/jackrabbit20100709/applications/marketing/widget/sfa/SfaMenus.xml ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/order/data/OrderHelpData.xml ofbiz/branches/jackrabbit20100709/applications/order/data/OrderTypeData.xml ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel_view.xml ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/order/OrderServices.xml ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/test/ShoppingCartTests.xml ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services.xml ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services_quote.xml ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services_return.xml ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java ofbiz/branches/jackrabbit20100709/applications/order/testdef/ShoppingCartTests.xml ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderinfo.ftl ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/return/returnItemInc.ftl ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/OrderForms.xml ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/OrderMenus.xml ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/OrderViewScreens.xml ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/QuoteForms.xml ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/QuoteScreens.xml ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml ofbiz/branches/jackrabbit20100709/applications/party/data/PartyTypeData.xml ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml ofbiz/branches/jackrabbit20100709/applications/party/servicedef/services.xml ofbiz/branches/jackrabbit20100709/applications/party/servicedef/services_view.xml ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyServices.java ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/findparty.ftl ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/product/data/ProductHelpData.xml ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services.xml ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services_shipment.xml ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CategoryServices.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CategoryWorker.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/price/PriceServices.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductWorker.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/category/CategoryTree.groovy ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogMenus.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductForms.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/facility/FacilityForms.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/facility/FacilityGroupForms.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/facility/FacilityGroupScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/facility/FacilityScreens.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/config/WorkEffortEntityLabels.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/config/WorkEffortUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/data/WorkEffortTypeData.xml 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/webapp/ical/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/webapp/workeffort/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/widget/WorkEffortForms.xml ofbiz/branches/jackrabbit20100709/build.xml ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/Base64.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilHttp.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilValidate.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java ofbiz/branches/jackrabbit20100709/framework/bi/data/BiTypeData.xml ofbiz/branches/jackrabbit20100709/framework/bi/webapp/bi/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml ofbiz/branches/jackrabbit20100709/framework/common/config/general.properties ofbiz/branches/jackrabbit20100709/framework/common/data/CommonTypeData.xml ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData.xml ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_MX.xml ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_US.xml ofbiz/branches/jackrabbit20100709/framework/common/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/framework/common/ofbiz-component.xml ofbiz/branches/jackrabbit20100709/framework/common/script/org/ofbiz/common/CommonServices.xml ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services.xml ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services_test.xml ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/CommonEvents.java ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/common-controller.xml ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/jackrabbit20100709/framework/entity/config/entityengine.xml ofbiz/branches/jackrabbit20100709/framework/entity/entitydef/entitygroup.xml ofbiz/branches/jackrabbit20100709/framework/entity/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/framework/entity/ofbiz-component.xml ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java ofbiz/branches/jackrabbit20100709/framework/example/data/ExampleTypeData.xml ofbiz/branches/jackrabbit20100709/framework/example/webapp/birt/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/flot/flotPie.ftl ofbiz/branches/jackrabbit20100709/framework/exampleext/webapp/exampleext/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/ecommain.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/additional-methods.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/additional-methods.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/changelog.txt ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/jquery.validate.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/jquery.validate.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ja.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/todo ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/validate/version.txt ofbiz/branches/jackrabbit20100709/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java ofbiz/branches/jackrabbit20100709/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.java ofbiz/branches/jackrabbit20100709/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java ofbiz/branches/jackrabbit20100709/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java ofbiz/branches/jackrabbit20100709/framework/resources/templates/CommonScreens.xml ofbiz/branches/jackrabbit20100709/framework/resources/templates/services.xml ofbiz/branches/jackrabbit20100709/framework/resources/templates/web.xml ofbiz/branches/jackrabbit20100709/framework/security/data/PasswordSecurityData.xml (props changed) ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/mail/MimeMessageWrapper.java ofbiz/branches/jackrabbit20100709/framework/sql/src/org/ofbiz/sql/SQLInsert.java ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Start.java ofbiz/branches/jackrabbit20100709/framework/testtools/src/org/ofbiz/testtools/SimpleMethodTest.java ofbiz/branches/jackrabbit20100709/framework/testtools/src/org/ofbiz/testtools/seleniumxml/RemoteRequest.java ofbiz/branches/jackrabbit20100709/framework/testtools/webapp/testtools/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java ofbiz/branches/jackrabbit20100709/framework/webslinger/websites/webslinger/www/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/framework/webtools/config/WebtoolsUiLabels.xml ofbiz/branches/jackrabbit20100709/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoBase.java ofbiz/branches/jackrabbit20100709/framework/webtools/webapp/webtools/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/framework/webtools/webapp/webtools/entity/xmldsdump.ftl ofbiz/branches/jackrabbit20100709/framework/widget/config/conditional.xml ofbiz/branches/jackrabbit20100709/framework/widget/config/widget.properties ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/ModelWidget.java ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/ModelForm.java ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl ofbiz/branches/jackrabbit20100709/ij.ofbiz ofbiz/branches/jackrabbit20100709/specialpurpose/assetmaint/data/AssetMaintSeedData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/specialpurpose/assetmaint/widget/AssetmaintScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/data/EbayStoreHelpData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/config/EcommerceUiLabels.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoMarketing.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoOrderTestData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoProduct.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ContactList.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/optionsettings.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ForumScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/myportal/data/MyPortalTypeData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/template/HtmlHead.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java ofbiz/branches/jackrabbit20100709/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/forms/TaskForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/config/scrumUiLabels.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumHelpData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumTypeData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumMenus.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java ofbiz/branches/jackrabbit20100709/startofbiz.sh ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/appbar.ftl ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/header.ftl ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/secondary-appbar.ftl ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/appbarOpen.ftl ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/header.ftl ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/includes/appbarOpen.ftl ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/includes/header.ftl ofbiz/branches/jackrabbit20100709/themes/flatgrey/includes/appbar.ftl ofbiz/branches/jackrabbit20100709/themes/flatgrey/includes/header.ftl ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/appbarClose.ftl ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/appbarOpen.ftl Propchange: ofbiz/branches/jackrabbit20100709/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 20 17:46:13 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4:951708-952957 /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:962442-1156267 +/ofbiz/trunk:962442-1173263 Modified: ofbiz/branches/jackrabbit20100709/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/.classpath?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/.classpath (original) +++ ofbiz/branches/jackrabbit20100709/.classpath Tue Sep 20 17:46:13 2011 @@ -37,7 +37,6 @@ <classpathentry kind="lib" path="framework/base/lib/ical4j-1.0-rc2.jar"/> <classpathentry kind="lib" path="framework/base/lib/icu4j-4_4.jar"/> <classpathentry kind="lib" path="framework/base/lib/ivy-2.2.0.jar"/> - <classpathentry kind="lib" path="framework/base/lib/jakarta-regexp-1.5.jar"/> <classpathentry kind="lib" path="framework/base/lib/javolution-5.4.3.jar"/> <classpathentry kind="lib" path="framework/base/lib/jcip-annotations-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/jdbm-1.0-SNAPSHOT.jar"/> @@ -91,10 +90,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-6.0.32-annotations-api.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.32-el-api.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.32-jsp-api.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.32-servlet-api.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.33.annotations-api.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.33.el-api.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.33.jsp-api.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.33.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"/> @@ -125,15 +124,16 @@ <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.3.1.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.32-catalina.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.32-catalina-ha.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.32-catalina-tribes.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.32-jasper.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.32-jasper-el.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.32-tomcat-coyote.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.32-tomcat-dbcp.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.32-tomcat-juli.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.32-tomcat-juli-adapters.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33-tomcat-juli-adapters.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33-tomcat-juli.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33.catalina-ant.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33.catalina-ha.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33.catalina-tribes.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33.catalina.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33.jasper-el.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33.jasper.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33.tomcat-coyote.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33.tomcat-dbcp.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"/> @@ -170,6 +170,9 @@ <classpathentry kind="lib" path="framework/service/lib/neethi-2.0.4.jar"/> <classpathentry kind="lib" path="framework/service/lib/XmlSchema-1.4.3.jar"/> <classpathentry kind="lib" path="framework/testtools/lib/selenium-java-client-driver.jar"/> + <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.test-3.1.0.M2.jar"/> + <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.web-3.1.0.M2.jar"/> + <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.core-3.1.0.M2.jar"/> <classpathentry kind="lib" path="framework/webapp/lib/DataVision-1.0.0.jar"/> <classpathentry kind="lib" path="framework/webapp/lib/ezmorph-0.9.1.jar"/> <classpathentry kind="lib" path="framework/webapp/lib/iText-2.1.7.jar"/> @@ -231,6 +234,7 @@ <classpathentry kind="src" path="applications/party/src"/> <classpathentry kind="src" path="applications/product/src" excluding="ShipmentScaleApplet.java"/> <classpathentry kind="src" path="applications/securityext/src" excluding="org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java"/> + <classpathentry kind="src" path="applications/humanres/src"/> <classpathentry kind="src" path="applications/workeffort/src"/> <classpathentry kind="src" path="framework/appserver/src"/> <classpathentry kind="src" path="framework/base/build/gen-src/javacc"/> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingConfig.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingConfig.properties?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingConfig.properties (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingConfig.properties Tue Sep 20 17:46:13 2011 @@ -37,3 +37,5 @@ accounting.payment.application.autocreat # create a 'not-paid' payment record if the purchase order is approved accounting.payment.purchaseorder.autocreate=Y +# create invoice per shipment = Y Invoice per order = N +create.invoice.per.shipment=Y Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml Tue Sep 20 17:46:13 2011 @@ -4069,4 +4069,12 @@ under the License. <key-map field-name="finAccountId"/> </view-link> </view-entity> + + <!-- Extend Entity Inventory Item for relation Fix Asset --> + <extend-entity entity-name="InventoryItem"> + <field name="fixedAssetId" type="id"></field> + <relation type="one" fk-name="FIXED_ASSET" title="FixedAsset" rel-entity-name="InventoryItem"> + <key-map field-name="fixedAssetId" rel-field-name="inventoryItemId"/> + </relation> + </extend-entity> </entitymodel> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Tue Sep 20 17:46:13 2011 @@ -883,4 +883,46 @@ under the License. </else> </if> </simple-method> + + <simple-method method-name="createInvoiceFromOrder" short-description="Create an invoice from existing order when invoicePerShipment is N"> + <entity-one value-field="orderHeader" entity-name="OrderHeader"> + <field-map field-name="orderId" from-field="parameters.orderId"/> + </entity-one> + <set field="invoicePerShipment" from-field="orderHeader.invoicePerShipment"/> + <if-empty field="invoicePerShipment"> + <property-to-field resource="AccountingConfig" property="create.invoice.per.shipment" field="invoicePerShipment"/> + </if-empty> + <if-compare operator="equals" value="N" field="invoicePerShipment"> + <entity-and list="orderItemBilling" entity-name="OrderItemBilling"> + <field-map field-name="orderId" from-field="parameters.orderId"/> + </entity-and> + <if-empty field="orderItemBilling"> + <set field="createInvoiceContext.orderId" from-field="parameters.orderId"/> + <call-service service-name="createInvoiceForOrderAllItems" in-map-name="createInvoiceContext"> + <result-to-field result-name="invoiceId" field="invoiceId"/> + </call-service> + <else> + <entity-and list="orderItems" entity-name="OrderItem"> + <field-map field-name="orderId" from-field="parameters.orderId"/> + <order-by field-name="orderItemSeqId"/> + </entity-and> + <iterate entry="orderItem" list="orderItems"> + <entity-and list="checkOrderItem" entity-name="OrderItemBilling"> + <field-map field-name="orderId" from-field="parameters.orderId"/> + <field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/> + </entity-and> + <if-empty field="checkOrderItem"> + <field-to-list list="billItems" field="orderItem"/> + </if-empty> + <set field="createInvoiceContext.orderId" from-field="parameters.orderId"/> + <set field="createInvoiceContext.billItems" from-field="billItems"/> + </iterate> + <call-service service-name="createInvoiceForOrder" in-map-name="createInvoiceContext"> + <result-to-field result-name="invoiceId" field="invoiceId"/> + </call-service> + </else> + </if-empty> + <field-to-result field="invoiceId" result-name="invoiceId"/> + </if-compare> + </simple-method> </simple-methods> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/secas_ledger.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/secas_ledger.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/secas_ledger.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/secas_ledger.xml Tue Sep 20 17:46:13 2011 @@ -31,6 +31,8 @@ under the License. <eca service="createItemIssuance" event="commit"> <condition field-name="orderId" operator="is-not-empty"/> <condition field-name="inventoryItemId" operator="is-not-empty"/> + <!-- Ignore the inventory shipment if affectAccounting set as false --> + <condition field-name="affectAccounting" operator="equals" value="true" type="Boolean"/> <action service="createAcctgTransForSalesShipmentIssuance" mode="sync"/> </eca> @@ -42,6 +44,8 @@ under the License. <!-- create the accounting transactions for a shipment receipt every time the inventory is received --> <eca service="createShipmentReceipt" event="commit"> + <!-- Ignore the inventory shipment if affectAccounting set as false --> + <condition field-name="affectAccounting" operator="equals" value="true" type="Boolean"/> <action service="createAcctgTransForShipmentReceipt" mode="sync"/> </eca> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_invoice.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_invoice.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_invoice.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_invoice.xml Tue Sep 20 17:46:13 2011 @@ -371,4 +371,11 @@ under the License. <attribute name="errorMessage" type="String" optional="true" mode="OUT"/> </service> + <service name="createInvoiceFromOrder" engine="simple" + location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="createInvoiceFromOrder"> + <description>Create an invoice from existing order when invoicePerShipment is N</description> + <attribute name="orderId" type="String" mode="IN" optional="false"/> + <attribute name="invoiceId" type="String" mode="OUT" optional="true"/> + </service> + </services> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Tue Sep 20 17:46:13 2011 @@ -713,8 +713,9 @@ public class InvoiceServices { if (prorateTaxes == null) { prorateTaxes = "Y"; } - for (GenericValue adj : taxAdjustments.keySet()) { - BigDecimal adjAlreadyInvoicedAmount = taxAdjustments.get(adj); + for (Map.Entry<GenericValue, BigDecimal> entry : taxAdjustments.entrySet()) { + GenericValue adj = entry.getKey(); + BigDecimal adjAlreadyInvoicedAmount = entry.getValue(); BigDecimal adjAmount = null; if ("N".equalsIgnoreCase(prorateTaxes)) { @@ -1063,23 +1064,47 @@ public class InvoiceServices { public static Map<String, Object> createInvoicesFromShipment(DispatchContext dctx, Map<String, Object> context) { //Delegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); String shipmentId = (String) context.get("shipmentId"); Locale locale = (Locale) context.get("locale"); List<String> invoicesCreated = FastList.newInstance(); + Map<String, Object> response = ServiceUtil.returnSuccess(); + List<GenericValue> orderShipments = FastList.newInstance(); + String invoicePerShipment = null; - Map<String, Object> serviceContext = UtilMisc.toMap("shipmentIds", UtilMisc.toList(shipmentId), "eventDate", context.get("eventDate"), "userLogin", context.get("userLogin")); try { - Map<String, Object> result = dispatcher.runSync("createInvoicesFromShipments", serviceContext); - invoicesCreated = UtilGenerics.checkList(result.get("invoicesCreated")); - } catch (GenericServiceException e) { - Debug.logError(e, "Trouble calling createInvoicesFromShipment service; invoice not created for shipment [" + shipmentId + "]", module); - return ServiceUtil.returnError(UtilProperties.getMessage(resource, - "AccountingTroubleCallingCreateInvoicesFromShipmentService", - UtilMisc.toMap("shipmentId", shipmentId), locale)); + orderShipments = delegator.findByAnd("OrderShipment", UtilMisc.toMap("shipmentId", shipmentId)); + } catch (GenericEntityException e) { + return ServiceUtil.returnError(e.getMessage()); + } + + GenericValue orderShipment = EntityUtil.getFirst(orderShipments); + if (orderShipment != null) { + String orderId = orderShipment.getString("orderId"); + try { + GenericValue orderHeader = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", orderId)); + invoicePerShipment = orderHeader.getString("invoicePerShipment"); + } catch (GenericEntityException e) { + return ServiceUtil.returnError(e.getMessage()); + } + } else { + invoicePerShipment = UtilProperties.getPropertyValue("AccountingConfig","create.invoice.per.shipment"); + } + + if ("Y".equals(invoicePerShipment)) { + Map<String, Object> serviceContext = UtilMisc.toMap("shipmentIds", UtilMisc.toList(shipmentId), "eventDate", context.get("eventDate"), "userLogin", context.get("userLogin")); + try { + Map<String, Object> result = dispatcher.runSync("createInvoicesFromShipments", serviceContext); + invoicesCreated = UtilGenerics.checkList(result.get("invoicesCreated")); + } catch (GenericServiceException e) { + Debug.logError(e, "Trouble calling createInvoicesFromShipment service; invoice not created for shipment [" + shipmentId + "]", module); + return ServiceUtil.returnError(UtilProperties.getMessage(resource, + "AccountingTroubleCallingCreateInvoicesFromShipmentService", + UtilMisc.toMap("shipmentId", shipmentId), locale)); + } + response.put("invoicesCreated", invoicesCreated); } - Map<String, Object> response = ServiceUtil.returnSuccess(); - response.put("invoicesCreated", invoicesCreated); return response; } @@ -1121,7 +1146,7 @@ public class InvoiceServices { // The orders can now be placed in separate groups, each for // 1. The group of orders for which payment is already captured. No grouping and action required. // 2. The group of orders for which invoice is IN-Process status. - Map<String, Object> ordersWithInProcessInvoice = FastMap.newInstance(); + Map<String, GenericValue> ordersWithInProcessInvoice = FastMap.newInstance(); for (GenericValue itemIssuance : itemIssuances) { String orderId = itemIssuance.getString("orderId"); @@ -1157,9 +1182,7 @@ public class InvoiceServices { } // For In-Process invoice, move the status to ready and capture the payment - Set<String> invoicesInProcess = ordersWithInProcessInvoice.keySet(); - for (String orderId : invoicesInProcess) { - GenericValue invoice = (GenericValue) ordersWithInProcessInvoice.get(orderId); + for (GenericValue invoice : ordersWithInProcessInvoice.values()) { String invoiceId = invoice.getString("invoiceId"); Map<String, Object> setInvoiceStatusResult = FastMap.newInstance(); try { @@ -1495,9 +1518,10 @@ public class InvoiceServices { if (totalAdditionalShippingCharges.signum() == 1) { // Add an OrderAdjustment to the order for each additional shipping charge - for (GenericValue shipment : additionalShippingCharges.keySet()) { + for (Map.Entry<GenericValue, BigDecimal> entry : additionalShippingCharges.entrySet()) { + GenericValue shipment = entry.getKey(); + BigDecimal additionalShippingCharge = entry.getValue(); String shipmentId = shipment.getString("shipmentId"); - BigDecimal additionalShippingCharge = additionalShippingCharges.get(shipment); Map<String, Object> createOrderAdjustmentContext = FastMap.newInstance(); createOrderAdjustmentContext.put("orderId", orderId); createOrderAdjustmentContext.put("orderAdjustmentTypeId", "SHIPPING_CHARGES"); @@ -1793,8 +1817,9 @@ public class InvoiceServices { } // loop through the returnId keys in the map and invoke the createInvoiceFromReturn service for each - for (String returnId : itemsShippedGroupedByReturn.keySet()) { - List<GenericValue> billItems = itemsShippedGroupedByReturn.get(returnId); + for (Map.Entry<String, List<GenericValue>> entry : itemsShippedGroupedByReturn.entrySet()) { + String returnId = entry.getKey(); + List<GenericValue> billItems = entry.getValue(); if (Debug.verboseOn()) { Debug.logVerbose("Creating invoice for return [" + returnId + "] with items: " + billItems.toString(), module); } @@ -2154,8 +2179,7 @@ public class InvoiceServices { } BigDecimal totalPayments = ZERO; - for (String paymentId : payments.keySet()) { - BigDecimal amount = payments.get(paymentId); + for (BigDecimal amount : payments.values()) { if (amount == null) amount = ZERO; totalPayments = totalPayments.add(amount).setScale(DECIMALS, ROUNDING); } @@ -2353,7 +2377,6 @@ public class InvoiceServices { if (amountApplied != null) { context.put("amountApplied", amountApplied); } else { - amountApplied = ZERO; context.put("amountApplied", ZERO); } Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java Tue Sep 20 17:46:13 2011 @@ -1455,28 +1455,27 @@ public class GiftCertificateServices { Random rand = new Random(); boolean isValid = false; - String number = null; + StringBuilder number = null; while (!isValid) { - number = ""; + number = new StringBuilder(""); for (int i = 0; i < length; i++) { int randInt = rand.nextInt(9); - number = number + randInt; + number.append(randInt); } if (isId) { - int check = UtilValidate.getLuhnCheckDigit(number); - number = number + check; + number.append(UtilValidate.getLuhnCheckDigit(number.toString())); // validate the number - if (checkCardNumber(number)) { + if (checkCardNumber(number.toString())) { // make sure this number doens't already exist - isValid = checkNumberInDatabase(delegator, number); + isValid = checkNumberInDatabase(delegator, number.toString()); } } else { isValid = true; } } - return number; + return number.toString(); } private static boolean checkNumberInDatabase(Delegator delegator, String number) throws GenericEntityException { Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Tue Sep 20 17:46:13 2011 @@ -1279,7 +1279,9 @@ public class PaymentGatewayServices { captureResult.put("invoiceId", invoiceId); captureResult.put("captureResult", Boolean.TRUE); captureResult.put("orderPaymentPreference", paymentPref); - captureResult.put("captureRefNum", ""); // FIXME: this is an hack to avoid a service validation error for processCaptureResult (captureRefNum is mandatory, but it is not used for billing accounts) + if (context.get("captureRefNum") == null) { + captureResult.put("captureRefNum", ""); // FIXME: this is an hack to avoid a service validation error for processCaptureResult (captureRefNum is mandatory, but it is not used for billing accounts) + } // process the capture's results try { Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java Tue Sep 20 17:46:13 2011 @@ -586,19 +586,19 @@ public class PaymentMethodServices { if (cardNumber.startsWith("*")) { // get the masked card number from the db String origCardNumber = giftCard.getString("cardNumber"); - String origMaskedNumber = ""; + StringBuilder origMaskedNumber = new StringBuilder(""); int cardLength = origCardNumber.length() - 4; if (cardLength > 0) { for (int i = 0; i < cardLength; i++) { - origMaskedNumber = origMaskedNumber + "*"; + origMaskedNumber.append("*"); } - origMaskedNumber = origMaskedNumber + origCardNumber.substring(cardLength); + origMaskedNumber.append(origCardNumber.substring(cardLength)); } else { - origMaskedNumber = origCardNumber; + origMaskedNumber.append(origCardNumber); } // compare the two masked numbers - if (cardNumber.equals(origMaskedNumber)) { + if (cardNumber.equals(origMaskedNumber.toString())) { cardNumber = origCardNumber; } } Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java Tue Sep 20 17:46:13 2011 @@ -95,7 +95,7 @@ public class ValueLinkServices { byte[] testBytes = StringUtil.fromHexString(testString); // place holder - byte[] testEncryption = new byte[0]; + byte[] testEncryption = null; String desc = ""; if (mode.intValue() == 1) { Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/testdef/invoicetests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/testdef/invoicetests.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/testdef/invoicetests.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/testdef/invoicetests.xml Tue Sep 20 17:46:13 2011 @@ -25,5 +25,7 @@ <test-case case-name="auto-invoice-tests"> <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml"/> </test-case> - + <test-case case-name="invoice-per-shipment-tests"> + <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/InvoicePerShipmentTests.xml"/> + </test-case> </test-suite> Modified: ofbiz/branches/jackrabbit20100709/applications/commonext/data/SetupData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/commonext/data/SetupData.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/commonext/data/SetupData.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/commonext/data/SetupData.xml Tue Sep 20 17:46:13 2011 @@ -19,5 +19,4 @@ --> <entity-engine-xml> - <WebSite webSiteId="SETUP" siteName="Setup Manager" visualThemeSetId="BACKOFFICE"/> </entity-engine-xml> Modified: ofbiz/branches/jackrabbit20100709/applications/commonext/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/commonext/ofbiz-component.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/commonext/ofbiz-component.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/commonext/ofbiz-component.xml Tue Sep 20 17:46:13 2011 @@ -30,6 +30,7 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/SystemInfoPortletData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/SetupData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/ShippingData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/OfbizSetupSecurityData.xml"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> Modified: ofbiz/branches/jackrabbit20100709/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml Tue Sep 20 17:46:13 2011 @@ -25,11 +25,6 @@ <description>Setup Manager Module of the Open For Business Project</description> <context-param> - <param-name>webSiteId</param-name> - <param-value>SETUP</param-value> - <description>A unique ID used to look up the WebSite entity</description> - </context-param> - <context-param> <param-name>entityDelegatorName</param-name> <param-value>default</param-value> <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description> Modified: ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml Tue Sep 20 17:46:13 2011 @@ -44,7 +44,8 @@ under the License. <set field="layoutSettings.middleTopMessage3" value="${groovy:resultNote.lastSystemInfoNote3!=null?resultNote.lastSystemInfoNote3.noteDateTime.toString().substring(0,16) + " " + resultNote.lastSystemInfoNote3.noteInfo:""}"/> <set field="layoutSettings.middleTopLink3" value="${linkStart}${resultNote.lastSystemInfoNote3.moreInfoPortletId}&amp;id=${resultNote.lastSystemInfoNote3.moreInfoItemId}"/> <!-- Help link actions --> - <set field="helpTopic" value="${groovy: webSiteId + '_' + requestAttributes._CURRENT_VIEW_}"/> + <!--<set field="helpTopic" value="${groovy: webSiteId + '_' + requestAttributes._CURRENT_VIEW_}"/>--> + <set field="helpTopic" value="${groovy: parameters.componentName.toUpperCase() + '_' + requestAttributes._CURRENT_VIEW_}"/> <entity-and list="pageAvail" entity-name="ContentAssoc"> <field-map field-name="mapKey" from-field="helpTopic"/> </entity-and> Modified: ofbiz/branches/jackrabbit20100709/applications/commonext/widget/ofbizsetup/SetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/commonext/widget/ofbizsetup/SetupForms.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/commonext/widget/ofbizsetup/SetupForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/commonext/widget/ofbizsetup/SetupForms.xml Tue Sep 20 17:46:13 2011 @@ -187,7 +187,7 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> - <form name="EditWebSite" extends="EditWebSite" extends-resource="component://content/webapp/content/website/WebSiteForms.xml"> + <form name="EditWebSite" extends="EditWebSite" extends-resource="component://content/widget/website/WebSiteForms.xml"> <actions><set field="webSiteId" from-field="webSite.webSiteId"/></actions> <field use-when="webSite==null&&webSiteId==null" name="webSiteId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text default-value="WebStore"/></field> <field name="siteName" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field> Modified: ofbiz/branches/jackrabbit20100709/applications/content/config/ContentUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/config/ContentUiLabels.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/config/ContentUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/config/ContentUiLabels.xml Tue Sep 20 17:46:13 2011 @@ -94,7 +94,7 @@ </property> <property key="ContentAssocUpdateError"> <value xml:lang="en">Error in updating ContentAssoc. Entity is null.</value> - <value xml:lang="en">Erreur dans la mise à jour de l'association. Entité inexistante.</value> + <value xml:lang="fr">Erreur dans la mise à jour de l'association. Entité inexistante.</value> <value xml:lang="it">Errore nell'aggiornamento dell'entità ContentAssoc che è nulla.</value> </property> <property key="ContentAssociation"> @@ -716,7 +716,7 @@ </property> <property key="ContentContentToOrFromErrorRetriving"> <value xml:lang="en">Error in retrieving content To or From.</value> - <value xml:lang="en">Erreur dans la récupération du document de destination ou d'origine.</value> + <value xml:lang="fr">Erreur dans la récupération du document de destination ou d'origine.</value> <value xml:lang="it">Errore nel ricavare il contenuto a o da.</value> </property> <property key="ContentContentsAssociatedToDataResource"> @@ -1890,7 +1890,7 @@ </property> <property key="ContentStatusUpdateError"> <value xml:lang="en">Problem updating content Status: ${errorString}</value> - <value xml:lang="en">Problème lors de la mise à jour du statut du document : ${errorString}</value> + <value xml:lang="fr">Problème lors de la mise à jour du statut du document : ${errorString}</value> <value xml:lang="it">Problema durante l'aggiornamento dello stato del contenuto: ${errorString}</value> </property> <property key="ContentSubContent"> @@ -2521,7 +2521,7 @@ </property> <property key="ContentUnableObtainReferenceToFile"> <value xml:lang="en">Unable to obtain a reference to file ${objectInfo}</value> - <value xml:lang="en">Impossible d'obtenir la référence du fichier ${objectInfo}</value> + <value xml:lang="fr">Impossible d'obtenir la référence du fichier ${objectInfo}</value> <value xml:lang="it">Non è possibile ottenere un riferimento al file ${objectInfo}</value> </property> <property key="ContentUnableToOpenFileForWriting"> @@ -2655,6 +2655,15 @@ <value xml:lang="zh">éå å°å 容</value> <value xml:lang="zh_TW">éå å°å §å®¹</value> </property> + <property key="ContentWebSiteContactList"> + <value xml:lang="en">Contact Lists</value> + </property> + <property key="ContentWebSiteContactListCreate"> + <value xml:lang="en">Create Contact List</value> + </property> + <property key="ContentWebSiteContactListView"> + <value xml:lang="en">Contact Lists View</value> + </property> <property key="ContentWebSiteContent"> <value xml:lang="da">Webside indhold</value> <value xml:lang="de">Webseite Inhalt</value> Modified: ofbiz/branches/jackrabbit20100709/applications/content/data/ContentHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/data/ContentHelpData.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/data/ContentHelpData.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/data/ContentHelpData.xml Tue Sep 20 17:46:13 2011 @@ -59,6 +59,6 @@ under the License. <DataResource dataResourceId="CONTENT_SITE_FindWeb" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="CONTENT_SITE_FindWeb" contentTypeId="DOCUMENT" contentName="Content Main Help" templateDataResourceId="HELP_TEMPL" dataResourceId="CONTENT_SITE_FindWeb" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_CONTENT" contentIdTo="CONTENT_SITE_FindWeb" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="CONTENT_SITE_FindWebSite"/> + <ContentAssoc contentId="HELP_CONTENT" contentIdTo="CONTENT_SITE_FindWeb" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="CONTENT_FindWebSite"/> </entity-engine-xml> Modified: ofbiz/branches/jackrabbit20100709/applications/content/data/ContentTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/data/ContentTypeData.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/data/ContentTypeData.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/data/ContentTypeData.xml Tue Sep 20 17:46:13 2011 @@ -257,8 +257,6 @@ under the License. </ElectronicText> <Content contentId="STDWRAP001" contentTypeId="DOCUMENT" dataResourceId="STDWRAP001" contentName="Standard SubContent Wrapper" description="Standard SubContent Wrapper"/> - <WebSite webSiteId="CONTENT_SITE" siteName="Content Manager" visualThemeSetId="BACKOFFICE"/> - <Content contentId="TREE_ROOT"/> <DataResource dataResourceId="DOCBOOK_HTML_TEMPL" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/template/docbook/html/docbook.xsl" dataTemplateTypeId="XSLT" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/> <DataResource dataResourceId="DOCBOOK_PDF_TEMPL" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/template/docbook/fo/docbook.xsl" dataTemplateTypeId="XSLT" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/> Modified: ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml Tue Sep 20 17:46:13 2011 @@ -69,6 +69,27 @@ <remove-value value-field="content"/> </simple-method> + <simple-method method-name="removeContentAndRelated" short-description="Remove a Content Record, related resource(s) and assocs."> + <entity-one entity-name="Content" value-field="content"/> + <remove-related value-field="content" relation-name="ContentRole"/> + <remove-related value-field="content" relation-name="ContentKeyword"/> + <remove-related value-field="content" relation-name="FromContentAssoc"/> + <remove-related value-field="content" relation-name="ToContentAssoc"/> + <remove-value value-field="content"/> + <get-related-one value-field="content" relation-name="DataResource" to-value-field="dataResource"/> + <if-not-empty field="dataResource"> + <get-related-one value-field="dataResource" relation-name="ImageDataResource" to-value-field="imageDataResource"/> + <if-not-empty field="imageDataResource"> + <remove-value value-field="imageDataResource"/> + </if-not-empty> + <get-related-one value-field="dataResource" relation-name="ElectronicText" to-value-field="electronicText"/> + <if-not-empty field="electronicText"> + <remove-value value-field="electronicText"/> + </if-not-empty> + <remove-related value-field="dataResource" relation-name="DataResourceRole"/> + <remove-value value-field="dataResource"/> + </if-not-empty> + </simple-method> <!-- content assoc services --> <simple-method method-name="createContentAssoc" short-description="Create a ContntAssoc Record"> Modified: ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml Tue Sep 20 17:46:13 2011 @@ -151,6 +151,17 @@ <attribute mode="INOUT" name="roleTypeList" optional="true" type="List"/> </service> + <service name="removeContentAndRelated" default-entity-name="Content" engine="simple" + location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContentAndRelated" auth="true"> + <description>Remove Content</description> + <permission-service service-name="genericContentPermission" main-action="DELETE"/> + <auto-attributes include="pk" mode="IN" optional="false"/> + <attribute mode="IN" name="targetOperationList" optional="true" type="List"/> + <attribute mode="IN" name="contentPurposeTypeId" optional="true" type="String"/> + <attribute mode="IN" name="userLogin" optional="true" type="org.ofbiz.entity.GenericValue"/> + <attribute mode="INOUT" name="roleTypeList" optional="true" type="List"/> + </service> + <!-- TODO: old permission service; being replaced with genericContentPermission --> <service name="checkContentPermission" transaction-timeout="7200" |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |