Start to implement the SCA policy framework 1.1 spec draft from OASIS OpenCSA

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

2 files changed, 10 insertions, 11 deletions

diff --git a/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java b/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
index cb5db57c15..12a90f5c37 100644
--- a/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
+++ b/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
@@ -28,37 +28,36 @@ import org.apache.tuscany.sca.contribution.processor.ContributionResolveExceptio
 import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.policy.Policy;
 
 /**
  *
  * @version $Rev$ $Date$
  */
-public class TestPolicyProcessor implements StAXArtifactProcessor<Policy> {
+public class TestPolicyProcessor implements StAXArtifactProcessor<Object> {
 
     public QName getArtifactType() {
         return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");
     }
 
-    public Policy read(XMLStreamReader arg0) throws ContributionReadException, XMLStreamException {
+    public Object read(XMLStreamReader arg0) throws ContributionReadException, XMLStreamException {
         return new MockPolicyImplOne();
     }
 
-    public void write(Policy arg0, XMLStreamWriter arg1) throws ContributionWriteException,
+    public void write(Object arg0, XMLStreamWriter arg1) throws ContributionWriteException,
                                                         XMLStreamException {
     }
 
-    public Class<Policy> getModelType() {
+    public Class<Object> getModelType() {
         // TODO Auto-generated method stub
-        return Policy.class;
+        return Object.class;
     }
 
-    public void resolve(Policy arg0, ModelResolver arg1) throws ContributionResolveException {
+    public void resolve(Object arg0, ModelResolver arg1) throws ContributionResolveException {
 
     }
 
     
-    public class MockPolicyImplOne implements Policy {
+    public class MockPolicyImplOne {
         public QName getSchemaName() {
             return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");
         }
diff --git a/java/sca/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/java/sca/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index 814476b4f9..c3db1d50ae 100644
--- a/java/sca/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/java/sca/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
@@ -17,15 +17,15 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
  			targetNamespace="http://test"
  			xmlns:test="http://test"
- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712">
 
 <policySet name="SecureWSPolicy"
  	provides="test:confidentiality"
  	appliesTo="sca:binding.ws"
- 	xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ 	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
  	xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
  	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
 	<wsp:Policy>