Derek Hulley d2bce74f0b Merge V1.4 to HEAD ...

- Ignored Enterprise-specific changes
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3701 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3703 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3704 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3705 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3707 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3876 .
   svn revert root\projects\web-client\source\web\jsp\admin\admin-console.jsp


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

2006-09-21 23:35:51 +00:00

..

constraint

Imports

2006-05-11 15:12:01 +00:00

CompiledModel.java

Fix AR-521: Constraints are inherited (added test to ensure) and overridable (new)

2006-05-24 15:22:34 +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

Merge V1.4 to HEAD

2006-09-21 23:35:51 +00:00

DictionaryDAO.java

- Action web service implementation

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

DictionaryDAOImpl.java

Merged V1.3 to HEAD(3161:3179)

2006-07-26 10:49:21 +00:00

dictionarydaotest_model.properties

Moving to root below branch label

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

dictionarydaotest_model.xml

Merge V1.4 to HEAD

2006-09-21 23:35:51 +00:00

DictionaryDAOTest.java

Merged V1.3 to HEAD(3161:3179)

2006-07-26 10:49:21 +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

Fix AR-521: Constraints are inherited (added test to ensure) and overridable (new)

2006-05-24 15:22:34 +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

Moving to root below branch label

2005-12-08 07:13:07 +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

Merged V1.3 to HEAD(3161:3179)

2006-07-26 10:49:21 +00:00

M2ClassAssociation.java

Moving to root below branch label

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

M2ClassDefinition.java

Data Dictionary:

2006-08-23 00:07:54 +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

Merge V1.4 to HEAD

2006-09-21 23:35:51 +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

Fix AR-521: Constraints are inherited (added test to ensure) and overridable (new)

2006-05-24 15:22:34 +00:00

M2PropertyDefinition.java

Fix AR-521: Constraints are inherited (added test to ensure) and overridable (new)

2006-05-24 15:22:34 +00:00

M2PropertyOverride.java

Fix AR-521: Constraints are inherited (added test to ensure) and overridable (new)

2006-05-24 15:22:34 +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

Moving to root below branch label

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