From c8b9d2d31f0758951d912472be2cb3867b0c3dd6 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 24 Jan 2014 16:36:03 +0100
Subject: Tweak Admin predef step restriction. Set correct activity property.
 Closes #152 Fix nulls in exceptions

---
 .../java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java   | 2 +-
 .../java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java     | 1 -
 .../c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java | 1 -
 src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java     | 1 +
 .../com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java     | 2 +-
 .../c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java   | 2 +-
 6 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/main/java/com/c2kernel/lifecycle/instance/predefined')

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java
index 989817c..8416820 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java
@@ -30,7 +30,7 @@ public class AddC2KObject extends PredefinedStep
     public AddC2KObject()
     {
         super();
-        getProperties().put("AgentRole", "Admin");
+        getProperties().put("Agent Role", "Admin");
     }
 
 	//requestdata is xmlstring
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java
index 0ed6e07..e38f71d 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java
@@ -39,7 +39,6 @@ public class AddNewSlot extends PredefinedStep
     public AddNewSlot()
     {
         super();
-        getProperties().put("AgentRole", "Admin");
     }
 
 
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java
index 45afde9..30d014c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java
@@ -15,7 +15,6 @@ public class AddStepsFromDescription extends PredefinedStep
 	public AddStepsFromDescription()
 	{
 		super();
-		getProperties().put("AgentRole", "Admin");
 	}
 
 	@Override
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java
index 20c9fb7..305128b 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java
@@ -36,6 +36,7 @@ public class Erase extends PredefinedStep
     public Erase()
     {
         super();
+        getProperties().put("Agent Role", "Admin");
     }
 
 	//requestdata is xmlstring
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java
index df78daa..44d4c5d 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java
@@ -29,7 +29,7 @@ public class RemoveC2KObject extends PredefinedStep
     public RemoveC2KObject()
     {
         super();
-        getProperties().put("AgentRole", "Admin");
+        getProperties().put("Agent Role", "Admin");
     }
 
 	//requestdata is xmlstring
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java
index b9639a4..2163d4c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java
@@ -14,7 +14,7 @@ public class ReplaceDomainWorkflow extends PredefinedStep
 	public ReplaceDomainWorkflow()
 	{
 		super();
-		getProperties().put("AgentRole", "Admin");
+		getProperties().put("Agent Role", "Admin");
 	}
 
 	@Override
-- 
cgit v1.2.3