David E. Jones
40fdb4076d
Fixed issue with serialization exceptions on shutdown and startup: the RequestHandler class no longer implements serializable, it was never serializable anyway because it has member fields of types ServletContext, ViewFactory, and EventFactory which are not serializable; I tried making those transient or removing them to load dynamically after a bunch of changes realized that it doesn't make sense to serialize this class anyway, it contains no useful data that a user would care about, and all of its information comes from configuration files that we would want to reload on a restart or in another system or whatever
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750572 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 20:09:53 +00:00
Adam Heath
44d8af6de0
Bad suite-name.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750339 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 06:44:49 +00:00
Jacques Le Roux
fe6219376d
Just keep the comment, in case someone one day wants to implement the counter idea
...
This closes "ServerHit aborts transactions when trying to create entries with duplicate startTime(s)." https://issues.apache.org/jira/browse/OFBIZ-2208 OFBIZ-2208
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750068 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 16:39:17 +00:00
Jacques Le Roux
cb74438cd4
Refactoring of ImageTransform, mostly
...
* Split into 2 classes one in framework/common : ImageTransform, one remains in product : ScaleImage.java
* Moved some labels used by ImageTransformCreated from ProductErrorUiLabels.xml in new CommonErrorUiLabels.xml
* Moved Jdom from webapp/lib to base/lib, updated .classpath
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750018 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 14:22:55 +00:00
David E. Jones
7a247f7135
Some improvements to the last view and view save code to handle request attributes and more parameters, safe since they are never going int he URL or anything; this resolves the issues I was running into before with this, and hopefully with no side effects other than a few CPU cycles here and there; made sure that the stuff is serializable before putting into the session
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@749970 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 11:49:27 +00:00
David E. Jones
f876f9a0c1
Simple implementation of feature discussed on the mailing list to facilitate getting back to a view after some generic action, like schanging the locale which this commit has use the new feature as a test case; I'm not sure I like this approach, will send message to dev list about it
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@749959 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 10:27:52 +00:00
Hans Bakker
2c183a034f
it looks like the requesthandler does deal with the default request which is required for the ofbiz cms ????DAVID????? can you please have a look if this change i made is correct?
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748455 13f79535-47bb-0310-9956-ffa450edef68
2009-02-27 09:21:37 +00:00
Jacques Le Roux
d8fceeeb82
Typo found by chance
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@747517 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 19:26:10 +00:00
Jacques Le Roux
df5dbc4cc9
A bit of refactoring + update of Jdom
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@747085 13f79535-47bb-0310-9956-ffa450edef68
2009-02-23 17:06:57 +00:00
Hans Bakker
6a4d119dff
upgrade fop 0.94 -> 0.95
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746645 13f79535-47bb-0310-9956-ffa450edef68
2009-02-22 07:59:30 +00:00
David E. Jones
ee8708e9b2
No functional changes, just type/generics cleanups
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746303 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 17:41:48 +00:00
David E. Jones
f27b4eeaaa
No functional changes, just reorganizing code: moved email services from content to the framework/common component except the CommunicationEvent related ones which are now in the party component along with other CommunicationEvent resources; changed framework components so that webapp no longer depends on common and common is higher level than the various tool components which was an odd dependency before; one new thing is in here and that is an entity called EmailTemplateSetting which is meant to be a generic version of the ProductStoreEmailSetting entity so we can have configurable email templates without depending on ProductStore, still need to write the service to send email from this (sendMailFromTemplateSetting)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744727 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 19:34:49 +00:00
David E. Jones
11bc29b4a6
Changed these back to have LoginWorker.makeLoginUrl return a StringWrapper so it doesn't get encoded, and the @ofbizUrl and @ofbizContentUrl tags back to not decode because it is important that various encoded parameters remain encoded so the browser does not interpret the characters as part of the URL
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744573 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 21:50:43 +00:00
David E. Jones
1a5c2de3c5
Changed LoginWorker.makeLoginUrl back to returning a String and implemented a more general solution for the @ofbizUrl and @ofbizContentUrl tags so that they do decoding and are now tolerant of encoded URLs just in case it happens; this should be a more general fix and avoid the problem more; also a few cleanups like resolving warnings
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744418 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 08:17:05 +00:00
David E. Jones
f8351887b9
Changed LoginWorker.makeLoginUrl to return a StringWrapper so it does not get html encoded in FTL; decided to do it here instead of in each FTL file because based on a search it appears that this is ONLY used in FTL files
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744232 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 20:35:04 +00:00
David E. Jones
29d2f40e84
Fixed issue reported by Hans Bakker which shows up in the strange situation for the content/views/Xxx URLs because they chain to a request with no event, and that was causing the overrideViewUrl to not get set to be picked up later when it is time to render the view; that is now fixed and the WebSite -> CMS tab is working again in the Content Manager
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744020 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 07:38:18 +00:00
David E. Jones
6c7938c134
Small change to suppress warning
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743984 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 04:50:55 +00:00
David E. Jones
26ad14469a
Fixed bug when there is not security element, certain values were not getting initialized; also fixed bug caused when default-request is not specified
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743822 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 18:15:35 +00:00
Hans Bakker
12ae876822
primarykey definition on the wrong place
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743637 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 07:20:01 +00:00
David E. Jones
b8707a26f8
Applied patch from Bruno Busco in Jira #OFBIZ-2172 with basics for VisualThemeSet; still not possible to change themes in ecommerce (should probably be supported on the back end instead of the front end, ie in the catalog manager and not by a customer in ecommerce, or perhaps only allowed in ecommerce if a flag on the ProductStore says its okay; also does not yet filter selectable themes in the back-end/manager applications
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743202 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 03:19:19 +00:00
David E. Jones
276dbd183b
Fixed changes from rev 742983 that caused a double question mark (?) for request-redirect responses with redirect-parameter sub-elements by changing the code for the case without redirect-parameter sub-elements to have a question mark, which was missing
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742991 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 15:16:00 +00:00
Jacques Le Roux
02d30e60fe
A patch from Arun Patidar "Fixed the bug when response type is 'request-redirect' and query string is available." ( https://issues.apache.org/jira/browse/OFBIZ-2179 ) - OFBIZ-2179
...
Not sure it's the best fix as maybe it fixes only the effect and not the cause, but at least for now it works!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742983 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 14:36:21 +00:00
David E. Jones
c62ba66bf2
Fixed issue where controller.xml was not reloading based on cache clear or timeout
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742035 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 09:47:46 +00:00
Jacopo Cappellato
153ec0eba1
Misc enhancements to the update password screen and events: improved layout, error handling.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742015 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 08:14:58 +00:00
David E. Jones
ebd5c3e78f
Implemented StringModel extension and BeansWrapper extension to load it in order to encode strings for HTML use; this is only done throught the HtmlWidget class that is part of the screen widget, so won't interfere with other FTL uses; note that there is other experimental code in here for wrapping the GenericValue object for html encoding, but that option wasn't very complete so went this way instead; this option behaves better and is more transparent than that escape x as x?html option for FTL files; there are also a few cleanups of typos and things in here; note that this means we have a different Configuration object and so a different template cache, and so we have different cache settings and such; after applying this I found a few places that encoded things they shouldn't but for the most part it is pretty good; will be committing some changes in applications in a bit to resolve a couple of these issues in ecommerce; all should watch out for funny things showing up as HTML text instead of being interpreted by the browser as HTML, meaning it was encoded; in extreme cases just comment out lines 71-73 of HtmlWidget.java to turn off this encoding
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742013 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 07:40:40 +00:00
Scott Gray
078a08692b
Fix NPE reported by Sneha Chaturvedi on the user mailing list
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741974 13f79535-47bb-0310-9956-ffa450edef68
2009-02-07 22:18:04 +00:00
David E. Jones
375c48a1c5
Changed for new runEvent method signature, fixes compiler error
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741846 13f79535-47bb-0310-9956-ffa450edef68
2009-02-07 06:33:05 +00:00
David E. Jones
afb434f132
More log message refinements for more info, but less message and noise
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741742 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 21:37:42 +00:00
David E. Jones
e0555f78d5
Fixed bug in new RequestHandler related to view override in the URL for a request with no event; addresses issue with entityref reported by Hans
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741494 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 09:37:41 +00:00
David E. Jones
57dcf34bcd
Some refactoring of canonicalize feature, also change ServiceEventHandler to use UtilHttp stuff for parameters so this and other things take effect there
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741478 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 09:05:50 +00:00
David E. Jones
4d9382e887
Cleanup and pretty-up a bunch of log statements; moved some less helpful ones to verbose, combined some, and generally tried to make logs in various places more user friendly
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741424 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 06:04:58 +00:00
David E. Jones
afe3dc9c81
A few related changes:
...
Big refactor of ControlServlet, RequestManager, RequestHandler, and ConfigXMLReader so that simple objects are used instead of Maps within Maps within Maps for the data from the controller.xml file, which results in eliminating hundreds of lines of code including the entire RequestHandler class. I have tested this a lot with different apps that use the ControlServlet differently, but this is a very big change so there could still be issues. Based on this cleanup future issues and new features should be easier and less error prone, and that is why doing it now in order to help with a number of other improvements and bug fixes that are part of this commit.
Also added redirect-parameter element to go under the request-map -> response element which allows you to specify which parameters will be passed on in a redirect instead of using all of them. Also improved default there and in various places to only include parameters from the URL to avoid issues with form data, but if the ID to display (like following a crAlso added redirect-parameter element to go under the request-map -> response element which allows you to specify which parameters will be passed on in a redirect instead of using all of them. Also improved default there and in various places to only include parameters from the URL to avoid issues with form data, but if the ID to display (like following a crAlso added redirect-parameter element to go under the request-map -> response element which allows you to specify which parameters will be passed on in a redirect instead of using all of them. Also improved default there and in various places to only include parameters from the URL to avoid issues wd in and also going to the same page after login from auth=true or from clicking on the login link.
Related to cleaning up login URLs also changed how the request and parameters passed to a request before a login are saved and used after a login is successful so that it URL parameters go on the URL in a redirect to the original request to make it more transparent, and non-URL parameters just stay in the session and are used when the original request is run again to avoid putting sensitive information like passwords and big information like textarea data in the URL, which has been a problem before.
To see what some of these things combined can do try going to the example app, login, click on the New Example link, then logout in another tab or window, then go back to the New Example page and enter a name and a whole bunch of text in the long description then click Create, the system will show you the login page so enter username/password, and then after login you'll see a nice URL to EditExample with the correct exampleId parameter and all of the data entered before login successfully saved and never appearing in a URL.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741374 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 02:14:19 +00:00
David E. Jones
4bd8c4399b
Added XSD catalog file for webapp component, like exists in other components
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@740697 13f79535-47bb-0310-9956-ffa450edef68
2009-02-04 11:10:46 +00:00
Jacopo Cappellato
f46ea50361
Fixed wrong pref group type id.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@740249 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 09:07:00 +00:00
Jacopo Cappellato
e1b1c85e1e
Added two new methods to the ViewHandler interface: getter/setter methods for the "name" field, used to store the name of the view handler as set in the controller.xml file.
...
No functional change, but this mode is required by the upcoming new screen renderer based on Freemarker macros.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739792 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 17:12:19 +00:00
Scott Gray
c152c76dd6
Fix for issue OFBIZ-2142 reported by Hans Bakker: " error message of login service does not show with common/messages.ftl
...
"
The labels had been moved to a different resource file
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739651 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 23:15:01 +00:00
Jacques Le Roux
572b7683e0
All tabs to 4 spaces in *.groovy, *.java, *.xml : less problems in future with that aspect...
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737003 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 11:08:47 +00:00
Jacques Le Roux
40f1371b56
A patch from Guy Gershoni "Allow use of HttpServletRequest.getRemoteUser() for 3rd party authentication" '( https://issues.apache.org/jira/browse/OFBIZ-1906 ) - OFBIZ-1906
...
I did not test the CAS case, but reviewed the code and tested in std mode (not using CAS) and it's OK
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@736660 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 14:52:24 +00:00
Jacques Le Roux
b680c6cd4a
Some French labels fixes
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735829 13f79535-47bb-0310-9956-ffa450edef68
2009-01-19 21:25:25 +00:00
Jacques Le Roux
9c5e043c53
Cleanup_labels35.patch from Marco Risaliti 'Clean up labels" ( https://issues.apache.org/jira/browse/OFBIZ-1780 ) - OFBIZ-1780
...
This close this issue.
There are some labels related to geoLocation in this commit, I will commit the geoLocation work as is since I will not have much time this next weeks to work on it. Anyway it's already sufficient as a basis for other parts.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735402 13f79535-47bb-0310-9956-ffa450edef68
2009-01-18 09:06:03 +00:00
Alfred Maxwell Byers
d72e39a4dd
OK, so I can't do a simple commit without botching it - left some comment where it did not need to be.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735234 13f79535-47bb-0310-9956-ffa450edef68
2009-01-17 06:30:02 +00:00
Alfred Maxwell Byers
40a8915053
Updating JSON lib and changing the three places that "fromMap" was used.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735187 13f79535-47bb-0310-9956-ffa450edef68
2009-01-17 00:25:21 +00:00
Alfred Maxwell Byers
8d8d8085be
This is a noop test case to see if I still have commit privileges. Sorry for the junk, but it has been a couple of years.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735125 13f79535-47bb-0310-9956-ffa450edef68
2009-01-16 20:54:05 +00:00
Andrew Zeneski
97eb91bc74
added code to make a few properties configurable per instance (webapp) new context-param configurations available:
...
xmlrpc.enabledForExtensions (true|false)
xmlrpc.enabledForExceptions (true|false)
if the context-param does not exist, defaults will be used
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735066 13f79535-47bb-0310-9956-ffa450edef68
2009-01-16 17:56:24 +00:00
David E. Jones
dced19567a
Moved product store specific field from framework/webapp component to product component
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@734897 13f79535-47bb-0310-9956-ffa450edef68
2009-01-16 02:57:19 +00:00
David E. Jones
874f02e9da
Manual merge of typecheckcleanup200810 branch as of rev 731346 in that branch, resolved all conflicts; with this BigDecimal is not the native type for many entity fields and is used for many calculations; some work is still needed in certain areas of the project but this covers the most critical ones; thanks especially to Scott for his work on this
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731851 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 07:13:36 +00:00
Andrew Zeneski
70f3896222
implemented per-site "protect" settings. Instead of only per request or per instance (setting in security.properties), now we support per application with a new <protect view="name_of_view"/> element in controller.xml. If the "protect" response is not found, first it will check for a applicaiton default before falling back to per instance.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731660 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 19:46:16 +00:00
Andrew Zeneski
2e2a719ae5
when using :_protect_: only set the error message if one exists
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731642 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 18:21:48 +00:00
Andrew Zeneski
df892b3d5f
fixed class javadoc
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731633 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 17:47:01 +00:00
Jacques Le Roux
233b969df0
cleanup_labels29.patch from Marco Risaliti 'Clean up labels" ( https://issues.apache.org/jira/browse/OFBIZ-1780 ) - OFBIZ-1780
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731602 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 15:41:39 +00:00