Commit Graph
10472 Commits
Author SHA1 Message Date
Jacques Le Roux d6030d2fc2 Improves the visibility of the Start error messages - OFBIZ-6783
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1744515 13f79535-47bb-0310-9956-ffa450edef68
2016-05-19 05:25:54 +00:00
Jacques Le Roux 0d40ddae13 No functional change, removes an useless private String, found by chance
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1744508 13f79535-47bb-0310-9956-ffa450edef68
2016-05-19 05:13:57 +00:00
Jacques Le Roux 317e53a702 Non functional change, removes an useless private static final var, spotted by chance
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1744397 13f79535-47bb-0310-9956-ffa450edef68
2016-05-18 11:54:36 +00:00
Taher A. Alkhateeb c84e3320c5 major change in the start component related to OFBIZ-6783
this is a big commit that achieves the following new features in ofbiz:

- add the commons-cli library
- fix build.xml in start menu to include the commons-cli. It is done
  in a way to ensure that the classpath continues to work when ofbiz.jar
  is copied to the root folder
- set a default portoffset value of 0 when not selected in build.xml
- fully redefine the commands passed in java -jar ofbiz.jar using the commons-cli
  api. The commands are now much more consistent and clean
- remove ofbiz dependency on String[] args across the different components and isolate
  them in a new entity class called StartupCommand. This decouples ofbiz from both
  String[] args and commons-cli at the same time
- fix all the calls in the master build.xml to comply with the new commands
- fix the Config.java to remove dependecies on the args array
- create a utility class StartupCommandUtil that takes care of all commons-cli
  operations and abstracts away the implementation in private methods
- substantially reduce the size of main and init in Start.java by refactoring
  them in different places
- create an intermediate function called populateLoaderArgs. This is the first
  step in removing the dependecies on args by "adapting" them using this method
- unify the exception model everywhere to StartupException. This makes exception
  propagation cleaner and easier
- lots of cleanup of the code related in all these areas

Big thanks to Jacques for the substantial help in testing.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1744107 13f79535-47bb-0310-9956-ffa450edef68
2016-05-16 18:40:49 +00:00
Jacques Le Roux 0e0dbb1dfe A patch from Ingo Wolfmayr for "Export widget ftl pointing to wrong location" https://issues.apache.org/jira/browse/OFBIZ-7068
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1743976 13f79535-47bb-0310-9956-ffa450edef68
2016-05-15 21:12:35 +00:00
Deepak Dixit a925601e66 (OFBIZ-7021) Removed some old and unused controller request and screen found during webtools component ftl file renaming.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1743883 13f79535-47bb-0310-9956-ffa450edef68
2016-05-15 06:54:09 +00:00
Deepak Dixit 913d2d3ff5 (OFBIZ-7021) Renamed webtools component ftl file name from lower case to upper case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1743879 13f79535-47bb-0310-9956-ffa450edef68
2016-05-15 04:50:13 +00:00
Deepak Dixit b3264aa9fc (OFBIZ-5740) Updated fromDate and thruDate filed type for CustomTimePeriod entity from date to date-time, and made chagnes accordingly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1743656 13f79535-47bb-0310-9956-ffa450edef68
2016-05-13 11:31:23 +00:00
Jacques Le Roux f0a5f582c1 Partially revert r1743411, some files inadvertently slipped in :/
This keep changes for OFBIZ-7053

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1743412 13f79535-47bb-0310-9956-ffa450edef68
2016-05-11 19:13:44 +00:00
Jacques Le Roux 4b364d1e5a A patch from Ravi Lodhi for "Order term description is not getting set on adding and updating new order term" https://issues.apache.org/jira/browse/OFBIZ-7053
Steps to regenerate (Create a new order) -
1) Go to Order Entry (in Order Manager) and add the necessary detail and continue.
2) Add Order items and click on Finalize Order.
3) Continue with Order Entry Ship-To Settings.
4) Add any shipment method and continue.
5) On Order Terms Page add a term with description. Term description is not getting saved. Same case with the update term functionality.

