- Resolving some problems on the project structure

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

14 files changed, 0 insertions, 706 deletions

diff --git a/sandbox/dougsleite/guardian-model/src/main/resources/server-backup.composite b/sandbox/dougsleite/guardian-model/src/main/resources/server-backup.composite
deleted file mode 100644
index e57403a791..0000000000
--- a/sandbox/dougsleite/guardian-model/src/main/resources/server-backup.composite
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 (thea
- * "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.    
--->
-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-                xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://serverbackup"
-		name="serverbackup">
-
-	<component name="Participant1">
-		<implementation.java class="org.apache.tuscany.sca.guardian.itests.NodeImpl"/>	
-		<reference name="guardian_member" target="GuardianMember1"/>
-		<reference name="node" target="Participant2"/>
-	</component>  
-
-	<component name="Participant2">
-		<implementation.java class="org.apache.tuscany.sca.guardian.itests.NodeImpl"/>	
-		<reference name="guardian_member" target="GuardianMember2"/>
-		<reference name="node" target="Participant1"/>
-	</component>  
-
-	<component name="GuardianMember1">
-		<implementation.java class="org.apache.tuscany.sca.guardian.GuardianMemberImpl"/> 
-		<reference name="guardian_group" target="GuardianGroup"/> 
-	</component> 
-
-	<component name="GuardianMember2">
-		<implementation.java class="org.apache.tuscany.sca.guardian.GuardianMemberImpl"/> 
-		<reference name="guardian_group" target="GuardianGroup"/> 
-	</component> 
-
-	<component name="GuardianGroup">
-		<implementation.java class="org.apache.tuscany.sca.guardian.GuardianGroupImpl"/>
-		<property name="recovery_rules">src/main/resources/recoveryrules.xml</property>
-	</component> 
-
-</composite>
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/ApplyUpdateFailureException.java b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/ApplyUpdateFailureException.java
deleted file mode 100644
index a40667ff8d..0000000000
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/ApplyUpdateFailureException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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.guardian.itests;
-
-public class ApplyUpdateFailureException extends RuntimeException {
-}
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/BackupFailedException.java b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/BackupFailedException.java
deleted file mode 100644
index 6483018a19..0000000000
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/BackupFailedException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.guardian.itests;
-
-import org.apache.tuscany.sca.guardian.*;
-
-public class BackupFailedException extends GlobalException {
-}
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/BackupJoinedException.java b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/BackupJoinedException.java
deleted file mode 100644
index 728db2bbd6..0000000000
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/BackupJoinedException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.guardian.itests;
-
-import org.apache.tuscany.sca.guardian.GlobalException;
-
-public class BackupJoinedException extends GlobalException {
-}
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/GuardianLaunch.java b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/GuardianLaunch.java
deleted file mode 100644
index 11ede178d0..0000000000
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/GuardianLaunch.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.guardian.itests;
-
-import java.io.IOException;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class GuardianLaunch {
-
-    public static void main(String... args) throws IOException {
-
-        SCADomain scaDomain = SCADomain.newInstance("guardiangroup.composite");
-        System.in.read();
-    }
-}
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/Launch.java b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/Launch.java
deleted file mode 100644
index bb4b41163f..0000000000
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/Launch.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.guardian.itests;
-
-import java.io.IOException;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class Launch {
-
-    public static void main(String... args) throws IOException {
-        SCADomain scaDomain = SCADomain.newInstance("server-backup.composite");
-
-        System.out.println("Starting participat1...");
-        Node c = scaDomain.getService(Node.class, "Participant1");
-        c.execute();
-
-        System.in.read();
-
-        System.out.println("Starting participant2...");
-        Node c2 = scaDomain.getService(Node.class, "Participant2");
-        c2.execute();
-
-        System.in.read();
-
-        System.out.println("Forcing exception ocurrence at participant1...");
-        TestInterface t = scaDomain.getService(TestInterface.class, "Participant1");
-        t.forcePrimaryServiceFailureException();
-
-        System.in.read();
-
-        scaDomain.close();
-    }
-}
-
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/Launch2.java b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/Launch2.java
deleted file mode 100644
index 7b9e3fc1de..0000000000
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/Launch2.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.guardian.itests;
-
-import java.io.IOException;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class Launch2 {
-
-    public static void main(String... args) throws IOException {
-        SCADomain scaDomain = SCADomain.newInstance("server-backup.composite");
-
-        System.out.println("Starting participat1...");
-        Node c = scaDomain.getService(Node.class, "Participant1");
-        c.execute();
-
-        System.in.read();
-
-        System.out.println("Starting participant2...");
-        Node c2 = scaDomain.getService(Node.class, "Participant2");
-        c2.execute();
-
-        System.in.read();
-
-        System.out.println("Forcing exception ocurrence at participant2...");
-        TestInterface t = scaDomain.getService(TestInterface.class, "Participant2");
-        t.forceApplyUpdateFailureException();
-
-        System.in.read();
-
-        scaDomain.close();
-    }
-}
-
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/Launch3.java b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/Launch3.java
deleted file mode 100644
index 271d5051fc..0000000000
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/Launch3.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright 2009 douglas.
- * 
- *  Licensed 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.
- *  under the License.
- */
-package org.apache.tuscany.sca.guardian.itests;
-
-import java.io.IOException;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- *
- * @author douglas
- */
-public class Launch3 {
-
-    public static void main(String... args) throws IOException {
-        SCADomain scaDomain = SCADomain.newInstance("participant1.composite");
-
-        System.out.println("Starting participat1...");
-        Node c = scaDomain.getService(Node.class, "Participant1");
-        c.execute();
-
-        System.in.read();
-
-        System.out.println("Starting participant2...");
-        Node c2 = scaDomain.getService(Node.class, "Participant2");
-        c2.execute();
-
-        System.in.read();
-
-        System.out.println("Forcing exception ocurrence at participant1...");
-        TestInterface t = scaDomain.getService(TestInterface.class, "Participant1");
-        t.forcePrimaryServiceFailureException();
-
-        System.in.read();
-
-        scaDomain.close();
-    }
-}
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/Node.java b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/Node.java
deleted file mode 100644
index 6557aa4732..0000000000
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/Node.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.guardian.itests;
-
-import org.apache.tuscany.sca.guardian.BlockingInterface;
-import org.osoa.sca.annotations.OneWay;
-
-public interface Node extends BlockingInterface {
-
-    @OneWay
-    public void execute();
-
-    public void sendUpdate(String s);
-
-    public void applyUpdate();
-
-    public boolean isExecuting();
-}
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/NodeImpl.java b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/NodeImpl.java
deleted file mode 100644
index 2500817100..0000000000
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/NodeImpl.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * 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.guardian.itests;
-
-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.GlobalException;
-import org.apache.tuscany.sca.guardian.GuardianMember;
-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 {
-
-    private static int PRIMARY = 0;
-    private static int BACKUP = 1;
-    private boolean isBlocked;
-    private Context mainContext;
-    private Context primaryContext;
-    private Context backupContext;
-    private int role;
-    private boolean isExecuting;
-    private String pID;
-    private Queue<String> updates;
-    @Reference(name = "guardian_member", required = true)
-    public GuardianMember gm;
-    @Reference(name = "node", required = true)
-    public Node node;
-    private boolean forcePSFException;
-    private boolean forceAUFException;
-
-    public NodeImpl() {
-
-        mainContext = new Context("MAIN");
-        mainContext.addException(PrimaryFailedException.class);
-        mainContext.addException(PrimaryExistsException.class);
-
-        primaryContext = new Context("PRIMARY");
-        primaryContext.addException(BackupFailedException.class);
-        primaryContext.addException(BackupJoinedException.class);
-        primaryContext.addException(PrimaryServiceFailureException.class);
-
-        backupContext = new Context("BACKUP", null);
-
-        updates = new LinkedList();
-
-        isBlocked = false;
-        isExecuting = false;
-
-        node = null;
-
-        forcePSFException = false;
-        forceAUFException = false;
-    }
-
-    @Init
-    public void init() {
-        gm.setService(this);
-        pID = gm.getParticipantIdentifier();
-    }
-
-    @Destroy
-    public void destroy() {
-        gm.removeService();
-    }
-
-    public boolean isExecuting() {
-        return isExecuting;
-    }
-
-    @OneWay
-    public void execute() {
-        isExecuting = true;
-        gm.enableContext(mainContext);
-        role = PRIMARY;
-
-        while (true) {
-            try {
-                System.out.println(pID + "#Main context: ");
-                sleep(pID + "#Sleeping at main context...", 4000);
-
-                gm.checkExceptionStatus();
-
-                if (role == PRIMARY) {
-                    //Config as primary then...
-                    primaryService();
-                } else {
-                    //Config as backup then...
-                    backupService();
-                }
-
-
-            } 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;
-                    ex.printStackTrace();
-                    return;
-                }
-                role = PRIMARY;
-
-            } catch (BackupFailedException ex) {
-                System.out.println(pID + "# Exception captured!: BackupFailedException");
-                System.out.println(pID + "#Needs propagation?: " + gm.propagate(ex));
-
-                if (gm.propagate(ex)) {
-                    //throw ex;
-                    ex.printStackTrace();
-                    return;
-                }
-            }
-        }
-    }
-
-    private void sleep(String msg, int millis) {
-        try {
-            System.out.println(msg);
-            Thread.sleep(millis);
-        } catch (InterruptedException ex) {
-            Logger.getLogger(NodeImpl.class.getName()).log(Level.SEVERE, null, ex);
-        }
-    }
-
-    private void primaryService() {
-        boolean backupAvailable = false;
-        int upcount = 1;
-
-        while (true) {
-
-            gm.enableContext(primaryContext);
-
-            try {
-                System.out.println(pID + "#Primary context: ");
-                sleep(pID + "#Sleeping at primary context...", 4000);
-                gm.checkExceptionStatus();
-
-                //Process the request then...
-                System.out.println(pID + "#Processing the request...");
-
-                //Check for an internal error
-                if (forcePSFException) {
-                    throw new PrimaryServiceFailureException();
-                }
-
-                if (backupAvailable && node.isExecuting()) {
-                    node.sendUpdate("Update " + upcount);
-                    upcount++;
-                } else {
-                    System.out.println(pID + "#No backup available to send updates!");
-                }
-                //send the reply to the client
-                System.out.println(pID + "#Sending the reply to the client...");
-
-            } catch (PrimaryServiceFailureException ex) {
-                System.out.println(pID + "# Exception captured!: PrimaryServiceFailureException");
-                gm.gthrow(new PrimaryFailedException(), null);
-            } catch (BackupFailedException ex) {
-                System.out.println(pID + "# Exception captured!: BackupFailedException");
-                backupAvailable = false;
-            } catch (BackupJoinedException ex) {
-                System.out.println(pID + "# Exception captured!: BackupJoinedException");
-                backupAvailable = true;
-            } finally {
-                gm.removeContext();
-            }
-        }
-    }
-
-    private void backupService() {
-        while (true) {
-
-            gm.enableContext(backupContext);
-
-            try {
-                System.out.println(pID + "#Backup context: ");
-                sleep(pID + "#Sleeping at backup service", 4000);
-                gm.checkExceptionStatus();
-
-                applyUpdate();
-
-                if (forceAUFException) {
-                    throw new ApplyUpdateFailureException();
-                }
-
-            } catch (ApplyUpdateFailureException ex) {
-                System.out.println(pID + "# Exception captured!: ApplyUpdateFailureException");
-                gm.gthrow(new BackupFailedException(), null);
-            } finally {
-                gm.removeContext();
-            }
-        }
-    }
-
-    //FIXME - It is not working asynchronously
-    //@OneWay
-    public void block() {
-        System.out.println(pID + "#Participant blocked!");
-        isBlocked = true;
-
-//        while (isBlocked) {
-//            try {
-//                Thread.sleep(5000);
-//            } catch (InterruptedException ex) {
-//                Logger.getLogger(ComponentImpl.class.getName()).log(Level.SEVERE, null, ex);
-//            }
-//        }
-    }
-
-    public boolean isBlocked() {
-        return isBlocked;
-    }
-
-    //@OneWay
-    public void unblock() {
-        System.out.println(pID + "#Participant unblocked!");
-        isBlocked = false;
-    }
-
-    public void sendUpdate(String update) {
-        System.out.println(pID + "#Receiving updates from primary: " + update);
-        updates.offer(update);
-    }
-
-    public void applyUpdate() {
-        System.out.println(pID + "#Applying the updates received from the primary: " + updates.poll());
-    }
-
-    public void forcePrimaryServiceFailureException() {
-        forcePSFException = true;
-    }
-
-    public void forceApplyUpdateFailureException() {
-        forceAUFException = true;
-    }
-}
-
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/PrimaryExistsException.java b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/PrimaryExistsException.java
deleted file mode 100644
index 75b44eb478..0000000000
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/PrimaryExistsException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.guardian.itests;
-
-import org.apache.tuscany.sca.guardian.GlobalException;
-
-public class PrimaryExistsException extends GlobalException {
-}
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/PrimaryFailedException.java b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/PrimaryFailedException.java
deleted file mode 100644
index daf013b90d..0000000000
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/PrimaryFailedException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.guardian.itests;
-
-import org.apache.tuscany.sca.guardian.*;
-
-public class PrimaryFailedException extends GlobalException {
-}
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/PrimaryServiceFailureException.java b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/PrimaryServiceFailureException.java
deleted file mode 100644
index 3e8f6af7a6..0000000000
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/PrimaryServiceFailureException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.guardian.itests;
-
-import org.apache.tuscany.sca.guardian.GlobalException;
-
-public class PrimaryServiceFailureException extends GlobalException {
-}
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/TestInterface.java b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/TestInterface.java
deleted file mode 100644
index 5368de138f..0000000000
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/TestInterface.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.guardian.itests;
-
-public interface TestInterface {
-
-    public void forcePrimaryServiceFailureException();
-
-    public void forceApplyUpdateFailureException();
-}