Commit Graph
203 Commits
Author SHA1 Message Date
Jacques Le Roux 32e7ea5781 No functional change, completes r179986 which was framework only, this is for
plugins
================================================================================
While checking there were no other cases like in OFBIZ-9432 
(missing path to class), to be consistent I removed the trailing semicolons in 
groovy scripts and made few formatting

================================================================================

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1800450 13f79535-47bb-0310-9956-ffa450edef68
2017-06-30 18:50:22 +00:00
Jacques Le Roux c47f662d38 Fixed: Wiki restructure issues
(OFBIZ-9416)

Replaces a bunch of deprecated links or shortcuts

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1799698 13f79535-47bb-0310-9956-ffa450edef68
2017-06-23 19:57:35 +00:00
Jacques Le Roux e44ec8d53d Improved: EntityListIterator closed but not in case of exception
(OFBIZ-9385)

This is an improvement only because no cases were reported. But obviously in 
case of unlucky exception after the EntityListIterator creation and before it's 
closed the EntityListIterator remains in memory. 
It should be closed in EntityListIterator.finalize() but the less happens there 
the better.

The solution is to use try-with-ressources

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1797073 13f79535-47bb-0310-9956-ffa450edef68
2017-05-31 17:04:40 +00:00
Deepak Dixit c1f0182890 Improved: Replace fields with "id-ne", "id-long-ne" and "id-vlong-ne"
with "id", "id-long" and "id-vlong" respectively which are primary keys for plugin components.
(OFBIZ-9351)
Thanks Aditya Sharma for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1796380 13f79535-47bb-0310-9956-ffa450edef68
2017-05-27 11:32:18 +00:00
Taher A. Alkhateeb ac3b7c14da Fixed: Remove all dependencies from OFBiz framework to plugins
(OFBIZ-9322)
   
This is related to commit r1793170 from ofbiz-trunk where data is moved from
ecommerce to accounting and party components.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1793171 13f79535-47bb-0310-9956-ffa450edef68
2017-04-29 07:09:20 +00:00
Jacques Le Roux 008e962b5c Fixed: add item to order cause exception
(OFBIZ-9167)

-go to https://localhost:8443/ordermgr/control/orderentry
-create order for DemoCustomer
-add an item

console output...
java.lang.NullPointerException
        at org.apache.ofbiz.content.content.ContentWorker.
renderContentAsText(ContentWorker.java:368) ~[ofbiz.jar:?]
[...]

While at it I also found issues with cartLine.getName() in ftl files. It was
also missing the dispatcher. 

This was broken by OFBIZ-9164

Thanks: Wai

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/plugins@1778889 13f79535-47bb-0310-9956-ffa450edef68
2017-01-15 07:37:35 +00:00
Taher A. Alkhateeb 436c99ca6d Implemented: renamed the directory specialpurpose to plugins
(OFBIZ-7972)

In another step towards completing the plugin system for OFBiz, we renamed
the /specialpurpose directory to /plugins and changed all occurences of the
word "specialpurpose" to "plugins" in all files found in the system

Reference discussion: http://markmail.org/message/hpyuxkmftiyn44w2


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/plugins@1778271 13f79535-47bb-0310-9956-ffa450edef68
2017-01-11 10:48:47 +00:00
Jacopo Cappellato c4d4e9d870 Improved: moved the logic/implementation of OFBiz legacy authentication
tokens from the LoginWorker class to a new class named ExternalLoginKeysManager.

Improved Javadocs in the new class.
 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1775807 13f79535-47bb-0310-9956-ffa450edef68
2016-12-23 09:35:26 +00:00
Jacques Le Roux 201e7f5957 No functional change, fixes wrong package-names, not sure these files are even
needed...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1773541 13f79535-47bb-0310-9956-ffa450edef68
2016-12-10 21:20:42 +00:00
Deepak Dixit 15bc40e491 Reverted: Minilang code readability and consistency improvements done at r#1768222, this commit reversed key and description of drop-down in the code.
(OFBIZ-9114)