As said Florian Montalbano:
I looked into the issue and found the root of the problem :
There are multiple functions prototype to add a term to an order and the one used wasn't using the "description" field.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1743411 13f79535-47bb-0310-9956-ffa450edef68
2016-05-11 19:10:10 +00:00
Deepak Dixit 6d8f4053fc (OFBIZ-7041) Forgot to update freemarker version from 2.3.22 to 2.3.24 in FreemarkerWroker.java
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1743132 13f79535-47bb-0310-9956-ffa450edef68
2016-05-10 09:01:54 +00:00
Deepak Dixit aa4a15049c (OFBIZ-7041) Removed freemarker2.3.22.jar.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742686 13f79535-47bb-0310-9956-ffa450edef68
2016-05-07 06:51:34 +00:00
Deepak Dixit da58d4da97 (OFBIZ-7041) Upgraded freemarker jar to 2.3.24
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742685 13f79535-47bb-0310-9956-ffa450edef68
2016-05-07 06:35:55 +00:00
Jacques Le Roux e5f4abf1a7 No functional change, removes a file committed by error
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742198 13f79535-47bb-0310-9956-ffa450edef68
2016-05-03 21:15:21 +00:00
Jacques Le Roux 6d5dd1c5ba Things got totally wrong with r1742196 which contained much more than expected.
This reverts things which should not have been committed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742197 13f79535-47bb-0310-9956-ffa450edef68
2016-05-03 21:03:11 +00:00
Jacques Le Roux 31ef1f9186 "Continue the work on the form widget grid element" - https://issues.apache.org/jira/browse/OFBIZ-7029
Completes in screens the changes done in forms at r1741873. I then replaced few form lists by grids, where it was possible to do it with regexp.
Also complete StatsForms.xml to use only grids and "searchList" form in ecommerce ContentForms to NOT use grid (not called in screen)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742196 13f79535-47bb-0310-9956-ffa450edef68
2016-05-03 20:50:10 +00:00
Jacques Le Roux 5490605e30 Reverts useless changes introduced with r1742126 for INVALID "Bug when getting to webtools/control/FindUtilCache" - https://issues.apache.org/jira/browse/OFBIZ-7033
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742195 13f79535-47bb-0310-9956-ffa450edef68
2016-05-03 20:41:48 +00:00
Jacques Le Roux 90c726d018 Fixes "Bug when getting to webtools/control/FindUtilCache" - https://issues.apache.org/jira/browse/OFBIZ-7033
With OFBIZ-7029 I replaced some widget list forms by grids. I don't know why yet but there are some cases, like at webtools/control/FindUtilCache, where it crashes.

I mean I know why, but I don't know why yet it's not in all places. For instance accounting/control/ListFixedAssets has not this problem.

I'll later check what is the difference between both cases

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742126 13f79535-47bb-0310-9956-ffa450edef68
2016-05-03 15:25:48 +00:00
Jacques Le Roux a57f9779b5 "Continue the work on the form widget grid element" - https://issues.apache.org/jira/browse/OFBIZ-7029
Replaces few form lists by grids, where it was possible to do it with regexp. For a reason I still don't understand I could not do it for all...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1741873 13f79535-47bb-0310-9956-ffa450edef68
2016-05-01 17:36:52 +00:00
Jacques Le Roux 2a39f125f3 "Continue the work on the form widget grid element" - https://issues.apache.org/jira/browse/OFBIZ-7029
This 
Updates the XSD documentation
Removes the list type when the grid element is used

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1741866 13f79535-47bb-0310-9956-ffa450edef68
2016-05-01 14:45:46 +00:00
Jacques Le Roux f5d8feac88 An enhanced patch from Christian Carlow for "Add ability to change Routing statuses" - https://issues.apache.org/jira/browse/OFBIZ-6307
Only ROU_ACTIVE statusItem exists for statusTypeId ROUTING_STATUS.  Adding another such as ROU_INACTIVE would allow for more control over routings.  Doing so entails adding the statusId to the find and edit screens.
ROU_INACTIVE was add as a StatusItem and currentStatusId was added to the routing find form as a multi-drop down

jleroux: I added use of common/webcommon/includes/setMultipleSelectJs.ftl and French labels

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1741789 13f79535-47bb-0310-9956-ffa450edef68
2016-04-30 18:43:10 +00:00
Jacques Le Roux 9d6072b3d8 Changes for "Use SecureRandom instead of Random where appropriate, and randomUUID for externalKey" - https://issues.apache.org/jira/browse/OFBIZ-7028
Because using SecureRandom comes with a cost, I have identified the places where it's reasonable to keep the non secured Random (like tests, internal sequences, etc.).
Ant to use UUID.randomUUID to generate the external link id

