Commit Graph
10472 Commits
Author SHA1 Message Date
Adam Heath ce4c794fb6 Revert wrongly committed 950261
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950274 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:59:21 +00:00
Adam Heath caa519f006 Revert wrongly committed 950262
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950273 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:59:02 +00:00
Adam Heath 9cc1b3e521 Revert wrongly committed 950265
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950269 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:55:59 +00:00
Adam Heath 0a84a9166c Minor fixes to make webtools work underneath webslinger(not ready to go
public).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950265 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:47:24 +00:00
Adam Heath b1da3a854c Make use of new HashCrypt cryptPassword functionality.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950262 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:47:06 +00:00
Adam Heath 2840ae46fb Refactored LoginServices.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950261 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:47:00 +00:00
Adam Heath e4e262751b Add unix(glibc)-compatible password hashing, exact same output, with
support for salts.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950260 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:46:54 +00:00
Adam Heath e29d564abb Only test UtilCache.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950259 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:46:49 +00:00
Adam Heath 69c2d455f3 sql foo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950258 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:46:44 +00:00
Adam Heath d25159568a Multi-threaded data loading.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950257 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:46:38 +00:00
Adam Heath 93adfe2429 Start making use of DependencyPool.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950256 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:46:32 +00:00
Adam Heath 85138b6244 Multi-threaded creation of tables, foreign key indices, and declared
indices.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950255 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:46:24 +00:00
Adam Heath b0a2e51209 Start work in provides in inflight features.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950254 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:46:19 +00:00
Adam Heath 447ef0c1da add() now returns the newly added item, or one that was added
concurrently by another thread.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950253 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:46:13 +00:00
Jacques Le Roux 6ff1d49d7a Revert r949617 because it introduce a bug:
2010-06-01 22:11:30,656 (http-0.0.0.0-8443-5) [  ServiceDispatcher.java:543:ERROR] Error in Service [executeFind]: Error running Find on the [ProductSearchNoNotInUse] entity: SQL Exception while executing the
 following:SELECT DISTINCT PR.PRODUCT_ID, PR.PRODUCT_TYPE_ID, PR.PRIMARY_PRODUCT_CATEGORY_ID, PR.PRODUCT_NAME FROM public.PRODUCT PR LEFT OUTER JOIN public.SUPPLIER_PRODUCT SP ON PR.PRODUCT_ID = SP.PRODUCT_ID
 WHERE  AND ((PR.PRODUCT_TYPE_ID <> ? OR PR.PRODUCT_TYPE_ID IS NULL)) ORDER BY PR.PRODUCT_NAME ASC (ERREUR: erreur de syntaxe sur ou prÞs de ½ AND +
  Position: 206)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950237 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 20:24:03 +00:00
