- Changing the guardian-model, policy-recoveryrules, policy-resolutiontrees to a new module: implementation-guardian;

- The new module creates a new kind of implementation (implementation.guardian)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@819561 13f79535-47bb-0310-9956-ffa450edef68

15 files changed, 139 insertions, 81 deletions

diff --git a/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/GuardianImplementationTest.java b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/GuardianImplementationTest.java
new file mode 100644
index 0000000000..ba4f6230d8
--- /dev/null
+++ b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/GuardianImplementationTest.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.sca.implementation.guardian;
+
+import org.apache.tuscany.sca.implementation.guardian.*;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.implementation.guardian.common.Context;
+import org.apache.tuscany.sca.implementation.guardian.common.GlobalException;
+import org.apache.tuscany.sca.implementation.guardian.impl.GuardianMemberImpl;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class GuardianImplementationTest {
+
+//    private SCADomain scaDomain;
+//    private GuardianGroup guardian;
+//
+//    @Before
+//    public void init() throws Exception {
+//        scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/implementation/guardian/guardianTest.composite");
+//        guardian = scaDomain.getService(GuardianGroup.class, "GuardianComponent");
+//    }
+//
+//    @Test
+//    public void enabelContextTest() throws Exception {
+//        guardian.enableContext(Context.INIT_CONTEXT);
+//    }
+//
+//    @After
+//    public void destroy() {
+//        scaDomain.close();
+//    }
+    public static void main(String... args) {
+
+        SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/implementation/guardian/guardianTest.composite");
+        GuardianGroup guardian = scaDomain.getService(GuardianGroup.class, "GuardianComponent");
+
+        System.out.println("\n#EnableContext invocation");
+        guardian.enableContext(Context.INIT_CONTEXT);
+
+        System.out.println("\n#RemoveContext invocation");
+        guardian.removeContext();
+
+        System.out.println("\n#CheckExceptionStatus invocation");
+        guardian.checkExceptionStatus();
+
+        System.out.println("\n#CheckExceptionStatus invocation");
+        boolean value = guardian.propagate(new GlobalException());
+        System.out.println("returned value: " + value);
+
+        System.out.println("\n#AddGuardianMember invocation");
+        guardian.addGuardianMember(new GuardianMemberImpl());
+
+        System.out.println("\n#RemoveGuardianMember invocation");
+        value = guardian.removeGuardianMember(new GuardianMemberImpl());
+        System.out.println("returned value: " + value);
+
+    }
+
+}
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/LCATestCase.java b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/LCATestCase.java
index bdcb7ac97d..3c5e6b1b19 100644
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/LCATestCase.java
+++ b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/LCATestCase.java
@@ -16,11 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.guardian.itests;
+package org.apache.tuscany.sca.implementation.guardian;
 
 import java.io.FileInputStream;
-import org.apache.tuscany.sca.policy.resolutiontrees.*;
-import org.apache.tuscany.sca.guardian.ResolutionTreeUtils;
+import org.apache.tuscany.sca.implementation.guardian.common.ResolutionTreeUtils;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.Map;
@@ -30,6 +29,7 @@ import org.junit.Test;
 import org.apache.axiom.om.OMElement;
 import java.util.List;
 import junit.framework.Assert;
