Commit Graph
3778 Commits
Author SHA1 Message Date
Jacques Le Roux 6e89a069e7 Revert r835394 (DBCP upgrade, issue compiling with jdk 1.5 OOTB)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835801 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 10:28:29 +00:00
Adam Heath b33013c644 Add shorthand for keymap lists, making use of "USING".
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835792 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:47:58 +00:00
Adam Heath c1a71d6eb0 Example of relations.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835790 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:35:52 +00:00
Adam Heath 60c9b07217 Send the debug to the browser, instead of the console.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835789 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:35:33 +00:00
Adam Heath 4a141e10fe Add <TYPE> to NamePart(); the other words should also be added here.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835787 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:21:41 +00:00
Adam Heath 38d0d601ba Add relation support. Not fully correct, as one-nofk is not yet
supported, because of the '-' in the name.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835786 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:20:15 +00:00
Adam Heath a4a9095e69 Fix creation when title=null.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835785 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:18:17 +00:00
Adam Heath d5c53231e9 Inline AllField and FieldDef, which lets LOOKAHEAD be removed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835768 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 07:47:04 +00:00
Adam Heath d8d6b957e4 More example usage, shows condition parsing, and makes use of more
sql syntax.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835765 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 07:24:41 +00:00
Adam Heath 8c84c6c554 Methods to convert dynamic views back to xml.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835764 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 07:20:15 +00:00
Adam Heath eace82a28c Fix KeyMaps(), duplicate keymap in the returned list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835762 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 07:15:20 +00:00
Adam Heath 4cfae426e4 Create a method to parse stand-alone conditions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835748 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 05:39:11 +00:00
Adam Heath dc56406606 Support sub conditions with ().
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835747 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 05:38:18 +00:00
Adam Heath c8f1e223c8 No longer use jjtree to implement parsing. As a consequence of this,
SQLSelect no longer depended on Parser, so javac wouldn't compile the
generated code.  SQLUtil was added to deal with this(this class will
get more helpers later).


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835741 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 04:55:55 +00:00
Adam Heath 65b2182293 Implement ORDER BY and GROUP BY; also, multiple joins work now.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835731 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 04:08:59 +00:00
Adam Heath 4e69fb0764 Allow for setting groupBy fields with just a simple list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835729 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 03:59:34 +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 5f44e7e3de Example showing how the sql parser works.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835650 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 00:04:44 +00:00
Adam Heath 205d63f9fc <NAME> actually swallows all name parts, don't need to loop in NamePart.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835649 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 00:01:23 +00:00
Adam Heath 43948cfff3 Store the DynamicViewEntity into the SQLSelect node.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835648 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 23:59:11 +00:00
Adam Heath b15bba608f Start of new sql parsing code. Not completely tested. It *does* parse
a test SELECT; what is not tested is actually running the built
DynamicViewEntity.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835637 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 23:23:12 +00:00
Adam Heath afee8ad000 Register the comparison operators with their punctuation variants.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835636 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 23:21:29 +00:00
Scott Gray aa499be644 Span elements weren't being created for the ajax in place editor, fixes OFBIZ-2494 reported by Jacques Le Roux
Also removed inPlaceEditorId from the code since it is always equal to idName anyway

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835585 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 22:06:34 +00:00
Scott Gray c3d2b880de Delay the completion of the testServiceEcaGlobalEventExec test to allow the global ecas to complete before the next test is run, fixes OFBIZ-3124 reported by Jeremy Wickersheimer
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835548 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 21:13:49 +00:00
Scott Gray c0cfbd2469 Allow the duration of the blocking service test to be specified by the caller
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835546 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 21:11:04 +00:00
Scott Gray f69cbf5456 Don't attempt to cast Service Eca Set Field values to string after formatting, fixes ClassCastException caused by when using certain formats
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835541 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 20:57:36 +00:00
Adam Heath 64b4ccc5f7 Oops, didn't do a clean/ant run, and broke this when
AbstractCollectionConverter was removed.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835476 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 17:56: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
Jacques Le Roux 7786dd9bfb commons-dbcp-1.3-20091111-r834702.jar built directly from DBCP trunk. An initiative from Philippe Mouawad at "Memory leak due to transaction management" (https://issues.apache.org/jira/browse/OFBIZ-2599) - OFBIZ-2599
We are been using Ofbiz with DBCP based implementation.
Ofbiz uses a Head revision of DBCP (package org.apache.commons.dbcp.managed is the same as current TRUNK) and geronimo-transaction-1.0.

We are having recurrent OutOfMemory which occur on a 2 days basis.

See: https://issues.apache.org/jira/browse/DBCP-294

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835394 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 14:39:43 +00:00
Ashish Vijaywargiya 1fff46444e Applied patch from jira issue - OFBIZ-2999 - Fix layout of profile pages.
Layout of profile pages (new pages) is not displayed properly.

Thanks Deepak for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835375 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 13:13:34 +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
Jacques Le Roux 0bd14b407c A patch from Bob Morley "When an entityModel has a field marked as a primary key, it should also be set to NotNull" (https://issues.apache.org/jira/browse/OFBIZ-3154) - OFBIZ-3154
We were doing some work with the ModelField and noticed that when a field is marked as a primary key it can still have its "NotNull" property set to "false" (the default). Because we were doing work based on if a field was nullable it was causing a bug on primary keys. The suggestion is to set NotNull = "true" when a field is marked as a primary key. This should have no impact to current code as (in most places) a redundant check was being done (see creation of tables where it will add "NOT NULL" based on both isNotNull and isPk – ideally it should be just based on the former).

This change makes minor modifications to two files ModelField and ModelEntity. ModelField.setIsPk() will call setIsNotNull(true) when the primary key indicator is true. ModelEntity will call field.isNotNull = true when it is reading the primary key elements in the entity definition.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835303 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 08:49:27 +00:00
Hans Bakker 398139f70d add a portal page as the first page in sfa containing calendar and email, but can be changed as required via preferences. add the first screens for events which will appear on the calendar. next step will be to be able to connect events/tasks to opportunities, show them in the party pprofile etc...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835270 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 07:04:41 +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
Jacques Le Roux a3b3d8623f A simple fix to avoid NPE in grovvy scripts, from Jeremy Wickersheimer at "Possible NPE in security check" (https://issues.apache.org/jira/browse/OFBIZ-3160) - OFBIZ-3160
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835161 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 23:38:05 +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
Bilgin Ismet Ibryam 108bcc056e Fixed rendering of image elements inside link elements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835081 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 21:38:16 +00:00
Adam Heath 86872afc45 Handle runtime/tempfiles not existing; it's an empty folder, so some
revision control systems don't handle that case, and never create it.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835074 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 21:20:02 +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
Hans Bakker bf3790cc50 ordered and itemized list now possible in the help screens and works in all three themes, see for an example in the example help screens: OFBIZ-3170 provided patch partly implemented
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834823 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 09:50:01 +00:00
Anil Patel ca9ba906dd use has_content to check if text parameter has any value
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834748 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 03:13:35 +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 4ec0dddba6 A partial patch from Amit Sharma "Improvement in input validation of 1st step (shopping cart) on onePageCheckout page." (https://issues.apache.org/jira/browse/OFBIZ-3098) - OFBIZ-3098
A common label, complete r834493

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834527 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 16:20:53 +00:00