Commit Graph
10472 Commits
Author SHA1 Message Date
Erwan de Ferrieres 029f6e9410 Removing usage some more iterators
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1306568 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 20:18:13 +00:00
Erwan de Ferrieres 5d3e068922 ApplicationSessionCookieConfig.getSessionCookieName() is now deprecated and replaced by SessionConfig.getSessionCookieName()
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1306175 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 05:19:29 +00:00
Joseph Eckard addff35b64 enable HashSessionManager persistent sessions, by default they will be written to runtime/jetty/sessions (can be configured via a property)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1305884 13f79535-47bb-0310-9956-ffa450edef68
2012-03-27 16:18:42 +00:00
Joseph Eckard b4b7b1b0a5 fixed typos in example jetty config, NIO connectors did not have the correct types
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1305605 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 21:18:34 +00:00
Jacques Le Roux 8f6004c2eb This was missing in r1305004
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1305316 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 11:42:49 +00:00
Jacques Le Roux 7d943cb341 A patch from Anne Jessel "Support validation of resource xml files" https://issues.apache.org/jira/browse/OFBIZ-4723
The xsd for the resource xml files is invalid. In addition, the format of the value of the xml:lang attribute in resource xml files is invalid, according to the xml standard.

The attached patch:

    provides a valid xsd
    updates UtilProperties and the Label Manager to deal with the correct formatting of the xml:lang value, while still working with the old format, following Adrian Crum's recommendation on the mailing list
    includes simple unit tests for UtilProperties to ensure it does work with both formats
    changes the Label Manager to include a reference to the new xsd, and to use the correct format of the xml:lang value, when writing a resource xml file.

Some minor code cleanups to these files.

jleroux: the base test suite was successfully run locally once UtilIOTests have been commented out (still an issue with it on Windows)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1305004 13f79535-47bb-0310-9956-ffa450edef68
2012-03-25 11:07:57 +00:00
Jacques Le Roux 0c07b6df6f Revert r1304193 for now
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1304737 13f79535-47bb-0310-9956-ffa450edef68
2012-03-24 09:35:09 +00:00
Jacopo Cappellato e5ead4907b Moved all platform dependent scripts to the "tool" folder, with the only exception of the "ant" scripts for unix and windows that are still in the home folder.
Removed a series of unused files (ant extensions).
Removed special handling for hsql db from ant tasks (hsql is no more bundled with OFBiz).
Please help testing the scripts as I was only able to run some limited tests on my Mac.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1304369 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 14:26:32 +00:00
Jacques Le Roux 7c02c7829f Fixes 6 duplicated German labels
<value xml:lang="de">Termine</value>
<value xml:lang="de">Standard-Organisation</value>
<value xml:lang="de">Portlet-Attribute anpassen</value>
<value xml:lang="en">Persönliche Seite</value>
<value xml:lang="de">Kinder</value>
<value xml:lang="en">Portalseiten für die Anwendung</value>

And 1 duplicated English labels
<value xml:lang="en">Delivery to the following recipient(s) failed:</value>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1304240 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 09:13:13 +00:00
Jacques Le Roux 3214b476cb A patch from Tri Duc Vo "contribute Ofbiz Vietnamese tranlasting to community from HaNoi" https://issues.apache.org/jira/browse/OFBIZ-4627
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1304237 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 08:56:48 +00:00
Jacques Le Roux b427c4d000 Add ${errMessage} to CommonDatabaseProblem label, it was missing there
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1304206 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 06:35:53 +00:00
Jacques Le Roux 9fc15eeb1b A patch from Kiran Gawde "StringIndexOutOfBoundsException in OfbizContentTransform" https://issues.apache.org/jira/browse/OFBIZ-4464
Fixes this bug:
---- exception report ----------------------------------------------------------
Error in request handler:
Exception: org.ofbiz.widget.screen.ScreenRenderException
Message: Error rendering screen component://ecommerce/widget/CommonScreens.xml#main-decorator: java.lang.StringIndexOutOfBoundsException: String index out of range: 0 (String index out of range: 0)
---- cause ---------------------------------------------------------------------
Exception: java.lang.StringIndexOutOfBoundsException
Message: String index out of range: 0
---- stack trace ---------------------------------------------------------------
java.lang.StringIndexOutOfBoundsException: String index out of range: 0
java.lang.String.charAt(String.java:686)
org.ofbiz.webapp.ftl.OfbizContentTransform$1.close(OfbizContentTransform.java:97)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1304200 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 06:26:22 +00:00
Hans Bakker 69d3195fc1 replace UtilProperties with EntityUtilProperties and pass delegator to checkSecureParameter
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1304197 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 06:14:02 +00:00
Jacques Le Roux 1c5a0459c3 A patch from Anne Jessel "Support validation of resource xml files" https://issues.apache.org/jira/browse/OFBIZ-4723
The xsd for the resource xml files is invalid. In addition, the format of the value of the xml:lang attribute in resource xml files is invalid, according to the xml standard.