Also, though there are no real proven vulnerabilities, I decided to backport as much as possible since it's now public.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1741684 13f79535-47bb-0310-9956-ffa450edef68
2016-04-29 18:54:49 +00:00
Jacques Le Roux 4f243ac529 No functional changes, removes duplicate ";"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1741674 13f79535-47bb-0310-9956-ffa450edef68
2016-04-29 17:36:31 +00:00
Taher A. Alkhateeb ebf0bd299d refactor Start.java as per guidelines in OFBIZ-6783
This specific commit achieves the following:

- remove private comments relating to the class to the JavaDoc location 
  at the top of the class
- relocate class fields to the top of the class as per Java conventions
- relocate the constructor with its singleton instance to the top of the
  class below the fields
- sort all the methods starting with main, followed by public, default 
  and private
- add JavaDoc to main
- remove System.exit(99) from main and replace it with throw new 
  StartException(e); I did this because main declares that it throws a
  StartupException which it never does
- breakup the logic part to evaluate ofbiz command to a new method
  called evaluateOfbizCommand(String[] args). I will replace this
  eventually with apache commons-cli
- make startStartLoaders private, since it is not called outside Start.java


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1741624 13f79535-47bb-0310-9956-ffa450edef68
2016-04-29 12:50:57 +00:00
Wei Zhang 3fefdb2617 OFBIZ-5732 Error in sendMailHiddenInLog service
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1741563 13f79535-47bb-0310-9956-ffa450edef68
2016-04-29 07:53:44 +00:00
Wei Zhang 210c162e32 OFBIZ-7024 Attribute 'placeholder' is not allowed to appear in element 'text'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1741146 13f79535-47bb-0310-9956-ffa450edef68
2016-04-27 04:50:26 +00:00
Jacques Le Roux e90be02370 Fixes "ExampleCompoundWidgets throws errors" - https://issues.apache.org/jira/browse/OFBIZ-7023
Actually this is due to both compound-widgets.xsd and ExampleCompoundWidgets.xml errors. Both have not visible effects but in logs

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1741022 13f79535-47bb-0310-9956-ffa450edef68
2016-04-26 13:35:07 +00:00
Jacques Le Roux 3168a01d10 A patch from Swapnil M Mane for "Calling Groovy as Event generates error when delegator.find used" reported by Wai at https://issues.apache.org/jira/browse/OFBIZ-6808
We are using Groovy as event in the controller request, everything works fine for us but as we used delegator.find()
it generates the following error


ERROR: Cannot do a find that returns an EntityListIterator with no transaction in place. Wrap this call in a transaction.
     [java] java.lang.Exception: Stack Trace
     [java] 	at org.ofbiz.entity.GenericDelegator.find(GenericDelegator.java:1757) [ofbiz-entity.jar:?]
     [java] 	at org.ofbiz.entity.Delegator$find.call(Unknown Source) [ofbiz-entity.jar:?]
     [java] 	at org.codehaus.groovy.runtime.callsite.CallSiteArray.defaultCall(CallSiteArray.java:45) [groovy-all-2.2.1.jar:2.2.1]
     [java] 	at org.codehaus.groovy.runtime.callsite.AbstractCallSite.call(AbstractCallSite.java:108) [groovy-all-2.2.1.jar:2.2.1]
     [java] 	at ProductInventory$_run_closure1.doCall(ProductInventory.groovy:18) [script:?]

Reason: 

