Commit Graph
10472 Commits
Author SHA1 Message Date
Erwan de Ferrieres 89f188a776 Upgrading tomcat to version 7.0.25 - changelog @ http://tomcat.apache.org/tomcat-7.0-doc/changelog.html
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1234563 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 18:05:28 +00:00
Erwan de Ferrieres f09f963cb0 Adding missing training statuses, as they are used in forms but not created in base. Adding entity labels related
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1234035 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 17:57:24 +00:00
Jacques Le Roux a79e90da46 Closes OFBIZ-4663 ERROR in log file when starting OFBiz, debug-xa-resources is commented in entityengine.xml
Oops... forgot the other files in previous commit

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1234015 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 17:21:41 +00:00
Jacques Le Roux 9d2a060d23 Closes OFBIZ-4663 ERROR in log file when starting OFBiz, debug-xa-resources is commented in entityengine.xml
About the issue I got. I simply forgot to update my XML catalogs after having changed the OFBiz working copy reference name.

Thanks to Paul Piper for his help about this last point, by pointing about XSD reference.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1234014 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 17:19:47 +00:00
Adrian Crum e22e2923b3 Fixed a bug where code assumed a GenericValue stored in the client session still exists in the database.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1232398 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 12:40:34 +00:00
Erwan de Ferrieres 9b03a5022b Improvements on the EmplLeave entity. Adding entityLabels for the leaveStatus field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1232158 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 20:51:18 +00:00
Sascha Rodekamp 3c573dc4c9 Disable the jackrabbit searchIndex because it won't work with Lucene 3.5 yet.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1232115 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 19:08:03 +00:00
Jacques Le Roux f0dacb7a23 A patch from Christoph Neuroth "Autocomplete / Suggest does not work with umlauts" https://issues.apache.org/jira/browse/OFBIZ-4661
Steps to Reproduce:

    Change the internal_name of a product to "Kochlöffel" (that's German for cooking spoon. Just in case you ever need one while in a German-speaking country and don't have a dictionary handy).
    Go to the catalog and use the product search box to the left to search for "Koch", you should see the product as a suggestion
    Clear the input field and search for "löffel" instead -> the product is not found.

The reason for this is that the special characters have to be url encoded for the GET request, but are never decoded. Easiest way to fix this is just to use a POST request instead.

jleroux: Post uses ISO-8859-1 as default encoding. But as we set a charset=UTF-8 in our header all characters should be handled correly (i18n concern)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1232053 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 16:26:42 +00:00
Erwan de Ferrieres e8c5d98519 Adding missing labels for portalPageName
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1232008 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 14:35:32 +00:00
Sascha Rodekamp 261318aaeb Remove duplicate tika lib and move the version 1.0 jar to jcr/lib
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1231948 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 11:43:50 +00:00
Erwan de Ferrieres 7e204338d9 Adding missing logger for sl4j (no more log in console), -- Failed to load class org.slf4j.impl.StaticLoggerBinder -- and correcting some .classpath missing lines and licences badly referenced
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1231915 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 10:53:59 +00:00
Sascha Rodekamp af727b0238 Fix the trunk after the Jackrabbit integration. Jackrabbit 2.3 doesn't work with lucene 3.5. I added a lucene 3.0.3 version only for the jcr part. I investigate what to do to make jackrabbit work with 3.5
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1231892 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 10:11:29 +00:00
Sascha Rodekamp aee44cea77 Remove obsolete slf4j lib
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1231656 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 12:19:37 +00:00
Sascha Rodekamp 0141c39f55 Reintegrating the Jackrabbit Development branch into the turnk.
The Merge contains the basic integration of jackrabbit into ofbiz and provides a simple API for further development.

Features:
API for easy CRUD operations
Versioning 
Multi Language Support
Object Content Mapping
Sample Implementation in Example Area

See this merge as first step. The development is still in progress but this is the stable starting point for all feature developments.


Detailed description can be found in the Wiki: https://cwiki.apache.org/OFBIZ/jackrabbit-branch-development.html