Thanks  Wei Zhang for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1772880 13f79535-47bb-0310-9956-ffa450edef68
2016-12-06 12:37:42 +00:00
Divesh Dutta a4567c2486 Improvement: Minilang code readability and consistency improvements.
(OFBIZ-8929) (OFBIZ-8930) (OFBIZ-8953) (OFBIZ-8965) (OFBIZ-8972) (OFBIZ-8986) (OFBIZ-8991) 

Thanks: Ankush Upadhyay, Anuj Jain, Abhijeet for your patches. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1768222 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:34:00 +00:00
Divesh Dutta 77af05bc8e Improvement: Miniland code readability and consistency improvements
(OFBIZ-8744) (OFBIZ-8745) (OFBIZ-8746) (OFBIZ-8748) (OFBIZ-8829) (OFBIZ-8830) (OFBIZ-8907) (OFBIZ-8908) (OFBIZ-8924) (OFBIZ-8925) 

Thanks: Ankush Upadhyay , Sega patidar , Abhijeet Ashapure for your patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1768219 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:14:04 +00:00
Divesh Dutta bef0bc4eb3 Improvement: Generic value is null or not should be checked using native checks. Utility method isEmpty or isNotEmpty is not needed to check if generic value is null or not because generic values can never be empty. They can be null or not nulls. So made changes accordingly all over the places.
(OFBIZ-8471)

Thanks: Ratnesh Upadhyay for reporting the improvement and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1768192 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 11:27:46 +00:00
Arun Patidar 8bb8f78872 Improved: Removed semicolon from all Groovy files of all components.
(OFBIZ-8652)

Thanks: Rohit Koushal, Jacques Le Roux and Rishi Solanki for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1767764 13f79535-47bb-0310-9956-ffa450edef68
2016-11-02 19:09:13 +00:00
Mridul Pathak 6f27e5f5b6 Improved: Error message not visible properly after adding item in webpos.
(OFBIZ-7563)

Increased section top-margin so that it won't overlap with the section above.

Thanks: Suraj Khurana for contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1765063 13f79535-47bb-0310-9956-ffa450edef68
2016-10-15 13:35:15 +00:00
Mridul Pathak b0a343af49 Improved: WebPos - Remove unused imports from groovy files for code optimization.
(OFBIZ-8442)

Thanks: Gopal Yadav for contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1765022 13f79535-47bb-0310-9956-ffa450edef68
2016-10-15 08:03:10 +00:00
Jacopo Cappellato 96b22285f4 Implemented: removed the "controller" related logic, that is now provided by the
new ControlFilter, from the ContextFilter; modified existing applications to use 
the two filters in a chain; removed from the other specialized filters all the 
logic that was duplicated or extended from ContextFilter.