Erwan de Ferrieres 48ece14b02 Adding entityLabels for training statuses
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950227 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 19:38:11 +00:00
David E. Jones 0befa87923 Added id to field titles to allow more direct styling, hiding/showing, etc
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950019 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 11:12:40 +00:00
Jacques Le Roux f0e875fcfc A patch from Sascha Rodekamp "Request Handler, makeQuesryString returns a '?' when no parameter is set" (https://issues.apache.org/jira/browse/OFBIZ-3792) - OFBIZ-3792
Just a little patch for good looking URLs. The Method returns a '?' when the query String is empty. I find there shouldn't be a '?' when no key/value pair is past to the URL. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949946 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 07:17:34 +00:00
David E. Jones 60fb1968f8 Changed the screenlet -> initially-collapsed attribute to support string expansion, includes xsd change; this allows custom logic to determine if the screenlet should appear collapsed or not
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949880 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 22:40:19 +00:00
Jacques Le Roux 51b9d1bce2 A patch from Atul Vani (see https://issues.apache.org/jira/browse/OFBIZ-3555) - OFBIZ-3555
On IE8 the description was not being displayed at all.
With Firefox it was working fine. After doing some research I ended up with this patch. Seem like 'textContent' doesn't work in IE.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949844 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 19:37:51 +00:00
Jacques Le Roux 32c8b8fb72 Better documentation on client-autocomplete-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949839 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 19:33:55 +00:00
Jacques Le Roux 3d4e68c1f7 A patch from Sascha Rodekamp "Encapsulate Methods in the UtilHttp Method" (https://issues.apache.org/jira/browse/OFBIZ-3788) - OFBIZ-3788
The Methods getQueryStringOnlyParameterMap, getPathInfoOnlyParameterMap and getUrlOnlyParameterMap can be better encapsulated. It does not affect the workflow but makes it easier to use the API.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949802 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 16:40:34 +00:00
Jacques Le Roux 1e9824ab0c * Remove useless white spaces in macro (make harder handling links in javascript)
* Implement target-parameter in case of layered lookup (was missing)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949710 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 10:33:52 +00:00
Adam Heath e73898b75b Return the value of needsUpperCase from getIndexInfo, so that the proper case can be used on declared index names.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949628 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:08:59 +00:00
Adam Heath b7434ab448 When fetching index info, if needsUpperCase is set, then the incoming tableName has been upper-cased. This means we have to convert it *back* to lower case when querying indices against the database.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949627 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:08:54 +00:00
Adam Heath a99d5b7b94 Add comment that describes why there is a check of the index name existing in set.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949626 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:08:48 +00:00
Adam Heath a60aabe718 Check whether any indices were created before printing a message saying what was done; handles the case when none were created.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949625 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:08:42 +00:00
Adam Heath 4a9f3516e4 Start refactoring fkIndex creation and declared index creation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949624 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:08:35 +00:00
Adam Heath f4ee31c10d Fix wrong index label on declared indices.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949623 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:08:29 +00:00
Adam Heath fe18c551ee getIndexInfo was skipping all indices that were unique. This was wrong, as it meant that declared unique indices wouldn't be detected, and a creation would be attempted, which would then fail, saying it already existed.
Since all PRIMARY KEY constraints have a prefix of 'PK_', just skip all
those indices instead of checking the uniqueness.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949622 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:08:24 +00:00
Adam Heath 98b552082b Fetching an index from the database requires the tableName pattern to *not* have the schemaName on the front. So, remove it when querying, but then add it back when checking if the table is allowed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949621 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:08:18 +00:00
Adam Heath 83507c3b2e In getIndexInfo, moved the lookupSchemaName calculation outside of the loop, as there is no way it could change at runtime.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949620 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:08:12 +00:00
Adam Heath c16c805359 Refactored several getConnection() calls; if the caller added an error message, then it got refactored.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949619 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:08:07 +00:00
Adam Heath 93ec48f7e8 Add new variants of makeHavingWhereString that take a StringBuilder, and deprecate the old versions that don't.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949618 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:08:01 +00:00
Adam Heath ea2ce99f4a Add new variants of makeConditionWhereString that take a StringBuilder, and deprecate the old versions that don't.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949617 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:07:55 +00:00
Adam Heath 99fdeabe24 Add new variants of makeWhereStringFromFields that take a StringBuilder, and deprecate the old versions that don't.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949616 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:07:50 +00:00
Adam Heath fac74c24b8 Add new variants of fieldsStringList that take a StringBuilder, and deprecate the old versions that don't.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949615 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:07:44 +00:00
Adam Heath 216a1a29d7 Add new variants of colNameString that take a StringBuilder, and deprecate the old versions that don't.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949614 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:07:36 +00:00
Adam Heath 4bb8795838 Optimize groupBy insertion a bit, to keep from having to make a copy of the groupBy list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949612 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:07:29 +00:00
Adam Heath 7e31d0b8e3 Fix instances of String+String while appending to a StringBuilder/StringBuffer.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949611 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:07:23 +00:00
Adam Heath c8a6d783aa Remove double assignment to addParens(slight optimization/code refactor).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949610 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:07:16 +00:00
Adam Heath feef6caffc Use the new equals implementations to test for a correct parse; also
test all the statements.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949609 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:07:10 +00:00
Adam Heath 17d8151d34 Allow fieldAlls, fieldDefs, and relations to be null; if they are empty,
then force them to null instead.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949608 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:07:04 +00:00
Adam Heath a24bab15cf Only output the alias if it is not the same as the default name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949607 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:06:58 +00:00
Adam Heath 40cff7fd7b Implement equals() in a bunch of places.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949606 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:06:53 +00:00
Adam Heath 69de194305 Convert operators to lowercase in the constructors that have them,
instead of only during parsing; this fixes instances where the objects
are not constructed by the sql parser.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949605 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:06:42 +00:00
Adam Heath 4a31886e82 Fix operator parsing; only the last character was being parsed as the
operator.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949604 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:06:36 +00:00
Adam Heath ddb9bf8b27 Remove FieldDefFieldValue, and merge FieldDefValue into FieldDef.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949603 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:06:31 +00:00
Adam Heath 8c083d6743 Make the Order enum public.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949602 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:06:23 +00:00
Adam Heath 39ee8befa9 Start adding DISTINCT support to SELECT.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949600 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 22:06:17 +00:00