Derek Hulley 473c9ff1ff Merged 1.4 to HEAD ...

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4329 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4331 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4332 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4339 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4653 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2006-12-19 12:35:52 +00:00

..

constraint

Morning merge.

2006-05-11 17:01:57 +00:00

CompiledModel.java

ML text index and search

2006-12-13 11:52:41 +00:00

DelegateModelQuery.java

Property constraint dictionary support

2006-03-14 22:57:50 +00:00

DictionaryBootstrap.java

svn merge -r 2570:2595 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root

2006-04-12 14:58:21 +00:00

DictionaryComponent.java

ML text index and search

2006-12-13 11:52:41 +00:00

DictionaryDAO.java

ML text index and search

2006-12-13 11:52:41 +00:00

DictionaryDAOImpl.java

ML text index and search

2006-12-13 11:52:41 +00:00

dictionarydaotest_model.properties

Moving to root below branch label

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

dictionarydaotest_model.xml

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

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

DictionaryDAOTest.java

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

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

DictionaryModelType.java

- Added update and inboundAndUpdate as example rule types that can be commented in.

2006-02-01 14:26:17 +00:00

DictionaryModelTypeTest.java

- Action web service implementation

2006-01-10 14:51:45 +00:00

DictionaryNamespaceComponent.java

Moving to root below branch label

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

DictionaryRepositoryBootstrap.java

Test fix up

2006-01-20 08:55:03 +00:00

DictionaryRepositoryBootstrapTest.java

Moving to root below branch label

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

m2binding.xml

Merged 1.4 to HEAD

2006-12-19 12:35:52 +00:00

M2AnonymousTypeDefinition.java

Content and folder node archival

2006-05-04 16:04:55 +00:00

M2Aspect.java

Moving to root below branch label

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

M2AspectDefinition.java

Moving to root below branch label

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

M2Association.java

Moving to root below branch label

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

M2AssociationDefinition.java

Merged 1.4 to HEAD

2006-12-19 12:35:52 +00:00

M2ChildAssociation.java

Moving to root below branch label

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

M2ChildAssociationDefinition.java

Moving to root below branch label

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

M2Class.java

Big honkin' merge from head. Sheesh!

2006-08-27 01:01:30 +00:00

M2ClassAssociation.java

Merged 1.4 to HEAD

2006-12-19 12:35:52 +00:00

M2ClassDefinition.java

Big honkin' merge from head. Sheesh!

2006-08-27 01:01:30 +00:00

M2Constraint.java

Property constraint dictionary support

2006-03-14 22:57:50 +00:00

M2ConstraintDefinition.java

Added LIST constraint

2006-04-15 20:30:14 +00:00

M2DataType.java

Moving to root below branch label

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

M2DataTypeDefinition.java

Moving to root below branch label

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

M2Label.java

Moving to root below branch label

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

M2Model.java

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

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

M2ModelDefinition.java

Moving to root below branch label

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

M2NamedValue.java

Added LIST constraint

2006-04-15 20:30:14 +00:00

M2Namespace.java

Moving to root below branch label

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

M2Property.java

Merged up to HEAD.

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

M2PropertyDefinition.java

Merged up to HEAD.

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

M2PropertyOverride.java

Merged up to HEAD.

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

M2Type.java

Moving to root below branch label

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

M2TypeDefinition.java

Moving to root below branch label

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

M2XML.java

Moving to root below branch label

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

ModelQuery.java

Property constraint dictionary support

2006-03-14 22:57:50 +00:00

NamespaceDAO.java

Moving to root below branch label

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

NamespaceDAOImpl.java

Moving to root below branch label

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

TestModel.java

WCM submit (for approval) workflow.

2006-12-07 00:05:28 +00:00