Britt Park b2f9df29d1 Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement ...

were both beyond me, and are just the raw conflict merge data.  If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2006-11-08 05:17:40 +00:00

..

impl

Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

2006-11-08 05:17:40 +00:00

results

Added support for result set meta data

2006-03-23 15:14:22 +00:00

transaction

Moving to root below branch label

2005-12-08 07:13:07 +00:00

AbstractResultSet.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

AbstractResultSetRow.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

AbstractResultSetRowIterator.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

AbstractSearcherComponent.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

CannedQueryDef.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

CannedQueryDefImpl.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

DocumentNavigator.java

- JCR L2 Document View Import

2005-12-09 18:02:03 +00:00

EmptyResultSet.java

Added support for result set meta data

2006-03-23 15:14:22 +00:00

Indexer.java

Merged up to HEAD.

2006-06-16 19:18:30 +00:00

IndexerAndSearcher.java

Merged up to HEAD.

2006-06-16 19:18:30 +00:00

IndexerAndSearcherFactoryException.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

IndexerComponent.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

IndexerException.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

IndexerSPI.java

Heinous merge from HEAD. Seems to basically work. Be on guard however.

2006-10-18 02:24:36 +00:00

NodeServiceXPath.java

XPath function usage exceptions

2006-01-26 01:39:38 +00:00

QueryCollection.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

QueryCollectionImpl.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

QueryParameterDefImpl.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

QueryParameterRefImpl.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

QueryRegisterComponent.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

QueryRegisterComponentImpl.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

QueryRegisterComponentTest.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

ResultSetRowIterator.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

SearcherComponent.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

SearcherComponentTest.java

Big hunk of merge.

2006-06-28 17:31:18 +00:00

SearcherException.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

SearchServiceTest.java

Added support for result set meta data

2006-03-23 15:14:22 +00:00

SimpleResultSetMetaData.java

Added support for result set meta data

2006-03-23 15:14:22 +00:00