Permalink
Commits on Sep 26, 2016
  1. Fixed: Adjusting access to static resources statically in entity unit…

    … tests
    
    Minor fix in the preparation of resources to be used in unit tests to be
    accessed statically instead of dynamically.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1762349 13f79535-47bb-0310-9956-ffa450edef68
    pythys committed Sep 26, 2016
  2. Fixes: Unable to run service findContentParents from webtools

    (OFBIZ-8322)
    
    Steps to regenerate
    1. Login into webtools application
    2. Try to run service findContentParents after passing parameters
    3. Cannot find service error occurs.
    
    
    Thanks: Tanmay Muley for the patch
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1762331 13f79535-47bb-0310-9956-ffa450edef68
    JacquesLeRoux committed Sep 26, 2016
Commits on Sep 25, 2016
  1. Improved: added some missing license headers.

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1762238 13f79535-47bb-0310-9956-ffa450edef68
    jacopoc committed Sep 25, 2016
  2. Improved: some minor formatting changes and a fix for a typo in the L…

    …ICENSE
    
    file.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1762233 13f79535-47bb-0310-9956-ffa450edef68
    jacopoc committed Sep 25, 2016
  3. Improved: cleanups and enhancements in the FreeMarkerWorker class, an…

    …d client
    
    code using it, that wraps most of the OFBiz integration with FreeMarker.
    
    This is the list of the main modifications:
    * simplified and cleaned up the public methods of FreeMarkerWorker, used to 
    retrieve and render Freemarker templates and changed client code accordingly to 
    use them
    * removed unused methods in FreeMarkerWorker and made some others private
    * improved the integration code in FreeMarkerWorker to better use the Freemarker 
    API and specifically to leverage the various TemplateLoaders and the Freemarker 
    caching mechanism; it is now possible to switch the OFBiz legacy template 
    caching mechanism to use the Freemarker one instead
    * improved the implementation of Freemarker template rendering from strings 
    (used by DataResourceWorker): it now leverages the Freemarker's 
    StringTemplateLoader that provides the ability to cache the strings, retrieved 
    from DataResources records, based on the timestamp of the last modification
    * moved freemarkerImports.properties from "widget" to "base" component, and 
    changed its content (and the content of the associated templates 
    AutoImportTemplate.ftl and HtmlTemplate.ftl) to remove the dependency from base 
    to widget&common; some resources of "widget" and "common" are still referenced 
    from AutoImportTemplate.ftl (that is in "base") but even if they are soft 
    dependencies: if they are missing the system will load properly without any 
    error or warning; before this change it was impossible to use, or unit test, 
    FreeMarkerWorker before the "widget" and "common" components were loaded by the 
    system, now it is possible
    * created a new class for unit tests for FreeMarkerWorker, named 
    FreeMarkerWorkerTests: at the moment it contains just one simple unit test but 
    more should be implemented
    * refactored WebToolsServices.entityImport(...) to leverage the 
    FreeMarkerWorker.renderTemplate(...) method to run the Freemarker template, 
    rather than dealing with the Freemarker API directly; this is now possible 
    thanks to the cleanups and improvements done in the FreeMarkerWorker class; this 
    same approach should be implemented for a few other similar integration points 
    (mostly in the "content" component); this is a TODO item
    * moved the encodeDoubleQuotes(...) method from FreeMarkerWorker to 
    MacroFormRenderer and made it private since this is the only calss using it and 
    its logic is not related to FreeMarker
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1762227 13f79535-47bb-0310-9956-ffa450edef68
    jacopoc committed Sep 25, 2016