A web application, in order to leverage the OFBiz framework, requires that a 
series of objects are in its contexts (servlet context, session and request) 
such as "delegator", "delegatorName", "dispatcher", "security" etc. etc...
This setup is performed by the logic contained in the servlet filter implemented 
by the ContextFilter class.
The execution of this logic is required for the application to run properly.
However, before this commit, in the ContextFilter there was other logic, related 
to access control and redirection rules (some of them performed in coordination 
with the ControlServlet), making it difficult to deploy this filter in all the 
web applications, especially the ones that implement special handling of paths.
In fact, this filter was deployed in most but not all the web application in the 
OFBiz codebase: specifically it was not deployed in web applications that 
require the execution of other filters (e.g. CatalogUrlFilter, etc...) like the 
ones in the "ecommerce" and "solr" components.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761304 13f79535-47bb-0310-9956-ffa450edef68
2016-09-18 08:08:30 +00:00
Arun Patidar c53cbd8122 Applied patch from jira issue - OFBIZ-7946 - Data load error on Web Pos component due to removal of POS component. Thanks Suraj Khurana for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1755393 13f79535-47bb-0310-9956-ffa450edef68
2016-08-06 12:04:33 +00:00
Jacques Le Roux 9179f9c8ba Fixes "Remove warnings regarding missing component lib folders" - https://issues.apache.org/jira/browse/OFBIZ-7776 - by cleaning/clearing the references to non existent/empty dirs.
Notes: 
* Also removes empty framework/base/lib/scripting and useless applications\content\lib\uno\README (miss doc in wiki)
* When jpim-0.1.jar will be (hopefully) replaced we can drop lib ref in framework/base/ofbiz-component.xml
* I wonder if we should let the geronimo component alone with only 2 classes, could we not put that in entity or entityext?
 
    



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1755306 13f79535-47bb-0310-9956-ffa450edef68
2016-08-05 12:27:21 +00:00
Jacques Le Roux d45dbb11b2 Removes system generated fields - POS - https://issues.apache.org/jira/browse/OFBIZ-7908
Thanks to Suraj Khurana and Scott for suggestion about POS to webPos

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1754611 13f79535-47bb-0310-9956-ffa450edef68
2016-07-30 09:37:22 +00:00
Jacques Le Roux 0ef717189f After removing the POS at r1754402, I tried the webPos and found that it missed the terminal data. As I suspected it was due to POS data and data model which were used by the webPos. For now I decided to add them all in webpos. We will see later which parts we can safely remove.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1754432 13f79535-47bb-0310-9956-ffa450edef68
2016-07-28 16:36:25 +00:00
Deepak Dixit 8f3141cd46 (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/specialpurpose@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Taher A. Alkhateeb 2963cd7188 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/specialpurpose@1752838 13f79535-47bb-0310-9956-ffa450edef68
2016-07-15 14:17:14 +00:00
Taher A. Alkhateeb 25ffc93eb5 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/specialpurpose@1752033 13f79535-47bb-0310-9956-ffa450edef68
2016-07-09 18:10:19 +00:00
Jacopo Cappellato e920bb300e OFBIZ-7765 converted Minilang code that was using the deprecated "call-bsh" element to use the "script" element with Groovy. Thanks to Deepak Dixit for the work and the patch and to Nicolas Malin for the review and imporvement.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1751945 13f79535-47bb-0310-9956-ffa450edef68
2016-07-08 17:37:36 +00:00
Jacques Le Roux 54917e8bbd 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/specialpurpose@1750647 13f79535-47bb-0310-9956-ffa450edef68
2016-06-29 14:06:29 +00:00
Jacques Le Roux f84f07a0fa 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/specialpurpose@1749938 13f79535-47bb-0310-9956-ffa450edef68
2016-06-23 16:40:22 +00:00
Jacques Le Roux 4deae05a38 Fixes a "typo" in last commit for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
We used targetNamespace (should only be used in schema) instead of xsi:schemaLocation



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749634 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 05:58:26 +00:00
Jacques Le Roux a98ac13d9d 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/specialpurpose@1749489 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:37:47 +00:00
Jacques Le Roux b20816bfa8 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/specialpurpose@1749488 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:14:16 +00:00
Deepak Dixit 3c08e51b02 (OFBIZ-7244) Relocate .groovy files in the specialpurpose/webpos component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1747796 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 20:01:05 +00:00
Deepak Dixit 840949dfc2 (OFBIZ-7227) Relocate .groovy files in the order component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1747769 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 18:36:39 +00:00
Jacques Le Roux 5e65059e4d 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/specialpurpose@1747712 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 14:04:30 +00:00
Jacques Le Roux 4b8d9a9aed Patches from Amardeep Singh Jhajj for "Missing UiLabels for shortcuts in webpos" https://issues.apache.org/jira/browse/OFBIZ-7144
I found missing UiLabels for shortcuts in webpos in trunk and Release 14.12, it was committed in Release 15.12 at -r1729098. I think you somehow missed to commit it in trunk and Release 14.12. Please have a look on patches attached and commit it in their respective branches.

jleroux:
I was curious about that so I checked and it's "a bit" more complicated. This is related with OFBIZ-6226 where Mridul Pathak committed in
    Trunk - r1720910
    14.12 - r1720916
    12.04 - r1720930

But there was duplicated labels so I partially reverted (only the duplicated labels) at 
Trunk - r1726529
14.12 - r1726539
12.04 - r1726540

Later I noticed r1720910 was committed in Trunk before R15.12 creation, so I reverted there also at revision: 1729098, but not partially hence the inconsistency.  But actually I should have reverted all everywhere!

Remains that Mridul and Suraj were somewhere right. Like them I don't like the names of the labels, I believe that (eg) WebPosCheckout is far better than WebPosShortcutF7. So they were partiallly wrong at OFBIZ-6226, they duplicated labels but the names would be better if they were not refering to keyboard keys numbers...

I did not take care of R12.04

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1746283 13f79535-47bb-0310-9956-ffa450edef68
2016-05-31 14:37:07 +00:00
Deepak Dixit 4833eca0a9 (OFBIZ-6981) Move groovy script under WEB-INF/actions for webpos.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1745567 13f79535-47bb-0310-9956-ffa450edef68
2016-05-26 06:48:15 +00:00
Pranay Pandey cb040dd7a7 [OFBIZ-7042] Fixed "Forgot your password" process for Web POS. On clicking "Forgot your password" link from Web POS login page, system was navigating to blank page.
Thanks Amardeep Singh Jhajj for reporting the issue and providing patch for the same.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1744041 13f79535-47bb-0310-9956-ffa450edef68
2016-05-16 12:34:36 +00:00
Jacques Le Roux 9d99df86de Fixes "POS login page getting error "FileNotFoundException"." reported by Amardeep Singh Jhajj at https://issues.apache.org/jira/browse/OFBIZ-7007
WebPos login page getting error "FileNotFoundException" at latest trunk. Here is the error:
Error rendering included template at location [component://webpos/template/Login.ftl]: java.io.FileNotFoundException: 

This issue is due to the change done in r1736869. "Login.ftl" was not moved but its reference was changed in "specialpurpose/webpos/widget/CommonScreens.xml ". I found one more file which was not moved "RequirePasswordChange.ftl".

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1739427 13f79535-47bb-0310-9956-ffa450edef68
2016-04-16 07:59:10 +00:00
Jacques Le Roux e9818f4a83 After r1737565 for OFBIZ-6837 (webpos) moves back images folder (with only .css and .js files) from template to webapp
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1737566 13f79535-47bb-0310-9956-ffa450edef68
2016-04-03 09:52:33 +00:00
Jacques Le Roux e7be1664a2 Following partial revert of r1736869 for OFBIZ-6837 (webpos), this moves the *.ftl files from webapp to template subfolders
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1737565 13f79535-47bb-0310-9956-ffa450edef68
2016-04-03 09:43:27 +00:00
Jacques Le Roux 6326ca24a4 This partially reverts the changes done by
r1736866 for OFBIZ-6816 (humanres)
  r1736867 for OFBIZ-6817 (manufacturing)
  r1736868 for OFBIZ-6819 (order)
  r1736869 for OFBIZ-6837 (webpos)
  r1736870 for OFBIZ-6860 (myportal)
  r1736876 for OFBIZ-6812 (project)
Partially because I did not revert the changes in screens files and I already restored the *.ftl files (+ ShowProductionRun.groovy) deleted in r1736867 in their initial locations.

I noticed there is another groovy file: OrderReportPrepare.groovy. It's not used OOTB (events in relation with JasperReport commented out in order controller)
Both groovy files will need to be moved to a right location before we move groovy files also. 
They might not be the only ones in this case (wrong initial locations)...

Actually I did not review these patches enough when I committed them. 
Apart r1736867 (manufacturing), the ftl files were not moved but simply copied from their initial locations to the templates components sub-folders. 
In r1736867 the files were not moved but deleted and copied (this maybe a patch effect, not sure we can move files using patches, I'll try)

images

So this simply deletes the templates components sub-folders and their contents
I'll soon properly move the file, in the meantime the trunk will be in an inconsistent state (because of the the changes in screens files not reverted).



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1737557 13f79535-47bb-0310-9956-ffa450edef68
2016-04-03 09:10:47 +00:00
Jacques Le Roux 800a0c22a7 Removes old simple-methods.xsd from the trunk as it's useless now (was replaced by simple-methods-v2.xsd)
Also renames simple-methods-v2.xsd in simple-methods.xsd and replaces simple-methods-v2.xsd references by simple-methods.xsd references everywhere it's needed



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1737087 13f79535-47bb-0310-9956-ffa450edef68
2016-03-30 09:13:03 +00:00
Jacques Le Roux 2b5e4f3c34 A patch from Pierre Smits for <<relocate .ftl files in the wepbpos component>> https://issues.apache.org/jira/browse/OFBIZ-6837
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1736869 13f79535-47bb-0310-9956-ffa450edef68
2016-03-28 11:15:43 +00:00
Jacques Le Roux a4231f0691 Something went wrong with r1720910 for OFBIZ-6226. There are duplicated labels now. Better to revert and redo correctly
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1726529 13f79535-47bb-0310-9956-ffa450edef68
2016-01-24 18:37:24 +00:00
Jacques Le Roux 0a982250e6 Temporary fix for "UtilXml.LocalResolver.resolveEntity] could not find LOCAL DTD/Schema with publicId [null] and the file/resource is [web-app_3_0.xsd]" - https://issues.apache.org/jira/browse/OFBIZ-6807
As suggested by Deepak keeps only <<web-app version="3.0">> in web.xml files instead of whole xmlns and schemaLocation. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1726388 13f79535-47bb-0310-9956-ffa450edef68
2016-01-23 11:52:08 +00:00
Deepak Dixit 3ae8efbbb1 (OFBIZ-6655) Applied patch from jira issue OFBIZ-6655.
Add session tracking mode and make cookie secure for some special purposes component.

Thanks Rahul Bhammarker for contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1724930 13f79535-47bb-0310-9956-ffa450edef68
2016-01-16 07:15:09 +00:00
Mridul Pathak 81f65f4a53 [OFBIZ-6226] Webpos F4-F11 label mismatch. Applying patch from OFBIZ-6226. Thanks Christian Carlow for reporting the issue and providing the initial patch. Thanks Suraj Khurana for providing the improved patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1720910 13f79535-47bb-0310-9956-ffa450edef68
2015-12-19 13:01:44 +00:00
Divesh Dutta b90618940b [OFBIZ-6709] Now when you add party content, party profile page refresh, earlier it was not refreshing. Updated uiLabelJsonObjects method's (used for jsonify ui lables) signature. Added callback function in this method to get response returned from asynchronous ajax request. After this uiLabel object is available which resolves the issue
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1715505 13f79535-47bb-0310-9956-ffa450edef68
2015-11-21 12:33:52 +00:00
Arun Patidar da04c7ce72 [OFBIZ-6171] Applied patch from Pierre Smits for replacing 'Open for Business' references with 'Apache OFBiz'.Thanks Pierre for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1706589 13f79535-47bb-0310-9956-ffa450edef68
2015-10-03 14:15:21 +00:00
Jacques Le Roux 69766d44fd I spotted some misses in FTL templates after r1705329, this fixes them
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1705417 13f79535-47bb-0310-9956-ffa450edef68
2015-09-26 11:52:31 +00:00
Jacques Le Roux 596359c680 I found a possible XSS attack through ProductContentWrapper.java.getProductContentAsText() which is notably used in several FTL files. This exists also in others *ContentWrapper.java.
Note that in supported releases it's hard to exploit, it's a Stored XSS https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting which means you need 1st to somehow inject exploiting code in the DB.

This fixes it by changing the ContentWrapper interface
from
    public interface ContentWrapper {
        public StringUtil.StringWrapper get(String contentTypeId);
    }
to
    public interface ContentWrapper {
        public StringUtil.StringWrapper get(String contentTypeId, String encoderType) {
    }

And changing the Category, Party, Product, ProductPromo and WorkEffort ContentWrapperS accordingly. This means to use 2 types of encoderTypes: "html" and "url".
The "html"  encoderType will be used for all ProductContentTypes but those who contain URL in their ContentTypeIdS (actually end with, "_URL") which will use "url" encoderType.
It concerns not only the get() method but also methods like getPartyContentAsText(), getProductContentAsText(), etc.

It seems a big change but it's straightforward. It's normally complete. 

There are some (unrelated) tabs replaced by spaces here and there, and few trailing spaces removed but nothing big

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1705329 13f79535-47bb-0310-9956-ffa450edef68
2015-09-25 16:27:12 +00:00