Commit Graph
1568 Commits
Author SHA1 Message Date
Deepak Dixit 834691742b (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Deepak Dixit 1db94eeaee (OFBIZ-1319) Replace selectall.js occurance with OfbizUtil.js.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752900 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 06:46:24 +00:00
Taher A. Alkhateeb b37ef2d280 Migrate ALL java files from /src to /src/main/java - OFBIZ-7790
This is the first of two steps in the above mentioned JIRA. This
first step changes the java source directory for every component
from /src to /src/main/java. The next step will be adding unit
tests to every component in /src/test/java

Thank you to Deepak Dixit for tips on how to use the SVN commands
to make the appropriate file moving.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752838 13f79535-47bb-0310-9956-ffa450edef68
2016-07-15 14:17:14 +00:00
Gil Portenseigne 3130f0eb95 OFBIZ-7763 :
Remove all bsh libraries and bsh remaining fonctionnalities.
Bsh interpreter is replaced by GroovyShell evaluation.

To avoid groovyShell undefined var exception, the evaluated expression is analysed, detecting variables used and setting its to null if undefined in context.
Today only alphabetic variable with '_' are detected (i.e. my_variable==null).
Add in example a test replacement of " syntax to simple quote.
Remove all found bsh references

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752231 13f79535-47bb-0310-9956-ffa450edef68
2016-07-11 23:04:54 +00:00
Taher A. Alkhateeb 4d2b415a91 Another major patch for OFBIZ-7534 replacing Ant with Gradle
This is the first patch that takes OFBiz to the point of no return
in terms of switching from Ant to Gradle build system. Specifically
this patch applies the following items:

- Delete all old Ant and Maven build scripts
- Delete 169 Jar libraries and replace them with remote ones in the
  gradle build script
- update the gradle build scripts for the dependencies and other minor
  changes needed for the script work correctly

All tests pass with the command ./gradlew cleanAll loadDefault testIntegration

Again, thank you for everyone who contributed valueble time and effort in this
process.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752033 13f79535-47bb-0310-9956-ffa450edef68
2016-07-09 18:10:19 +00:00
Jacopo Cappellato e0da901504 OFBIZ-7760 Removed from UtilCache the ability to persist entries in the file system.
This feature has been contributed a long time ago as an experimental feature but never really matured into a production ready artifact: since it was contributed, no users asked about how to use it, or tested it, or reported bugs or enhancement requests.
More importantly, the feature has always been disabled in the OFBiz framework (i.e. the widget code and the entity engine code were not using it).
This removal should not impact our user base; however, after the removal, an entry to the Attic will be created to keep track of it and to make it easier, to interested users, to get this code, improve it (e.g. by making it dependent on a live external jar, for example MapDB instead of JDBM) and possibly contribute it back to the project.
The most compelling reason for its removal is that the feature was based on a snapshot, unreleased version of JDBM, which is now a mostly dead project: for licensing reasons we are no more allowed to bundle jars in our releases. Additionally, having code that relies an old jar from a no more active project represents a maintenance issue for the community.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751817 13f79535-47bb-0310-9956-ffa450edef68
2016-07-07 17:00:05 +00:00
Ashish Vijaywargiya f802907da9 Applied patch from jira issue - OFBIZ-7634 - Remove HtmlFormRenderer Class after removing its dependency.
Thanks Ravi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751270 13f79535-47bb-0310-9956-ffa450edef68
2016-07-04 12:59:37 +00:00
Ashish Vijaywargiya f40a6b6cb4 Applied patch from jira issue - OFBIZ-7635 - Remove HtmlScreenRenderer Class after removing its dependency.
Thanks Ravi for the contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751267 13f79535-47bb-0310-9956-ffa450edef68
2016-07-04 12:53:21 +00:00
Ashish Vijaywargiya 9470a3bd0e Applied patch from jira issue - OFBIZ-7513 - alt-target tag is not working as expected in Form Widget.
Thanks Pritam for the contribution. Thanks Montalbano and Jacques for participating in discussion.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751124 13f79535-47bb-0310-9956-ffa450edef68
2016-07-03 06:46:14 +00:00
Jacques Le Roux 949d21159c A patch from James Yong for "Invalid content was found starting with element 'xls'" https://issues.apache.org/jira/browse/OFBIZ-7699 reported by Nameet Jain
If found this in console logs:

XmlFileLoader: File file:/home/ofbizDemo/trunk/framework/common/widget/CommonScreens.xml process error. Line: 491. Error message: cvc-complex-type.2.4.d: Invalid content was found starting with element 'xls'. No child element is expected at this point.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751055 13f79535-47bb-0310-9956-ffa450edef68
2016-07-02 12:47:38 +00:00
Arun Patidar e7f41ad116 Applied patch from jira issue - OFBIZ-7551 - Enforce noninstantiability to SSLUtil class. Thanks Rishi solanki and Rohit Koushal for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751040 13f79535-47bb-0310-9956-ffa450edef68
2016-07-02 08:50:31 +00:00
Arun Patidar f3ce2f02ec Applied patch from jira issue - OFBIZ-7562 - Enforce noninstantiability to UtilDateTime class. Thanks Rishi Solanki and Rohit Koushal for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751028 13f79535-47bb-0310-9956-ffa450edef68
2016-07-02 06:16:52 +00:00
Jacques Le Roux 6e54fba04e A last slightly modified patch from James Yong for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
I have uploaded a patch for the simple methods schema.
In general, the top level attributes are converted to simpleType, and attributeGroups to complexType.

Changed the following attribute name
1. ‘field’ to ‘fieldType’
2. ‘level’ to ‘levelType'

Denormalize the following attributeGroups
1. attlist.compare
2. attlist.compare-field

Left attributeGroup ‘typeDefaultString’ unchanged, cos it doesn’t matter. Not in use, it seem.

jleroux: we also fixed an issue with 
<xs:element name="field" type="fieldType"/> 
to 
<xs:element ref="field"/>
In the patch 

And I found a small issue (not minilang related) in ExampleCompoundWidgets.xml
-            <sm:log message="CompoundWidgetsFunc runs" sm:level="info"/>
+            <sm:log message="CompoundWidgetsFunc runs" level="info"/>


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750647 13f79535-47bb-0310-9956-ffa450edef68
2016-06-29 14:06:29 +00:00
Arun Patidar 77dbb2851c Applied patch from jira issue - OFBIZ-7459 - Enforce noninstantiability to ApacheFopWorker Class. Thanks Rishi Solanki and Rohit Koushal for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750534 13f79535-47bb-0310-9956-ffa450edef68
2016-06-28 15:10:51 +00:00
Arun Patidar 760d8e11a5 Applied patch from jira issue - OFBIZ-7428 - Enforce noninstantiability to WidgetContentWorker Class. Thanks Rishi Solanki and Pratik Kulshreshth for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750521 13f79535-47bb-0310-9956-ffa450edef68
2016-06-28 14:27:18 +00:00
Arun Patidar 00f9537e01 Applied patch from jira issue - OFBIZ-7422 - Enforce noninstantiability to WidgetDataResourceWorker Class. Thanks Rishi Solanki and Rohit Koushal for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750515 13f79535-47bb-0310-9956-ffa450edef68
2016-06-28 14:06:41 +00:00
Arun Patidar c5cb0d4f49 Applied patch from jira issue - OFBIZ-7420 - Enforce noninstantiability to WidgetPortalPageWorker Class. Thanks Rishi Solanki and Rahul Singh Kushwah for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750513 13f79535-47bb-0310-9956-ffa450edef68
2016-06-28 14:02:14 +00:00
Nicolas Malin 05c05be429 OFBIZ-7632 and OFBIZ-7633 Remove deprecated TextFormRenderer class that has been replace by MacroFormRenderer. Thanks Ravi Lodhi for this issue.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750401 13f79535-47bb-0310-9956-ffa450edef68
2016-06-27 18:38:14 +00:00
Nicolas Malin 1fd2632252 OFBIZ-7631 Remove deprecated XmlFormRenderer class that has been replace by MacroFormRenderer. Thanks Ravi Lodhi for this issue
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750400 13f79535-47bb-0310-9956-ffa450edef68
2016-06-27 18:33:29 +00:00
Arun Patidar f36e6a76f8 Applied patch from jira issue - OFBIZ-7412 - Enforce noninstantiability to UtilHelpText Class. Thanks Amit Gadaley for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750353 13f79535-47bb-0310-9956-ffa450edef68
2016-06-27 14:46:24 +00:00
Ashish Vijaywargiya 33d8e7a9a1 Applied patch from jira issue OFBIZ-7574 - Remove HtmlFormWrapper Class after removing all its dependencies.
Thanks Ravi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750309 13f79535-47bb-0310-9956-ffa450edef68
2016-06-27 08:20:28 +00:00
Jacques Le Roux 642f42886e A temporary workaround for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
Reverts the simple method to use the original schema without namespace. "Duplicates" simple-methods.xsd in simple-methods-ns.xsd as we did, to get the simple-method namespace for compound-widgets.

For myself: when we will do the 3rd more elegant option (no schema duplication), have been changed also:
minilang-catalog.xml
compound-widgets.xsd


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749938 13f79535-47bb-0310-9956-ffa450edef68
2016-06-23 16:40:22 +00:00
Ashish Vijaywargiya 9e63d2dde8 Applied patch from jira issue - OFBIZ-7330 - Error with Agreement Item Supplier product Pdf.
Thanks Ravi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749850 13f79535-47bb-0310-9956-ffa450edef68
2016-06-23 06:59:22 +00:00
Jacques Le Roux a0acf8fa3d No functional change, just formatting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749664 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 12:47:38 +00:00
Jacques Le Roux 89212904bd Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
This is the 2nd step: puts back the original names, so it will be transparent for remaining references in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749489 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:37:47 +00:00
Jacques Le Roux 4931db1ed9 Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 by replacing xsd files references in xml files by -ns.xsd files and removing the concerned xsd files
This is a 1st step, in a 2nd I will put back the original names, so it will be transparent for remaining reference in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749488 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:14:16 +00:00
Pranay Pandey ce35b0d583 [OFBIZ-7274] Updated the widget.lookup.width property so that the pagination header in lookups is rendered properly.
Thanks Vaibhav Jain for reporting the issue and Aditya Patwa for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1748929 13f79535-47bb-0310-9956-ffa450edef68
2016-06-18 07:34:32 +00:00
Jacques Le Roux 3d61573b57 A patch from Arvind Singh Tomar for "Inventory report throws an error" https://issues.apache.org/jira/browse/OFBIZ-6947 reported by Pierre Smits
When executing the print pdf function in https://demo-trunk-ofbiz.apache.org/facility/control/ViewFacilityInventoryByProduct
the following error is thrown:
Unable to transform FO file: org.apache.fop.apps.FOPException: org.apache.fop.fo.ValidationException: null:80:115: "fo:table-cell" is missing child elements. Required content model: marker* (%block;)+ (See position 80:115) javax.xml.transform.TransformerException: org.apache.fop.fo.ValidationException: null:80:115: "fo:table-cell" is missing child elements. Required content model: marker* (%block;)+ (See position 80:115)

The issue was due to missing child element which is failing on validation. Earlier we were using fop-1.1.jar and now it is updated to fop-2.0.jar which by default validates the markup. It is same as OFBIZ-7090
I have added the missing child elements in the macro which were causing the validation to fail and providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1748628 13f79535-47bb-0310-9956-ffa450edef68
2016-06-15 20:11:57 +00:00
Jacques Le Roux 1ee87e749b This has slipped in inadvertently in a previous commit, removes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747792 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 19:52:15 +00:00
Jacques Le Roux ec66e361e1 A big but straightforward commit for "Move minilang scripts from component://componentname/script/org/ofbiz to component://componentname/minilang" - https://issues.apache.org/jira/browse/OFBIZ-7267
I removed duplicate paths were componentname was uselessly repeated after component://componentname/script/org/ofbiz (projectmngr was the only one using there project instead)

I had few typos, easily fixed thanks to the tests. There could be still typos but they are unexpected and anyway no-brainer to fix 

I'm still wondering about specialpurpose/example/minilang/README.txt.
I changed its content to 
  "The minilang directory is for static resources that are interpreted at run time rather than being compiled. This goes on the classpath, but does not get built or put into a JAR file."
not sure it makes any sense, I don't see how this relates to the classpath. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747712 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 14:04:30 +00:00
Ashish Vijaywargiya 89e4e9c642 Applied patch from jira issue - OFBIZ-7203 - Empty Requirement Id and Product Id fields when generating pdf for Approved Product Requirements. Thanks Ravi for the contribution. Thanks for your extensive research and providing the details in the task, your notes are very helpful.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747516 13f79535-47bb-0310-9956-ffa450edef68
2016-06-09 09:14:13 +00:00
Deepak Dixit 09ca38b7f6 (OFBIZ-7164) Fix typo in freemarker else tag.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746691 13f79535-47bb-0310-9956-ffa450edef68
2016-06-03 08:59:56 +00:00
Jacques Le Roux 0e7696a881 Adds a missing xls reference in platform-specific, stumbled upon it by chance
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746420 13f79535-47bb-0310-9956-ffa450edef68
2016-06-01 10:51:20 +00:00
Jacques Le Roux 3aadf4e8da A slightly modified patch from James Yong for "Autocompletion for Compound Widget" https://issues.apache.org/jira/browse/OFBIZ-7061
1. The following xsd are duplicated to use namespaces
  site-conf.xsd     ->  site-conf-ns.xsd
  widget-form.xsd   ->  widget-form-ns.xsd
  widget-screen.xsd ->  widget-screen-ns.xsd
  widget-menu.xsd   ->  widget-menu-ns.xsd
  simple-methods.xsd->  simple-methods-ns.xsd
For example, in site-conf-ns.xsd, we have the following document level attribute
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://ofbiz.apache.org/Site-Conf" targetNamespace="http://ofbiz.apache.org/Site-Conf">
instead of 
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">

2. The above schema are used into compound-widgets.xsd so that compound widgets use only one consolidated schema. 

3. Update ExampleCompoundWidgets.xml to use the new compound-widgets.xsd. For example
<compound-widgets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:sc="http://ofbiz.apache.org/Site-Conf"
        xmlns:sm="http://ofbiz.apache.org/Simple-Method"
        xmlns:wf="http://ofbiz.apache.org/Widget-Form"
        xmlns:wt="http://ofbiz.apache.org/Widget-Tree"
        xmlns:wm="http://ofbiz.apache.org/Widget-Menu"
        xmlns:ws="http://ofbiz.apache.org/Widget-Screen"
        xsi:noNamespaceSchemaLocation="../../../../framework/widget/dtd/compound-widgets.xsd">
    
    <sc:site-conf>
        <sc:request-map uri="CompoundWidgets1">
            <sc:security https="true" auth="true"/>
            <sc:event type="simple" invoke="CompoundWidgetsFunc" path="component://example/widget/example/ExampleCompoundWidgets.xml"/>
            <sc:response name="success" type="view" value="CompoundWidgets1"/>
        </sc:request-map>
        <sc:request-map uri="CompoundWidgets2"><sc:security https="true" auth="true"/><sc:response name="success" type="view" value="CompoundWidgets2"/></sc:request-map>

        <sc:view-map name="CompoundWidgets1" type="screen" page="component://example/widget/example/ExampleCompoundWidgets.xml#CompoundWidgets1"/>
        <sc:view-map name="CompoundWidgets2" type="screen" page="component://example/widget/example/ExampleCompoundWidgets.xml#CompoundWidgets2"/>
    </sc:site-conf>
...... the rest

4. Change java code to support reading xml with namespace (i.e. xml for compound widgets)

jleroux: I simply replaced tabs by spaces in Java files and removed this commented out line 
  <compound-widgets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/compound-widgets.xsd">
in ExampleCompoundWidgets.xml

We decided to duplicate the simple-methods.xsd rather than updating all concerned files. Else we would have to update the attributes at document level for rest of the controllers, menus, forms, simple methods and screens. For example, in controller.xml, we would have to change 
  xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd”
to 
  xmlns="http://ofbiz.apache.org/sc” xsi:schemaLocation="http://ofbiz.apache.org/dtds/site-conf-ns.xsd”>
But especially we would have to use the same syntax with namespaces prefixes than in ExampleCompoundWidgets.xml (see example above). This can be discussed because with auto-completion it's not a big deal, but could be overwhelming for existing custom projects...

James mentionned that "the schema location at compound-widgets.xsd is relative to the project...". I don't see any problems with that. We can keep as is as long as we maintain the relation (ie if the main XSDs are moved). Moreover with the previous addition of compound-widgets.xsd in widget-catalog.xml it seems all things work correctly (eg w/o the new *-ns.xsd yet committed, the auto-completion works well in ExampleCompoundWidgets.xml




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746302 13f79535-47bb-0310-9956-ffa450edef68
2016-05-31 16:48:09 +00:00
Nicolas Malin ab92393570 Add xls screen renderer to convert a screen definition like an html flow directly ready by a spreadsheet application
In addition, add an export example button on FindExample screen and add complete macro ftl renderer unit test. Issue OFBIZ-6931 proposed by Leila Mekika. Thanks to her, jacques and pierre for theirs remarks.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746045 13f79535-47bb-0310-9956-ffa450edef68
2016-05-29 18:38:26 +00:00
Deepak Dixit 83696e3203 (OFBIZ-7021) Renamed framework common component ftl file name from lower camel case to upper camel case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1744783 13f79535-47bb-0310-9956-ffa450edef68
2016-05-20 18:52:54 +00:00
Deepak Dixit 79a4302d2c (OFBIZ-7021) Renamed framework widget component ftl file name from lower camel case to upper camel case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1744782 13f79535-47bb-0310-9956-ffa450edef68
2016-05-20 18:21:02 +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 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 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
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
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
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
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
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 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