- Fixed unreported bug where boolean deafult values where not set correctly

- Fixed AR-314, category rule was not appending additional categories
- Fixed spelling mistake and moved lock messages into properties file while I was there (AWC-350)

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

config/alfresco/application-context.xml

@@ -109,6 +109,7 @@
     			<value>alfresco.messages.content-service</value>
     			<value>alfresco.messages.coci-service</value>
     			<value>alfresco.messages.template-service</value>
+    			<value>alfresco.messages.lock-service</value>    			
     		</list>
     	</property>
     </bean>

config/alfresco/messages/lock-service.properties

@@ -0,0 +1,6 @@
+# Lock service externalised display strings
+
+lock_service.insufficent_preveleges=You have insufficent priveleges to realese the lock on the node (id: {0}).  The node is locked by another user.
+lock_service.node_locked=The node (id: {0}) could not be locked since it is already locked by another user.
+lock_service.no_op=Can not perform operation since the node (id:{0}) is locked by another user.
+lock_service.no_op2=Can not perform operation {0} since the node (id:{1}) is locked by another user.

source/java/org/alfresco/repo/action/executer/LinkCategoryActionExecuter.java

@@ -17,6 +17,7 @@
 package org.alfresco.repo.action.executer;
 
 import java.io.Serializable;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -30,6 +31,7 @@ import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.QName;
 
 /**
@@ -117,10 +119,21 @@ public class LinkCategoryActionExecuter extends ActionExecuterAbstractBase
                 
                 if (categoryAspect != null)
                 {
-                    // Add the aspect setting the category property to the approptiate values
+                    if (this.nodeService.hasAspect(actionedUponNodeRef, categoryAspect) == false)
-                    Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
+                    {
-                    properties.put(categoryProperty, categoryValue);
+                        // Add the aspect and set the category property value
-                    this.nodeService.addAspect(actionedUponNodeRef, categoryAspect, properties);
+                        Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
+                        properties.put(categoryProperty, categoryValue);
+                        this.nodeService.addAspect(actionedUponNodeRef, categoryAspect, properties);
+                    }
+                    else
+                    {
+                        // Append the category value to the existing values
+                        Serializable value = this.nodeService.getProperty(actionedUponNodeRef, categoryProperty);
+                        Collection<NodeRef> categories = DefaultTypeConverter.INSTANCE.getCollection(NodeRef.class, value);
+                        categories.add(categoryValue);
+                        this.nodeService.setProperty(actionedUponNodeRef, categoryProperty, (Serializable)categories);
+                    }
                 }
             }			
 		}

source/java/org/alfresco/repo/lock/LockServiceImplTest.java

@@ -165,6 +165,7 @@ public class LockServiceImplTest extends BaseSpringTest
         }
         catch (UnableToAquireLockException exception)
         {
+            System.out.println(exception.getMessage());
         }
         
         TestWithUserUtils.authenticateUser(GOOD_USER_NAME, PWD, rootNodeRef, this.authenticationService);
@@ -220,6 +221,7 @@ public class LockServiceImplTest extends BaseSpringTest
         }
         catch (UnableToReleaseLockException exception)
         {
+            System.out.println(exception.getMessage());
         }
         
         TestWithUserUtils.authenticateUser(GOOD_USER_NAME, PWD, rootNodeRef, this.authenticationService);

source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java

@@ -40,6 +40,7 @@ import org.alfresco.repo.policy.PolicyComponent;
 import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
 import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.ClassDefinition;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.dictionary.InvalidAspectException;
 import org.alfresco.service.cmr.dictionary.InvalidTypeException;
@@ -334,8 +335,32 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
         {
             if (properties.containsKey(entry.getKey()) == false)
             {
+                Serializable value = entry.getValue();
+                
+                // TODO what other conversions are nessesary here for other types of default values ?
+                
+                // Check the type of the default property
+                PropertyDefinition prop = this.dictionaryService.getProperty(entry.getKey());
+                if (prop != null)
+                {
+                    if (DataTypeDefinition.BOOLEAN.equals(prop.getDataType().getName()) == true)
+                    {
+                        if (value instanceof String)
+                        {
+                            if (((String)value).toUpperCase().equals("TRUE") == true)
+                            {
+                                value = Boolean.TRUE;
+                            }
+                            else if (((String)value).toUpperCase().equals("FALSE") == true)
+                            {
+                                value = Boolean.FALSE;
+                            }
+                        }
+                    }
+                }
+                
                 // Set the default value of the property
-                properties.put(entry.getKey(), entry.getValue());
+                properties.put(entry.getKey(), value);
             }
         }
     }

source/java/org/alfresco/service/cmr/lock/NodeLockedException.java

@@ -19,6 +19,7 @@ package org.alfresco.service.cmr.lock;
 import java.text.MessageFormat;
 
 import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.i18n.I18NUtil;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**
@@ -36,10 +37,8 @@ public class NodeLockedException extends AlfrescoRuntimeException
     /**
      * Error message
      */
-    private static final String ERROR_MESSAGE = "Can not perform operation since " +
+    private static final String ERROR_MESSAGE = I18NUtil.getMessage("lock_service.no_op");
-            "the node (id:{0}) is locked by another user.";
+    private static final String ERROR_MESSAGE_2 = I18NUtil.getMessage("lock_service.no_op2");
-    private static final String ERROR_MESSAGE_2 = "Can not perform operation {0} since " +
-    "the node (id:{1}) is locked by another user.";
 
     /**
      * @param message

source/java/org/alfresco/service/cmr/lock/UnableToAquireLockException.java

@@ -18,6 +18,7 @@ package org.alfresco.service.cmr.lock;
 
 import java.text.MessageFormat;
 
+import org.alfresco.i18n.I18NUtil;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**
@@ -33,8 +34,7 @@ public class UnableToAquireLockException extends RuntimeException
     /**
      * Error message
      */
-    private final static String ERROR_MESSAGE = "The node (id: {0})could not be locked since it" +
+    private final static String ERROR_MESSAGE = I18NUtil.getMessage("lock_service.node_locked");
-            " is already locked by antoher user.";
 
     /**
      * Constructor

source/java/org/alfresco/service/cmr/lock/UnableToReleaseLockException.java

@@ -18,6 +18,7 @@ package org.alfresco.service.cmr.lock;
 
 import java.text.MessageFormat;
 
+import org.alfresco.i18n.I18NUtil;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**
@@ -35,10 +36,7 @@ public class UnableToReleaseLockException extends RuntimeException
     /**
      * Error message
      */
-    private static final String ERROR_MESSAGE = 
+    private static final String ERROR_MESSAGE = I18NUtil.getMessage("lock_service.insufficent_preveleges");
-        "You have insufficent priveleges to realese the " +
-        "lock on the node (id: {0}).  The node is locked by " +
-        "another user.";
 
     /**
      * Constructor