The attached patch:

    provides a valid xsd
    updates UtilProperties and the Label Manager to deal with the correct formatting of the xml:lang value, while still working with the old format, following Adrian Crum's recommendation on the mailing list
    includes simple unit tests for UtilProperties to ensure it does work with both formats
    changes the Label Manager to include a reference to the new xsd, and to use the correct format of the xml:lang value, when writing a resource xml file.

Some minor code cleanups to these files.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1304193 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 05:47:10 +00:00
Joseph Eckard 32f7394a19 removed jsp & el api jars, these exist in base/lib/j2eespecs
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1303994 13f79535-47bb-0310-9956-ffa450edef68
2012-03-22 19:20:01 +00:00
Joseph Eckard ba4d9e2eee update jetty container to use the latest jetty-8 release, 8.1.2
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1303894 13f79535-47bb-0310-9956-ffa450edef68
2012-03-22 17:08:31 +00:00
Jacopo Cappellato dced383147 Added missing argument form macro to fix rendering error in PDF forms
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1303677 13f79535-47bb-0310-9956-ffa450edef68
2012-03-22 07:48:38 +00:00
Scott Gray 1e3d9b9f55 CVE-2012-1621: Ensure that collections (except for maps) are properly encoded for html when rendered using toString() e.g.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1303145 13f79535-47bb-0310-9956-ffa450edef68
2012-03-20 20:54:06 +00:00
Ashish Vijaywargiya b0e153006c Bug fix, Applied patch from jira issue - OFBIZ-4734 - User behaviour issue on auto-completer.
Currently if user type in auto-completer text box and if matches found then list display as auto-completer result list but if no matches found then user didn't know that result will come or not, even no matches found.

Change behaviour is when user type in text box then spinner (ajax loader image) shows wchich tells user that search is in progress.
If matches found or not found spinner disapperars and reult/ no result message listed in auto-completer relsult list.
Now user won't see any abnormal behaviour at ui.

Added spinner image for the auto-completer request.
Also added the "No Records Found" message if no matches found for the auto-completer search.

Thanks Nitesh, Deepak and Rishi for the contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1303062 13f79535-47bb-0310-9956-ffa450edef68
2012-03-20 18:08:05 +00:00
Ashish Vijaywargiya 34141f79f8 Bug fix, Applied patch from jira issue OFBIZ-4735 - User behaviour issue on Lookup.
Currently if user perform search or use pagination in lookup and if matches found then list display but if no matches found then user didn't know that result will come or not, even no matches found.