Since we are using find method of GenericDelegator.java
As per the code implementation it required the transaction should exist 
   if (!TransactionUtil.isTransactionInPlace()) {
if not, it generate error
    ERROR: Cannot do a find that returns an EntityListIterator with no transaction in place. Wrap this call in a transaction.

-----------------------------------------------------------------------------------------------------------------------------------------------------------

Solution: initialize the transaction when the groovy is called as event and commit the transaction after the completion.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1740629 13f79535-47bb-0310-9956-ffa450edef68
2016-04-23 03:51:13 +00:00
Deepak Dixit 209b95cbbf (OFBIZ-6823) relocate .ftl files in the framework/common component
Thanks Pierre for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1740497 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 12:28:46 +00:00
Deepak Dixit cee0263cef (OFBIZ-6815) relocate .ftl files in the content component
Thanks Pierre for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1740446 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 06:12:08 +00:00
Gil Portenseigne 76dd74850f OFBIZ-5703 :
Fix a regression on <auto-parameters-entity/> and <auto-parameters-service/> in which default-entity-name and default-service-name weren't taken in consideration anymore.

Thanks Dhiraj Gupta for reporting the issue, Thanks Jacques and Divesh for the analysis

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1740415 13f79535-47bb-0310-9956-ffa450edef68
2016-04-21 21:56:52 +00:00
Jacques Le Roux a26666f7bc Updates ICU4J from version 52 to 57, no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1740229 13f79535-47bb-0310-9956-ffa450edef68
2016-04-21 05:18:07 +00:00
Jacques Le Roux 6455c9382c A sightly modified patch from Wai for "ofbizsetup create product store cause exception, remove use of temp file to load entity data" - https://issues.apache.org/jira/browse/OFBIZ-5949
The exception is caused by foreign key constraint violation between ShipmentCostEstimate and  CarrierShipmentMethod entities.
Currently, when creating a new product store using ofbizsetup component default data associated with the product store is loaded into the database using the following steps.
1. read default data from entity xml file and replace specific items in the read data and write to temp file.
2. use service=parseEntityXmlFile to load the processed file into database.
The issue with this method is that the temp file can present a problem when ofbiz is operating in multitenant mode.
The solution is to modify the relevant services so that no temp file needs generated.

jleroux: I simply used an UtilValidate.isNotEmpty() method in  EntitySaxReader class

I was initially reluctant to these changes because you can no longer load the content of the GlAccountData.xml and ProductStoreData.xml files, or the files themselves, using the import XML feature of webtools. But those files are specific to the setup component, so they should not be missed, they are supposed to be used in this context only.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1740008 13f79535-47bb-0310-9956-ffa450edef68
2016-04-19 21:09:14 +00:00
Jacques Le Roux 7316ee4818 A patch from Pierre Smits for "Remove limitation regarding menu-name in ofbiz-component.xsd" https://issues.apache.org/jira/browse/OFBIZ-6667
Currently the following is in the ofbiz-component.xsd:
        <xs:attribute name="menu-name" default="main">
            <xs:simpleType>
                <xs:restriction base="xs:token">
                    <xs:enumeration value="main"/>
                    <xs:enumeration value="secondary"/>
                </xs:restriction>
            </xs:simpleType>
        </xs:attribute>

However, this is limiting the options that can be applied generates unnecessary errors when developers opt for another methodology.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1739968 13f79535-47bb-0310-9956-ffa450edef68
2016-04-19 17:56:07 +00:00
Nicolas Malin a6284ff24a Correct the fop macro library to pass test testFopMacroLibrary(). This has been possible with the issue OFBIZ-7015 Ugrade Apache Tika library, to use tika for analyse the pdf as string
related issue OFBIZ-6497

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1739553 13f79535-47bb-0310-9956-ffa450edef68
2016-04-17 08:41:03 +00:00
Nicolas Malin ab000418de Uprade the Apache Tika Library :
tika-parsers-1.7.jar -> tika-parsers-1.12.jar
    tika-core-1.7.jar -> tika-core-1.12.jar

This update induce updating of :

    pdfbox-1.8.5.jar -> pdfbox-1.8.11.jar
    jempbox-1.8.5.jar -> jempbox-1.8.11.jar
    fontbox-1.8.5.jar -> fontbox-1.8.11.jar
    commons-compress-1.9.jar -> commons-compress-1.11.jar

And pdfbox-1.8.11.jar need the introduction of :

    jce-jdk13-154.jar under MIT licence (www.bouncycastle.org)

Apache Tika is needed to test the screenfop on issue OFBIZ-6497. So I move all library from applications/content/lib/ to framework/base/lib/ to didn't create a dependency between widget and content 
Related issue OFBIZ-7015

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1739551 13f79535-47bb-0310-9956-ffa450edef68
2016-04-17 08:26:45 +00:00
Ashish Vijaywargiya e439033d32 Applied patch from jira issue - OFBIZ-7006. Cache Maintenance action links UI improvement. This is UI improvement but I think we can also consider it as UI bug because link in present scenario creates issues at user end and in case of quick operations they may click on the wrong links. Thanks Rahul Bhooteshwar for creating the issue and providing the patch for the same.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1739446 13f79535-47bb-0310-9956-ffa450edef68
2016-04-16 12:20:58 +00:00
Jacques Le Roux 7b82a482e2 A combined patch from Adrian's, James Yong's and my work for "Add Support For Compound Screen Widget XML Files" - https://issues.apache.org/jira/browse/OFBIZ-4090 and "Add Example for Compound Screen Widget" - https://issues.apache.org/jira/browse/OFBIZ-6990
Adrian: This adds the ability to include screen widgets, form widgets, menu widgets, and simple methods in a single XML file. This approach could be used in situations where the widgets share a logical grouping - so they can be kept in one place.

James: An example to test out Compound Screen Widget

jlerouxc: here are the changes and tests globally
# As James mentionned we no longer need *-v2.xsd files, I removed them from Adrian's patch
# I created a compound-widgets.xsd based on Adrian's and James Yong's previous work. From Paul Foxworthy's comment in OFBIZ-4090, I decided to name the root compound-widgets (hence the file name). I arranged its elements in another way, see below with ExampleCompoundWidgets.xml
# I slightly modified James Yong's ExampleCompoundScreenWidget.xml file and renamed it ExampleCompoundWidgets.xml. I added an "s" because there are several OFBiz widgets gathered in one place. For the modifications: I simply changed the names and arranged the elements in another way which I find better suited. I'm used to 1st create the query, then the menus, the screens and their forms. We rarely use widget-trees but it's there also. Finally the simple-method at end if any. The order is not enforced though, so everybody can use her/his own :)
# I added a French label
# I completed the widget-catalog.xml with this new entry and tested locally in Eclipse by reloading the XML catalog entries.

I hope I did not miss nor mixed things, the local instance I used is a bit overcrowded with pending changes...




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738958 13f79535-47bb-0310-9956-ffa450edef68
2016-04-13 15:38:16 +00:00
Jacques Le Roux c64517519b A slightly modified patch from Chatree Srichart for "Upgrade Tomcat to 8.0.32" https://issues.apache.org/jira/browse/OFBIZ-6915
jleroux: I simply changed the doc link in catalina ofbiz-component.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738902 13f79535-47bb-0310-9956-ffa450edef68
2016-04-13 07:40:25 +00:00
Jacques Le Roux 92e56e4078 A patch from Gareth Carter for "some files set viewIndex to 1 by default rather than 0" https://issues.apache.org/jira/browse/OFBIZ-6705
Implements a PagedList object (stores list of data items, resultset size, viewSize, viewIndex, lowIndex (called startIndex) and highIndex (called endIndex), also a utils class that returns the PagedList object based on a EntityListIterator, viewSize and viewIndex. 
And implements a queryPagedList method in EntityQuery, used as an example in findOrders service Java implementation

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738900 13f79535-47bb-0310-9956-ffa450edef68
2016-04-13 07:29:11 +00:00
Jacques Le Roux 5d65e6e84b A modified patch from James Young based on a an original patch from Christoph Neuroth for "Improved CMS tree: more functionality and faster for large trees" - https://issues.apache.org/jira/browse/OFBIZ-4502
We here at [Lusini|http://www.lusini.de/] did several improvements to the CMS backend to make it more usable for large CMS installations. 

* Improved performance of CMS tree
** loading nodes dynamically using AJAX
*** Created ContentJsonEvents to handle the JSON calls
** use OFBiz entity caches
** removed duplicate execution of WebSitePublishPoint.groovy
*** removed reference from controller.xml as it is not used anywhere

* Moving nodes in CMS tree possible now using drag'n'drop
** ContentJsonEvents returns updated node attributes
** Adjusted WebSiteCMSNav.ftl to update the moved node with the data from the ajax request
** Needed to replace the jstree jQuery plugin by the current version available on the jstree website

* Made nodes deleteable
** added remove to context menu
** We did not want to delete the WebSitePathAlias entities right away, so we added a fromDate and thruDate to it. 
*** extended WebSitePathAlias entity definition: added fromDate and thruDate
*** now checking for date range everywhere when accessing path aliases
*** This also allows users to publish or unpublish contents under a certain URL automatically at some time in the future. 
** created event to "delete" a node
*** thruDate of all assocs pointing to this node are set to current timestamp
*** thruDate of WebSitePathAliases pointing to this content or any contents below are set to current timestamp
*** this way nothing is actually removed from the DB and a "undo" would be possible if necessary
** extracted context menu to variable so it can be reused for all trees

* fixed missing references to uiLabels in CMS menu bar

* Activated cookie plugin so the selected node is remembered



jleroux: I made few changes
* Use of UtilGenerics.cast() in new ContentJsonEvents.java rather than @SuppressWarnings("unchecked")
* Removal of the commented out block "Lusini: disable RTE". I see no reasons why we would not use elRTE. Notably in relation with adding errors where it's currently used in trunk demo
* I changed the line 
    var unmovableSubtrees = [false, "categoryChildren_LusiniBrowseRoot", "homeContentsRoot", "merchantContentsRoot"];
    We have no such subtrees OOTB but it's good to keep the idea, I just renamed categoryChildren_LusiniBrowseRoot to categoryChildren and put an explaining comment
* I have roughly added the labels ContentWebSiteErrors, ContentWebSiteAddNewErrors and ContentWebSiteAddError, though I have a doubt about how this works. At least it's different than on trunk demo where it seems to works better (despite having uncommented out elRTE in this commit). ALso I don't remember how to add a menu worked (if it worked).
* I checked the version of jstree we use is the same than in the original patch from Christoph Neuroth. BTW at r1559769 I tried to update jstree  to jstree 3 but gave up.
* I removed the jquery.cookie.js implemnentation and replaced link in WebSiteCMSNav.ftl. I already updted to jquery.cookie-1.4.0 at r1559769

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738588 13f79535-47bb-0310-9956-ffa450edef68
2016-04-11 14:17:30 +00:00
Deepak Dixit 5063287ddf (OFBIZ-6824) Apply slightly modified patch from jira issue, updated path for ping.ftl and showDateTime.ftl in controller.xml
============================================================
relocate .ftl files in the framework/webtools component
============================================================
Thanks  Pierre Smits for your contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738581 13f79535-47bb-0310-9956-ffa450edef68
2016-04-11 12:57:45 +00:00
Nicolas Malin f81916c504 correct error when sort a localized field with the order way is present like '-field', '+field', 'field ASC', 'field DESC'
This error raise by james yong on the issue OFBIZ-6987. Thanks to him for the issue and Deepak Dixit to spot the source

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738258 13f79535-47bb-0310-9956-ffa450edef68
2016-04-08 15:16:22 +00:00
Jacques Le Roux 53ab8eebd9 A patch from Kongrath Suankaewmanee for "Error in entity reference chart for static in webtools" https://issues.apache.org/jira/browse/OFBIZ-6995
I found the error when I try to use entity reference chart for static in webtools,
https://localhost:8443/webtools/control/entityref?forstatic=true
and choose one from the list of left side and the error appear on right hand side.
It's work without error for "Enitity Packages" list but doesn't for "Entities - Alphabetical" list.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738235 13f79535-47bb-0310-9956-ffa450edef68
2016-04-08 11:54:01 +00:00
Jacques Le Roux e6193df72d Partial improvement for "Remove from trunk the deprecated code if deprecated before December 2014" https://issues.apache.org/jira/browse/OFBIZ-6273
Deletes FoScreenRenderer.java no longer used/needed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737807 13f79535-47bb-0310-9956-ffa450edef68
2016-04-05 09:31:43 +00:00
Jacques Le Roux 6ed0d2e22b Partial improvement for "Remove from trunk the deprecated code if deprecated before December 2014" https://issues.apache.org/jira/browse/OFBIZ-6273
Replaces the deprecated FoScreenRenderer.getFoStyle() by new MacroScreenRenderer.getFoStyle() in Fo form and screen renderers

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737806 13f79535-47bb-0310-9956-ffa450edef68
2016-04-05 09:13:20 +00:00
Jacques Le Roux 01ab6dd9b7 Partial improvement for "Remove from trunk the deprecated code if deprecated before December 2014" https://issues.apache.org/jira/browse/OFBIZ-6273
Replaces the deprecated new HtmlScreenRenderer() in HtmlTreeRenderer.java.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737803 13f79535-47bb-0310-9956-ffa450edef68
2016-04-05 08:57:35 +00:00
Jacques Le Roux 4ecbb21ee0 Partial improvement for "Remove from trunk the deprecated code if deprecated before December 2014" https://issues.apache.org/jira/browse/OFBIZ-6273
Replaces the deprecated StAXSOAPModelBuilder(XMLStreamReader) and StAXOMBuilder(reader) in SOAPEventHandler.java. I did not find how to test though...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737789 13f79535-47bb-0310-9956-ffa450edef68
2016-04-05 06:57:54 +00:00
Nicolas Malin 882b2ca482 no functionnal change, remove unnecessary space and unnecessary return
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737734 13f79535-47bb-0310-9956-ffa450edef68
2016-04-04 19:02:01 +00:00
Jacques Le Roux 2001f1091a For "Replace OFBiz HttpClient by org.apache.commons.httpclient.HttpClient" - https://issues.apache.org/jira/browse/OFBIZ-4430
Since commons.httpclient.HttpClient is now deprecated/not-maintained an vulnerable I prefer to simply put a warning at the top of the class. So people can pick what they prefer and is handy for their problem at than

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737695 13f79535-47bb-0310-9956-ffa450edef68
2016-04-04 14:49:44 +00:00