Properties preserve and respect the PropertyDescription 'isMutable'

property. This setting prevents the WriteProperty predefined step from
changing the property value when isMutable is false. WriteProperty also
requires the selected property to already exist - they should be created
either during Item instantiation or using AddC2KObject.
LDAPPropertyManager prepends the Property name in its entries with ! if
they are non mutable.
Various places around the kernel that create properties now set the
mutable field.
Fixes #150

4 files changed, 30 insertions, 21 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
index 10e54d1..3197ce5 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
@@ -128,8 +128,8 @@ public class CreateItemFromDescription extends PredefinedStep
 					prop.setValue(newName);

 				}

 			}

-            if (!foundName) props.list.add(new Property("Name", newName));

-            props.list.add( new Property("Creator", agent.getAgentName()));

+            if (!foundName) props.list.add(new Property("Name", newName, true));

+            props.list.add( new Property("Creator", agent.getAgentName(), false));

 

             /* ITEM CREATION */

 

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/WriteProperty.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/WriteProperty.java
index 1eef4f5..abb0e95 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/WriteProperty.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/WriteProperty.java
@@ -12,7 +12,10 @@
 package com.c2kernel.lifecycle.instance.predefined;

 

 import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.lookup.AgentPath;

+import com.c2kernel.persistency.ClusterStorage;

+import com.c2kernel.persistency.ClusterStorageException;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.property.Property;

 import com.c2kernel.utils.Logger;

@@ -38,24 +41,30 @@ public class WriteProperty extends PredefinedStep
 			int transitionID, String requestData) throws InvalidDataException {

 

         Logger.msg(1, "WriteProperty::request() - Starting.");

-

         String[] params = getDataList(requestData);

+

         if (params.length != 2)

-            throw new InvalidDataException("WriteProperty::request() - need 2 params - name and value", "");

-        try

-        {

-

-            Logger.msg(5, "WriteProperty::request() - name:" + params[0] +" val:"+params[1]);

-

-            Property newProp = new Property(params[0], params[1]);

-			Gateway.getStorage().put(itemSysKey, newProp, null );

-        }

-        catch( Exception ex )

-        {

-            Logger.error("WriteProperty::request() - during unmarshall.");

-            Logger.error(ex);

-            throw new InvalidDataException(ex.toString(), "");

-        }

+            throw new InvalidDataException("WriteProperty usage: [ name, value ]", "");

+

+        Logger.msg(5, "WriteProperty::request() - name:" + params[0] +" val:"+params[1]);

+        

+        String name = params[0];

+        String newValue = params[1];

+        

+        Property prop;

+        

+        try {

+			prop = (Property)Gateway.getStorage().get(itemSysKey, ClusterStorage.PROPERTY+"/"+name, null);

+			if (!prop.isMutable() && !newValue.equals(prop.getValue()))

+				throw new InvalidDataException("Property '"+name+"' is not mutable.", "");

+			prop.setValue(newValue);

+			Gateway.getStorage().put(itemSysKey, prop, null);

+		} catch (ObjectNotFoundException e) {

+			throw new InvalidDataException("WriteProperty: Property '"+name+"' not found.", "");

+		} catch (ClusterStorageException e) {

+			Logger.error(e);

+			throw new InvalidDataException("Storage error. See logs.", "");

+		} 

 

         Logger.msg(1, "WriteProperty::request() - DONE.");

         return requestData;

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java
index e7301a1..12bbb56 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java
@@ -38,8 +38,8 @@ public class NewAgent extends ModuleImport implements java.io.Serializable {
         ActiveEntity newAgentEnt = (ActiveEntity)Gateway.getCorbaServer().createEntity(newAgent);

         Gateway.getLDAPLookup().add(newAgent);

         // assemble properties

-        properties.add(new com.c2kernel.property.Property("Name", name));

-        properties.add(new com.c2kernel.property.Property("Type", "Agent"));

+        properties.add(new com.c2kernel.property.Property("Name", name, true));

+        properties.add(new com.c2kernel.property.Property("Type", "Agent", false));

         try {

             newAgentEnt.initialise(Gateway.getMarshaller().marshall(new PropertyArrayList(properties)));

         } catch (Exception ex) {

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
index dacb1a3..d5da008 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
@@ -80,7 +80,7 @@ public class NewItem extends ModuleImport {
         }

         

         // set the name property

-        properties.add(new Property("Name", name));

+        properties.add(new Property("Name", name, true));

 

         // init the new item

         try {