Remove old beta1 branch

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

15 files changed, 0 insertions, 717 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/policies/pom.xml b/sca-java-2.x/branches/2.0-Beta1/itest/policies/pom.xml
deleted file mode 100644
index cff7269ffa..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/policies/pom.xml
+++ /dev/null
@@ -1,59 +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 (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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-policies</artifactId>
-    <name>Apache Tuscany SCA iTest Policies</name>
-
-    <dependencies>
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-logging</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java b/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java
deleted file mode 100644
index fd33be01d6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java
+++ /dev/null
@@ -1,65 +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.itest.policies;
-
-import java.io.Serializable;
-
-/**
- * Credit Card 
- */
-public class CreditCard implements Serializable {
-    private static final long serialVersionUID = -6107293191546007197L;
-    private String type;
-    private String number;
-    private String owner;
-    private int expMonth;
-    private int expYear;
-    
-    public String getType() {
-        return type;
-    }
-    public void setType(String type) {
-        this.type = type;
-    }
-    public String getNumber() {
-        return number;
-    }
-    public void setNumber(String number) {
-        this.number = number;
-    }
-    public String getOwner() {
-        return owner;
-    }
-    public void setOwner(String owner) {
-        this.owner = owner;
-    }
-    public int getExpMonth() {
-        return expMonth;
-    }
-    public void setExpMonth(int expMonth) {
-        this.expMonth = expMonth;
-    }
-    public int getExpYear() {
-        return expYear;
-    }
-    public void setExpYear(int expYear) {
-        this.expYear = expYear;
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java b/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java
deleted file mode 100644
index 368179dc29..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java
+++ /dev/null
@@ -1,37 +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.itest.policies;
-
-import org.oasisopen.sca.annotation.Authentication;
-import org.oasisopen.sca.annotation.Confidentiality;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * 
- */
-@Remotable
-@Authentication
-public interface CreditCardPayment {
-    String COMPLETED = "Completed";
-    String REJECTED = "Rejected";
-    
-    @Confidentiality
-    String authorize(CreditCard creditCard, float amount);
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java b/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java
deleted file mode 100644
index 05ea341466..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java
+++ /dev/null
@@ -1,51 +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.itest.policies;
-
-import java.io.Serializable;
-
-/**
- * Customer
- */
-public class Customer implements Serializable {
-    private static final long serialVersionUID = 680227659536711695L;
-    private String id;
-    private String name;
-    private CreditCard creditCard;
-    
-    public String getId() {
-        return id;
-    }
-    public void setId(String id) {
-        this.id = id;
-    }
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-    public CreditCard getCreditCard() {
-        return creditCard;
-    }
-    public void setCreditCard(CreditCard creditCard) {
-        this.creditCard = creditCard;
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java b/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java
deleted file mode 100644
index c9f50d08ee..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java
+++ /dev/null
@@ -1,27 +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.itest.policies;
-
-/**
- * 
- */
-public interface CustomerRegistry {
-    Customer find(String id);
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java b/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java
deleted file mode 100644
index cc7c555aff..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java
+++ /dev/null
@@ -1,30 +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.itest.policies;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * 
- */
-@Remotable
-public interface Payment {
-    String charge(String customerID, float amount);
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java
deleted file mode 100644
index 01cc8ac636..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java
+++ /dev/null
@@ -1,40 +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.itest.policies.impl;
-
-import org.apache.tuscany.sca.itest.policies.CreditCard;
-import org.apache.tuscany.sca.itest.policies.CreditCardPayment;
-
-/**
- * 
- */
-public class CreditCardPaymentImpl implements CreditCardPayment {
-
-    public String authorize(CreditCard creditCard, float amount) {
-        System.out.println(creditCard.getType() + " " + creditCard.getNumber());
-        System.out.println(amount);
-        if (amount < 200f) {
-            return COMPLETED;
-        } else {
-            return REJECTED;
-        }
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java
deleted file mode 100644
index 943720451f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java
+++ /dev/null
@@ -1,78 +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.itest.policies.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.itest.policies.CreditCard;
-import org.apache.tuscany.sca.itest.policies.Customer;
-import org.apache.tuscany.sca.itest.policies.CustomerRegistry;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * 
- */
-@Service(CustomerRegistry.class)
-@Scope("COMPOSITE")
-public class CustomerRegistryImpl implements CustomerRegistry {
-    private Map<String, Customer> customers = new HashMap<String, Customer>();
-    
-    
-    @Init
-    public void init() {
-        Customer c1 = new Customer();
-        c1.setId("001");
-        c1.setName("John Smith");
-        CreditCard creditCard = new CreditCard();
-        creditCard.setNumber("1234-5678-1234");
-        creditCard.setType("Visa");
-        creditCard.setOwner("John Smith");
-        creditCard.setExpMonth(6);
-        creditCard.setExpYear(2015);
-        c1.setCreditCard(creditCard);
-        customers.put(c1.getId(), c1);
-        
-        Customer c2 = new Customer();
-        c2.setId("002");
-        c2.setName("Jane Smith");
-        creditCard = new CreditCard();
-        creditCard.setNumber("1234-5678-5678");
-        creditCard.setType("MasterCard");
-        creditCard.setOwner("Jane Smith");
-        creditCard.setExpMonth(9);
-        creditCard.setExpYear(2012);
-        c2.setCreditCard(creditCard);
-        customers.put(c2.getId(), c2);
-    }
-    
-    public Customer find(String id) {
-        return customers.get(id);
-    }
-    
-    @Destroy
-    public void destroy() {
-        customers.clear();
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
deleted file mode 100644
index b712b99388..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
+++ /dev/null
@@ -1,54 +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.itest.policies.impl;
-
-import org.apache.tuscany.sca.itest.policies.CreditCard;
-import org.apache.tuscany.sca.itest.policies.CreditCardPayment;
-import org.apache.tuscany.sca.itest.policies.Customer;
-import org.apache.tuscany.sca.itest.policies.CustomerRegistry;
-import org.apache.tuscany.sca.itest.policies.Payment;
-import org.apache.tuscany.sca.policy.logging.Logging;
-import org.oasisopen.sca.annotation.Authentication;
-import org.oasisopen.sca.annotation.Confidentiality;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Requires;
-
-/**
- * 
- */
-@Logging
-public class PaymentImpl implements Payment {
-
-    @Reference
-    protected CustomerRegistry customerRegistry;
-
-    @Reference
-    @Authentication
-    @Requires({Confidentiality.CONFIDENTIALITY_MESSAGE, Confidentiality.CONFIDENTIALITY_TRANSPORT})
-    protected CreditCardPayment creditCardPayment;
-
-    public String charge(String customerID, float amount) {
-        Customer customer = customerRegistry.find(customerID);
-        CreditCard creditCard = customer.getCreditCard();
-        String status = creditCardPayment.authorize(creditCard, amount);
-        return status;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/resources/Customer.composite b/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/resources/Customer.composite
deleted file mode 100644
index 7c66c741f6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/resources/Customer.composite
+++ /dev/null
@@ -1,34 +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 (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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-    xmlns:c="http://customer"
-    targetNamespace="http://customer"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-    name="Customer">
-
-    <service name="Registry" promote="CustomerRegistry" requires="tuscany:logging">
-        <binding.sca/>
-    </service>
-    
-    <component name="CustomerRegistry">
-        <implementation.java class="org.apache.tuscany.sca.itest.policies.impl.CustomerRegistryImpl" />
-    </component>
-
-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/resources/LoggingMessages.properties b/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/resources/LoggingMessages.properties
deleted file mode 100644
index ada808be0e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/resources/LoggingMessages.properties
+++ /dev/null
@@ -1,16 +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. 
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/resources/META-INF/definitions.xml
deleted file mode 100644
index dc9deb549a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/resources/META-INF/definitions.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-            xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-            targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
-            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
-
-    <policySet name="JDKLoggingPolicy" 
-               provides="tuscany:logging" 
-               appliesTo="//binding | //implementation">
-        <tuscany:jdkLogger name="test.logger">
-            <tuscany:logLevel>FINE</tuscany:logLevel>
-            <tuscany:resourceBundle>LoggingMessages.properties</tuscany:resourceBundle>
-        </tuscany:jdkLogger>
-
-    </policySet>
-    
-    <policySet name="JDKLoggingImplPolicy" 
-               provides="tuscany:logging" 
-               appliesTo="//implementation.java"
-               attachTo="//sca:component[@name='CreditCardPayment']">
-        <tuscany:jdkLogger name="test.logger">
-            <tuscany:logLevel>INFO</tuscany:logLevel>
-            <tuscany:resourceBundle>LoggingMessages.properties</tuscany:resourceBundle>
-        </tuscany:jdkLogger>
-
-    </policySet>
-    
-    <!-- A set of policy sets introduced just to ensure that intents are resolved -->
-    
-    <policySet name="SuspendsTransactionPolicy" 
-               provides="sca:suspendsTransaction" 
-               appliesTo="//binding | //implementation"
-               attachTo="IntentRefs('sca:suspendsTransaction')"/>    
-               
-    <policySet name="AuthorizationFineGrainPolicy" 
-               provides="sca:authorization.fineGrain" 
-               appliesTo="//binding | //implementation" 
-               attachTo="IntentRefs('sca:authorization') | IntentRefs('sca:authorization.fineGrain')"/>   
-               
-    <policySet name="ConfidentialityTransportPolicy" 
-               provides="sca:confidentiality.transport" 
-               appliesTo="//binding | //implementation"
-               attachTo="IntentRefs('sca:confidentiality.transport')"/>               
-
-    <policySet name="ConfidentialityMessagePolicy" 
-               provides="sca:confidentiality.message" 
-               appliesTo="//binding | //implementation"
-               attachTo="IntentRefs('sca:confidentiality.message')"/>   
-               
-    <policySet name="ClientAuthenticationTransportPolicy" 
-               provides="sca:clientAuthentication.transport" 
-               appliesTo="//binding | //implementation"
-               attachTo="IntentRefs('sca:clientAuthentication.transport')"/>  
-               
-    <policySet name="IntegrityTransportPolicy" 
-               provides="sca:integrity.transport" 
-               appliesTo="//binding | //implementation"
-               attachTo="IntentRefs('sca:integrity.transport')"/>                
-</definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index d5d1840754..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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 (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.    
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-    xmlns:p="http://payment">
-    <deployable composite="p:Payment" />
-</contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/resources/Payment.composite b/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/resources/Payment.composite
deleted file mode 100644
index 20124467b0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/main/resources/Payment.composite
+++ /dev/null
@@ -1,57 +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 (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.    
--->
-
-<!--  
-      NOTE - policy sets all defined at top level as external attach functions
-             not working yet so it's difficult to know precisely where to
-             attach policy to
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-    xmlns:p="http://payment"
-    xmlns:c="http://customer"
-    xmlns:sca = "http://docs.oasis-open.org/ns/opencsa/sca/200912"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-    requires = "sca:authorization" 
-    targetNamespace="http://payment"
-    name="Payment"
-    policySets="tuscany:JDKLoggingPolicy tuscany:JDKLoggingImplPolicy tuscany:SuspendsTransactionPolicy tuscany:AuthorizationFineGrainPolicy tuscany:ConfidentialityTransportPolicy tuscany:ConfidentialityMessagePolicy tuscany:ClientAuthenticationTransportPolicy tuscany:IntegrityTransportPolicy">
-
-    <component name="Payment">
-        <implementation.java class="org.apache.tuscany.sca.itest.policies.impl.PaymentImpl" />
-        <reference name="creditCardPayment" target="CreditCardPayment">
-            <binding.sca requires="sca:integrity tuscany:logging">
-            </binding.sca>
-        </reference>
-        <reference name="customerRegistry" target="Customer/Registry" requires="sca:suspendsTransaction tuscany:logging"/>
-    </component>
-
-    <component name="CreditCardPayment">
-        <implementation.java class="org.apache.tuscany.sca.itest.policies.impl.CreditCardPaymentImpl" />
-        <service name="CreditCardPayment" requires="tuscany:logging sca:confidentiality.message sca:confidentiality.transport"/>
-    </component>
-
-    <component name="Customer" requires="tuscany:logging">
-        <implementation.composite name="c:Customer" requires="sca:managedTransaction.global"/>
-        <service name="Registry" requires="sca:suspendsTransaction">
-            <binding.sca/>
-        </service>
-    </component>
-
-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java
deleted file mode 100644
index 3385ee9071..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java
+++ /dev/null
@@ -1,69 +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.itest.policies;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class PaymentTestCase {
-    private static Node node;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            String location = ContributionLocationHelper.getContributionLocation("Payment.composite");
-            node = NodeFactory.newInstance().createNode(new Contribution("c1", location));
-            node.start();
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw e;
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        if (node != null) {
-            node.stop();
-        }
-    }
-
-    @Test
-    public void testPayment() {
-        Payment payment = node.getService(Payment.class, "Payment");
-        String status = payment.charge("001", 100f);
-        Assert.assertEquals(CreditCardPayment.COMPLETED, status);
-        
-        status = payment.charge("002", 300f);
-        Assert.assertEquals(CreditCardPayment.REJECTED, status);
-    }
-
-    public static void main(String[] args) throws Exception {
-        PaymentTestCase.init();
-        PaymentTestCase tester = new PaymentTestCase();
-        tester.testPayment();
-        PaymentTestCase.destroy();
-    }
-}