Commits on Sep 23, 2016
  1. Implemented: converted EntitySaxReader to use the default Sax reader …

    …instead
    
    of the legacy implementation from Javolution; removed a bunch of unused or 
    deprecated methods; created some unit tests to test the EntitySaxReader in 
    isolation. Removed the dependency from Javolution since this was the last class 
    dependent on it.
    (OFBIZ-5169)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1762079 13f79535-47bb-0310-9956-ffa450edef68
    jacopoc committed Sep 23, 2016
  2. Fixes: no functional change, replaces a tab by spaces

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1762078 13f79535-47bb-0310-9956-ffa450edef68
    JacquesLeRoux committed Sep 23, 2016
  3. Improves: Translate the svn and git info footers

    (OFBIZ-7798)
    
    We slightly changed the old format of the footer. The old format used only the 
    translated words _uiLabelMap.CommonBuiltOn_ and _uiLabelMap.CommonWith_. 
    On the other hand, the new format contains the words Branch, Revision, 
    Built On and Java Version.
    
    We need to translate all four words in the CommonUiLabels.xml and then 
    incorporate them
    
    old version:
    " - Release-revision : ${releasePath}-r${info.entry.commit(revision)},  
    ${uiLabelMap.CommonBuiltOn} ${dateTime} ${uiLabelMap.CommonWith} 
    Java ${java.version}
    
    new version:
    "Branch: ${info.entry.url.text()}" + System.lineSeparator()
    "Revision: ${info.entry.commit.@revision}" + System.lineSeparator()
    "Built on: ${timestamp}" + System.lineSeparator()
    "Java Version: ${org.gradle.internal.jvm.Jvm.current()}"
    
    Thanks: Taher Alkhateeb for the 1st patch
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1762077 13f79535-47bb-0310-9956-ffa450edef68
    JacquesLeRoux committed Sep 23, 2016
  4. Improved: removed unnecessary * symbol.

    Thanks: Jacques Le Roux for the report.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1762049 13f79535-47bb-0310-9956-ffa450edef68
    jacopoc committed Sep 23, 2016
  5. Improved: initial cleanup of the old OPTIONAL_LIBRARIES file; we shou…

    …ld probably
    
    simply remove it.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1762045 13f79535-47bb-0310-9956-ffa450edef68
    jacopoc committed Sep 23, 2016
  6. Improved: major refactoring of the content of the LICENSE and NOTICE …

    …files as
    
    a consequence of the fact that, after the switch to Gradle, most of the 
    product's dependencies are not bundled in the package.
    
    While doing that, I have also cleaned up and unified the format of the files, 
    removed unnecessary content (like the full text of other licenses), moved the 
    "Crypto notice" from NOTICE to README.md, merged the LICENSE/NOTICE files in 
    specialpurpose with the ones in the distribution's main folder.
    In general, I have followed the directions provided by these documents:
    http://www.apache.org/dev/licensing-howto.html
    http://www.apache.org/dev/crypto.html
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1762037 13f79535-47bb-0310-9956-ffa450edef68
    jacopoc committed Sep 23, 2016
