Commit Graph
50 Commits
Author SHA1 Message Date
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Adam Heath fca9bd08e9 Fix lines that *only* have whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759230 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:56:08 +00:00
Adam Heath 1d0b236799 Fix purely empty whitespace lines, and remove trailing whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757067 13f79535-47bb-0310-9956-ffa450edef68
2009-03-21 23:22:57 +00:00
Jacques Le Roux f796e230d2 catch( => catch(
}else => } else

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751005 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:55:43 +00:00
Scott Gray 52271c33d5 Applied patch from OFBIZ-2060 by Harmeet Bedi
Import ambiguity in CrossSubdomainSessionValve.java


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737408 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 18:09:41 +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
Adam Heath 7cecc5aaf2 Annotations are not the same thing as javadocs.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@709638 13f79535-47bb-0310-9956-ffa450edef68
2008-11-01 03:42:09 +00:00
Scott Gray 3261efb9b0 Forgot to remove some code that wasn't needed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@704679 13f79535-47bb-0310-9956-ffa450edef68
2008-10-14 20:51:12 +00:00
Scott Gray 6380d64dfd Changed the cross domain session valve to skip rewriting the session cookie if the domain is an IP address
Thanks to Adrian Crum for reporting the issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@704678 13f79535-47bb-0310-9956-ffa450edef68
2008-10-14 20:48:32 +00:00
Scott Gray 82e9c5243f Fix for problem that the new cross domain session cookie valve was having with localhost domains.
Thanks to Mridul Pathak for the patch and Andrew Zeneski for his advice

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@703784 13f79535-47bb-0310-9956-ffa450edef68
2008-10-12 10:56:41 +00:00
Scott Gray 1a24259b66 OFBIZ-1980: CrossSubdomainSessionValve for Tomcat, allows a session cookie to be shared across multiple subdomains.
Thanks to Mridul Pathak for the patch, Pranay Pandey and Chirag Manocha for testing and Andrew Zeneski for guidance and review.

