- Modifying the guardian-model to deal with concurrent exceptions;

- The policy-resolutiontrees module is used to process the resolution tree - the lowest common ancestor is the resolved exception for a set of concurrent exceptions;

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

2 files changed, 4 insertions, 12 deletions

diff --git a/sandbox/dougsleite/guardian-model/src/main/java/org/apache/tuscany/sca/guardian/GuardianMemberAdapter.java b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/PrimaryBackupFailedTogetherException.java
index b6cbfe8ec6..d2ce160bd7 100644
--- a/sandbox/dougsleite/guardian-model/src/main/java/org/apache/tuscany/sca/guardian/GuardianMemberAdapter.java
+++ b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/PrimaryBackupFailedTogetherException.java
@@ -16,19 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.sca.guardian;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+package org.apache.tuscany.sca.guardian.itests.primaryBackup.common;
 
-public class GuardianMemberAdapter extends XmlAdapter<GuardianMemberImpl, GuardianMember> {
+import org.apache.tuscany.sca.guardian.GlobalException;
 
-    @Override
-    public GuardianMember unmarshal(GuardianMemberImpl v) throws Exception {
-        return v;
-    }
+public class PrimaryBackupFailedTogetherException extends GlobalException {
 
-    @Override
-    public GuardianMemberImpl marshal(GuardianMember v) throws Exception {
-        return (GuardianMemberImpl) v;
-    }
 }
diff --git a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/PrimaryFailedException.java b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/PrimaryFailedException.java
index 086e255e94..00f2f84c00 100644
--- a/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/PrimaryFailedException.java
+++ b/sandbox/dougsleite/guardian-model/src/test/java/org/apache/tuscany/sca/guardian/itests/primaryBackup/common/PrimaryFailedException.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.guardian.itests.primaryBackup.common;
 
-import org.apache.tuscany.sca.guardian.*;
+import org.apache.tuscany.sca.guardian.GlobalException;
 
 public class PrimaryFailedException extends GlobalException {
 }