Change behaviour should be when user perform search or use pagination then spinner (ajax loader image) shows which tells user that search is in progress. If matches found or not found spinner disappears.
Now user won't see any abnormal behaviour at ui.
Thanks Deepak, Rishi & Anil Gupta for the contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1303045 13f79535-47bb-0310-9956-ffa450edef68
2012-03-20 17:51:40 +00:00
Jacques Le Roux 024a070743 A change from Alexander Reelsen "Xml Deserializer does not support BigDecimal" https://issues.apache.org/jira/browse/OFBIZ-4733
In the last weeks the XML Serializer in trunk was extended to support BigDecimal. Unfortunately deserializing is not supported, which leads to services being broken when running via async as their are persisted in runtime_data... like sending mails, when a bigdecimal is involved

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1302324 13f79535-47bb-0310-9956-ffa450edef68
2012-03-19 08:48:03 +00:00
Hans Bakker 0d802c0385 OFBIZ-4730 make <property-to-field/> in widget firstly lookup up the SystemProperty entity and then the properties file, contribution of Leon
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1302320 13f79535-47bb-0310-9956-ffa450edef68
2012-03-19 08:25:06 +00:00
Jacopo Cappellato dc4edc748e CVE-2012-1621: Removed the Webslinger component and all the framework dependencies on it; the reasons for this
* no active committer was maintaining the webslinger component
* the component was experimental and not really used by OFBiz
* the component was really big (lot of jars etc...) and we are trying to slim down the OFBiz framework and keep only the essential/useful features
* this fixes a security issue reported to the OFBiz PMC

The only Webslinger feature used by the OFBiz framework was the "service debug mode" (enabled by default with the property servicedispatcher.servicedebugmode): I have considered to keep it but it was impossible because it relied on Webslinger legacy code (in the org.webslinger.invoker.* package) that was never contributed as a source file to the OFBiz project; I have tried to review the source file from an external Webslinger repo but I couldn't find them; the only site about Webslinger I could find is this:
http://www.webslinger.org/Downloads
but the svn resources mentioned there are broken. The fact that the OFBiz frameework was dependent (for a feature useful only in development mode) on an external project that doesn't publish its source code (at least in an easy to find location) convinced me that it was better to clean up the dependency completely; on the bright side OFBiz should now use less memory.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1301866 13f79535-47bb-0310-9956-ffa450edef68
2012-03-17 05:35:45 +00:00
Adrian Crum 48ac918030 Made the ScriptHelperImpl createServiceMap method behave more like mini-language. Error messages are saved in the result Map.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300965 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 12:58:46 +00:00
Adrian Crum ded0847a65 Simplified ContextHelper.java code by adding auto-creation of some commonly-used bindings.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300954 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 12:26:50 +00:00
Adrian Crum 762466f309 Fix type-unsafe casts in ContextHelper.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300889 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 10:37:38 +00:00
Adrian Crum 057bd2595e Fixed a static field that was initialized to the wrong class name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300847 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 08:47:00 +00:00
Hans Bakker 25c5483493 make the currencyRounding a property variable, using the value which is hardcoded now. contribution of 'Tor'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300817 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 06:31:32 +00:00
Hans Bakker 12326f72c1 OFBIZ-4729: defaultValue in EntityUtilProperties.getPropertyValue(String resource, String name, String defaultValue, Delegator delegator) method is forgotten. contributed by Leon
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300815 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 06:15:22 +00:00
David E. Jones d9ff4288bf Fixed bug when there is a view-entity having-condition and no having condition passed to the find method
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300747 13f79535-47bb-0310-9956-ffa450edef68
2012-03-14 21:58:37 +00:00
Jacopo Cappellato 66db37dc11 Services and events methods are defined with a methods without arguments (or a script): as usual the input fields are available in the context (Bindings)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300473 13f79535-47bb-0310-9956-ffa450edef68
2012-03-14 07:40:31 +00:00
Adrian Crum 203f5ee73d Improved JavaScriptTest.js file:
1. Fixed reference to application-level entity.
2. Made the behavior of the test function different from the behavior of global code - so the distinctions are clear in the service results.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300469 13f79535-47bb-0310-9956-ffa450edef68
2012-03-14 06:40:55 +00:00
Jacopo Cappellato 66656fb4ac Now the Script Event Handler properly set the success/error messages returned by the events as request attributes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300268 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 18:23:09 +00:00
Jacopo Cappellato 4845c553ac The scripthelper object was created too early when the bindings were not set in the context; this caused the wrong scriptType to be set in the ContextHelper.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300202 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 15:47:50 +00:00
Jacopo Cappellato 2dbf4c0e6e If a ScriptException is thrown while running a script that implements a service then a result map with the error message is automatically returned by the engine: this default error handling mechanism is similar to the one provided by Minilang and allows to delegate to the engine most of the most common error handling logic.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300117 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 13:33:55 +00:00
Sascha Rodekamp dd3c285da8 JCR container definition was placed between the cataline container definition description and th definition itself. That doesn't looked good.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300014 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 09:00:43 +00:00
Hans Bakker 0372daa663 OFBIZ-4638: make ofbiz run with openjdk7,6. Contribution of Chattree
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1299985 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 06:50:41 +00:00
Adrian Crum fda9bad4cf More JSR-223 work - added a ScriptHelper object to the bindings. Also added a demonstration to the JavaScript test service.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1299924 13f79535-47bb-0310-9956-ffa450edef68
2012-03-12 23:20:55 +00:00
Adrian Crum 1c162eb3d7 JSR-223 bug fix, added String constants for commonly used binding keys.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1299636 13f79535-47bb-0310-9956-ffa450edef68
2012-03-12 11:41:03 +00:00
Adrian Crum e3c333acdb Small fix for my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1299134 13f79535-47bb-0310-9956-ffa450edef68
2012-03-10 01:42:27 +00:00
Adrian Crum 7f741eb700 Added a JSR-223 event handler.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1299131 13f79535-47bb-0310-9956-ffa450edef68
2012-03-10 01:38:15 +00:00
Adrian Crum 7f15204b03 JSR-223 bug fixes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1299121 13f79535-47bb-0310-9956-ffa450edef68
2012-03-10 00:46:54 +00:00
Adrian Crum 484f0e6999 More JSR-223 work - added the ability to protect the bindings, plus some minor code formatting changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1299040 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 20:41:18 +00:00
Jacopo Cappellato c8323e7ab5 Enhanced Groovy Event Handler to support the execution of a method (as an event) inside of a groovy source file (script class): the method can be specified in the "invoke" attribute.
Similarly to Groovy services, the Groovy Events Handler sets the base script class containing helper methods; these helper methods have been enhanced in order to be used by groovy method executed as services or events in a transparent way.
 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1298908 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 16:34:18 +00:00