Note: I made one small change, switched from logInfo to logVerbose to reduce the amount of noise created in the logs

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@701564 13f79535-47bb-0310-9956-ffa450edef68
2008-10-03 23:08:36 +00:00
Jacques Le Roux e7905f2c8c Fix the anti-pattern
if (* != null && *.size() > 0) { 
where * is a variable name (String or Collection). Rewritten to
    if (UtilValidate.isNotEmpty(*)) {

Done with Eclipse regex replace feature with
search = if \((\w+) *!= *null *&& *(\w+)\.size\(\) *> *0\) *\{
replace = if (UtilValidate.isNotEmpty($1)) {

And of course some hand-work for imports and cleaning. I compiled and tested with ant run-tests

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686591 13f79535-47bb-0310-9956-ffa450edef68
2008-08-17 07:47:18 +00:00
Adam Heath e410552cc9 No longer *copy* the extra support files into the classes dir;
instead, just add them straight to the final jar.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@685934 13f79535-47bb-0310-9956-ffa450edef68
2008-08-14 15:08:14 +00:00
Adam Heath b6a1ae5e5e Another minor optimization; no longer need to specify classpathref in
all the build.xml files.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@681935 13f79535-47bb-0310-9956-ffa450edef68
2008-08-02 03:41:46 +00:00
Jacques Le Roux 641ff10050 Update Copyright to 2008
A real replace in files feature was one of the reasons I use Eclipse 3.4 for near a year now (I even helped to test, a real must have :o)
Not sure previous commit was sent partially or not at all (I needed to update)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@677685 13f79535-47bb-0310-9956-ffa450edef68
2008-07-17 18:56:25 +00:00
Jacopo Cappellato 930970efd3 Upgraded (again) to Tomcat 6.0.16.
Upgraded commons-dbcp to the HEAD revision (from snapshot taken in 20071125): the upgrade of the dbcp jar seems to have fixed all the issues we were having with "OutOfMemoryError: Java heap space" exceptions.
Sorry for the noise (two big commits in the base and catalina components in the same day): hopefully this rather critical issue is now resolved (but I will continue my load tests).


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@674776 13f79535-47bb-0310-9956-ffa450edef68
2008-07-08 11:47:02 +00:00
Jacopo Cappellato 3fd79154a9 As a temp fix for issues with "OutOfMemoryError: Java heap space" errors reported after the upgrade of Tomcat, I'm downgrading from Tomcat 6.0.16 to Tomcat 5.5.23.
As soon as the issues is fixed we will commit back the code; this effort is tracked in OFBIZ-1863

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@674732 13f79535-47bb-0310-9956-ffa450edef68
2008-07-08 06:44:12 +00:00
David E. Jones 204d775174 More entitygroups gone, all of framework
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@672910 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 20:49:10 +00:00
Adam Heath 18391f98a9 The build.xml files are now much smaller and simpler; they reuse a
few global definitions.  1585 lines removed.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@672657 13f79535-47bb-0310-9956-ffa450edef68
2008-06-29 18:39:36 +00:00
Jacopo Cappellato dbd34520d7 Cleaned up a bunch of warning messages for deprecated methods; in preparation for the framework release.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@671223 13f79535-47bb-0310-9956-ffa450edef68
2008-06-24 15:47:28 +00:00
Jacques Le Roux 10676abb06 A patch from Michael Brohl "Configure cookie use for a module through the ofbiz-component.xml" (https://issues.apache.org/jira/browse/OFBIZ-1831) - OFBIZ-1831
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@670268 13f79535-47bb-0310-9956-ffa450edef68
2008-06-21 23:02:59 +00:00
Jacopo Cappellato cfd0f1c0c8 Upgrade to Tomcat 6
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@659490 13f79535-47bb-0310-9956-ffa450edef68
2008-05-23 10:26:46 +00:00
Scott Gray 153653615b Removed the rest of the calls to deprecated GenericDelegator methods, except for the findListIteratorByCondition which takes a DynamicViewEntity as a parameter not sure what to do about that one.
There's still all the bsh files to check though.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@655235 13f79535-47bb-0310-9956-ffa450edef68
2008-05-11 03:29:04 +00:00
David E. Jones 329631a4b5 A whole bunch of cleanups to use newer and more consolidated delegator find methods; still lots of deprecation warnings, bots of deprecation warnings but this is a first pass, and things still run as before
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@653029 13f79535-47bb-0310-9956-ffa450edef68
2008-05-03 09:40:51 +00:00
Adam Heath d73602df56 Add -Xlint:unchecked to several javac calls; they are all clean, so
no warnings are produced.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@585858 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 04:19:48 +00:00
Adam Heath e780c1da5b Java 1.5 markup for framework/catalina.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@585848 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 04:04:05 +00:00
Adam Heath 2ff7a8a575 Make use of the single-arg variants of makePK/makeValue, removeAll,
and clearCacheLine


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@585803 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 02:46:57 +00:00
Adam Heath 686210a51b Fix loc incrementing in OfbizStore.keys().
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@585786 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 02:15:59 +00:00
Andrew Zeneski c239535138 changed log level to stop annoying error when running test cases
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@576678 13f79535-47bb-0310-9956-ffa450edef68
2007-09-18 03:53:12 +00:00
David E. Jones 07b48643c5 As noted needing to be done by Jacques Le Roux did a search/replace on source=1.4 and changed to 1.5
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@541997 13f79535-47bb-0310-9956-ffa450edef68
2007-05-27 15:55:18 +00:00
David E. Jones 7d70c41c12 Did a big search/replace to change all xsd file refs from www.ofbiz.org to ofbiz.apache.org
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@539504 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 15:47:14 +00:00
Andrew Zeneski cf8a96276d now disabling the app-bar display when an app is not load due to the fact an app w/ the same mount has already been loaded
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@537920 13f79535-47bb-0310-9956-ffa450edef68
2007-05-14 17:13:35 +00:00
Andrew Zeneski bf62e5f4d1 updated catalina container to load webapps in reverse order from how they are defined, also it only attempts to load a webapp once. Apps which "override" the stock apps will now have priority.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@537918 13f79535-47bb-0310-9956-ffa450edef68
2007-05-14 17:09:04 +00:00
Andrew Zeneski c5700ea665 fixed bad conditions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@536687 13f79535-47bb-0310-9956-ffa450edef68
2007-05-09 22:12:10 +00:00
Andrew Zeneski a7bb5a0b5c updated tomcat to 5.5.23
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@536686 13f79535-47bb-0310-9956-ffa450edef68
2007-05-09 22:11:50 +00:00
Andrew Zeneski f24adea3c9 added log message when error
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@532040 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 18:51:36 +00:00
Andrew Zeneski 7cbcc85cbd refactored x509 implementations; now it will use the certificate to determine the userlogin; tomcat changed to ignore cert files (just pass through) so all checking can be handled by ofbiz; login worker updated to use new method of cert checking; added isser entity to configure what issuers are allowed to sign login certs (the certificate must also be included in a trust store) new component based trust/cert stores configured in ofbiz-component.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@531272 13f79535-47bb-0310-9956-ffa450edef68
2007-04-22 20:56:58 +00:00
Andrew Zeneski 4ddc4d770a now adds the component name to the servlet context
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@531230 13f79535-47bb-0310-9956-ffa450edef68
2007-04-22 16:58:17 +00:00
Andrew Zeneski e12a9fb5c8 now loads the JSSE settings before starting catalina; this way tomcat uses our truststore instead of the default java truststore
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@529429 13f79535-47bb-0310-9956-ffa450edef68
2007-04-16 22:49:57 +00:00
David E. Jones 75e03b6d97 Changed CatalinaContainer and added configuration settings for the cataling runtime directory, which is now under the ofbiz/runtime directory and that is where the work directory and such will go
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@523002 13f79535-47bb-0310-9956-ffa450edef68
2007-03-27 17:16:35 +00:00
Andrew Zeneski 6bfc2359c6 applied fix to multicast problem reported by Sterling Okura
https://issues.apache.org/jira/browse/OFBIZ-738


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509393 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 00:31:42 +00:00
Jacques Le Roux dad67935f7 A (large) patch from Scott Gray "Update ASL header" (https://issues.apache.org/jira/browse/OFBIZ-637).
I put also some svn:ignore for shark build and lib diretories and assetmaint/build 

I did some by hand lately, too much to remember. They were files with old header but without copyright. A 1st attempt I suppose, will have to check this after this commit.

I add some problems to commit this patch in one piece because it's so huge (specially with Eclipse I had to turn to Tortoise) !

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@499486 13f79535-47bb-0310-9956-ffa450edef68
2007-01-24 17:15:54 +00:00
Jacques Le Roux a5632fa086 This is hte change of ASL2 headers in java files only.
Seems correct (35827 lines to review ;o).
I just wonder if we should keep the copyright comment in Classpath.java (about MortBay)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@496982 13f79535-47bb-0310-9956-ffa450edef68
2007-01-17 10:22:33 +00:00
David E. Jones b83e151ce6 Added valve to support incoming HTTP requests from an SSL Accelerator that are not HTTPS/SSL requests, but that should be treated by the server as secure
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@488748 13f79535-47bb-0310-9956-ffa450edef68
2006-12-19 18:08:59 +00:00
David E. Jones fc96cf5ab7 Changed all build files to add NOTICE and LICENSE files to the META-INF directory in each jar file that is created in OFBiz
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@472422 13f79535-47bb-0310-9956-ffa450edef68
2006-11-08 08:23:23 +00:00
David E. Jones a895536c39 Updated Tomcat/Catalina to version 5.5.20
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@463657 13f79535-47bb-0310-9956-ffa450edef68
2006-10-13 12:00:01 +00:00
Jacopo Cappellato 3b27a14912 Removed author information from all the files of the "catalina" component: keeping this information in source files is discouraged by the ASF (clearer information about the contributors of a file can be derived from the commit logs).
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@454160 13f79535-47bb-0310-9956-ffa450edef68
2006-10-08 15:31:07 +00:00
David E. Jones d3f94c5aef Replaced all old references to [Copyright * The Open For Business Project] which should take care of all of the legal loose ends
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@446798 13f79535-47bb-0310-9956-ffa450edef68
2006-09-16 00:35:48 +00:00
Jacopo Cappellato 87b52b4c6a License change from MIT to ASL2.0 for the files of the catalina component.
Thanks to Scott Gray for the patch (Apache OFBIZ-87).


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@423871 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 10:27:31 +00:00
David E. Jones 94fe6d1cda Initial OFBiz import from revision 7923 of the old svn.ofbiz.org SVN repository.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@418498 13f79535-47bb-0310-9956-ffa450edef68
2006-07-01 19:05:20 +00:00