Kevin Roast ec80a72900 . Merge horrors fixed ...

. Code compile issue fixed

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

2006-12-20 10:03:44 +00:00

..

cmr

. Merge horrors fixed

2006-12-20 10:03:44 +00:00

descriptor

Merge from HEAD to WCM-DEV2.

2006-09-02 18:19:00 +00:00

license

Merge from HEAD to WCM-DEV2.

2006-09-02 18:19:00 +00:00

namespace

Merged 1.4 to HEAD

2006-12-18 13:18:44 +00:00

transaction

Merge from HEAD to WCM-DEV2.

2006-09-02 18:19:00 +00:00

AnnotationTest.java

Merge from head.

2006-07-13 07:06:30 +00:00

AnnotationTestInterface.java

Merge from HEAD to WCM-DEV2.

2006-09-02 18:19:00 +00:00

Auditable.java

Merge from head.

2006-07-13 07:06:30 +00:00

NotAuditable.java

Merge from head.

2006-07-13 07:06:30 +00:00

PublicService.java

Merge from HEAD to WCM-DEV2.

2006-09-02 18:19:00 +00:00

ServiceDescriptor.java

Moving to root below branch label

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

ServiceException.java

Moving to root below branch label

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

ServiceRegistry.java

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

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