Jacopo Cappellato 9986094080 Updated all the controller entries for Groovy event to consistently use the same way to define the location for the script file. Now the path and filename are always in the "path" attribute and the "invoke" attribute is reserved for the execution of a method in the file (I am going to add support for this feature in my next commit); if the invoke element is not specified then the whole script is executed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1298904 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 16:17:12 +00:00
Jacopo Cappellato da59ea40b4 Enhanced Groovy service engine to inject a (configurable) script base class that provides a basic DSL language to the Groovy services; the DSL is still a work in progress but it is already enough to implement several services in Groovy following a programming style very close to Minilang.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1298461 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 16:36:18 +00:00
Sascha Rodekamp deced8bce4 No Url encoding for get parameters (https://issues.apache.org/jira/browse/OFBIZ-2628) using the URLEncoder to encode and render URLs with special Chars. The encoding is always UTF-8. Fixed Patch without the HTTPS redirect bug.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1298454 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 16:15:25 +00:00
Adrian Crum d9f7ea2cd4 Restore service definition that was unintentionally removed in my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1298269 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 04:40:20 +00:00
Hans Bakker aa355b8fb5 Upgrade tomcat to 7.0.26: solve javax.naming.NameNotFoundException: Resource /WEB-INF/classes not found problem when OFBiz started. A contribution of Chattree
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1298261 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 02:38:40 +00:00
Adrian Crum 2ba7468eff More JSR-223 work - added a bsh engine so that bsh-specific code can be eliminated. Bsh is now invoked using JSR-223.
The engine comes from http://java.net/projects/scripting. I had to modify the code slightly because the BshScriptEngine class implemented Compilable - but the Compilable methods were not implemented. So I removed implements Compilable. I renamed the jar to signify that the code has been modified.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1297478 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 14:06:13 +00:00