Commits on Sep 22, 2016
  1. Improves: no functional change, few trivial formatting, notably "if (…

    …" vs "if("
    
    It seems this file does not need more changes
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761998 13f79535-47bb-0310-9956-ffa450edef68
    JacquesLeRoux committed Sep 22, 2016
  2. Improves: no functional change, adds a new line at EOF

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761997 13f79535-47bb-0310-9956-ffa450edef68
    JacquesLeRoux committed Sep 22, 2016
  3. Improved: upgraded Apache Tomcat from 8.0.36 to 8.0.37 and Log4j from…

    … 2.3 to
    
    2.6.2.
    
    Added a few comments to document the purpose of the various Log4j dependencies.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761992 13f79535-47bb-0310-9956-ffa450edef68
    jacopoc committed Sep 22, 2016
  4. Improved: added "mockito-core" to the LICENSE file.

    I have replaced the three version numbers with the "x" symbol: in this way we 
    will not have to edit the LICENSE file everytime we upgrade the jar. This 
    strategy is used by other ASF projects (e.g. Tomcat).
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761988 13f79535-47bb-0310-9956-ffa450edef68
    jacopoc committed Sep 22, 2016
  5. Fixes: Sorting of lists generates undesired results

    (OFBIZ-8302)
    
    This was due to r1759555 has Scott spotted on. r1759555 fixed a vulnerability 
    but as explained in r1759555 commit message we used
    >2 redundant mechanisms (better safe than sorry):
    >1) linkUrl = URLEncoder.encode(linkUrl, "UTF-8");
    >2) sr.append("\" linkUrl=r\"");
    
    Removing the 1st way fixes the reported issue and we are still safe.
    
    I'll have a look at how the catalog/control/FindProduct URL is generated to be 
    sure it's OK as is
    
    Thanks: Pierre for report, Scott for spotting the issue.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761978 13f79535-47bb-0310-9956-ffa450edef68
    JacquesLeRoux committed Sep 22, 2016
  6. Improves: Adds a small sentence saying to look before for a possible

    FormFieldTitle_ in the autocompletion help when creating a form widget title
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761975 13f79535-47bb-0310-9956-ffa450edef68
    JacquesLeRoux committed Sep 22, 2016
  7. Improved: removed the OFBiz legacy class (SSLImpl) that extended the …

    …Tomcat
    
    default implementation (JSSEImplementation) in order to override the 
    getServerFactory(...) method; changed the "catalina" container configuration to 
    use the default implementation: 
    org.apache.tomcat.util.net.jsse.JSSEImplementation
    
    The getServerFactory(...) method is only used by the old Tomcat BIO connectors, 
    that have been deprecated and have been removed since Tomcat 8.5.x; even if 
    OFBiz is still using Tomcat 8.0.x, it is already using the new NIO connectors.
    
    Thanks: Mark Thomas (@Tomcat) for the useful details about Tomcat internals:
    https://lists.apache.org/thread.html/108ab57cd3b65e15aaf2631f2aeb015c3446d544c9d98d1631d16349@%3Cusers.tomcat.apache.org%3E
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761972 13f79535-47bb-0310-9956-ffa450edef68
    jacopoc committed Sep 22, 2016
  8. Fixes: webtools label search widget issue

    (OFBIZ-8315)
    
    go to https://localhost:8443/webtools/control/SearchLabels
    click find to show entries
    click on a link in the listing
    shows error page...
    
    This bug was introduced while working on OFBIZ-8154 (still WIP)
    
    Thanks: Wai for report
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761940 13f79535-47bb-0310-9956-ffa450edef68
    JacquesLeRoux committed Sep 22, 2016
  9. Fixed: Error on scrum main page.

    (OFBIZ-8318)
    
    There was an error introduced in r1761111, the open quote for an attribute 
    was missing.
    
    Thanks: Amardeep Singh Jhajj for reporting and providing the patch.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761931 13f79535-47bb-0310-9956-ffa450edef68
    mbrohl committed Sep 22, 2016
  10. Reverts: Maximise the utilisation of common labels in various applica…

    …tions
    
    (OFBIZ-8102) (OFBIZ-8130)
    Reverts r1758774 for OFBIZ-8102 w/o reverting changes which slipped in
    Reverts r1761687 for OFBIZ-8130
     
    We decided this is not a good way, we prefer to keep the FormFieldTitle_ way
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761923 13f79535-47bb-0310-9956-ffa450edef68
    JacquesLeRoux committed Sep 22, 2016
  11. Fixes: Add WebSocket support in OFBiz (this was broken with Gradle)

    (OFBIZ-7073)
    
    WebSocket support was not working after the upgrade of trunk to Gradle. 
    I have slightly changed the FilterJar.java to scan only ofbiz.jar. 
    It is working now. 
    
    jleroux: Of course the trick used before with the discoverable word in jars 
    filenames no longer makes sense. But since there is now only this ofbiz.jar to 
    parse it's now less an issue and will not delay OFBiz start in a noticeable
     way. At least I did not notice any noticeable effect.
    
    Thanks: Amardeep Singh Jhajj 
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761874 13f79535-47bb-0310-9956-ffa450edef68
    JacquesLeRoux committed Sep 22, 2016
  12. Improves: Incorporate readmes for order, commonExt and content compon…

    …ents
    
    (OFBIZ-7500) (OFBIZ-7501) (OFBIZ-7505) 
    
    A readme should be the first starting point of each component for developers to 
    have references to the placeholder in the Wiki, in Jira and in Svn/Viewvc
    
    jleroux: This will be certainly more helpful with the plugins, even if for now 
    plugins are only components
    
    Thanks: Pierre Smits
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761867 13f79535-47bb-0310-9956-ffa450edef68
    JacquesLeRoux committed Sep 22, 2016
