Commit Graph
33 Commits
Author SHA1 Message Date
Jacques Le Roux cd94e1167c Documented: Document how the thread-pool max-threads works
(OFBIZ-10002)

Minimalist documentation with reference to stackoverflow itself referencing
Brian Goetz's and co's "Java Concurrency in Practice" after discussion at 
http://markmail.org/message/ksutqpuyyd4kmbl2


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817040 13f79535-47bb-0310-9956-ffa450edef68
2017-12-03 16:16:24 +00:00
Jacopo Cappellato a9835e4825 Improved: Removal of support for the Bean Scripting Framework (BSF).
(OFBIZ-8224)

This commit removes the support for the Bean Scripting Framework (BSF) from the OFBiz framework:
no application code was using this since several years and there are better and more modern tools at the present time.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760384 13f79535-47bb-0310-9956-ffa450edef68
2016-09-12 14:53:47 +00:00
Deepak Dixit 834691742b (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@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Jacopo Cappellato 539084a511 OFBIZ-7763 Removed a series of artifacts dependent on the old Beanshell jar that is going to be removed from the project; specifically:
* removed the code that implemented the deprecated "call-bsh" operation in Minilang
* removed the BeanShellContainer (it has been disabled a long time ago)
* removed the BeanShell service engine, no more used


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751947 13f79535-47bb-0310-9956-ffa450edef68
2016-07-08 17:53:59 +00:00
Jacques Le Roux e7cdb8a30d Implements "Use only HTTPS in OFBiz" - https://issues.apache.org/jira/browse/OFBIZ-6849
All tests passes and the normal use of OFBiz seems to work

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1745525 13f79535-47bb-0310-9956-ffa450edef68
2016-05-25 18:02:23 +00:00
Jacques Le Roux 6d5dd1c5ba Things got totally wrong with r1742196 which contained much more than expected.
This reverts things which should not have been committed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742197 13f79535-47bb-0310-9956-ffa450edef68
2016-05-03 21:03:11 +00:00
Jacques Le Roux 31ef1f9186 "Continue the work on the form widget grid element" - https://issues.apache.org/jira/browse/OFBIZ-7029
Completes in screens the changes done in forms at r1741873. I then replaced few form lists by grids, where it was possible to do it with regexp.
Also complete StatsForms.xml to use only grids and "searchList" form in ecommerce ContentForms to NOT use grid (not called in screen)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742196 13f79535-47bb-0310-9956-ffa450edef68
2016-05-03 20:50:10 +00:00
Jacopo Cappellato 66daa32f1a Cleaned up and inproved the code that integrates Groovy in the OFBiz framework:
* Groovy services and Groovy events now use the same util methods from GroovyUtil to parse/execute the scripts
* the script base class is now specified in the base/config/groovy.parameter file rather than in the serviceengine.xml
* the same util methods (DSL) are now available to all Groovy scripts (executed as services, events or widget actions)
* removed a series of unused methods in the GroovyUtil class



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1636346 13f79535-47bb-0310-9956-ffa450edef68
2014-11-03 13:15:29 +00:00
Jacques Le Roux c386f6ab30 Set different ports for testing in a CI environment (e.g. Jenkins) https://issues.apache.org/jira/browse/OFBIZ-4794
*What's for?*
Finally, OOTB the port offset is interesting in 2 cases:
# To eventually run Sonar on OFBiz sources https://issues.apache.org/jira/browse/INFRA-3590
# To simultaneously run the demos without having to change much things, just one parameter (this will need to have the same commited in R13.07... to be discussed...)

Of course, It can be used for other purposes outside of the ASF context...

*How it's done?*
Basically, I just added a portoffset integer parameter to 3 ant targets (of course this JVM param can also be used in a Java call from command line): start, start-pos, start-both,

The portoffset parameter is set to zero by default in ClassLoaderContainer.java. 
If a value is passed, it's then grabed by Config.java and passed to ClassLoaderContainer.java, where it's set to this value.

 The portoffset is then used to change in one shoot all the default ports values defined (in config or hardcoded), and the admin port value
This is done in following classes:
CatalinaContainer
NamingServiceContainer
ServiceEngine through ServiceLocation
RmiServiceContainer
XMLRPCClientEngine
XmlRpcTests

To avoid hardcoding locations in services definitions, I also created 2 service-locations: main-http and main-soap

*To summarize:* these changes will be used to run "ant start" with a portoffset value which will take care of all ports values, including admin port. For running R12.04 demo as stable we will still need to create a patch for the last time. R13.07 could have a similar patch applied since it's not yet released...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1533839 13f79535-47bb-0310-9956-ffa450edef68
2013-10-19 22:07:35 +00:00
Jacques Le Roux 0ef1ff543e Reverts revisions: 1525909 + 1526533 + 1526560, OFBIZ-4794 is not yet ready
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1526583 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 15:44:40 +00:00
Jacques Le Roux c86a579cf8 Set different ports for testing in a CI environment (e.g. Jenkins) https://issues.apache.org/jira/browse/OFBIZ-4794
*What's for?*
OOTB the port offset is interesting in at least 3 cases:
# To simultaneously run tests on the same Buildbot machine. This is related to http://mail-archives.apache.org/mod_mbox/www-builds/201209.mbox/%3C002101cd991b$0a16de50$1e449af0$@16degrees.com.au%3E
# To simultaneously run the demos without having to change much things, just one parameter
# To eventually run Sonar on OFBiz sources https://issues.apache.org/jira/browse/INFRA-3590

*How it's done?*
Basically, I just added a portoffset integer parameter to some ant targets (of course this JVM param can also be used in a Java call from command line):
* in trunk and R13.07: start, start-batch, start-debug, start-pos, start-both, run-tests and run-test
* in R12.04 and R11.04: run-tests, run-test. I did not set start targets because anyway it would miss the admin port offset, withouh much changes. So can't be used to demonstrate. We will continue to use the current paches for those.

The portoffset parameter is set to zero by default in ClassLoaderContainer.java. 
If a value is passed, it's then grabed by Config.java and passed to ClassLoaderContainer.java, where it's set to this value.

 The portoffset is then used to change in one shoot all the default ports values defined (in config or hardcoded), and the admin port value in R13.07 and trunk.
This is done in following classes:
CatalinaContainer
NamingServiceContainer
ServiceEngine through ServiceLocation
RmiServiceContainer
XMLRPCClientEngine
XmlRpcTests

To avoid hardcoding locations in services definitions, I also had to create some service-locations: main-local-soap and main-remote-soap 

*What are the constraints?*
* For demos: the offset should not be applied to trunk because <service-location name="main-remote-soap" location="http://demo-trunk.ofbiz.apache.org:8080/webtools/control/SOAPService"/> is used for tests by trunk *and all releases*. It's useless to apply to trunk anyway,  offsetting port in releases is enough.
* I did not take into account the Ideal payment harcoded port values in IdealPaymentServiceTest.java. Weirdly I did not cross error during tests, though it seems there are tests using an harcoded port in url.

*What is the status?*
Locally (on Win XP)  I ran many tests combinations with <<ant load-demo run-tests>>.  
Applying the portoffset on a sole running test instance has no effects. I have still some fails (no errors) but those are not related to my changes, they appear also without.
But when I run a combination of any releases/trunk but with R11.04, I get a time out error with testSOAPSimpleService, that I can't explain so far. 
If I run the trunk alone with the portoffset no errors occur. Same if I run a release with portoffset and only testSOAPSimpleService in trunk (w/ or w/o portoffset)

*To summarize:* these changes will be used to run Buildot tests instances simultaneously . And, for coming releases, to run demos without having to create patches. Simply running ant start with a portoffset value which will take care of all ports values, including admin port. For running R12.04 demo as stable we will still need to create a patch for the last time.

*What I will to do for now:* commit the patches and test if I cross the same issue on Buildbot. If it's the same (99% chances it will) I will revert and will continue to locally try to find the reason . I believe this issue is unrelated to the changes I implemened.  And it's just because it's now possible to simultaneously run tests that it appears. 

BTW I just noticed that when you run R11.04 with R12.04, R12.04 takes almost all the CPU (XP is not very, while when running any combinations w/o R11.04 the CPU load is shared. 
Also there are far less tests in R11.04, which coul be the reason when I run it with another test run instance there are no issues.  Because R11.04 tests finish before the other instance gets to run testSOAPSimpleService.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1525909 13f79535-47bb-0310-9956-ffa450edef68
2013-09-24 14:47:30 +00:00
Jacques Le Roux 107a6762b6 No functional change.
When I reverted r1311214 for "set different ports for testing in a CI environment (e.g. Jenkins)" https://issues.apache.org/jira/browse/OFBIZ-4794 I did not notice Jacopo's also changed some ports value at r1324614
This reverts r1324614 to have things consistent. I don't backport (only R12.04 is concerned) because as long as catalina/ofbiz-component.xml is consistent (port =+ 1) things are working

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1502121 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 05:38:47 +00:00
Jacques Le Roux 9dcd3564e3 Moves the workflow component to attic
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1381884 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 05:39:26 +00:00
Adrian Crum 3627d8bbc8 More work on the Job Scheduler:
1. Gave the job queue a fixed size so the job poller can't create an out-of-memory condition.
2. Changed min/max thread settings to more conservative values.
3. Changed JobSandbox polling code to accept a limit argument to control the number of records retrieved. Also used ELI to limit memory use.
4. Improved JobManager reloadCrashedJobs method to recover queued jobs that were being missed previously.

At this stage the Job Scheduler has been fixed to not crash/saturate the server, but it can still lose jobs. That will be fixed in the next commit.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1370437 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 19:11:06 +00:00
Jacopo Cappellato 8693969ac4 Refactored the very old code in the org.ofbiz.service.job package to leverage the Executor framework of java.util.concurrent rather than relying on ad-hoc synchronization and thread management: the new code is simpler, smaller and it is now easier to review and change the execution policy; two attributes of service-config.xsd have been deprecated as they are not used in the new version ("jobs" and "wait-millis").
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1362422 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 09:20:42 +00:00
Jacques Le Roux b48ff3a62c Closes "Move SHARK to Attic" https://issues.apache.org/jira/browse/OFBIZ-4795
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343064 13f79535-47bb-0310-9956-ffa450edef68
2012-05-27 15:47:32 +00:00
Jacopo Cappellato 11f9742f58 Changes required after the test port changes introduced in rev. 1311214: now the tests should all pass.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1324614 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 07:58:15 +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
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
Adrian Crum 0a0903efb8 More JSR-223 work - added a generic script service engine.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1297323 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 02:16:29 +00:00
Erwan de Ferrieres e710059ab7 OFBIZ-3798 Add xml-rpc engine on serviceengine - A new patch from Nicolas Malin (https://issues.apache.org/jira/browse/OFBIZ-3798) - Also updating xml-rpc libs from 3.0.1 to 3.1.2
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959261 13f79535-47bb-0310-9956-ffa450edef68
2010-06-30 10:52:12 +00:00
Erwan de Ferrieres 0803e3c6f1 Reverting previous commit as it wasn't fully reviewed and was producing errors. Sorry guys...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959076 13f79535-47bb-0310-9956-ffa450edef68
2010-06-29 19:19:55 +00:00
Erwan de Ferrieres ad183f5cea OFBIZ-3798 Add xml-rpc engine on serviceengine - (https://issues.apache.org/jira/browse/OFBIZ-3798)
A patch from Nicolas Malin - adding a generic service to call xml-rpc server. The goal is to have a technical interface to make calls directly from mini-lang.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959071 13f79535-47bb-0310-9956-ffa450edef68
2010-06-29 18:43:56 +00:00
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 9057861730 Add the appropriate configuration to allow webslinger to work at
runtime.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753084 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 01:18:54 +00:00
David E. Jones 2ccff0b5d8 An option I've resisted for a while due to limited flexibility when used, but we have a lot of these common cases so this may be worth it; can now define CrUD services and not have to implement them for common cases; the create, update, and delete ExampleItem services now use this entity-auto implementation instead of explicit simple-methods; those are tested and are working, and other variations on create should too but I haven't tested them yet; this also includes various refactorings to expose nderlying tools in simple method code and make it reusable
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@679058 13f79535-47bb-0310-9956-ffa450edef68
2008-07-23 10:24:58 +00:00
David E. Jones a713ad4bd7 Added support for groovy services, and an example of the same; cleaned up the way that bsh services work and updated the example and such to match, now returns a context as one would expect
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@657701 13f79535-47bb-0310-9956-ffa450edef68
2008-05-19 00:22:46 +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 e63fc39ea4 implemented internal email notifications for service invocations; configure groups for notifications, setup templates, email addresses and assign services to groups (serviceengine.xml) all services belong to the default group, in case you want to monitor all errors, failures and/or success
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@523801 13f79535-47bb-0310-9956-ffa450edef68
2007-03-29 19:12:10 +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
David E. Jones b60163e1a0 Added ofbiz-workflow engine for service engine to refer to the old OFBiz workflow engine
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424205 13f79535-47bb-0310-9956-ffa450edef68
2006-07-21 07:00:54 +00:00
Jacopo Cappellato de1b33bba9 License change from MIT to ASL2.0 for the files of the service component.
Thanks to Scott Gray for the patch (Apache OFBIZ-87).

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@423866 13f79535-47bb-0310-9956-ffa450edef68
2006-07-20 10:19:51 +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