Merge from HEAD into WCM-DEV2. Also fixes build breakage in

jndi-client and catalina-virtual that I introduced earlier. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-07-24 18:27:41 +00:00
parent ca9496d090
commit f6355ea108
171 changed files with 11880 additions and 3450 deletions

View File

@@ -137,7 +137,7 @@ public class LinkPropertiesBean
Map<String, Object> props = this.editableNode.getProperties();
// get the name and move the node as necessary
String name = (String)props.get(ContentModel.PROP_NAME);
//String name = (String)props.get(ContentModel.PROP_NAME);
//if (name != null)
//{
// fileFolderService.rename(nodeRef, name);