Commits on Sep 21, 2016
  1. Improved: Re-introduce iteration over components for building the cl…

    …asspath
    
     
     Adopters noted that some components ship with their jars, and it would be
     much more convenient to keep the jar with the component than to copy it
     to the top level /lib directory. Hence we re-introduce the code snippet
     to iterate over all components and load any jars found in ${component}/lib
     
     Thanks: Scott Gray for highlighting and guiding on this issue
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761708 13f79535-47bb-0310-9956-ffa450edef68
    pythys committed Sep 21, 2016
  2. Improves: Maximise the utilisation of common labels in various applic…

    …ations
    
    (OFBIZ-8110)
    
    There are many commonalities among entity field definitions. Often these field 
    definitions have led to unique label definitions, where a shared (common) label 
    could have sufficed. 
    
    As examples you can take:
    * the various Id fields (where for most label CommonId could be used)
    * the various Type fields (where for most label CommonType could be used)
    
    This is a placeholder ticket, intended to capture applicable issues as sub tasks
     to address the aspect of maximising the utilisation of labels in the 
    CommonUiLabels.xml file and to track progress.
    
    Thanks: Pierre Smits
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761687 13f79535-47bb-0310-9956-ffa450edef68
    JacquesLeRoux committed Sep 21, 2016
  3. Fixes: Order By Referrer is not working

    (OFBIZ-7318)
    
    See
    https://ofbiz-vm.apache.org:8443/ordermgr/control/OrderPurchaseReportOptions
    Section : Order By Referrer
    
    Found out that in OrderByReferrer.rptdesign we tried to fetch nonexisting fields
    like "visitId" and "initialReferrer" from SalesOrderItemFact which causing 
    problem in this report. On rev #886743 SalesOrderItemFact extended with visitId 
    and initialReferrer and on rev #1055774 these field has been removed.
    So I think we need to clean references of visitId and initialReferrer from the 
    report and if we removed these fields then report will not make any sense. 
    So in my opinion it is better to remove this report from OFBIZ.
    
    Thanks: Rohit Koushalfor report and patch
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761678 13f79535-47bb-0310-9956-ffa450edef68
    JacquesLeRoux committed Sep 21, 2016
  4. Improves: splitting commits messages in ToirToiseSVN

    OK, I found how to split lines in ToirToiseSVN, tt's at 
    https://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-propertypage.html
    
    It's somehow tsvn:logwidthmarker. 
    I say somehow because the limit marker is fine but the split-lines feature
     is really not helping much. 
    You still have to do it by hand to be realistic, at least you see where to split
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761677 13f79535-47bb-0310-9956-ffa450edef68
    JacquesLeRoux committed Sep 21, 2016
Commits on Sep 20, 2016
  1. Improved: gzip json files served by tomcat.

    (OFBIZ-8299)
    
    Currently json files are not compressed. Updating the compressableMimeType setting in the http/https connectors makes them compressed.
    
    Thanks: Chris Howe for reporting and providing the patch.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761618 13f79535-47bb-0310-9956-ffa450edef68
    mbrohl committed Sep 20, 2016
  2. Improved: Remove the creation of the temporary git/svn footer files.

    The files were created because of a bug in the TemplateLoader for Freemarker, see OFBIZ-8292. This is fixed so this is not needed anymore.
    
    Thanks: Jacopo for the TemplateLoader fix.
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761591 13f79535-47bb-0310-9956-ffa450edef68
    mbrohl committed Sep 20, 2016
  3. Improved: removed the no more required property

    ofbiz.start.classpath.addFilesFromPath.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761589 13f79535-47bb-0310-9956-ffa450edef68
    jacopoc committed Sep 20, 2016
  4. Fix for: Freemarker's ignore_missing attribute of the #include direct…

    …ive was not
    
    working because of an issue in the OFBiz custom TemplateLoader for Freemarker 
    templates.
    (OFBIZ-8292)
    
    The OFBiz custom TemplateLoader now returns null if the resource is missing as 
    required by the TemplateLoader specification.
    Additional cleanups for unused methods in the FreeMarkerWorker class and some 
    minor fine tuning; improved the way errors are rendered: now the full stack 
    trace is not shown in the screen but only in the logs.
    
    Thanks: Jacques Le Roux for the report.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761586 13f79535-47bb-0310-9956-ffa450edef68
    jacopoc committed Sep 20, 2016