svn commit: r1559799 [1/12] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1559799 [1/12] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Author: jleroux
Date: Mon Jan 20 18:23:28 2014 New Revision: 1559799 URL: http://svn.apache.org/r1559799 Log: Merges trunk HEAD I will soon merge this branch in trunk... Added: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.50-catalina-ha.jar - copied unchanged from r1559794, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.50-catalina-ha.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.50-catalina-tribes.jar - copied unchanged from r1559794, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.50-catalina-tribes.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.50-tomcat-embed-core.jar - copied unchanged from r1559794, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.50-tomcat-embed-core.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.50-tomcat-embed-jasper.jar - copied unchanged from r1559794, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.50-tomcat-embed-jasper.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.50-tomcat-embed-logging-log4j.jar - copied unchanged from r1559794, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.50-tomcat-embed-logging-log4j.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/imagemanagement/ - copied from r1559794, ofbiz/trunk/framework/images/webapp/images/imagemanagement/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-1.10.2.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.10.2.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-1.10.2.min.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.10.2.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-1.10.2.min.map - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.10.2.min.map ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-migrate-1.2.1.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/jquery-migrate-1.2.1.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery.mobile/ - copied from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/jquery.mobile/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-sliderAccess.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-sliderAccess.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.4.3.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.4.3.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.css - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.css ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min.css - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min.css ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-af.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-af.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-am.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-am.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-bg.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-bg.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-da.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-da.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-eu.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-eu.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hr.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hr.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sr-RS.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sr-RS.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sr-YU.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sr-YU.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-th.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-th.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-uk.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-uk.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/API.md - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/API.md ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/CONTRIBUTING.md - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/CONTRIBUTING.md ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/FAQ.md - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/FAQ.md ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/NEWS.md - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/NEWS.md ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/PLUGINS.md - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/PLUGINS.md ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/README.md - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/README.md ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.canvas.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.canvas.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.canvas.min.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.canvas.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.categories.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.categories.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.categories.min.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.categories.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.errorbars.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.errorbars.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.errorbars.min.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.errorbars.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.time.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.time.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.time.min.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.time.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/hotkeys/jquery.hotkeys-0.8.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/hotkeys/jquery.hotkeys-0.8.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/jquery.maskedinput-1.3.1.min.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jquery.maskedinput-1.3.1.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/jsTree/jquery.jstree-3.0.0-beta3.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/jquery.jstree-3.0.0-beta3.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/jsTree/jquery.jstree.min-3.0.0-beta3.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/jquery.jstree.min-3.0.0-beta3.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/jsTree/libs/ - copied from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/libs/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/32px.png - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/32px.png ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/40px.png - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/40px.png ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/style-3.0.0-beta3.css - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/style-3.0.0-beta3.css ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/style.min-3.0.0-beta3.css - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/style.min-3.0.0-beta3.css ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/ui/i18n/ - copied from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/ui/i18n/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.10.3.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.10.3.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.10.3.min.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.10.3.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/ui/js/jquery.cookie-1.4.0.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/jquery/ui/js/jquery.cookie-1.4.0.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/util.js - copied unchanged from r1559794, ofbiz/trunk/framework/images/webapp/images/util.js Removed: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/js/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.47-catalina-ha.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.47-catalina-tribes.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.47-tomcat-embed-core.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.47-tomcat-embed-jasper.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.47-tomcat-embed-logging-log4j.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/GooglemapMarkers.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/GooglemapSimple.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-1.6.2.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-1.6.2.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-1.7.2.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-1.7.2.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-1.7.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-1.7.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-1.8.2.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-1.8.2.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery.mobile-1.1.0-rc.1/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.0.5.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/API.txt ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/NEWS.txt ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/PLUGINS.txt ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/README.txt ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/hotkeys/jquery.hotkeys-0.7.9.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/jquery.maskedinput-1.2.2.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ptbr.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ptpt.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/ui/development-bundle/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/ui/index.html ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.9.0.custom.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/ui/js/jquery-ui-1.9.0.custom.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/docbook/webhelp/docs/common/jquery/jquery-1.4.2.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/docbook/webhelp/docs/common/jquery/jquery-ui-1.8.2.custom.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/docbook/webhelp/docs/common/jquery/jquery.cookie.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/docbook/webhelp/template/common/jquery/jquery-1.4.2.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/docbook/webhelp/template/common/jquery/jquery-ui-1.8.2.custom.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/docbook/webhelp/template/common/jquery/jquery.cookie.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/example/flot/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/example/flotr/ Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed) ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/CommonScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageCrop.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageRotating.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageWatermark.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ResizeImage.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/CommonScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonEvents.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/template/JsLanguageFilesMapping.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/common-controller.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/flotCharts/Bars.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/flotCharts/Pie.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/lookup.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/CommonScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/fieldlookup.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/README.md ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ca.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-cs.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-el.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-et.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fi.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-gl.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-he.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hu.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-id.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-it.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ja.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ko.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-lt.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-nl.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-no.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pl.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pt-BR.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pt.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ro.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sk.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sv.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-vi.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-CN.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-TW.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/LICENSE.txt ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/Makefile ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/excanvas.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/excanvas.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.colorhelpers.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.colorhelpers.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.crosshair.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.crosshair.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.fillbetween.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.fillbetween.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.image.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.image.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.navigate.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.navigate.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.pie.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.pie.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.resize.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.resize.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.selection.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.selection.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.stack.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.stack.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.symbol.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.symbol.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.threshold.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.threshold.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/jcarousel/jquery.jcarousel.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/jcarousel/jquery.jcarousel.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/validate/additional-methods.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/validate/additional-methods.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/validate/jquery.validate.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/plugins/validate/jquery.validate.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/selectall.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/job/JobManager.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-screen.xsd ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlMenuMacroLibrary.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlScreenMacroLibrary.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/example/WEB-INF/controller.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleMenus.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/widget/CommonScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bizznesstime/webapp/bizznesstime/css/style.css ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bluelight/webapp/bluelight/style.css ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/webapp/flatgrey/javascript.css ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/webapp/tomahawk/css/style.css Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1557460-1559794 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath?rev=1559799&r1=1559798&r2=1559799&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath Mon Jan 20 18:23:28 2014 @@ -100,11 +100,11 @@ <classpathentry kind="lib" path="specialpurpose/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar"/> <classpathentry kind="lib" path="specialpurpose/birt/lib/viewservlets.jar"/> <classpathentry kind="lib" path="framework/catalina/lib/ecj-4.2.2.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.47-catalina-ha.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.47-catalina-tribes.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.47-tomcat-embed-core.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.47-tomcat-embed-jasper.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.47-tomcat-embed-logging-log4j.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-catalina-ha.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-catalina-tribes.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-tomcat-embed-core.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-tomcat-embed-jasper.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-tomcat-embed-logging-log4j.jar"/> <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.4.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE?rev=1559799&r1=1559798&r2=1559799&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE Mon Jan 20 18:23:28 2014 @@ -74,11 +74,11 @@ framework/base/lib/scripting/jansi-1.2.1 framework/base/lib/xmlrpc-client-3.1.2.jar framework/base/lib/xmlrpc-common-3.1.2.jar framework/base/lib/xmlrpc-server-3.1.2.jar -framework/catalina/lib/tomcat-7.0.47-catalina-ha.jar -framework/catalina/lib/tomcat-7.0.47-catalina-tribes.jar -framework/catalina/lib/tomcat-7.0.47-tomcat-embed-core.jar -framework/catalina/lib/tomcat-7.0.47-tomcat-embed-jasper.jar -framework/catalina/lib/tomcat-7.0.47-tomcat-embed-logging-log4j.jar +framework/catalina/lib/tomcat-7.0.50-catalina-ha.jar +framework/catalina/lib/tomcat-7.0.50-catalina-tribes.jar +framework/catalina/lib/tomcat-7.0.50-tomcat-embed-core.jar +framework/catalina/lib/tomcat-7.0.50-tomcat-embed-jasper.jar +framework/catalina/lib/tomcat-7.0.50-tomcat-embed-logging-log4j.jar framework/entity/lib/commons-dbcp-1.4.jar framework/entity/lib/jdbc/derby-10.10.1.1.jar framework/entity/lib/jdbc/derbytools-10.8.2.2.jar Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetForms.xml?rev=1559799&r1=1559798&r2=1559799&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetForms.xml Mon Jan 20 18:23:28 2014 @@ -617,7 +617,7 @@ under the License. <field name="nbv" title="Net Book Value"><display type="currency" currency="${fixedAsset.purchaseCostUomId}"/></field> </form> <form name="FixedAssetTransactions" type="list" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" list-name="fixedAssetTransactions"> <actions> <entity-condition entity-name="AcctgTransAndEntries" list="fixedAssetTransactions"> <condition-expr field-name="fixedAssetId" from-field="fixedAssetId"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/CommonScreens.xml?rev=1559799&r1=1559798&r2=1559799&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/CommonScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/CommonScreens.xml Mon Jan 20 18:23:28 2014 @@ -38,7 +38,7 @@ under the License. <set field="layoutSettings.javaScripts[]" value="/partymgr/static/partymgr.js" global="true"/> <set field="layoutSettings.styleSheets[]" value="/partymgr/static/partymgr.css" global="true"/> <set field="layoutSettings.styleSheets[]" value="/images/humanres/humanres.css" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/external/jquery.cookie.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery.cookie-1.4.0.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/> <set field="applicationMenuName" value="HumanResAppBar" global="true"/> <set field="applicationMenuLocation" value="component://humanres/widget/HumanresMenus.xml" global="true"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1559799&r1=1559798&r2=1559799&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Mon Jan 20 18:23:28 2014 @@ -4415,7 +4415,7 @@ public class ShoppingCart implements Ite if (totalAmount.compareTo(BigDecimal.ZERO) == 0) { return BigDecimal.ZERO; } else { - return getTotalDiscountAmount().negate().divide(totalAmount); + return getTotalDiscountAmount().negate().divide(totalAmount, scale, rounding); } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1559799&r1=1559798&r2=1559799&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/controller.xml Mon Jan 20 18:23:28 2014 @@ -3258,7 +3258,7 @@ under the License. <view-map name="LookupDataResource" page="component://content/widget/content/DataResourceScreens.xml#LookupDataResource" type="screen"/> <view-map name="LookupPerson" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson" type="screen"/> <view-map name="LookupPreferredContactMech" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupPreferredContactMech"/> - <view-map name="LookupContactList" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupContactList"/> + <view-map name="LookupContactList" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupContactList"/> <!-- Image Management request mappings --> <view-map name="Imagemanagement" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#Imagemanagement"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageCrop.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageCrop.ftl?rev=1559799&r1=1559798&r2=1559799&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageCrop.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageCrop.ftl Mon Jan 20 18:23:28 2014 @@ -16,9 +16,9 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script src="/catalog/imagemanagement/js/jquery.min.js"></script> -<script src="/catalog/imagemanagement/js/jquery.Jcrop.js"></script> -<link rel="stylesheet" href="/catalog/imagemanagement/js/jquery.Jcrop.css" type="text/css" /> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/imagemanagement/jquery.Jcrop.min.js</@ofbizContentUrl>"></script> +<link rel="stylesheet" href="<@ofbizContentUrl>/images/imagemanagement/jquery.Jcrop.css</@ofbizContentUrl>" type="text/css" /> <script type="text/javascript"> jQuery.noConflict(); jQuery(document).ready(function(){ Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageRotating.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageRotating.ftl?rev=1559799&r1=1559798&r2=1559799&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageRotating.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageRotating.ftl Mon Jan 20 18:23:28 2014 @@ -16,8 +16,8 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script src="/catalog/imagemanagement/js/jquery.min.js"></script> -<script src="/catalog/imagemanagement/js/jquery.Rotate.js"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/imagemanagement/jQueryRotateCompressed.js</@ofbizContentUrl>"></script> <style type="text/css"> td.cropbox span { width: auto !important; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageWatermark.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageWatermark.ftl?rev=1559799&r1=1559798&r2=1559799&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageWatermark.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageWatermark.ftl Mon Jan 20 18:23:28 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script src="/catalog/imagemanagement/js/jquery.min.js"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script> <script type="text/javascript"> jQuery.noConflict(); var host = document.location.host; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ResizeImage.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ResizeImage.ftl?rev=1559799&r1=1559798&r2=1559799&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ResizeImage.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ResizeImage.ftl Mon Jan 20 18:23:28 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script src="/catalog/imagemanagement/js/jquery.min.js"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script> <script type="text/javascript"> jQuery.noConflict(); jQuery(document).ready(function(){ Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl?rev=1559799&r1=1559798&r2=1559799&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl Mon Jan 20 18:23:28 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script src="/catalog/imagemanagement/js/jquery.min.js"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script> <script type="text/javascript"> jQuery.noConflict(); jQuery(document).ready(function(){ Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/CommonScreens.xml?rev=1559799&r1=1559798&r2=1559799&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/CommonScreens.xml Mon Jan 20 18:23:28 2014 @@ -41,7 +41,7 @@ under the License. <set field="applicationMenuName" value="CatalogAppBar" global="true"/> <set field="applicationMenuLocation" value="component://product/widget/catalog/CatalogMenus.xml" global="true"/> <set field="applicationTitle" value="${uiLabelMap.ProductCatalogManagerApplication}" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/external/jquery.cookie.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery.cookie-1.4.0.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/> </actions> <widgets> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml?rev=1559799&r1=1559798&r2=1559799&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml Mon Jan 20 18:23:28 2014 @@ -90,6 +90,7 @@ under the License. <antcall target="clean-tempfiles"/> <antcall target="clean-search-indexes"/> <antcall target="clean-downloads"/> + <antcall target="clean-uploads"/> <antcall target="clean"/> </target> @@ -159,12 +160,19 @@ under the License. </target> <target name="clean-search-indexes" - description="Remove search indexes (e.g. Lucene indexes) created under runtime/indexes"> + description="Remove search indexes (e.g. Lucene indexes) created under runtime/indexes"> <delete includeemptydirs="true"> <fileset dir="./runtime/indexes" includes="**/*" erroronmissingdir="false" /> </delete> </target> - + + <target name="clean-uploads" + description="Remove uploaded files"> + <delete includeemptydirs="true"> + <fileset dir="./runtime/uploads" includes="**/*" erroronmissingdir="false" /> + </delete> + </target> + <target name="tests" depends="ofbiz-init"> <iterate target="tests" filelist="test-builds"/> </target> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonEvents.java?rev=1559799&r1=1559798&r2=1559799&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonEvents.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonEvents.java Mon Jan 20 18:23:28 2014 @@ -68,6 +68,20 @@ public class CommonEvents { public static final String module = CommonEvents.class.getName(); + private static final String[] ignoreAttrs = new String[] { // Attributes removed for security reason; _ERROR_MESSAGE_ is kept + "javax.servlet.request.key_size", + "_CONTEXT_ROOT_", + "_FORWARDED_FROM_SERVLET_", + "javax.servlet.request.ssl_session", + "javax.servlet.request.ssl_session_id", + "multiPartMap", + "javax.servlet.request.cipher_suite", + "targetRequestUri", + "_SERVER_ROOT_URL_", + "_CONTROL_PATH_", + "thisRequestUri" + }; + private static final UtilCache<String, Map<String, String>> appletSessions = UtilCache.createUtilCache("AppletSessions", 0, 600000, true); public static String checkAppletRequest(HttpServletRequest request, HttpServletResponse response) { @@ -266,22 +280,39 @@ public class CommonEvents { public static String jsonResponseFromRequestAttributes(HttpServletRequest request, HttpServletResponse response) { // pull out the service response from the request attribute + Map<String, Object> attrMap = UtilHttp.getJSONAttributeMap(request); + for (String ignoreAttr : ignoreAttrs) { + if (attrMap.containsKey(ignoreAttr)) { + attrMap.remove(ignoreAttr); + } + } + // create a JSON Object for return JSONObject json = JSONObject.fromObject(attrMap); - writeJSONtoResponse(json, response); + writeJSONtoResponse(json, request.getMethod(), response); return "success"; } - private static void writeJSONtoResponse(JSON json, HttpServletResponse response) { + private static void writeJSONtoResponse(JSON json, String httpMethod, HttpServletResponse response) { String jsonStr = json.toString(); if (jsonStr == null) { Debug.logError("JSON Object was empty; fatal error!", module); return; } + // This was added for security reason (OFBIZ-5409), you might need to remove the "//" prefix when handling the JSON response + // Though normally you simply have to access the data you want, so should not be annoyed by the "//" prefix + if ("GET".equalsIgnoreCase(httpMethod)) { + Debug.logWarning("for security reason (OFBIZ-5409) the the '//' prefix was added handling the JSON response. " + + "Normally you simply have to access the data you want, so should not be annoyed by the '//' prefix." + + "You might need to remove it if you use Ajax GET responses (not recommended)." + + "In case, the util.js scrpt is there to help you", module); + jsonStr = "//" + jsonStr; + } + // set the X-JSON content type response.setContentType("application/x-json"); // jsonStr.length is not reliable for unicode characters @@ -337,7 +368,7 @@ public class CommonEvents { } } - writeJSONtoResponse(jsonUiLabel, response); + writeJSONtoResponse(jsonUiLabel, request.getMethod(), response); return "success"; } @@ -376,7 +407,7 @@ public class CommonEvents { } } - writeJSONtoResponse(jsonUiLabel, response); + writeJSONtoResponse(jsonUiLabel, request.getMethod(), response); return "success"; } @@ -437,8 +468,7 @@ public class CommonEvents { int charDim = Math.max(maxAdvance, fontHeight); int halfCharDim = (charDim / 2); - BufferedImage charImage = - new BufferedImage(charDim, charDim, BufferedImage.TYPE_INT_ARGB); + BufferedImage charImage = new BufferedImage(charDim, charDim, BufferedImage.TYPE_INT_ARGB); Graphics2D charGraphics = charImage.createGraphics(); charGraphics.translate(halfCharDim, halfCharDim); double angle = (Math.random() - 0.5) * rotationRange; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java?rev=1559799&r1=1559798&r2=1559799&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java Mon Jan 20 18:23:28 2014 @@ -55,7 +55,7 @@ public class JsLanguageFileMappingCreato // setup some variables to locate the js files String componentRoot = "component://images/webapp"; - String jqueryUiLocaleRelPath = "/images/jquery/ui/development-bundle/ui/i18n/"; + String jqueryUiLocaleRelPath = "/images/jquery/ui/i18n/"; String dateJsLocaleRelPath = "/images/jquery/plugins/datejs/"; String validateRelPath = "/images/jquery/plugins/validate/localization/"; String dateTimePickerJsLocaleRelPath = "/images/jquery/plugins/datetimepicker/localization/"; @@ -66,17 +66,15 @@ public class JsLanguageFileMappingCreato String jqueryUiLocalePrefix = "jquery.ui.datepicker-"; String dateTimePickerPrefix = "jquery-ui-timepicker-"; String defaultLocaleDateJs = "en-US"; - String defaultLocaleJquery = "en"; + String defaultLocaleJquery = "en"; // Beware to keep the OFBiz specific jquery.ui.datepicker-en.js file when upgrading... for (Locale locale : localeList) { String displayCountry = locale.toString(); String modifiedDisplayCountry = null; String modifiedDisplayCountryForValidation = null; - String modifiedDisplayCountryForValidation2 = null; - if (displayCountry.indexOf('_') != -1) { + if (displayCountry.contains("_")) { modifiedDisplayCountry = displayCountry.replace("_", "-"); - modifiedDisplayCountryForValidation = displayCountry.replace("_", "").toLowerCase(); // fun: in validate plugin we have also ptpt and ptbr for instance... - modifiedDisplayCountryForValidation2 = displayCountry.substring(displayCountry.indexOf('_')+1).toLowerCase(); // weird, validate plugin treat zh_CN as cn (not zhcn) and zh_TW as tw (not zhtw) + modifiedDisplayCountryForValidation = displayCountry; // messages*.js use "_" not "-" as others } else { modifiedDisplayCountry = displayCountry; } @@ -102,8 +100,8 @@ public class JsLanguageFileMappingCreato if (file.exists()) { fileUrl = dateJsLocaleRelPath + dateJsLocalePrefix + tmpLocale + jsFilePostFix; } else { - // use default language en-US - fileUrl = dateJsLocaleRelPath + dateJsLocalePrefix + defaultLocaleDateJs + jsFilePostFix; + // use language en-US as fallback + fileUrl = dateJsLocaleRelPath + dateJsLocalePrefix + defaultLocaleDateJs + jsFilePostFix; } } dateJsLocaleFile.put(displayCountry, fileUrl); @@ -111,28 +109,30 @@ public class JsLanguageFileMappingCreato /* * Try to open the jquery validation language file */ - fileName = componentRoot + validateRelPath + validateLocalePrefix + strippedLocale + jsFilePostFix; - file = FileUtil.getFile(fileName); - - if (file.exists()) { - fileUrl = validateRelPath + validateLocalePrefix + strippedLocale + jsFilePostFix; - } else { - // use default language en - fileUrl = validateRelPath + validateLocalePrefix + defaultLocaleJquery + jsFilePostFix; - // Try to guess a language (fun: in validate plugin we have also ptpt and ptbr for instance....) - if (modifiedDisplayCountryForValidation != null) { - fileName = componentRoot + validateRelPath + validateLocalePrefix + modifiedDisplayCountryForValidation + jsFilePostFix; + if (modifiedDisplayCountryForValidation != null) { // Try 1st lang_country + fileName = componentRoot + validateRelPath + validateLocalePrefix + modifiedDisplayCountryForValidation + jsFilePostFix; + file = FileUtil.getFile(fileName); + if (file.exists()) { + fileUrl = validateRelPath + validateLocalePrefix + modifiedDisplayCountryForValidation + jsFilePostFix; + } else { // lang only + fileName = componentRoot + validateRelPath + validateLocalePrefix + strippedLocale + jsFilePostFix; file = FileUtil.getFile(fileName); if (file.exists()) { - fileUrl = validateRelPath + validateLocalePrefix + modifiedDisplayCountryForValidation + jsFilePostFix; + fileUrl = validateRelPath + validateLocalePrefix + strippedLocale + jsFilePostFix; } else { - fileName = componentRoot + validateRelPath + validateLocalePrefix + modifiedDisplayCountryForValidation2 + jsFilePostFix; - file = FileUtil.getFile(fileName); - if (file.exists()) { - fileUrl = validateRelPath + validateLocalePrefix + modifiedDisplayCountryForValidation2 + jsFilePostFix; - } + // use default language en as fallback + fileUrl = validateRelPath + validateLocalePrefix + defaultLocaleJquery + jsFilePostFix; } } + } else { // Then try lang only + fileName = componentRoot + validateRelPath + validateLocalePrefix + strippedLocale + jsFilePostFix; + file = FileUtil.getFile(fileName); + if (file.exists()) { + fileUrl = validateRelPath + validateLocalePrefix + strippedLocale + jsFilePostFix; + } else { + // use default language en as fallback + fileUrl = validateRelPath + validateLocalePrefix + defaultLocaleJquery + jsFilePostFix; + } } validationLocaleFile.put(displayCountry, fileUrl); @@ -151,7 +151,7 @@ public class JsLanguageFileMappingCreato if (file.exists()) { fileUrl = jqueryUiLocaleRelPath + jqueryUiLocalePrefix + modifiedDisplayCountry + jsFilePostFix; } else { - // use default language en + // use default language en as fallback fileUrl = jqueryUiLocaleRelPath + jqueryUiLocalePrefix + defaultLocaleJquery + jsFilePostFix; } } @@ -172,8 +172,8 @@ public class JsLanguageFileMappingCreato if (file.exists()) { fileUrl = dateTimePickerJsLocaleRelPath + dateTimePickerPrefix + modifiedDisplayCountry + jsFilePostFix; } else { - // use default language en - fileUrl = dateTimePickerJsLocaleRelPath + dateTimePickerPrefix + defaultLocaleJquery + jsFilePostFix; + // use default language en as fallback + fileUrl = dateTimePickerJsLocaleRelPath + dateTimePickerPrefix + defaultLocaleJquery + jsFilePostFix; } } dateTimePickerLocaleFile.put(displayCountry, fileUrl); @@ -188,8 +188,7 @@ public class JsLanguageFileMappingCreato mapWrapper.put("validation", validationLocaleFile); mapWrapper.put("dateTime", dateTimePickerLocaleFile); - // some magic to create a new java file - // render it as FTL + // some magic to create a new java file: render it as FTL Writer writer = new StringWriter(); try { FreeMarkerWorker.renderTemplateAtLocation(template, mapWrapper, writer); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |