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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
============================================================
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
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
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
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
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