Based on revisions: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1072382 Note: Opentaps is now using GIT, you can clone and/or contribute at http://gitorious.org/opentaps Overall changes --------------- applications/securityext/data/PasswordSecurityData.xml ad00f3895b1f Set the admin accounts default passwords to opentaps 7a33f581bbd5 Change the login test accordingly Commented out various webapps and components which duplicate or are superseded by opentaps. r13679, 13743, 13753 applications/*/webapp/*/WEB-INF/web.xml r13646 Added ofbizServerName context-param for JBOSS integration framework/common/widget/CommonScreens.xml specialpurpose/ecommerce/widget/CommonScreens.xml specialpurpose/webpos/widget/CommonScreens.xml r13762 Changed favicon to the opentaps icon framework/common/config/CommonUiLabels.xml specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl specialpurpose/webpos/webapp/webpos/includes/Footer.ftl themes/bizznesstime/includes/footer.ftl themes/flatgrey/includes/footer.ftl themes/multiflex/includes/footer.ftl r13761, r13800 Fix ofbiz footers to include Opentaps Localized date/time input and output feature Affected files: framework/base/src/org/ofbiz/base/util/UtilDateTime.java framework/base/src/org/ofbiz/base/util/ObjectType.java framework/base/src/org/ofbiz/base/util/UtilHttp.java framework/base/src/org/ofbiz/base/util/UtilValidate.java framework/base/src/org/ofbiz/base/util/string/UelFunctions.java framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java framework/widget/src/org/ofbiz/widget/form/ModelForm.java framework/widget/src/org/ofbiz/widget/form/ModelFormField.java framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java framework/common/config/CommonUiLabels.xml framework/common/src/org/ofbiz/common/FindServices.java applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java In revisions: r13768, r13769, r13784, r13786, r13798, r13812-r13818, r13822, r13824, r13833, r13834, 4d0b94a1fdf644d8bdbb4c114a05d9bdb48627bc, 5394c0be0b4623e88035ae2c3bbd5789cdae0a90 371eaa40ed7f1e223432858fb3902ab7f3a9a1fa Framework changes ----------------- This list the changes made in the framework directory, from the 09.04 ofbiz release. framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java 0a48af8 Make RequestHandler.makeLink to also handle encoded ? so the jsessionid is inserted at the right place framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java 0288e86 Fix unnamed processor events silently overriding each others (for backward compatibility) framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java framework/entity/src/org/ofbiz/entity/util/EntityUtil.java 748252a Added API to handle java.sql.Date so that they are not converted to Timestamp as some entities would then throw a warning framework/base/src/org/ofbiz/base/util/UtilFormatOut.java r12890 Added a formatCurrency method which does not require the maximumFractionDigits argument. It uses the default value for the locale. Added for backward compatibility. framework/base/config/pojoentities-containers.xml framework/start/src/org/ofbiz/base/start/pojoentities.properties r13007 Added the POJO generator configuration framework/base/config/hibernatecfg-containers.xml framework/base/config/ofbiz-containers.xml framework/base/config/test-containers.xml framework/start/src/org/ofbiz/base/start/hibernatecfg.properties r13030 Added hibernate configuration generator container framework/base/lib/etl/ framework/base/lib/etl/js.jar framework/base/lib/etl/kettle-core.jar framework/base/lib/etl/kettle-db.jar framework/base/lib/etl/kettle-engine.jar framework/base/lib/etl/ognl-2.6.9.jar r13618 Move kettle libraries to framework in order to resolve classpath problems r13623 Removed log4j.xml from the kettle-engine.jar root because it affects common logging format. framework/base/config/debug.properties r13645 Filter Spring logging to WARN framework/base/src/org/ofbiz/base/util/UtilHttp.java r13392 Port back change in makeParamValueFromComposite to return the String representing the parsed Timestamp instead of directly the Timestamp framework/entity/src/org/ofbiz/entity/Delegator.java r12909 Removed depracation tags for the findXXX methods. Ofbiz deprecated them to be replaced with findOne, findList but the old methods are used in too many places to be refactored completely for now. framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java r14349 abbreviate the SQL exception messages r14742 but provide more detailed logging in the log files framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java r13040 fix a bug in the validation which did not work if the rhs was an empty collection framework/entity/fieldtype/fieldtypederby.xml framework/entity/fieldtype/fieldtypemysql.xml framework/entity/fieldtype/fieldtypeoracle.xml framework/entity/fieldtype/fieldtypepostgres.xml framework/entity/fieldtype/fieldtypepostnew.xml r13031 add field types for pentaho integration framework/entity/src/org/ofbiz/entity/GenericEntity.java framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java r13261 Remove backtrace from database type warnings 0a3ab79b0436322c4c0b691ca382c049b981224c framework/entity/config/entityengine.xml r13534 Add analytics & testing(analytics test database) to entity engine config framework/entity/src/org/ofbiz/entity/GenericEntity.java r13280 Return field value if entity label for a primary key equals to this key. This fix broken labels in many screens The reason: some common entity labels (example CommonEntityLabels.xml DataSource.description.*> are ID, not description. framework/service/config/serviceengine.xml r12978 Added the POJOJavaEngine as a service engine. This is a needed part of opentaps. framework/service/src/org/ofbiz/service/ModelService.java r14149 Fix invalid WSDL (OFBIZ-3300) framework/webapp/dtd/site-conf.xsd framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java r13252, r13253 Port back request-redirect-filterparam framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java r13794 Avoid PK exceptions when multiple server hits at the same timestamp are stored framework/webapp/lib r13338 Updated itext-2.0.1.jar to iText-2.1.7.jar, necessary to work with our version of jasper report r13342 Added jasperreports-3.5.2.jar library, needed for compilation of content/report for example framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java r13357 Changed error message for secured URL parameters framework/widget/templates/foScreenMacroLibrary.ftl r13376 Fix for missing macros and new parameters framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java framework/widget/src/org/ofbiz/widget/screen/ScreenWidgetViewHandler.java r13276 Save the current content type in the context, and skip inserting an HTML DocType if the content type is not html. This is used for example for javascript files. r13298 Fixed, reverted previous change in RequestHandler.java 6c236eec9f0928214ddda65985966934222ab0a7 framework/widget/src/org/ofbiz/widget/screen/ScreenXmlViewHandler.java r14305 Adding content type to the view handler framework/widget/src/org/ofbiz/widget/form/ModelFormField.java framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java r13551,r13554 add re-display search value for date/time calendar on submit support. framework/widget/dtd/widget-form.xsd framework/widget/src/org/ofbiz/widget/form/ModelForm.java r13488 Default form pagination back to false, and fix the ModelForm to actually the paginate = false framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java r13693 Instead of throwing a complicated error, just render it to the writer when caught. This is much clearer. framework/widget/dtd/widget-screen.xsd framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java r13738 Applied patch from JIRA 44, allow to use java action in addition to bsh action in screens framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java r13747 Remove non-serializable entries from each attribute that is an instance of Map framework/webapp/config/url.properties r13789 disable https by default for demo purposes framework/service/servicedef/services_test_se.xml framework/service/src/org/ofbiz/service/test/ServiceEngineTestServices.java framework/service/testdef/servicetests.xml r13842 Fix concurrency issue for service-eca-global-event-exec test, see JIRA 3124 as this should be a temporary hack framework/common/servicedef/services_email.xml r13869 Be more permissive for the HTML in the email bodies. framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java r13870 Fix issues in the freemarker template caching causing different template string but same template locations to be cached under the same key. framework/webapp/config/fop.xconf framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java r14022 Disable cache (that used for keep font triplet info) because it doesn't work and throw classloader exception. Also add references to fonts that are in opentaps-common/lib/DejaVu by default r13024 Set up font base URL framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java r13832 r14077 Fix test html report, and add extra logging of Test progress. framework/widget/dtd/widget-screen.xsd framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java framework/widget/src/org/ofbiz/widget/screen/ScreenStringRenderer.java framework/widget/src/org/ofbiz/widget/text/TextScreenRenderer.java framework/widget/templates/htmlScreenMacroLibrary.ftl r14407 r14434 Add screen XML node to render a simple frame section with styled header. framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java r14376 fix the add redirect parameter of request-redirect which after multipart/form-data form submit framework/entity/config/entityengine.xml r14503 add useOldAliasMetadataBehavior parameter in mysql jdbc url for avoid hibernate got not found column on search view entity framework/common/webcommon/foErrorAsHtml.ftl framework/common/widget/CommonScreens.xml framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java r14773 Fix FO error message screen framework/base/src/org/ofbiz/base/util/ObjectType.java r15076 Fix timestamp parsing for single digit hour framework/service/src/org/ofbiz/service/ModelService.java r15196 Fix service model so that semaphore attributes are used *** VB Present framework/common/src/org/ofbiz/common/FindServices.java framework/entity/src/org/ofbiz/entity/finder/ByAndFinder.java framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java framework/entity/src/org/ofbiz/entity/model/ModelEntity.java r15394 Fix localized date conversion error in entity engine for