+import org.apache.tuscany.sca.implementation.guardian.xml.ResolutionTreesProcessor;
 import org.junit.Before;
 
 public class LCATestCase {
@@ -38,13 +38,14 @@ public class LCATestCase {
 
     @Before
     public void init() throws Exception {
-        ResolutionTreesPolicyProcessor processor = new ResolutionTreesPolicyProcessor(null, null);
+        ResolutionTreesProcessor processor = new ResolutionTreesProcessor();
 
-        FileInputStream fileInputStream = new FileInputStream("src/main/resources/lcaTest.xml");
+        FileInputStream fileInputStream = new FileInputStream("src/main/resources/org/apache/" +
+                "tuscany/sca/implementation/guardian/lcaTest.xml");
         XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(fileInputStream);
 
 
-        ResolutionTreesPolicy policy = processor.read(reader);
+        ResolutionTrees policy = processor.read(reader);
         Map<String, OMElement> resolutionTrees = policy.getResolutionTreeElements();
 
         List<OMElement> rootElements = getRootElements(resolutionTrees.values());
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/ApplyUpdateFailureException.java b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/ApplyUpdateFailureException.java
index d7f0f763e2..b08b26942d 100644
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/ApplyUpdateFailureException.java
+++ b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/ApplyUpdateFailureException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.guardian.itests.primaryBackup.common;
+package org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.common;
 
 public class ApplyUpdateFailureException extends RuntimeException {
 }
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/BackupFailedException.java b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/BackupFailedException.java
index 6660d6b42f..25adf1d739 100644
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/BackupFailedException.java
+++ b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/BackupFailedException.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.guardian.itests.primaryBackup.common;
+package org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.common;
 
-import org.apache.tuscany.sca.guardian.*;
+import org.apache.tuscany.sca.implementation.guardian.common.GlobalException;
 
 public class BackupFailedException extends GlobalException {
 }
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/BackupJoinedException.java b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/BackupJoinedException.java
index 6d81d1933e..f0d29f461f 100644
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/BackupJoinedException.java
+++ b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/BackupJoinedException.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.guardian.itests.primaryBackup.common;
+package org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.common;
 
-import org.apache.tuscany.sca.guardian.GlobalException;
+import org.apache.tuscany.sca.implementation.guardian.common.GlobalException;
 
 public class BackupJoinedException extends GlobalException {
 }
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/Node.java b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/Node.java
index 9fb6a27a45..6aa9456816 100644
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/Node.java
+++ b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/Node.java
@@ -16,12 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.guardian.itests.primaryBackup.common;
+package org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.common;
 
-import org.apache.tuscany.sca.guardian.BlockingInterface;
 import org.osoa.sca.annotations.OneWay;
 
-public interface Node extends BlockingInterface {
+public interface Node {
 
     @OneWay
     public void execute();
@@ -31,4 +30,8 @@ public interface Node extends BlockingInterface {
     public void applyUpdate();
 
     public String getID();
+
+    public void kill();
+
+    public boolean isDead();
 }
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/NodeImpl.java b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/NodeImpl.java
index 00880352b8..37f4f529f0 100644
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/NodeImpl.java
+++ b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/NodeImpl.java
@@ -16,28 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.guardian.itests.primaryBackup.common;
+package org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.common;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.apache.tuscany.sca.guardian.Context;
-import org.apache.tuscany.sca.guardian.GuardianMember;
+import org.apache.tuscany.sca.implementation.guardian.GuardianMember;
+import org.apache.tuscany.sca.implementation.guardian.common.Context;
 import org.osoa.sca.annotations.Init;
 import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Destroy;
 import org.osoa.sca.annotations.OneWay;
 
 @Scope("COMPOSITE")
-//public class NodeImpl implements Node, TestInterface {
-public class NodeImpl implements Node {
+public class NodeImpl implements Node, TestInterface {
 
     private static int PRIMARY = 0;
     private static int BACKUP = 1;
-    private boolean isBlocked;
+    private boolean isDead;
     private Context mainContext;
     private Context primaryContext;
     private Context backupContext;
@@ -67,7 +65,7 @@ public class NodeImpl implements Node {
 
         updates = new LinkedList();
 
-        isBlocked = true;
+        isDead = true;
 
         nodeList = new LinkedList<Node>();
 
@@ -77,18 +75,12 @@ public class NodeImpl implements Node {
 
     @Init
     public void init() {
-        gm.setService(this);
         pID = gm.getParticipantIdentifier();
     }
 
-    @Destroy
-    public void destroy() {
-        gm.removeService();
-    }
-
     @OneWay
     public void execute() {
-        isBlocked = false;
+        isDead = false;
         gm.enableContext(mainContext);
         role = PRIMARY;
 
@@ -113,20 +105,15 @@ public class NodeImpl implements Node {
 
             } catch (PrimaryExistsException ex) {
                 System.out.println(pID + "# Exception captured!: PrimaryExistsException");
-                System.out.println(pID + "#Needs propagation?: " + gm.propagate(ex));
-
-                if (gm.propagate(ex)) {
-                    throw ex;
-                }
-
                 role = BACKUP;
+                
             } catch (PrimaryFailedException ex) {
                 System.out.println(pID + "# Exception captured!: PrimaryFailedException");
                 System.out.println(pID + "#Needs propagation?: " + gm.propagate(ex));
 
                 if (gm.propagate(ex)) {
                     //throw ex;
-                    this.block();
+                    this.kill();
                     ex.printStackTrace();
                     return;
                 }
@@ -139,7 +126,7 @@ public class NodeImpl implements Node {
 
                 if (gm.propagate(ex)) {
                     //throw ex;
-                    this.block();
+                    this.kill();
                     ex.printStackTrace();
                     return;
                 }
@@ -204,7 +191,7 @@ public class NodeImpl implements Node {
         boolean flag = false;
 
         for (Node n : nodeList) {
-            if (!n.isBlocked()) {
+            if (!n.isDead()) {
                 n.sendUpdate("Update " + upcount);
                 flag = true;
             }
@@ -258,36 +245,19 @@ public class NodeImpl implements Node {
 
     private boolean isThereBackupAvailable() {
         for (Node n : nodeList) {
-            if (!n.isBlocked()) {
+            if (!n.isDead()) {
                 return true;
             }
         }
         return false;
     }
 
-    public void block() {
-        isBlocked = true;
+    public void kill() {
+        isDead = true;
     }
 
-    public boolean isBlocked() {
-        return isBlocked;
-    }
-
-    public void unblock() {
-        isBlocked = false;
-    }
-
-    private void blockingCheck() {
-        System.out.println(pID + "#Participant blocked!");
-        while (isBlocked) {
-            System.out.println("isBlocked: " + isBlocked);
-            try {
-                Thread.sleep(5000);
-            } catch (InterruptedException ex) {
-                Logger.getLogger(NodeImpl.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
-        System.out.println(pID + "#Participant unblocked!");
+    public boolean isDead() {
+        return isDead;
     }
 
     public void sendUpdate(String update) {
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/PrimaryBackupFailedTogetherException.java b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/PrimaryBackupFailedTogetherException.java
index d2ce160bd7..5521caa550 100644
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/PrimaryBackupFailedTogetherException.java
+++ b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/PrimaryBackupFailedTogetherException.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.apache.tuscany.sca.guardian.itests.primaryBackup.common;
+package org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.common;
 
-import org.apache.tuscany.sca.guardian.GlobalException;
+import org.apache.tuscany.sca.implementation.guardian.common.GlobalException;
 
 public class PrimaryBackupFailedTogetherException extends GlobalException {
 
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/PrimaryExistsException.java b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/PrimaryExistsException.java
index 935c97966e..d6297a1012 100644
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/PrimaryExistsException.java
+++ b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/PrimaryExistsException.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.guardian.itests.primaryBackup.common;
+package org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.common;
 
-import org.apache.tuscany.sca.guardian.GlobalException;
+import org.apache.tuscany.sca.implementation.guardian.common.GlobalException;
 
 public class PrimaryExistsException extends GlobalException {
 }
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/PrimaryFailedException.java b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/PrimaryFailedException.java
index 00f2f84c00..cc1715d077 100644
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/PrimaryFailedException.java
+++ b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/PrimaryFailedException.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.guardian.itests.primaryBackup.common;
+package org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.common;
 
-import org.apache.tuscany.sca.guardian.GlobalException;
+import org.apache.tuscany.sca.implementation.guardian.common.GlobalException;
 
 public class PrimaryFailedException extends GlobalException {
 }
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/PrimaryServiceFailureException.java b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/PrimaryServiceFailureException.java
index 46f52ea198..0bcfb72bc8 100644
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/PrimaryServiceFailureException.java
+++ b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/PrimaryServiceFailureException.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.guardian.itests.primaryBackup.common;
+package org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.common;
 
-import org.apache.tuscany.sca.guardian.GlobalException;
+import org.apache.tuscany.sca.implementation.guardian.common.GlobalException;
 
 public class PrimaryServiceFailureException extends GlobalException {
 }
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/TestInterface.java b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/TestInterface.java
index f659a15530..7e7bd35cd2 100644
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/TestInterface.java
+++ b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/common/TestInterface.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.guardian.itests.primaryBackup.common;
+package org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.common;
 
 public interface TestInterface {
 
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/concurrentexceptions/Launch.java b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/concurrentExceptions/Launch.java
index 9ac2e9113b..ab0c21dba6 100644
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/concurrentexceptions/Launch.java
+++ b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/concurrentExceptions/Launch.java
@@ -16,17 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.guardian.itests.concurrentexceptions;
+package org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.concurrentExceptions;
 
 import java.io.IOException;
-import org.apache.tuscany.sca.guardian.itests.primaryBackup.common.Node;
-import org.apache.tuscany.sca.guardian.itests.primaryBackup.common.TestInterface;
+import org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.common.Node;
+import org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.common.TestInterface;
 import org.apache.tuscany.sca.host.embedded.SCADomain;
 
 public class Launch {
 
     public static void main(String... args) throws IOException {
-        SCADomain scaDomain = SCADomain.newInstance("primaryNbackups-concurrent.composite");
+        SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/" +
+                "implementation/guardian/itests/primaryBackup/" +
+                "concurrentExceptions/primaryBackup.composite");
 
         System.out.println("Starting participat1...");
         Node c = scaDomain.getService(Node.class, "Participant1");
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/simple/Launch.java b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/simple/Launch.java
index 66b7d0a18d..86df9bc5f9 100644
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/simple/Launch.java
+++ b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/simple/Launch.java
@@ -16,17 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.guardian.itests.primaryBackup.simple;
+package org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.simple;
 
 import java.io.IOException;
-import org.apache.tuscany.sca.guardian.itests.primaryBackup.common.Node;
-import org.apache.tuscany.sca.guardian.itests.primaryBackup.common.TestInterface;
+import org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.common.Node;
+import org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.common.TestInterface;
 import org.apache.tuscany.sca.host.embedded.SCADomain;
 
 public class Launch {
 
     public static void main(String... args) throws IOException {
-        SCADomain scaDomain = SCADomain.newInstance("primarybackup.composite");
+        SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/" +
+                "implementation/guardian/itests/primaryBackup/" +
+                "simple/primaryBackup.composite");
 
         System.out.println("Starting participat1...");
         Node c = scaDomain.getService(Node.class, "Participant1");
@@ -43,6 +45,7 @@ public class Launch {
         System.out.println("Forcing exception ocurrence at participant1...");
         TestInterface t = scaDomain.getService(TestInterface.class, "Participant1");
         t.forcePrimaryServiceFailureException();
+        
 
         System.in.read();
 
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/simple/Launch2.java b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/simple/Launch2.java
index 34eedcaa13..1c5fd26745 100644
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/simple/Launch2.java
+++ b/sandbox/dougsleite/implementation-guardian/src/test/java/org/apache/tuscany/sca/implementation/guardian/itests/primaryBackup/simple/Launch2.java
@@ -16,17 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.guardian.itests.primaryBackup.simple;
+package org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.simple;
 
 import java.io.IOException;
 import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.guardian.itests.primaryBackup.common.Node;
-import org.apache.tuscany.sca.guardian.itests.primaryBackup.common.TestInterface;
+import org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.common.Node;
+import org.apache.tuscany.sca.implementation.guardian.itests.primaryBackup.common.TestInterface;
 
 public class Launch2 {
 
     public static void main(String... args) throws IOException {
-        SCADomain scaDomain = SCADomain.newInstance("primarybackup.composite");
+        SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/" +
+                "implementation/guardian/itests/primaryBackup/" +
+                "simple/primaryBackup.composite");
 
         System.out.println("Starting participat1...");
         Node c = scaDomain.getService(Node.class, "Participant1");