For any questions, requests, issues use the jira post: https://issues.apache.org/jira/browse/OFBIZ-4659

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1231647 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 10:41:50 +00:00
Adrian Crum 13c5b28a17 Fixed a bug in GenericEntity.java where warnings were logged when the value came from a view entity and it tried to generate a property key for localization.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1231584 13f79535-47bb-0310-9956-ffa450edef68
2012-01-14 20:57:25 +00:00
Adrian Crum 97082c457f Extracted FileUtil.java's OS-dependent file path conversion to a separate method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1231539 13f79535-47bb-0310-9956-ffa450edef68
2012-01-14 17:49:01 +00:00
Erwan de Ferrieres 8c0a41e885 tabs to spaces, no functional changes - xml files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1230481 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 10:51:58 +00:00
Erwan de Ferrieres 0aead2f1ac tabs to spaces, no functional changes - ftl files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1230479 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 10:39:49 +00:00
Erwan de Ferrieres 05c9bae6e5 tabs to spaces, no functional changes - java files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1230478 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 10:37:35 +00:00
Sascha Rodekamp c8d37ad7d5 Example Application Is Badly Broken (https://issues.apache.org/jira/browse/OFBIZ-4619). A Bug reported by Adrian Crum:
Go to https://localhost:8443/example/control/main

Click the New Example button. In the popup window, click Create. You are taken to the Find Example screen and it contains an error message.

Look at the current URL. Try navigating to it: https://localhost:8443/example/control/createExample The Find Example screen is displayed with an error message.

Click your browser's Back button. The popup dialog appears again.

In summary: There is no way to correct an invalid entry.

I added a required flag for the mandatory fields. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1230474 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 10:21:36 +00:00
Erwan de Ferrieres 31a9eaaaa7 tabs to spaces, no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1230445 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 09:09:24 +00:00
Erwan de Ferrieres 337aa79464 OFBIZ-3651 - Minor tweaks to the Cobertura integration - A patch from Bob Morley. I've also changed the cobertura version from 1.9.3 to 1.9.4.1 (latest) as your modifications are allowing it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1230444 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 09:01:06 +00:00
Hans Bakker 380d3638c4 revert 1229478 : test result files are empty
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1229799 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 23:29:24 +00:00
Hans Bakker f207e9cd22 make test-results location configurable in a propoerties file
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1229478 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 07:13:31 +00:00
Adrian Crum 9e24170402 Converted login message in lookup screen to a link to the login page.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1229344 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 20:52:04 +00:00
Adrian Crum bae6b61fe8 Give the login screen a page title.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1229135 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 13:07:23 +00:00
Ashish Vijaywargiya 04ae57b902 Apply bug fix patch from jira issue OFBIZ-4649 - Some parameters missing in xmlFormMacroLibrary.ftl macros.
Description:
Getting errors on clicking "Export" tab. Steps to regenerate the issue.

1. Go to Facility component.
2. Go to inventory tab. 
3. After that go to "Export" tab, there is an error:

Macro renderFormOpen has no such argument: viewSize
The problematic instruction:
----------
==> macro renderFormOpen [on line 64, column 1 in component://widget/templates/xmlFormMacroLibrary.ftl]
in user-directive renderFormOpen

For reference- please have a look on below given link-

https://demo-trunk.ofbiz.apache.org:8443/facility/control/ViewFacilityInventoryByProduct?facilityId=WebStoreWarehouse

I have done searching and found that there are parameters missing in some xmlFormMacroLibrary.ftl macros for both trunk and release branch 11.04.
Thanks Amardeep for the contribution!!!


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1229090 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 10:47:33 +00:00
Erwan de Ferrieres 09529c62a4 OFBIZ-4648 - Better french translations - A patch from Youssef Khaye
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1228649 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 16:23:54 +00:00
Adrian Crum 6067eec6ef FreeMarkerWorker JavaDocs - no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1228592 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 10:26:52 +00:00
Jacques Le Roux 80b29253bf A patch from Deepak Dixit "Autocompleter fails if lookup fieldFormName contains (?)" https://issues.apache.org/jira/browse/OFBIZ-4646
For regenerating issue go to https://demo-trunk.ofbiz.apache.org/facility/control/ReceiveInventory?facilityId=WebStoreWarehouse , enter GZ-1005 and receive.
Now on receive inventory page search "Facility Location" via autocompleter then it will show the lookup screen instead of search result.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1227965 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 05:47:27 +00:00
Erwan de Ferrieres c011b5e9cd OFBIZ-4614 - property auto-field-map in services in actions in forms, not working as describe in xsd description, name of map is not used - A patch from Olivier Heintz
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1227365 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 22:34:47 +00:00
Erwan de Ferrieres b41313ca26 OFBIZ-4641 - in Form.xml, special characters are not manage correctly in description if text-size is used in drop-down - a patch from Olivier Heintz
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1227340 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 21:46:53 +00:00
Erwan de Ferrieres c919f07e52 OFBIZ-4643 - Add description for Component, only complete existing functionality - a patch from Olivier Heintz
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1226954 13f79535-47bb-0310-9956-ffa450edef68
2012-01-03 21:28:24 +00:00
Jacques Le Roux f02692f632 A patch from Philippe Mouawad "Set TransactionUtil#debugResources default value to false and make it configurable" https://issues.apache.org/jira/browse/OFBIZ-4293
debugResources is true which creates a DebugXAResource (that creates an Exception) , it should be false and made an option for debuging

jleroux: see comments in Jira 4282 for more

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1226234 13f79535-47bb-0310-9956-ffa450edef68
2012-01-01 11:27:10 +00:00
Jacques Le Roux e5566e66cd A patch from Philippe Mouawad "Remove Synchronized in internalBegin" https://issues.apache.org/jira/browse/OFBIZ-4292
InternalBegin is uselessly synchronized , since it is a static method it is a very big useless Contention Point since not unthread safe instance variable is used

jleroux: see comments in Jira 4282 for more

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1226231 13f79535-47bb-0310-9956-ffa450edef68
2012-01-01 10:50:27 +00:00
Jacques Le Roux ae3205204e A patch from Martin Kreidenweis "Deserialization of arrays with UtilObject.getObject() throws ClassNotFoundException" https://issues.apache.org/jira/browse/OFBIZ-4295
Deserialization of arrays with UtilObject.getObject() throws a ClassNotFoundException. This happened to us when we enabled the distributed cache clear feature and it was sending arrays of EntityExpr objects to other OFBiz instances.

The reason is, that the org.ofbiz.base.util.ObjectInputStream calls classLoader.loadClass(name) directly instead of using Class.forName(name, init, classLoader).
According to java bug http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6446627 ClassLoader.loadClass() is not intended to being used this way and doesn't support loading arrays.

jleroux: Sun/Oracle is pretty clear about that <<[When you want to reflectively load a class by name initiated using a specific class loader, you should not invoke that loader's public loadClass method directly-- instead, you should always use the static three-argument Class.forName method.  The ClassLoader.loadClass instance method is more intended for delegation from one class loader to another within a class loading operation (although this is a common confusion and not well described in the documentation).  In other words, replace L.loadClass(N) with Class.forName(N,false,L).  The Class.forName invocation may eventually end up invoking loadClass on the specified loader, but only after taking care of some other aspects of the VM's standard symbolic class name resolution process-- the significant bit in this case being the support for loading/creation of array classes.]>> More at the link above


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1226223 13f79535-47bb-0310-9956-ffa450edef68
2012-01-01 09:57:50 +00:00
Jacques Le Roux db4b30ba20 A small comment to better understand the reason of the trick
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1226072 13f79535-47bb-0310-9956-ffa450edef68
2011-12-31 11:42:49 +00:00
Jacques Le Roux 7f9eaa2793 This completes "Null values are not synchronized in http mode" https://issues.apache.org/jira/browse/OFBIZ-4602
And I better understand Patrick's answer to the issue now...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1226065 13f79535-47bb-0310-9956-ffa450edef68
2011-12-31 11:37:23 +00:00
Jacques Le Roux 7ee4d9c8ec Should close "Null values are not synchronized in http mode" https://issues.apache.org/jira/browse/OFBIZ-4602
I followed Adrian's advice. I tried to create an order with a dropship1 item (like in Jira 4637) and it worked perfectly. I guess, as we were suspecting, using 
  set(name, "");
instead of
  element.setAttribute(name, "null");
had side effects. 

Anyway, as Adrian pointed out, the right returned string should be "[null-field]" and it's now correct/consistent. On the other side (entity sync clients), of course, now "[null-field]" should be handled instead of "" or "null"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1226055 13f79535-47bb-0310-9956-ffa450edef68
2011-12-31 10:13:34 +00:00
Hans Bakker d9414ad2b3 if an override view is specified in a url and it does not exist, it will not generate a 404 return code but will display an error. this change will do this. example url: http://localhost:8080/ecommerce/control/main/aaa
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1225746 13f79535-47bb-0310-9956-ffa450edef68
2011-12-30 03:22:36 +00:00
Erwan de Ferrieres 69d9ecc741 Removing DojoJSONServiceEventHandler.java as dojo is no more used in OFBiz
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1225597 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 17:26:29 +00:00
Jacques Le Roux 96bf9e337e This reverts r1222241 and should fix "Can not create drop shipment order" https://issues.apache.org/jira/browse/OFBIZ-4637 reported by Sergei Biletnikov and confirmed by mz4wheeler
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1225506 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 12:28:54 +00:00
Adrian Crum aa63974531 Moved some of the temporal expression data from demo to seed - so components can reference temporal expressions in their seed data.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1225330 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 20:51:26 +00:00
Erwan de Ferrieres b2f285eb47 Upgrading tomcat to version 7.0.23 - changelog @ http://tomcat.apache.org/tomcat-7.0-doc/changelog.html
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1225271 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 18:44:59 +00:00
Erwan de Ferrieres afa8f33046 Removing JSON handlers as they are deprecated since December 2009. More info @ http://s.apache.org/6zF
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1225242 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 17:32:16 +00:00
Adrian Crum 7d71b0b4b6 Fixup for my previous commit. Browsers should not parse the contents of CDATA elements, but apparently they do.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1225224 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 16:39:56 +00:00
Adrian Crum 19cc573a09 Bug fix for lookup screens - jQuery was loaded twice, which resulted in quirky behavior in the lookup screens.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1224914 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 14:31:17 +00:00
Hans Bakker 8e40b2e30d missing quote
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1222587 13f79535-47bb-0310-9956-ffa450edef68
2011-12-23 07:03:08 +00:00
Hans Bakker 00c84e8470 new ant allows failonerror parameter
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1222573 13f79535-47bb-0310-9956-ffa450edef68
2011-12-23 05:41:00 +00:00
Hans Bakker fb504ca2d4 upgrade ant to rev 1.8
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1222547 13f79535-47bb-0310-9956-ffa450edef68
2011-12-23 04:08:15 +00:00