svn commit: r1084863 [1/11] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1084863 [1/11] - in /ofbiz/branches/jackrabbit2010
 
|
Author: sascharodekamp
Date: Thu Mar 24 07:23:42 2011 New Revision: 1084863 URL: http://svn.apache.org/viewvc?rev=1084863&view=rev Log: Trunk Merge - Merged the Jackrabbit Brunch against the current trunk, to keep the brunch up to date. Added: ofbiz/branches/jackrabbit20100709/applications/content/lib/fontbox-1.4.0.jar - copied unchanged from r1084618, ofbiz/trunk/applications/content/lib/fontbox-1.4.0.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/jempbox-1.4.0.jar - copied unchanged from r1084618, ofbiz/trunk/applications/content/lib/jempbox-1.4.0.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/metadata-extractor-2.4.0-beta-1.jar - copied unchanged from r1084618, ofbiz/trunk/applications/content/lib/metadata-extractor-2.4.0-beta-1.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/pdfbox-1.4.0.jar - copied unchanged from r1084618, ofbiz/trunk/applications/content/lib/pdfbox-1.4.0.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/poi-3.7.jar - copied unchanged from r1084618, ofbiz/trunk/applications/content/lib/poi-3.7.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/poi-ooxml-3.7.jar - copied unchanged from r1084618, ofbiz/trunk/applications/content/lib/poi-ooxml-3.7.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/poi-ooxml-schemas-3.7.jar - copied unchanged from r1084618, ofbiz/trunk/applications/content/lib/poi-ooxml-schemas-3.7.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/poi-scratchpad-3.7.jar - copied unchanged from r1084618, ofbiz/trunk/applications/content/lib/poi-scratchpad-3.7.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/tika-core-0.9.jar - copied unchanged from r1084618, ofbiz/trunk/applications/content/lib/tika-core-0.9.jar ofbiz/branches/jackrabbit20100709/applications/content/lib/tika-parsers-0.9.jar - copied unchanged from r1084618, ofbiz/trunk/applications/content/lib/tika-parsers-0.9.jar ofbiz/branches/jackrabbit20100709/applications/marketing/data/MarketingDemoData.xml - copied unchanged from r1084618, ofbiz/trunk/applications/marketing/data/MarketingDemoData.xml ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java - copied unchanged from r1084618, ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java - copied unchanged from r1084618, ofbiz/trunk/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy - copied unchanged from r1084618, ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategorySEO.groovy ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductSEO.groovy - copied unchanged from r1084618, ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductSEO.groovy ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/catalog/categorytree.css - copied unchanged from r1084618, ofbiz/trunk/framework/images/webapp/images/catalog/categorytree.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/jquery-1.5.1.js - copied unchanged from r1084618, ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.5.1.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/jquery-1.5.1.min.js - copied unchanged from r1084618, ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.5.1.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.resize.js - copied unchanged from r1084618, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.resize.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/jquery.maskedinput-1.2.2.min.js - copied unchanged from r1084618, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jquery.maskedinput-1.2.2.min.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/jsTree/themes/classic/d.gif - copied unchanged from r1084618, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/classic/d.gif ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/config/autoUpdateToGoogleBase.properties - copied unchanged from r1084618, ofbiz/trunk/specialpurpose/googlebase/config/autoUpdateToGoogleBase.properties ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/data/GoogleBaseHelpData.xml - copied unchanged from r1084618, ofbiz/trunk/specialpurpose/googlebase/data/GoogleBaseHelpData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/data/helpdata/ - copied from r1084618, ofbiz/trunk/specialpurpose/googlebase/data/helpdata/ ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/data/helpdata/HELP_GOOGLEBASE.xml - copied unchanged from r1084618, ofbiz/trunk/specialpurpose/googlebase/data/helpdata/HELP_GOOGLEBASE.xml ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/script/ - copied from r1084618, ofbiz/trunk/specialpurpose/googlebase/script/ ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/script/org/ - copied from r1084618, ofbiz/trunk/specialpurpose/googlebase/script/org/ ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/script/org/ofbiz/ - copied from r1084618, ofbiz/trunk/specialpurpose/googlebase/script/org/ofbiz/ ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/script/org/ofbiz/googlebase/ - copied from r1084618, ofbiz/trunk/specialpurpose/googlebase/script/org/ofbiz/googlebase/ ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/script/org/ofbiz/googlebase/GooglebaseEvents.xml - copied unchanged from r1084618, ofbiz/trunk/specialpurpose/googlebase/script/org/ofbiz/googlebase/GooglebaseEvents.xml ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/script/org/ofbiz/googlebase/GooglebaseServices.xml - copied unchanged from r1084618, ofbiz/trunk/specialpurpose/googlebase/script/org/ofbiz/googlebase/GooglebaseServices.xml ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/FilterProducts.groovy - copied unchanged from r1084618, ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/FilterProducts.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy - copied unchanged from r1084618, ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/googlebaseDivideList.groovy - copied unchanged from r1084618, ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/googlebaseDivideList.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/productsToGooglebase.groovy - copied unchanged from r1084618, ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/productsToGooglebase.groovy Removed: ofbiz/branches/jackrabbit20100709/applications/content/lib/poi-3.2-FINAL-20081019.jar ofbiz/branches/jackrabbit20100709/applications/marketing/testdef/SeleniumTests.xml Modified: ofbiz/branches/jackrabbit20100709/.classpath ofbiz/branches/jackrabbit20100709/LICENSE ofbiz/branches/jackrabbit20100709/applications/accounting/data/AccountingTypeData.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/tax/TaxAuthorityServices.java ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/applications/content/data/WebtoolsHelpData.xml ofbiz/branches/jackrabbit20100709/applications/content/data/helpdata/HELP_CONTENT.xml ofbiz/branches/jackrabbit20100709/applications/content/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/data/DataServices.xml ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_data.xml ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/ContentManagementEvents.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/ContentManagementServices.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/ContentManagementWorker.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentServices.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentWorker.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/content/DisplayContentNav.ftl ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java ofbiz/branches/jackrabbit20100709/applications/marketing/ofbiz-component.xml ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/order/email/default/emailprocessnotify.ftl ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderEvents.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderListState.java 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/quote/QuoteServices.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/requirement/RequirementServices.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/ShoppingCartHelper.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/shoppingcart/product/ProductDisplayWorker.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/task/TaskWorker.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/test/OrderTestServices.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderStats.groovy ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderstats.ftl ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/QuoteScreens.xml ofbiz/branches/jackrabbit20100709/applications/party/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/js/PartyProfileContent.js ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/profileblocks/Content.ftl ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml ofbiz/branches/jackrabbit20100709/applications/product/config/ProductErrorUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/product/config/freemarkerTransforms.properties ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel_shipment.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/category/CategoryServices.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementEvents.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) 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/src/org/ofbiz/product/category/CategoryServices.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/image/ScaleImage.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductServices.java ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/category/CategoryTree.groovy ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/category/CategoryTree.ftl ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/find/keywordsearch.ftl ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryForms.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductForms.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductScreens.xml ofbiz/branches/jackrabbit20100709/build.xml ofbiz/branches/jackrabbit20100709/framework/base/config/both-containers.xml ofbiz/branches/jackrabbit20100709/framework/base/config/ofbiz-containers.xml ofbiz/branches/jackrabbit20100709/framework/base/config/test-containers.xml ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/container/ComponentContainer.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/container/Container.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/container/ContainerLoader.java ofbiz/branches/jackrabbit20100709/framework/bi/widget/BiScreens.xml ofbiz/branches/jackrabbit20100709/framework/birt/data/helpdata/HELP_BIRT.xml ofbiz/branches/jackrabbit20100709/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/login/LoginServices.java ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy 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/helplink.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/documents/UnitTest.xml ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java ofbiz/branches/jackrabbit20100709/framework/example/data/ExampleDemoData.xml ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/flot/flotPie.ftl ofbiz/branches/jackrabbit20100709/framework/example/widget/example/CommonScreens.xml ofbiz/branches/jackrabbit20100709/framework/example/widget/example/ExampleScreens.xml ofbiz/branches/jackrabbit20100709/framework/example/widget/example/FormWidgetExampleForms.xml ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/getDependentDropdownValues.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/API.txt ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/NEWS.txt ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/PLUGINS.txt ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/README.txt ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.colorhelpers.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.crosshair.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.navigate.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.pie.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.selection.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/jsTree/jquery.jstree.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/jsTree/themes/apple/style.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/jsTree/themes/classic/style.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/jsTree/themes/default-rtl/style.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/style.css ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/myportal.js ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/selectall.js ofbiz/branches/jackrabbit20100709/framework/resources/templates/build.xml ofbiz/branches/jackrabbit20100709/framework/security/data/PasswordSecurityData.xml (props changed) ofbiz/branches/jackrabbit20100709/framework/sql/src/org/ofbiz/sql/Planner.java ofbiz/branches/jackrabbit20100709/framework/start/build.xml ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Classpath.java ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Start.java ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/StartupLoader.java ofbiz/branches/jackrabbit20100709/framework/testtools/build.xml ofbiz/branches/jackrabbit20100709/framework/testtools/config/seleniumXml.properties ofbiz/branches/jackrabbit20100709/framework/testtools/data/helpdata/HELP_WEBTOOLS_selenium.xml ofbiz/branches/jackrabbit20100709/framework/testtools/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/framework/testtools/src/org/ofbiz/testtools/VerifySeleniumSetups.java ofbiz/branches/jackrabbit20100709/framework/testtools/src/org/ofbiz/testtools/seleniumxml/SeleniumXml.java ofbiz/branches/jackrabbit20100709/framework/testtools/src/org/ofbiz/testtools/seleniumxml/TestCaseException.java ofbiz/branches/jackrabbit20100709/framework/testtools/testdef/seleniumxml/example/recorded/NewExample.html ofbiz/branches/jackrabbit20100709/framework/testtools/webapp/testtools/SeleniumTest.ftl ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java ofbiz/branches/jackrabbit20100709/framework/webtools/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/framework/widget/dtd/widget-form.xsd 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/screen/ModelScreenWidget.java ofbiz/branches/jackrabbit20100709/framework/widget/templates/csvFormMacroLibrary.ftl ofbiz/branches/jackrabbit20100709/framework/widget/templates/foFormMacroLibrary.ftl ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl ofbiz/branches/jackrabbit20100709/macros.xml ofbiz/branches/jackrabbit20100709/specialpurpose/build.xml ofbiz/branches/jackrabbit20100709/specialpurpose/component-load.xml ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ApplicationAuthenticationContext.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/AuthenticatedToken.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/PasswordCredential.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/PrincipalAuthenticationContext.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ValidationFactor.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationAccessDeniedException.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationPermissionException.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InactiveAccountException.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthenticationException.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthorizationTokenException.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidCredentialException.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidGroupException.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidPrincipalException.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidRoleException.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidTokenException.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ObjectNotFoundException.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPAttribute.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPCookieInfo.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPGroup.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPNestableGroup.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPPrincipal.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPRole.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SearchRestriction.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerHttpBindingStub.java ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerLocator.java ofbiz/branches/jackrabbit20100709/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java ofbiz/branches/jackrabbit20100709/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/data/GoogleBaseTypeData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/servicedef/services.xml ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/GoogleBaseAdvancedSearch.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/productsExportToGoogle.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/widget/GoogleBaseForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/widget/GoogleBaseMenus.xml ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/widget/GoogleBaseScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/googlecheckout/webapp/googlecheckout/redirect/redirectHeader.ftl 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/ofbizwebsite/template/HtmlHead.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/header.ftl ofbiz/branches/jackrabbit20100709/themes/bizznesstime/webapp/bizznesstime/css/style.css ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/header.ftl ofbiz/branches/jackrabbit20100709/themes/bluelight/webapp/bluelight/style.css ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/includes/header.ftl ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css ofbiz/branches/jackrabbit20100709/themes/flatgrey/includes/header.ftl ofbiz/branches/jackrabbit20100709/themes/flatgrey/webapp/flatgrey/maincss.css ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/appbarClose.ftl ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/help.css ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css Modified: ofbiz/branches/jackrabbit20100709/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/.classpath?rev=1084863&r1=1084862&r2=1084863&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/.classpath (original) +++ ofbiz/branches/jackrabbit20100709/.classpath Thu Mar 24 07:23:42 2011 @@ -2,8 +2,16 @@ <classpath> <classpathentry kind="con" path="GROOVY_SUPPORT" exported="true"/> <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/poi-3.2-FINAL-20081019.jar"/> + <classpathentry kind="lib" path="applications/content/lib/metadata-extractor-2.4.0-beta-1.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/tika-core-0.9.jar"/> + <classpathentry kind="lib" path="applications/content/lib/tika-parsers-0.9.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"/> Modified: ofbiz/branches/jackrabbit20100709/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/LICENSE?rev=1084863&r1=1084862&r2=1084863&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/LICENSE (original) +++ ofbiz/branches/jackrabbit20100709/LICENSE Thu Mar 24 07:23:42 2011 @@ -153,8 +153,16 @@ ofbiz/trunk/framework/webslinger/lib/web ofbiz/trunk/framework/webslinger/lib/webslinger-extension-velocity-20091211-3897-7ab22baea4b6.jar ofbiz/trunk/framework/webslinger/lib/webslinger-extension-wiki-20091211-3897-7ab22baea4b6.jar 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/poi-3.2-FINAL-20081019.jar +ofbiz/trunk/applications/content/lib/metadata-extractor-2.4.0.jar +ofbiz/trunk/applications/content/lib/pdfbox-1.4.0.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/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 Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/data/AccountingTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/data/AccountingTypeData.xml?rev=1084863&r1=1084862&r2=1084863&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/data/AccountingTypeData.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/data/AccountingTypeData.xml Thu Mar 24 07:23:42 2011 @@ -483,6 +483,8 @@ under the License. <InvoiceItemType description="Return Fee" hasTable="N" invoiceItemTypeId="CRT_FEE_ADJ" parentTypeId="CRETURN_ADJ"/> <InvoiceItemType description="Return Miscellaneous Charges" hasTable="N" invoiceItemTypeId="CRT_MISC_ADJ" parentTypeId="CRETURN_ADJ"/> <InvoiceItemType description="Return Sales Tax" hasTable="N" invoiceItemTypeId="CRT_SALES_TAX_ADJ" parentTypeId="CRETURN_ADJ"/> + <InvoiceItemType description="Return VAT Tax" hasTable="N" invoiceItemTypeId="CRT_VAT_TAX_ADJ" parentTypeId="CRETURN_ADJ"/> + <InvoiceItemType description="Return VAT Price Correct" hasTable="N" invoiceItemTypeId="CRT_VAT_PC_ADJ" parentTypeId="CRETURN_ADJ"/> <InvoiceItemType description="Return Shipping and Handling" hasTable="N" invoiceItemTypeId="CRT_SHIPPING_ADJ" parentTypeId="CRETURN_ADJ"/> <InvoiceItemType description="Return Surcharge" hasTable="N" invoiceItemTypeId="CRT_SURCHARGE_ADJ" parentTypeId="CRETURN_ADJ"/> <InvoiceItemType description="Return Additional Feature" hasTable="N" invoiceItemTypeId="CRT_ADD_FEATURE_ADJ" parentTypeId="CRETURN_ADJ"/> @@ -507,6 +509,8 @@ under the License. <InvoiceItemType description="Return Fee" hasTable="N" invoiceItemTypeId="SRT_FEE_ADJ" parentTypeId="SRETURN_ADJ"/> <InvoiceItemType description="Return Miscellaneous Charges" hasTable="N" invoiceItemTypeId="SRT_MISC_ADJ" parentTypeId="SRETURN_ADJ"/> <InvoiceItemType description="Return Sales Tax" hasTable="N" invoiceItemTypeId="SRT_SALES_TAX_ADJ" parentTypeId="SRETURN_ADJ"/> + <InvoiceItemType description="Return VAT Tax" hasTable="N" invoiceItemTypeId="SRT_VAT_TAX_ADJ" parentTypeId="SRETURN_ADJ"/> + <InvoiceItemType description="Return VAT Price Correct" hasTable="N" invoiceItemTypeId="SRT_VAT_PC_ADJ" parentTypeId="SRETURN_ADJ"/> <InvoiceItemType description="Return Shipping and Handling" hasTable="N" invoiceItemTypeId="SRT_SHIPPING_ADJ" parentTypeId="SRETURN_ADJ"/> <InvoiceItemType description="Return Surcharge" hasTable="N" invoiceItemTypeId="SRT_SURCHARGE_ADJ" parentTypeId="SRETURN_ADJ"/> <InvoiceItemType description="Return Additional Feature" hasTable="N" invoiceItemTypeId="SRT_ADD_FEATURE_ADJ" parentTypeId="SRETURN_ADJ"/> @@ -580,6 +584,8 @@ under the License. <InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_FEE_ADJ" invoiceItemTypeId="CRT_FEE_ADJ"/> <InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_MISC_CHARGE_ADJ" invoiceItemTypeId="CRT_MISC_ADJ"/> <InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_SALES_TAX_ADJ" invoiceItemTypeId="CRT_SALES_TAX_ADJ"/> + <InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_VAT_TAX_ADJ" invoiceItemTypeId="CRT_VAT_TAX_ADJ"/> + <InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_VAT_PC_ADJ" invoiceItemTypeId="CRT_VAT_PC_ADJ"/> <InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_SHIPPING_ADJ" invoiceItemTypeId="CRT_SHIPPING_ADJ"/> <InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_SURCHARGE_ADJ" invoiceItemTypeId="CRT_SURCHARGE_ADJ"/> <InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_ADD_FEATURE_ADJ" invoiceItemTypeId="CRT_ADD_FEATURE_ADJ"/> @@ -596,6 +602,8 @@ under the License. <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_FEE_ADJ" invoiceItemTypeId="SRT_FEE_ADJ"/> <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_MISC_CHARGE_ADJ" invoiceItemTypeId="SRT_MISC_ADJ"/> <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_SALES_TAX_ADJ" invoiceItemTypeId="SRT_SALES_TAX_ADJ"/> + <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_VAT_TAX_ADJ" invoiceItemTypeId="SRT_VAT_TAX_ADJ"/> + <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_VAT_PC_ADJ" invoiceItemTypeId="SRT_VAT_PC_ADJ"/> <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_SHIPPING_ADJ" invoiceItemTypeId="SRT_SHIPPING_ADJ"/> <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_SURCHARGE_ADJ" invoiceItemTypeId="SRT_SURCHARGE_ADJ"/> <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_ADD_FEATURE_ADJ" invoiceItemTypeId="SRT_ADD_FEATURE_ADJ"/> 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=1084863&r1=1084862&r2=1084863&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 Thu Mar 24 07:23:42 2011 @@ -1828,8 +1828,12 @@ public class InvoiceServices { String invoiceTypeId; String description; // get the return header - GenericValue returnHeader = delegator.findByPrimaryKey("ReturnHeader", UtilMisc.toMap("returnId", returnId)); - if ("CUSTOMER_RETURN".equals(returnHeader.getString("returnHeaderTypeId"))) { + GenericValue returnHeader = delegator.findByPrimaryKey("ReturnHeader", UtilMisc.toMap("returnId", returnId)); + if (returnHeader == null || returnHeader.get("returnHeaderTypeId") == null) { + return ServiceUtil.returnError("Return type cannot be null"); + } + + if (returnHeader.getString("returnHeaderTypeId").startsWith("CUSTOMER_")) { invoiceTypeId = "CUST_RTN_INVOICE"; description = "Return Invoice for Customer Return #" + returnId; } else { 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=1084863&r1=1084862&r2=1084863&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 Thu Mar 24 07:23:42 2011 @@ -800,7 +800,7 @@ public class GiftCertificateServices { if (responseAnswers != null) { Iterator<GenericValue> rai = responseAnswers.iterator(); while (rai.hasNext()) { - GenericValue answer = (GenericValue) rai.next(); + GenericValue answer = rai.next(); GenericValue question = null; try { question = answer.getRelatedOne("SurveyQuestion"); @@ -893,7 +893,7 @@ public class GiftCertificateServices { if (productStoreEmail == null) { Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", module); } else { - ResourceBundleMapWrapper uiLabelMap = (ResourceBundleMapWrapper) UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); + ResourceBundleMapWrapper uiLabelMap = UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); uiLabelMap.addBottomResourceBundle("OrderUiLabels"); uiLabelMap.addBottomResourceBundle("CommonUiLabels"); answerMap.put("uiLabelMap", uiLabelMap); @@ -1038,7 +1038,7 @@ public class GiftCertificateServices { if (responseAnswers != null) { Iterator<GenericValue> rai = responseAnswers.iterator(); while (rai.hasNext()) { - GenericValue answer = (GenericValue) rai.next(); + GenericValue answer = rai.next(); GenericValue question = null; try { question = answer.getRelatedOne("SurveyQuestion"); @@ -1140,7 +1140,7 @@ public class GiftCertificateServices { if (productStoreEmail == null) { Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", module); } else { - ResourceBundleMapWrapper uiLabelMap = (ResourceBundleMapWrapper) UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); + ResourceBundleMapWrapper uiLabelMap = UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); uiLabelMap.addBottomResourceBundle("OrderUiLabels"); uiLabelMap.addBottomResourceBundle("CommonUiLabels"); answerMap.put("uiLabelMap", uiLabelMap); Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1084863&r1=1084862&r2=1084863&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Thu Mar 24 07:23:42 2011 @@ -112,7 +112,7 @@ public class TaxAuthorityServices { // add up amounts from adjustments (amount OR exemptAmount, sourcePercentage) Iterator<GenericValue> taxAdustmentIter = taxAdustmentList.iterator(); while (taxAdustmentIter.hasNext()) { - GenericValue taxAdjustment = (GenericValue) taxAdustmentIter.next(); + GenericValue taxAdjustment = taxAdustmentIter.next(); if ("SALES_TAX".equals(taxAdjustment.getString("orderAdjustmentTypeId"))) { taxPercentage = taxPercentage.add(taxAdjustment.getBigDecimal("sourcePercentage")); BigDecimal adjAmount = taxAdjustment.getBigDecimal("amount"); @@ -208,11 +208,11 @@ public class TaxAuthorityServices { // Loop through the products; get the taxCategory; and lookup each in the cache. for (int i = 0; i < itemProductList.size(); i++) { - GenericValue product = (GenericValue) itemProductList.get(i); - BigDecimal itemAmount = (BigDecimal) itemAmountList.get(i); - BigDecimal itemPrice = (BigDecimal) itemPriceList.get(i); - BigDecimal itemQuantity = itemQuantityList != null ? (BigDecimal) itemQuantityList.get(i) : null; - BigDecimal shippingAmount = (BigDecimal) itemShippingList.get(i); + GenericValue product = itemProductList.get(i); + BigDecimal itemAmount = itemAmountList.get(i); + BigDecimal itemPrice = itemPriceList.get(i); + BigDecimal itemQuantity = itemQuantityList != null ? itemQuantityList.get(i) : null; + BigDecimal shippingAmount = itemShippingList.get(i); List<GenericValue> taxList = null; if (shippingAddress != null) { taxList = getTaxAdjustments(delegator, product, productStore, payToPartyId, billToPartyId, taxAuthoritySet, itemPrice, itemQuantity, itemAmount, shippingAmount, ZERO_BASE); @@ -300,7 +300,7 @@ public class TaxAuthorityServices { Iterator<GenericValue> taxAuthorityIter = taxAuthoritySet.iterator(); while (taxAuthorityIter.hasNext()) { - GenericValue taxAuthority = (GenericValue) taxAuthorityIter.next(); + GenericValue taxAuthority = taxAuthorityIter.next(); EntityCondition taxAuthCond = EntityCondition.makeCondition( EntityCondition.makeCondition("taxAuthPartyId", EntityOperator.EQUALS, taxAuthority.getString("taxAuthPartyId")), EntityOperator.AND, @@ -334,7 +334,7 @@ public class TaxAuthorityServices { pcmList = EntityUtil.filterByDate(pcmList, true); Iterator<GenericValue> pcmIter = pcmList.iterator(); while (pcmIter.hasNext()) { - GenericValue pcm = (GenericValue) pcmIter.next(); + GenericValue pcm = pcmIter.next(); productCategoryIdSet.add(pcm.getString("productCategoryId")); } @@ -398,7 +398,7 @@ public class TaxAuthorityServices { // find the right entry(s) based on purchase amount Iterator<GenericValue> flIt = filteredList.iterator(); while (flIt.hasNext()) { - GenericValue taxAuthorityRateProduct = (GenericValue) flIt.next(); + GenericValue taxAuthorityRateProduct = flIt.next(); BigDecimal taxRate = taxAuthorityRateProduct.get("taxPercentage") != null ? taxAuthorityRateProduct.getBigDecimal("taxPercentage") : ZERO_BASE; BigDecimal taxable = ZERO_BASE; @@ -480,7 +480,7 @@ public class TaxAuthorityServices { List<GenericValue> partyRelationshipList = EntityUtil.filterByDate(delegator.findByAndCache("PartyRelationship", UtilMisc.toMap("partyIdTo", billToPartyId, "partyRelationshipTypeId", "GROUP_ROLLUP")), true); Iterator<GenericValue> partyRelationshipIter = partyRelationshipList.iterator(); while (partyRelationshipIter.hasNext()) { - GenericValue partyRelationship = (GenericValue) partyRelationshipIter.next(); + GenericValue partyRelationship = partyRelationshipIter.next(); billToPartyIdSet.add(partyRelationship.getString("partyIdFrom")); } handlePartyTaxExempt(taxAdjValue, billToPartyIdSet, taxAuthGeoId, taxAuthPartyId, taxAmount, nowTimestamp, delegator); @@ -558,7 +558,7 @@ public class TaxAuthorityServices { boolean foundExemption = false; if (partyTaxInfos.size() > 0) { - GenericValue partyTaxInfo = (GenericValue) partyTaxInfos.get(0); + GenericValue partyTaxInfo = partyTaxInfos.get(0); adjValue.set("customerReferenceId", partyTaxInfo.get("partyTaxId")); if ("Y".equals(partyTaxInfo.getString("isExempt"))) { adjValue.set("amount", BigDecimal.ZERO); Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java?rev=1084863&r1=1084862&r2=1084863&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java Thu Mar 24 07:23:42 2011 @@ -325,8 +325,8 @@ public class PcChargeServices { GenericValue creditCard = (GenericValue) context.get("creditCard"); if (creditCard != null) { List<String> expDateList = StringUtil.split(creditCard.getString("expireDate"), "/"); - String month = (String) expDateList.get(0); - String year = (String) expDateList.get(1); + String month = expDateList.get(0); + String year = expDateList.get(1); String y2d = year.substring(2); String expDate = month + y2d; Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java?rev=1084863&r1=1084862&r2=1084863&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java Thu Mar 24 07:23:42 2011 @@ -146,15 +146,15 @@ public class RitaApi { throw new IllegalArgumentException("Field [" + name + "] is not a valid OUT parameter"); } - return (String) document.get(name); + return document.get(name); } @Override public String toString() { StringBuilder buf = new StringBuilder(); for (Map.Entry<String, String> entry : document.entrySet()) { - String name = (String) entry.getKey(); - String value = (String) entry.getValue(); + String name = entry.getKey(); + String value = entry.getValue(); buf.append(name); buf.append(" "); buf.append(value); Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java?rev=1084863&r1=1084862&r2=1084863&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java Thu Mar 24 07:23:42 2011 @@ -409,8 +409,8 @@ public class RitaServices { } if (creditCard != null) { List<String> expDateList = StringUtil.split(creditCard.getString("expireDate"), "/"); - String month = (String) expDateList.get(0); - String year = (String) expDateList.get(1); + String month = expDateList.get(0); + String year = expDateList.get(1); String y2d = year.substring(2); String title = creditCard.getString("titleOnCard"); Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java?rev=1084863&r1=1084862&r2=1084863&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java Thu Mar 24 07:23:42 2011 @@ -1000,7 +1000,7 @@ public class ValueLinkApi { // create a List of Maps for each set of values List<Map<String, String>> valueMap = FastList.newInstance(); for (int i = 0; i < valueList.size(); i++) { - valueMap.add(StringUtil.createMap(StringUtil.split(keys, "|"), StringUtil.split((String) valueList.get(i), "|"))); + valueMap.add(StringUtil.createMap(StringUtil.split(keys, "|"), StringUtil.split(valueList.get(i), "|"))); } if (debug) { 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=1084863&r1=1084862&r2=1084863&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 Thu Mar 24 07:23:42 2011 @@ -1157,7 +1157,7 @@ public class ValueLinkServices { if (responseAnswers != null) { Iterator<GenericValue> rai = responseAnswers.iterator(); while (rai.hasNext()) { - GenericValue answer = (GenericValue) rai.next(); + GenericValue answer = rai.next(); GenericValue question = null; try { question = answer.getRelatedOne("SurveyQuestion"); @@ -1270,7 +1270,7 @@ public class ValueLinkServices { if (productStoreEmail == null) { Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", module); } else { - ResourceBundleMapWrapper uiLabelMap = (ResourceBundleMapWrapper) UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); + ResourceBundleMapWrapper uiLabelMap = UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); uiLabelMap.addBottomResourceBundle("OrderUiLabels"); uiLabelMap.addBottomResourceBundle("CommonUiLabels"); answerMap.put("uiLabelMap", uiLabelMap); @@ -1414,7 +1414,7 @@ public class ValueLinkServices { if (responseAnswers != null) { Iterator<GenericValue> rai = responseAnswers.iterator(); while (rai.hasNext()) { - GenericValue answer = (GenericValue) rai.next(); + GenericValue answer = rai.next(); GenericValue question = null; try { question = answer.getRelatedOne("SurveyQuestion"); @@ -1525,7 +1525,7 @@ public class ValueLinkServices { Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", module); } else { Map<String, Object> emailCtx = FastMap.newInstance(); - ResourceBundleMapWrapper uiLabelMap = (ResourceBundleMapWrapper) UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); + ResourceBundleMapWrapper uiLabelMap = UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); uiLabelMap.addBottomResourceBundle("OrderUiLabels"); uiLabelMap.addBottomResourceBundle("CommonUiLabels"); answerMap.put("uiLabelMap", uiLabelMap); Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java?rev=1084863&r1=1084862&r2=1084863&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java Thu Mar 24 07:23:42 2011 @@ -319,7 +319,7 @@ public class WorldPayEvents { Set<String> keySet = parametersMap.keySet(); Iterator<String> i = keySet.iterator(); while (i.hasNext()) { - String name = (String) i.next(); + String name = i.next(); String value = request.getParameter(name); Debug.logError("### Param: " + name + " => " + value, module); } @@ -422,7 +422,7 @@ public class WorldPayEvents { if (paymentPrefs.size() > 0) { Iterator<GenericValue> i = paymentPrefs.iterator(); while (i.hasNext()) { - GenericValue pref = (GenericValue) i.next(); + GenericValue pref = i.next(); boolean okay = setPaymentPreference(dispatcher, userLogin, pref, request); if (!okay) { return false; Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java?rev=1084863&r1=1084862&r2=1084863&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java Thu Mar 24 07:23:42 2011 @@ -127,7 +127,7 @@ public class UtilAccounting { List<GenericValue> glAccountClassChildren = glAccountClass.getRelatedCache("ChildGlAccountClass"); Iterator<GenericValue> glAccountClassChildrenIt = glAccountClassChildren.iterator(); while (glAccountClassChildrenIt.hasNext()) { - GenericValue glAccountClassChild = (GenericValue) glAccountClassChildrenIt.next(); + GenericValue glAccountClassChild = glAccountClassChildrenIt.next(); getGlAccountClassChildren(glAccountClassChild, glAccountClassIds); } } Modified: ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml?rev=1084863&r1=1084862&r2=1084863&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml Thu Mar 24 07:23:42 2011 @@ -24,10 +24,6 @@ under the License. <section> <actions> <property-map resource="CommonExtUiLabels" map-name="uiLabelMap" global="true"/> - <service service-name="getUserPreferenceGroup" result-map="prefResult"> - <field-map field-name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/> - </service> - <set field="userPreferences" from-field="prefResult.userPrefMap" global="true"/> <entity-one entity-name="PartyNameView" value-field="partyNameView"> <field-map field-name="partyId" from-field="userLogin.partyId"/> </entity-one> @@ -47,6 +43,11 @@ under the License. <set field="layoutSettings.middleTopLink2" value="${linkStart}${resultNote.lastSystemInfoNote2.moreInfoPortletId}&amp;id=${resultNote.lastSystemInfoNote2.moreInfoItemId}"/> <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_}"/> + <entity-and list="pageAvail" entity-name="ContentAssoc"> + <field-map field-name="mapKey" from-field="helpTopic"/> + </entity-and> </actions> <widgets> <section> @@ -77,36 +78,7 @@ under the License. </actions> <widgets/> </section> - <decorator-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"> - <decorator-section name="pre-body"> - <decorator-section-include name="pre-body"/> - </decorator-section> - <decorator-section name="body"> - <container id="column-container"> - <section> - <condition> - <if-empty-section section-name="left-column"/> - </condition> - <widgets> - <container id="content-main-section"> - <decorator-section-include name="body"/> - </container> - </widgets> - <fail-widgets> - <container style="left"> - <decorator-section-include name="left-column"/> - </container> - <container id="content-main-section" style="leftonly"> - <container style="no-clear"> - <decorator-section-include name="body"/> - </container> - </container> - </fail-widgets> - </section> - <container style="clear"></container> - </container> - </decorator-section> - </decorator-screen> + <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/> </widgets> </section> </screen> Modified: ofbiz/branches/jackrabbit20100709/applications/content/data/WebtoolsHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/data/WebtoolsHelpData.xml?rev=1084863&r1=1084862&r2=1084863&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/data/WebtoolsHelpData.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/data/WebtoolsHelpData.xml Thu Mar 24 07:23:42 2011 @@ -19,10 +19,7 @@ --> <entity-engine-xml> - <!-- example test suite --> - <SeleniumTestSuitePath testSuiteId="EXAMPLE_TESTSUITE" testSuiteName="example_testsuite" testSuitePath="framework/testtools/testdef/seleniumxml/example/example_testsuite.xml" description="test suite for example component"/> - - <DataResource dataResourceId="HELP_WEBTOOLS" localeString="en" dataResourceTypeId="OFBIZ_FILE" + <DataResource dataResourceId="HELP_WEBTOOLS" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="framework/webtools/data/helpdata/HELP_WEBTOOLS.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Webtools Overview" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HELP_WEBTOOLS" contentTypeId="DOCUMENT" contentName="Framework Webtools" templateDataResourceId="HELP_TEMPL" @@ -38,12 +35,9 @@ objectInfo="framework/testtools/data/helpdata/HELP_WEBTOOLS_selenium.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Selenium help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="WEBTOOLS_selenium" contentTypeId="DOCUMENT" contentName="Selenium test." templateDataResourceId="HELP_TEMPL" dataResourceId="WEBTOOLS_selenium" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_WEBTOOLS" contentIdTo="WEBTOOLS_selenium" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="WEBTOOLS_selenium"/> - - + <!--Selenium Help Load in contentTypeData.xml file --> <DataResource dataResourceId="SELENIUM_HTTPS" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="framework/testtools/documents/OfbizSeleniumSetupHTTPS.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ofbiz Selenium HTTPS" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SELENIUM_HTTPS" contentTypeId="DOCUMENT" contentName="OFBiz Selenium with HTTPS" templateDataResourceId="HELP_TEMPL" dataResourceId="SELENIUM_HTTPS" localeString="en" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="DOCUMENTS" contentIdTo="SELENIUM_HTTPS" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum="" /> - - </entity-engine-xml> Modified: ofbiz/branches/jackrabbit20100709/applications/content/data/helpdata/HELP_CONTENT.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/data/helpdata/HELP_CONTENT.xml?rev=1084863&r1=1084862&r2=1084863&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/data/helpdata/HELP_CONTENT.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/data/helpdata/HELP_CONTENT.xml Thu Mar 24 07:23:42 2011 @@ -17,12 +17,148 @@ specific language governing permissions and limitations under the License. --> +<!--from https://cwiki.apache.org/confluence/display/OFBENDUSER/Content+Management+Overview--> + <section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" xmlns="http://docbook.org/ns/docbook"> - <title>The Content Manager Overview</title> + <title>Content Management Overview</title> <para>The Document Content Management System (DMS/CMS) is designed to store data once and then allow it to be reused in multiple arrangements.</para> + + <section> + <title>Overview</title> + <para> + The term 'content management' generally refers to a system for acquiring, storing and retrieving electronic data in varying formats - such as text, images or proprietary formats. Content management systems (CMS) usually incorporate a rendering system to let the developer display the content in various formats. While some CMSs are rigid in the manner in which content is entered and rendered, the content management module of OFBiz is more of a set of tools which can be used in a variety of situations. In addition to HTML, the content can be rendered in non-Web modes, such as PDF or email newsletters. + The OFBiz CMS is designed to store data once and then allow it to be reused in multiple arrangements. Hence, there are basically two aspects - the back-end storage subsystem, which is oriented around the DataResource entity, and the front-end association subsystem, which revolves around the Content entity. Note that the Content entity has a foreign key pointing to one and only one DataResource entity, but the same DataResource entity can be referenced by multiple Content entities. It is a general rule that data can only be accessed via a Content entity, but one common exception is that images are typically served up using the DataResource primary key. + Content entities are related to other content via ContentAssoc entities. The ContentAssoc entity has a four part primary key and other fields that are used to relate content. The key specifies the 'to' Content and the 'from' Content, as well as the type of association and its effective date. See the discussion of the ContentAssoc entity for more information on how content is related. + </para> + </section> + <section> + <title>Major CMS entities</title> + <section> + <title>DataResource</title> + <para> + The DataResource entity acts as the gateway to actual content retrieval. There are two important fields for determining the format and storage of a resource. These are the 'mimeTypeId' and the 'dataResourceTypeId'. + </para> + </section> + <section> + <title>mimeTypeId</title> + <para> + The mime type is the standard Multipurpose Internet Mail Extension, of which, 'text/html' and 'image/gif' will be two of the more common examples. The mimeTypeId indicates the format of the content as it is stored. This must be compared to the desired output format to see if the rendering system can handle the request. For example, if the DataResource.mimeTypeId equals, 'image/png', and the target output format is 'text/html', the rendering system could make the logical supposition that it should return an HTML "img.../" tag. If the output format were 'application/pdf' then it will need to determine if it can convert the image to a PDF format. + </para> + </section> + <section> + <title>dataResourceTypeId</title> + <para> + The dataResourceTypeId field indicates the storage mechanism for the resource. It could be of type ELECTRONIC_TEXT, which indicates that there is an entry in the ElectronicText table that is related to the DataResource by its primary key. + If the mimeTypeId is of type image, then the dataResourceId could be IMAGE_OBJECT (stored in the database ImageDataResource table), OFBIZ_FILE (stored in a file the path of which is relative to the OFBiz home directory) or URL_RESOURCE (could be accessed via HTTP protocol). + </para> + </section> + <section> + <title>dataTemplateTypeId</title> + <para> + One of the powerful concepts of the OFBiz CMS is that it can store templates that can be used to control the formatting of data. In this case, the resource pointed to by the DataResource entity will not be rendered, itself; instead, it will be used as a template to format data that is associated with it. The currently supported templating types are FreeMarker (FTL) and the OFBiz Screen Widget (SCREEN_COMBINED) format. + If the value of dataTemplateTypeId is empty or equal to NONE, then the data pointed to by the dataResource entity is rendered directly. + </para> + </section> + <section> + <title>objectInfo</title> + <para> + If dataResourceTypeId is ELECTRONIC_TEXT or IMAGE_OBJECT, then objectInfo is not used, but for other types, it will contain the resource storage information. If dataResourceTypeId is one of OFBIZ_FILE, CONTEXT_FILE, LOCAL_FILE or URL_RESOURCE; then objectInfo contains path info. If dataResourceTypeId equals SHORT_TEXT, then objectInfo will contain the actual resource (short text) value. + </para> + </section> + </section> + <section> + <title>ElectronicText</title> + <para> + ElectronicText contains ASCII text data. An ElectronicText entity can be associated with only one DataResource entity and vice-versa. The mimeTypeId field of the DataResource entity must be checked to determine the format of the ElectronicText data. + </para> + </section> + <section> + <title>ImageDataResource</title> + <para> + ImageDataResource is the equivalent of ElectronicText for binary image data. The DataResource.mimeTypeId must be checked to determine the format of the data. + </para> + </section> + <section> + <title>Content</title> + <para> + The Content entity determines how DataResources are rendered. It does this on a 'local' level, in that it has a mimeTypeId, localeString and other fields that indicate to the rendering system how the DataResource should look, but it can also control the larger picture because it can act as a placeholder and head for other content. The Content.dataResourceId does not need to point to anything, instead a Content entity can be related to other Content via ContentAssoc entities. At some point, some of the child Content entities must point to DataResources, else nothing will ever be displayed. + </para> + <section> + <title>dataResourceId</title> + <para> + The dataResourceId points to a DataResource entity that represents content associated with the parent Content entity. The related DataResource could be data that is rendered or it could be a template that indicates how child Content of the parent Content are rendered. + </para> + </section> + <section> + <title>contentName</title> + <para> + contentName is the field that is used to represent the Content entity in lists. The contentName field value must be less than 100 characters. + </para> + </section> + <section> + <title>description</title> + <para> + description is used in cases where a short summary or description of the Content is desired. The description field value must be less than 255 characters. + </para> + </section> + <section> + <title>templateDateResourceId</title> + <para> + The templateDataResourceId field points to a DataResource entity that is used to transform the data contained in the DataResource pointed to by the Content.dataResourceId field. The dataTemplateTypeId of the DataResource pointed to by templateDataResourceId will be checked to determine what sort of transform will be applied. + </para> + </section> + </section> + <section> + <title>ContentRole</title> + <para> + The ContentRole entity is used to assign permission authority to a piece of content. The ContentRole entity identifies the Content to which the authority is being attached and the Party that has that authority and what sort of authority (role) that party has. The ContentRole also establishes the time frame (from/thruDate) for which that authority is valid. + </para> + </section> + <section> + <title>ContentPurpose</title> + <para> + The ContentPurpose entity adds extra information to a Content entity that is used to determine what permissions are required to access that Content. + </para> + </section> + <section> + <title>ContentPurposeOperation</title> + <para> + ContentPurposeOperation is used to setup permission validation rules. + </para> + </section> + <section> + <title>ContentAssoc</title> + <para> + ContentAssoc relates one Content entity to another. A sense of direction is conveyed in the fact that one field is named contentIdTo (the from field is contentId). + </para> + <section> + <title>contentId</title> + <para> + This is the 'parent' Content in a Content-to-Content relationship. + </para> + </section> + <section> + <title>contentIdTo</title> + <para> + This field is the 'from' or 'child' field in a Content-to-Content relationship. + </para> + </section> + <section> + <title>contentAssocTypeId</title> + <para> + The contentAssocTypeId field is used to add information about the type of a Content-to-Content relationship. It is part of the primary key. Two Content entities can be related by multiple ContentAssoc entities if the contentAssocTypeId field varies (or the fromDate is different). + </para> + </section> + <section> + <title>fromDate</title> + <para> + the fromDate field is part of the primary key. + </para> + </section> + </section> </section> Modified: ofbiz/branches/jackrabbit20100709/applications/content/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/entitydef/entitymodel.xml?rev=1084863&r1=1084862&r2=1084863&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/entitydef/entitymodel.xml Thu Mar 24 07:23:42 2011 @@ -163,7 +163,7 @@ under the License. <field name="contentName" type="name"></field> <field name="description" type="description"></field> <field name="localeString" type="very-short"></field> - <field name="mimeTypeId" type="id-long"></field> + <field name="mimeTypeId" type="id-vlong"></field> <field name="characterSetId" type="id-long"></field> <field name="childLeafCount" type="numeric"/> <field name="childBranchCount" type="numeric"/> @@ -763,7 +763,7 @@ under the License. <field name="statusId" type="id"></field> <field name="dataResourceName" type="name"></field> <field name="localeString" type="very-short"></field> - <field name="mimeTypeId" type="id-long"></field> + <field name="mimeTypeId" type="id-vlong"></field> <field name="characterSetId" type="id-long"></field> <field name="objectInfo" type="long-varchar"><description>For Short Text the text goes here.</description></field> <field name="surveyId" type="id"></field> @@ -988,7 +988,7 @@ under the License. package-name="org.ofbiz.content.data" title="File Extension Entity"> <field name="fileExtensionId" type="id-long-ne"></field> - <field name="mimeTypeId" type="id-long-ne"></field> + <field name="mimeTypeId" type="id-vlong-ne"></field> <prim-key field="fileExtensionId"/> <relation type="one" fk-name="FILEEXT_MMTYP" rel-entity-name="MimeType"> <key-map field-name="mimeTypeId"/> @@ -1016,7 +1016,7 @@ under the License. package-name="org.ofbiz.content.data" default-resource-name="ContentEntityLabels" title="Mime Type Entity"> - <field name="mimeTypeId" type="id-long-ne"></field> + <field name="mimeTypeId" type="id-vlong-ne"></field> <field name="description" type="description"></field> <prim-key field="mimeTypeId"/> </entity> @@ -1024,7 +1024,7 @@ under the License. package-name="org.ofbiz.content.data" default-resource-name="ContentEntityLabels" title="Mime Text Template Entity"> - <field name="mimeTypeId" type="id-long-ne"></field> + <field name="mimeTypeId" type="id-vlong-ne"></field> <field name="templateLocation" type="long-varchar"></field> <prim-key field="mimeTypeId"/> <relation type="one" fk-name="MIMETYPE_TPL_MT" rel-entity-name="MimeType"> Modified: ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/data/DataServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=1084863&r1=1084862&r2=1084863&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/data/DataServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/data/DataServices.xml Thu Mar 24 07:23:42 2011 @@ -51,8 +51,8 @@ under the License. </if-empty> <if-empty field="newEntity.mimeTypeId"> - <call-class-method class-name="org.ofbiz.content.data.DataResourceWorker" method-name="getMimeType" ret-field="newEntity.mimeTypeId"> - <field field="newEntity" type="GenericValue"/> + <call-class-method class-name="org.ofbiz.content.data.DataResourceWorker" method-name="getMimeTypeWithByteBuffer" ret-field="newEntity.mimeTypeId"> + <field field="parameters.uploadedFile" type="java.nio.ByteBuffer"/> </call-class-method> </if-empty> @@ -752,7 +752,6 @@ under the License. <first-from-list entry="extension" list="extensions"/> <set from-field="parameters._uploadedFile_fileName" field="dataResource.dataResourceName"/> - <set from-field="parameters._uploadedFile_contentType" field="dataResource.mimeTypeId"/> <set value="${uploadPath}/${dataResource.dataResourceId}" field="dataResource.objectInfo"/> <if-not-empty field="extension"> <set value="${uploadPath}/${dataResource.dataResourceId}.${extension.fileExtensionId}" field="dataResource.objectInfo"/> 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=1084863&r1=1084862&r2=1084863&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml Thu Mar 24 07:23:42 2011 @@ -74,6 +74,7 @@ <implements service="createContent" optional="true"/> <attribute name="dataResourceId" type="String" mode="IN" optional="false"/> <attribute name="contentId" type="String" mode="OUT" optional="false"/> + <attribute name="uploadedFile" type="java.nio.ByteBuffer" mode="IN" optional="true"/> </service> <service name="attachUploadToDataResource" engine="simple" transaction-timeout="300" |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |