Commit Graph
542 Commits
Author SHA1 Message Date
Scott Gray d79e59f640 Added java.sql.Date -> java.sql.Timestamp converter
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881045 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 23:27:19 +00:00
Adam Heath 91050d9263 Very large update. SQL parser is fairly generic now. Can parse sql
that is compatible with features used by ofbiz.  Has support for
DELETE, INSERT, INSERT SELECT, SELECT, UPDATE, and VIEW.

Modified the delegator side of the above to handle the new
interfaces.  Now supports complex alias.  Only SELECT is supported,
and the parseCondition code is disabled for the time being.

The plan(sic) here is to obviously support the other sql statements.
Then, to have a jdbc wrapper around all this, so external tools, that
only know how to talk jdbc, can actually talk directly to the
delegator.

Plus, many more people can understand sql syntax.  This allows them
to do things with ofbiz, that they would find much more difficult if
they had to write <view-entity> definitions.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@880835 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 16:31:32 +00:00
Jacques Le Roux 03ac565c90 No functional changes just a clean-up : no intermediate var is needed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835851 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 14:01:47 +00:00
Adrian Crum 7a5509a277 Small improvement to the Converters class. A converter is registered only once.
Now client code can create local instances of specific converters without interfering with the operation of the factory method.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835667 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 00:31:39 +00:00
Adam Heath eb02b4e77d Simplied the object graph, removed AbstractCollectionConverter. All
collection conversions now have proper generification.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835453 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 17:15:01 +00:00
Adam Heath edf7210d88 Remove extraneous blank lines, and trailing whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835451 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 17:12:02 +00:00
Adrian Crum be36dd70be Changed the String to Timestamp converter code to fix a problem reported by Hans.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835440 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 16:52:23 +00:00
Scott Gray 6fa4e52764 Passed in locale was being discarded, fixes OFBIZ-3177 reported by Willem Janssen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835309 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 09:15:42 +00:00
Adrian Crum 19f8bf0228 More converter improvements. Better handling of strings supplied to formatting classes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835197 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 02:31:59 +00:00
Adam Heath 172a135a56 Move getSourceClass and getTargetClass into the base class; removes a
bunch of code.  This also nescessitated the creation of a helper class
for collection containment.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835164 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 23:47:03 +00:00
Adrian Crum 3fe7e1f03e Oops, I forgot to include one of the Converter collections in my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835159 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 23:29:21 +00:00
Adrian Crum a55f49fce5 More improvements to the conversion framework, plus bug fixes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835032 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 19:35:34 +00:00
Adrian Crum ae236a6b7d Conversion framework improvements, fixed bugs reported on mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834978 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 17:45:33 +00:00
Adrian Crum 7ec17ed148 Some work on CachedClassLoader.java. Fixed non-thread-safe code, converted HashMap and HashSet to Javolution classes, added a registerClass method, and simplified the Init interface.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834727 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 00:39:44 +00:00
Adrian Crum 2f53c75789 Revert unintended change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834667 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 21:08:31 +00:00
Adrian Crum b4d02def78 Modified ObjectType.java to use only the new conversion framework.
This change can be reverted if any major issues come up. I will monitor the dev mailing list and fix any issues that are reported.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834552 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 17:18:34 +00:00
Adrian Crum 3fcdc998af Minor improvements to the new object type Converters.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834549 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 17:14:58 +00:00
Jacques Le Roux 107acdde60 I prefer to revert as it's not needed anymore since r834444. I had an intuitive feeling that something was wrong, and forgot to check :( Thanks to Todor it's ok!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834447 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 12:16:43 +00:00
Adrian Crum ee835d014a Added Java type converters for the entity engine.
This commit demonstrates how the object type converter framework can be extended by other components.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833964 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 01:48:23 +00:00
Adrian Crum 5babe48c44 File missing in last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833828 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 05:12:20 +00:00
Adrian Crum 6d4917f304 Added Collection Converters.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833827 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 05:08:26 +00:00
Adrian Crum 2070f32b2e Modified ObjectType.java to use the new Java object type conversion framework.
Since the new converters aren't finished, I set it up so conversions fall back on the old ObjectType.java conversion code when needed.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833786 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 00:48:19 +00:00
Adrian Crum 99d3b54cb8 The new Java object type conversion framework. It isn't complete, but there is enough there to grasp the general idea.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833784 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 00:43:17 +00:00
Jacques Le Roux ac889d7a13 A modified patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - entityext" (https://issues.apache.org/jira/browse/OFBIZ-3108) - OFBIZ-3108
I replaced 4 while loops by for loops. Doing that I removed the empty checks. So I also used a FastList in StrungUtile.split() which I also refactored a bit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833725 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 18:14:22 +00:00
Adrian Crum f30d44ccdc TimeDuration.java improvements. This is the first step in a duration data type implementation discussed here - https://issues.apache.org/jira/browse/OFBIZ-3125.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832574 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 21:58:00 +00:00
Adrian Crum f046004995 Remove Eclipse compiler warnings from framework/base component. Patch contributed by Marc Morin with additional work by me - https://issues.apache.org/jira/browse/OFBIZ-3102.
This commit requires an ant clean + build.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831550 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 15:22:05 +00:00
Jacopo Cappellato 49da966a43 Fixed typo in comment.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829466 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 23:28:27 +00:00
Jacques Le Roux 7beb1ad4a9 In this case I don't need to persist the property.
This changes just do that : set temporary the property in memory, and reset it back to its original value

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@824937 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 21:37:49 +00:00
Jacques Le Roux 8221fd7899 New feature : in the POS adds the possibility to create a client profile (for now : name, email, phone#, card id for promo), email is also used to create an user login with card id as pwd (login/pwd couple follows changes).
The card id is stored in the Person.memberId field. It's used as a promo code. So if the same id is defined as a promocode, any promotion using this promo code will be added to the cart when you select a client from the Client Profile screen. Else a message will pop when selecting the client.
The idea is to generate promo codes and to use them as card id when creating the physical card.

The Client Profile screen (from Promo button in promo panel) allow you to search for all client (all fields empty) or to focus on a client (at least one field files). For now the search use a stric equals but I plan to allow also contains (ie %like%)
You may edit the client profile and as explained above select a client to apply promotions related to his/her card id.
I plan to add a status bar at bottom of the POS screen to see promocodes used (you may still enter arbitrary promo code with the Promo Code button) or even maybe rather the related promotions (but I doubt there will enough place).
The promo code is used as long as the cart is open.

There are also some generics enhancement in PosTransaction not all related to this new feature.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823475 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 09:24:54 +00:00
Adam Heath d9b4865da7 Misssed a few createCache calls, bother.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823299 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 19:51:50 +00:00
Adam Heath 2275cb5b78 Don't create CacheLineTable each time setPropertiesParam is called.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823298 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 19:49:57 +00:00
Jacques Le Roux 8583100478 Fix a recursive bug
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823175 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 13:43:11 +00:00
Adrian Crum dd22f83c72 Improvements to the GenericDelegator refactoring - based on suggestions from Adam Heath.
I removed the deprecated methods from the Delegator interface. So, any replacements of GenericDelegator.getGenericDelegator(...) with the new factory method will have to include code to replace the deprecated method calls.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821391 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 18:52:29 +00:00
Jacques Le Roux 932849b7ed Fix wrong file in r819274 (Chinese Geo data)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@819277 13f79535-47bb-0310-9956-ffa450edef68
2009-09-27 09:10:03 +00:00
Jacques Le Roux f12f0f263a Add GeoData_CN and geoTypeId="MUNICIPALITY" from Terence NG (https://issues.apache.org/jira/browse/OFBIZ-2970) - OFBIZ-2970
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@819274 13f79535-47bb-0310-9956-ffa450edef68
2009-09-27 08:55:38 +00:00
Hans Bakker 542740f38f spaces for tabs
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@819079 13f79535-47bb-0310-9956-ffa450edef68
2009-09-26 01:06:01 +00:00
Adrian Crum 2f063e3fd7 Refactored GenericDelegator.java based on a design proposed by Adam Heath on the dev mailing list.
DelegatorInterface.java has been replaced by Delegator.java.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@819067 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 23:36:13 +00:00
Hans Bakker 87a48231f0 added a chapter how to internationalize the help files show with: http://localhost:8080/cmssite/cms/APACHE_OFBIZ_HTML#helpInternationalization
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818850 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 13:37:35 +00:00
Hans Bakker 4533720a3e docbook files now converted to html using a first (simple) visual scheme dependent css stylesheet. This css is now also used for the display of the help files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818780 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 09:16:26 +00:00
Scott Gray 2afbb75457 Get rid of a whole pile of unnecessary string instantiations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818665 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 23:49:02 +00:00
Adrian Crum 323df772f6 UEL bug fix. Patch provided by Mridul Pathak - https://issues.apache.org/jira/browse/OFBIZ-2928.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818500 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 14:52:40 +00:00
Jacques Le Roux 57fe549e6f Related to directives for different screen sizes for POS
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818449 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 11:21:23 +00:00
Adam Heath 44b87c4b9c Add support for generics markup in string type names.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816350 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 19:39:45 +00:00
Jacques Le Roux 48fda8a035 A patch from Brett Palmer "Adding Tomcat Catalina configuration for "privileged" applications" (https://issues.apache.org/jira/browse/OFBIZ-2945) - OFBIZ-2945
Out of the box Tomcat allows you to configure "privileged" applications by specifying the context as follows.
<Context path="/manager" debug="0" privileged="true"
   docBase="/usr/local/kinetic/tomcat6/server/webapps/manager">
</Context>

Since OFBiz is an embedded version of Tomcat it does not currently include a similar configuration for privileged applications.

The Tomcat manager application is a "privileged" application that includes utilities for monitoring JMX resources such as thread counts, connections, and any other configured JMX parameter. We use JMX with Hyperic to monitor our OFBiz servers

BTW, I used almost the same for Lambda Probe (https://issues.apache.org/jira/browse/OFBIZ-1397)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816335 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 18:56:36 +00:00
Jacques Le Roux 1817d35d28 A patch from Deyan Tsvetanov "NamingServiceContainer binds to all network interfaces." (https://issues.apache.org/jira/browse/OFBIZ-2559) - OFBIZ-2559
org.ofbiz.base.container.NamingServiceContainer by default binds a server socket to all available network interfaces. Configuration of this container is done in
framework/base/config/ofbiz-containers.xml

<!-- load the naming (JNDI) server -->
<container name="naming-container" class="org.ofbiz.base.container.NamingServiceContainer">
<property name="port" value="1099"/>
</container>

Only the port can be configured.
Additional configuration property needs to be implemented:

<property name="host" value="0.0.0.0"/>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814390 13f79535-47bb-0310-9956-ffa450edef68
2009-09-13 21:49:21 +00:00
Adam Heath 3fbb02cf7f getDocument() now returns elements that contain location data.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812778 13f79535-47bb-0310-9956-ffa450edef68
2009-09-09 05:57:22 +00:00
Jacques Le Roux dac7fd2208 Add some missing ASL2 headers and remove empty files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812724 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 23:29:03 +00:00
Jacopo Cappellato 5a48eefcc0 Fix for error happening when using a csv export with fields containing quotes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812483 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 12:46:28 +00:00
Scott Gray daaecdb81b Copy/paste error, thanks Adam
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812314 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 00:49:20 +00:00
Scott Gray 838436eaf6 Add EAN validation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812313 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 00:40:57 +00:00