Copy trunk to test sandbox trunk

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

9 files changed, 1024 insertions, 0 deletions

diff --git a/sandbox/ant/sca/trunk/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java b/sandbox/ant/sca/trunk/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
new file mode 100644
index 0000000000..7d87a8a659
--- /dev/null
+++ b/sandbox/ant/sca/trunk/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
@@ -0,0 +1,210 @@
+/*
+ * 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.definitions.xml;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
+import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.apache.tuscany.sca.definitions.Definitions;
+import org.apache.tuscany.sca.definitions.DefinitionsFactory;
+import org.apache.tuscany.sca.definitions.util.DefinitionsUtil;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.tuscany.sca.monitor.Problem.Severity;
+import org.apache.tuscany.sca.policy.BindingType;
+import org.apache.tuscany.sca.policy.ImplementationType;
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.PolicySet;
+
+/**
+ * A SCA Definitions Document processor.
+ *
+ * @version $Rev$ $Date$
+ */
+public class DefinitionsDocumentProcessor implements URLArtifactProcessor<Definitions> {
+    private StAXArtifactProcessor<Object> extensionProcessor;
+    private XMLInputFactory inputFactory;
+    private DefinitionsFactory definitionsFactory;
+    private Monitor monitor;
+
+    /**
+     * Construct a new SCADefinitions processor
+     * @param assemblyFactory
+     * @param policyFactory
+     * @param staxProcessor
+     */
+    public DefinitionsDocumentProcessor(StAXArtifactProcessor<Object> staxProcessor,
+                                        XMLInputFactory inputFactory,
+                                        DefinitionsFactory definitionsFactory,
+                                        Monitor monitor) {
+        this.extensionProcessor = (StAXArtifactProcessor<Object>)staxProcessor;
+        this.inputFactory = inputFactory;
+        this.definitionsFactory = definitionsFactory;
+        this.monitor = monitor;
+    }
+
+    /**
+     * Constructs a new SCADefinitions processor.
+     * 
+     * @param modelFactories
+     * @param staxProcessor
+     */
+    public DefinitionsDocumentProcessor(FactoryExtensionPoint modelFactories,
+                                        StAXArtifactProcessor<Object> staxProcessor,
+                                        Monitor monitor) {
+        this.extensionProcessor = (StAXArtifactProcessor<Object>)staxProcessor;
+        this.inputFactory = modelFactories.getFactory(XMLInputFactory.class);
+        this.definitionsFactory = modelFactories.getFactory(DefinitionsFactory.class);
+        this.monitor = monitor;
+    }
+
+    /**
+     * Report a exception.
+     * 
+     * @param problems
+     * @param message
+     * @param model
+     */
+    private void error(String message, Object model, Exception ex) {
+        if (monitor != null) {
+            Problem problem =
+                monitor.createProblem(this.getClass().getName(),
+                                      "definitions-xml-validation-messages",
+                                      Severity.ERROR,
+                                      model,
+                                      message,
+                                      ex);
+            monitor.problem(problem);
+        }
+    }
+
+    public Definitions read(URL contributionURL, final URI uri, final URL url) throws ContributionReadException {
+        InputStream urlStream = null;
+        try {
+            // Allow privileged access to open URL stream. Add FilePermission to added to security
+            // policy file.
+            try {
+                urlStream = AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>() {
+                    public InputStream run() throws IOException {
+                        URLConnection connection = url.openConnection();
+                        connection.setUseCaches(false);
+                        return connection.getInputStream();
+                    }
+                });
+            } catch (PrivilegedActionException e) {
+                error("PrivilegedActionException", url, (IOException)e.getException());
+                throw (IOException)e.getException();
+            }
+
+            //urlStream = createInputStream(url);
+            XMLStreamReader reader = inputFactory.createXMLStreamReader(url.toString(), urlStream);
+
+            Definitions definitions = definitionsFactory.createDefinitions();
+            int event = reader.getEventType();
+            while (reader.hasNext()) {
+                event = reader.next();
+
+                // We only deal with the root element
+                if (event == XMLStreamConstants.START_ELEMENT) {
+                    // QName name = reader.getName();
+                    Object model = extensionProcessor.read(reader);
+                    if (model instanceof Definitions) {
+                        DefinitionsUtil.aggregate((Definitions)model, definitions);
+                        return definitions;
+                    } else {
+                        error("ContributionReadException", model, null);
+                    }
+                }
+            }
+
+            return definitions;
+        } catch (XMLStreamException e) {
+            ContributionReadException ce = new ContributionReadException(e);
+            error("ContributionReadException", inputFactory, ce);
+            throw ce;
+        } catch (IOException e) {
+            ContributionReadException ce = new ContributionReadException(e);
+            error("ContributionReadException", inputFactory, ce);
+            throw ce;
+        } finally {
+
+            try {
+                if (urlStream != null) {
+                    urlStream.close();
+                    urlStream = null;
+                }
+            } catch (IOException ioe) {
+                //ignore
+            }
+        }
+    }
+
+    // FIXME: [rfeng] We need to validate the definitions against the Conformance Items
+    // defined by the SCA Policy Framework Spec V1.1
+    private static void stripDuplicates(Definitions definitions) {
+        Set<Intent> intents = new HashSet<Intent>(definitions.getIntents());
+        Set<PolicySet> policySets = new HashSet<PolicySet>(definitions.getPolicySets());
+
+        Set<BindingType> bindingTypes = new HashSet<BindingType>(definitions.getBindingTypes());
+        Set<ImplementationType> implementationTypes = new HashSet<ImplementationType>(definitions.getImplementationTypes());
+
+        definitions.getIntents().clear();
+        definitions.getIntents().addAll(intents);
+        definitions.getPolicySets().clear();
+        definitions.getPolicySets().addAll(policySets);
+        definitions.getBindingTypes().clear();
+        definitions.getBindingTypes().addAll(bindingTypes);
+        definitions.getImplementationTypes().clear();
+        definitions.getImplementationTypes().addAll(implementationTypes);
+    }
+
+    public void resolve(Definitions scaDefinitions, ModelResolver resolver) throws ContributionResolveException {
+        stripDuplicates(scaDefinitions);
+        extensionProcessor.resolve(scaDefinitions, resolver);
+    }
+
+    public String getArtifactType() {
+        return "/META-INF/definitions.xml";
+    }
+
+    public Class<Definitions> getModelType() {
+        return Definitions.class;
+    }
+
+}
diff --git a/sandbox/ant/sca/trunk/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java b/sandbox/ant/sca/trunk/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
new file mode 100644
index 0000000000..7b80a750d2
--- /dev/null
+++ b/sandbox/ant/sca/trunk/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
@@ -0,0 +1,226 @@
+/*
+ * 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.definitions.xml;
+
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
+import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
+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.core.FactoryExtensionPoint;
+import org.apache.tuscany.sca.definitions.Definitions;
+import org.apache.tuscany.sca.definitions.DefinitionsFactory;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.policy.BindingType;
+import org.apache.tuscany.sca.policy.ImplementationType;
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.PolicySet;
+
+/**
+ * Processor for SCA Definitions
+ *
+ * @version $Rev$ $Date$
+ */
+public class DefinitionsProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<Definitions> {
+
+    private StAXArtifactProcessor<Object> extensionProcessor;
+    private DefinitionsFactory definitionsFactory;
+    private Monitor monitor;
+
+    public static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    public static final String BINDING = "binding";
+    public static final String IMPLEMENTATION = "implementation";
+    public static final String DEFINITIONS = "definitions";
+    public static final QName DEFINITIONS_QNAME = new QName(SCA11_NS, DEFINITIONS);
+    public static final String TARGET_NAMESPACE = "targetNamespace";
+    public static final String NAME = "name";
+
+    public DefinitionsProcessor(FactoryExtensionPoint factoryExtensionPoint,
+                                StAXArtifactProcessor<Object> extensionProcessor,
+                                Monitor monitor) {
+        this.extensionProcessor = extensionProcessor;
+        this.monitor = monitor;
+        this.definitionsFactory = factoryExtensionPoint.getFactory(DefinitionsFactory.class);
+    }
+
+    public Definitions read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+        QName name = null;
+        Definitions definitions = null;
+        String targetNamespace = null;
+
+        while (reader.hasNext()) {
+            int event = reader.getEventType();
+            switch (event) {
+                case START_ELEMENT: {
+                    name = reader.getName();
+                    if (DEFINITIONS_QNAME.equals(name)) {
+                        definitions = definitionsFactory.createDefinitions();
+                        targetNamespace = reader.getAttributeValue(null, TARGET_NAMESPACE);
+                        definitions.setTargetNamespace(targetNamespace);
+                    } else {
+                        Object extension = extensionProcessor.read(reader);
+                        if (extension != null) {
+                            if (extension instanceof Intent) {
+                                Intent intent = (Intent)extension;
+                                intent.setName(new QName(targetNamespace, intent.getName().getLocalPart()));
+                                definitions.getIntents().add(intent);
+                                for (Intent i : intent.getQualifiedIntents()) {
+                                    i.setName(new QName(targetNamespace, i.getName().getLocalPart()));
+                                }
+                            } else if (extension instanceof PolicySet) {
+                                PolicySet policySet = (PolicySet)extension;
+                                policySet.setName(new QName(targetNamespace, policySet.getName().getLocalPart()));
+                                definitions.getPolicySets().add(policySet);
+                            } else if (extension instanceof Binding) {
+                                Binding binding = (Binding)extension;
+                                definitions.getBindings().add(binding);
+                            } else if (extension instanceof BindingType) {
+                                definitions.getBindingTypes().add((BindingType)extension);
+                            } else if (extension instanceof ImplementationType) {
+                                definitions.getImplementationTypes().add((ImplementationType)extension);
+                            }
+                        }
+                        break;
+                    }
+                }
+
+                case XMLStreamConstants.CHARACTERS:
+                    break;
+
+                case END_ELEMENT:
+                    name = reader.getName();
+                    if (DEFINITIONS_QNAME.equals(name)) {
+                        return definitions;
+                    }
+                    break;
+            }
+
+            //Read the next element
+            if (reader.hasNext()) {
+                reader.next();
+            }
+        }
+        return definitions;
+    }
+
+    public void write(Definitions definitions, XMLStreamWriter writer) throws ContributionWriteException,
+        XMLStreamException {
+
+        writeStartDocument(writer, SCA11_NS, DEFINITIONS, new XAttr(TARGET_NAMESPACE, definitions.getTargetNamespace()));
+
+        for (Intent policyIntent : definitions.getIntents()) {
+            extensionProcessor.write(policyIntent, writer);
+        }
+
+        for (PolicySet policySet : definitions.getPolicySets()) {
+            extensionProcessor.write(policySet, writer);
+        }
+
+        for (BindingType bindingType : definitions.getBindingTypes()) {
+            extensionProcessor.write(bindingType, writer);
+        }
+
+        for (ImplementationType implType : definitions.getImplementationTypes()) {
+            extensionProcessor.write(implType, writer);
+        }
+
+        writeEndDocument(writer);
+    }
+
+    public void resolve(Definitions scaDefns, ModelResolver resolver) throws ContributionResolveException {
+        // start by adding all of the top level artifacts into the resolver as there
+        // are many cross artifact references in a definitions file and we don't want
+        // to be dependent on the order things appear
+
+        List<Intent> intents = new ArrayList<Intent>();
+        List<PolicySet> policySets = new ArrayList<PolicySet>();
+        List<PolicySet> referredPolicySets = new ArrayList<PolicySet>();
+
+        for (Intent intent : scaDefns.getIntents()) {
+            intents.add(intent);
+            resolver.addModel(intent);
+            for (Intent i : intent.getQualifiedIntents()) {
+                intents.add(i);
+                resolver.addModel(i);
+            }
+        }
+
+        for (PolicySet policySet : scaDefns.getPolicySets()) {
+            if (policySet.getReferencedPolicySets().isEmpty()) {
+                policySets.add(policySet);
+            } else {
+                referredPolicySets.add(policySet);
+            }
+
+            resolver.addModel(policySet);
+        }
+
+        for (BindingType bindingType : scaDefns.getBindingTypes()) {
+            resolver.addModel(bindingType);
+        }
+
+        for (ImplementationType implType : scaDefns.getImplementationTypes()) {
+            resolver.addModel(implType);
+        }
+
+        // now resolve everything to ensure that any references between
+        // artifacts are satisfied
+
+        for (Intent policyIntent : intents)
+            extensionProcessor.resolve(policyIntent, resolver);
+
+        for (PolicySet policySet : policySets)
+            extensionProcessor.resolve(policySet, resolver);
+
+        for (PolicySet policySet : referredPolicySets)
+            extensionProcessor.resolve(policySet, resolver);
+
+        for (BindingType bindingType : scaDefns.getBindingTypes()) {
+            extensionProcessor.resolve(bindingType, resolver);
+        }
+
+        for (ImplementationType implementationType : scaDefns.getImplementationTypes()) {
+            extensionProcessor.resolve(implementationType, resolver);
+        }
+    }
+
+    public QName getArtifactType() {
+        return DEFINITIONS_QNAME;
+    }
+
+    public Class<Definitions> getModelType() {
+        return Definitions.class;
+    }
+
+}
diff --git a/sandbox/ant/sca/trunk/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sandbox/ant/sca/trunk/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
new file mode 100644
index 0000000000..024953e255
--- /dev/null
+++ b/sandbox/ant/sca/trunk/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -0,0 +1,19 @@
+# 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. 
+
+# Implementation class for the artifact processor extension
+org.apache.tuscany.sca.definitions.xml.DefinitionsProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#definitions,model=org.apache.tuscany.sca.definitions.Definitions
diff --git a/sandbox/ant/sca/trunk/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sandbox/ant/sca/trunk/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
new file mode 100644
index 0000000000..c0350c8189
--- /dev/null
+++ b/sandbox/ant/sca/trunk/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
@@ -0,0 +1,19 @@
+# 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. 
+
+# Implementation class for the artifact processor extension
+org.apache.tuscany.sca.definitions.xml.DefinitionsDocumentProcessor;type=/META-INF/definitions.xml,model=org.apache.tuscany.sca.definitions.Definitions
diff --git a/sandbox/ant/sca/trunk/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties b/sandbox/ant/sca/trunk/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties
new file mode 100644
index 0000000000..857887ec3f
--- /dev/null
+++ b/sandbox/ant/sca/trunk/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties
@@ -0,0 +1,22 @@
+#
+#
+#    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.
+#
+#
+ContributionReadException = ContributionReadException occured due to :
+PrivilegedActionException = Privileged Action Exception occured due to FilePermission in security policy file: 
\ No newline at end of file
diff --git a/sandbox/ant/sca/trunk/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/MockPolicy.java b/sandbox/ant/sca/trunk/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/MockPolicy.java
new file mode 100644
index 0000000000..496a909572
--- /dev/null
+++ b/sandbox/ant/sca/trunk/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/MockPolicy.java
@@ -0,0 +1,39 @@
+/*
+ * 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.definitions;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Mocked Policy
+ */
+public class MockPolicy {
+    public QName getName() {
+        return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");
+    }
+
+    public boolean isUnresolved() {
+        return false;
+    }
+
+    public void setUnresolved(boolean unresolved) {
+    }
+
+}
diff --git a/sandbox/ant/sca/trunk/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java b/sandbox/ant/sca/trunk/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
new file mode 100644
index 0000000000..cc36cd69ec
--- /dev/null
+++ b/sandbox/ant/sca/trunk/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
@@ -0,0 +1,226 @@
+/*

+ * 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.definitions;

+

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertFalse;

+import static org.junit.Assert.assertNotNull;

+import static org.junit.Assert.assertNull;

+import static org.junit.Assert.assertTrue;

+

+import java.net.URI;

+import java.net.URL;

+import java.util.Hashtable;

+import java.util.Map;

+

+import javax.xml.namespace.QName;

+

+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;

+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;

+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;

+import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;

+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

+import org.apache.tuscany.sca.policy.BindingType;

+import org.apache.tuscany.sca.policy.ImplementationType;

+import org.apache.tuscany.sca.policy.Intent;

+import org.apache.tuscany.sca.policy.IntentMap;

+import org.apache.tuscany.sca.policy.PolicySet;

+import org.apache.tuscany.sca.policy.Qualifier;

+import org.junit.BeforeClass;

+import org.junit.Test;

+

+/**

+ * Test reading SCA XML assembly documents.

+ * 

+ * @version $Rev: 551296 $ $Date: 2007-06-28 01:18:35 +0530 (Thu, 28 Jun 2007) $

+ */

+public class ReadDocumentTestCase {

+

+    private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor = null;

+    private static Definitions definitions;

+    private static Map<QName, Intent> intentTable = new Hashtable<QName, Intent>();

+    private static Map<QName, PolicySet> policySetTable = new Hashtable<QName, PolicySet>();

+    private static Map<QName, BindingType> bindingTypesTable = new Hashtable<QName, BindingType>();

+    private static Map<QName, ImplementationType> implTypesTable = new Hashtable<QName, ImplementationType>();

+    public static final String scaNamespace = "http://docs.oasis-open.org/ns/opencsa/sca/200903";

+    public static final String namespace = "http://test";

+

+    private static final QName secureWsPolicy = new QName(namespace, "SecureWSPolicy");

+    private static final QName confidentiality = new QName(namespace, "confidentiality");

+    private static final QName integrity = new QName(namespace, "integrity");

+    private static final QName messageProtection = new QName(namespace, "messageProtection");

+    private static final QName confidentiality_transport = new QName(namespace, "confidentiality.transport");

+    private static final QName confidentiality_message = new QName(namespace, "confidentiality.message");

+    private static final QName secureReliablePolicy = new QName(namespace, "SecureReliablePolicy");

+    private static final QName secureMessagingPolicies = new QName(namespace, "SecureMessagingPolicies");

+    private static final QName securityPolicy = new QName(namespace, "SecurityPolicy");

+    private static final QName basicAuthMsgProtSecurity = new QName(namespace, "BasicAuthMsgProtSecurity");

+    private static final QName wsBinding = new QName(scaNamespace, "binding.ws");

+    private static final QName javaImpl = new QName(scaNamespace, "implementation.java");

+

+    @BeforeClass

+    public static void setUp() throws Exception {

+        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

+

+        // Create StAX processors

+        StAXArtifactProcessorExtensionPoint staxProcessors =

+            extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);

+        staxProcessors.addArtifactProcessor(new TestPolicyProcessor());

+

+        URLArtifactProcessorExtensionPoint documentProcessors =

+            extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);

+        policyDefinitionsProcessor = documentProcessors.getProcessor(Definitions.class);

+

+        URL url = ReadDocumentTestCase.class.getResource("test_definitions.xml");

+        URI uri = URI.create("test_definitions.xml");

+        definitions = policyDefinitionsProcessor.read(null, uri, url);

+

+        for (Intent intent : definitions.getIntents()) {

+            intentTable.put(intent.getName(), intent);

+            for (Intent i : intent.getQualifiedIntents()) {

+                intentTable.put(i.getName(), i);

+            }

+        }

+

+        for (PolicySet policySet : definitions.getPolicySets()) {

+            policySetTable.put(policySet.getName(), policySet);

+        }

+

+        for (BindingType bindingType : definitions.getBindingTypes()) {

+            bindingTypesTable.put(bindingType.getType(), bindingType);

+        }

+

+        for (ImplementationType implType : definitions.getImplementationTypes()) {

+            implTypesTable.put(implType.getType(), implType);

+        }

+    }

+

+    @Test

+    public void testReadSCADefinitions() throws Exception {

+        assertNotNull(definitions);

+

+        assertNotNull(intentTable.get(confidentiality));

+        assertNotNull(intentTable.get(messageProtection));

+        assertNotNull(intentTable.get(confidentiality_transport));

+        assertTrue(intentTable.get(confidentiality).getDescription().length() > 0);

+

+        assertNotNull(policySetTable.get(secureReliablePolicy));

+        assertTrue(policySetTable.get(secureReliablePolicy).getProvidedIntents().size() == 2);

+        assertTrue(policySetTable.get(secureReliablePolicy).getPolicies().size() == 2);

+

+        assertNotNull(policySetTable.get(secureMessagingPolicies));

+        assertEquals(2, policySetTable.get(secureMessagingPolicies).getIntentMaps().get(0).getQualifiers().size());

+        //assertTrue(policySetTable.get(secureWsPolicy).getPolicies().get(0) instanceof org.apache.neethi.Policy);

+

+        assertEquals(bindingTypesTable.size(), 1);

+        assertNotNull(bindingTypesTable.get(wsBinding));

+        assertEquals(implTypesTable.size(), 1);

+        assertNotNull(implTypesTable.get(javaImpl));

+    }

+

+    private boolean isRealizedBy(PolicySet policySet, Intent intent) {

+        if (intent.getName().getLocalPart().indexOf('.') == -1) {

+            return policySet.getProvidedIntents().contains(intent);

+        }

+        for (IntentMap map : policySet.getIntentMaps()) {

+            for (Qualifier q : map.getQualifiers()) {

+                if (q.getIntent().equals(intent)) {

+                    return true;

+                }

+            }

+        }

+        return false;

+    }

+    

+    private int getNumberOfQualifiedPolicies(PolicySet policySet) {

+        int count = 0;

+        for(IntentMap intentMap: policySet.getIntentMaps()) {

+            for(Qualifier q: intentMap.getQualifiers()) {

+                count += q.getPolicies().size();

+            }

+        }

+        return count;

+    }

+

+    @Test

+    public void testResolveSCADefinitions() throws Exception {

+        Intent i1 = intentTable.get(messageProtection);

+        assertTrue(!i1.getRequiredIntents().isEmpty());

+        assertNull(i1.getRequiredIntents().get(0).getDescription());

+

+        QName confidentiality_transport = new QName(namespace, "confidentiality.transport");

+        Intent i2 = intentTable.get(confidentiality_transport);

+        assertNotNull(i2.getQualifiableIntent());

+

+        PolicySet secureReliablePolicySet = policySetTable.get(secureReliablePolicy);

+        PolicySet secureMessagingPolicySet = policySetTable.get(secureMessagingPolicies);

+        PolicySet securityPolicySet = policySetTable.get(securityPolicy);

+

+        assertEquals(secureReliablePolicySet.getProvidedIntents().get(1).getName(), integrity);

+        assertNull(secureReliablePolicySet.getProvidedIntents().get(1).getDescription());

+        assertTrue(secureMessagingPolicySet.isUnresolved());

+        assertEquals(3, getNumberOfQualifiedPolicies(securityPolicySet));

+

+        //testing to ensure that inclusion of referred policy sets has not happened

+        PolicySet basicAuthMsgProtSecurityPolicySet = policySetTable.get(basicAuthMsgProtSecurity);

+        assertTrue(basicAuthMsgProtSecurityPolicySet.getPolicies().isEmpty());

+        assertTrue(basicAuthMsgProtSecurityPolicySet.getIntentMaps().isEmpty());

+

+        BindingType wsBindingType = bindingTypesTable.get(wsBinding);

+        assertNull(wsBindingType.getAlwaysProvidedIntents().get(0).getDescription());

+        assertNull(wsBindingType.getMayProvidedIntents().get(0).getDescription());

+

+        ImplementationType javaImplType = implTypesTable.get(javaImpl);

+        assertNull(javaImplType.getAlwaysProvidedIntents().get(0).getDescription());

+        assertNull(javaImplType.getMayProvidedIntents().get(0).getDescription());

+

+        ModelResolver resolver = new DefaultModelResolver();

+        policyDefinitionsProcessor.resolve(definitions, resolver);

+        //builder.build(scaDefinitions);

+

+        //testing if policy intents have been linked have property been linked up 

+        assertNotNull(i1.getRequiredIntents().get(0).getDescription());

+        // assertNotNull(i2.getQualifiableIntent().getDescription());

+        assertEquals(secureReliablePolicySet.getProvidedIntents().get(1).getName(), integrity);

+        assertNotNull(secureReliablePolicySet.getProvidedIntents().get(1).getDescription());

+

+        //testing if policysets have been properly linked up with intents

+        assertFalse(secureMessagingPolicySet.isUnresolved());

+        assertTrue(isRealizedBy(secureMessagingPolicySet, intentTable.get(confidentiality)));

+        assertTrue(isRealizedBy(secureMessagingPolicySet, intentTable.get(confidentiality_transport)));

+

+        //testing if intent maps have been properly mapped to policies

+        assertFalse(securityPolicySet.isUnresolved());

+        assertTrue(isRealizedBy(securityPolicySet, intentTable.get(confidentiality)));

+        assertTrue(isRealizedBy(securityPolicySet, intentTable.get(confidentiality_message)));

+

+        //testing for inclusion of referred policysets

+        assertFalse(basicAuthMsgProtSecurityPolicySet.getPolicies().isEmpty());

+        assertFalse(basicAuthMsgProtSecurityPolicySet.getIntentMaps().get(0).getQualifiers().isEmpty());

+        assertTrue(isRealizedBy(basicAuthMsgProtSecurityPolicySet, intentTable.get(confidentiality_transport)));

+

+        assertNotNull(wsBindingType.getAlwaysProvidedIntents().get(0).getDescription());

+        assertNotNull(wsBindingType.getMayProvidedIntents().get(0).getDescription());

+

+        assertNotNull(javaImplType.getAlwaysProvidedIntents().get(0).getDescription());

+        assertNotNull(javaImplType.getMayProvidedIntents().get(0).getDescription());

+    }

+}

diff --git a/sandbox/ant/sca/trunk/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java b/sandbox/ant/sca/trunk/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java
new file mode 100644
index 0000000000..73a84f5354
--- /dev/null
+++ b/sandbox/ant/sca/trunk/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java
@@ -0,0 +1,57 @@
+/*

+ * 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.definitions;

+

+import javax.xml.namespace.QName;

+import javax.xml.stream.XMLStreamException;

+import javax.xml.stream.XMLStreamReader;

+import javax.xml.stream.XMLStreamWriter;

+

+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;

+import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;

+import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;

+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

+

+/**

+ * A PolicyProcessor used for testing.

+ *

+ * @version $Rev$ $Date$

+ */

+public class TestPolicyProcessor implements StAXArtifactProcessor<MockPolicy> {

+    public QName getArtifactType() {

+        return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");

+    }

+

+    public MockPolicy read(XMLStreamReader arg0) throws ContributionReadException, XMLStreamException {

+        return new MockPolicy();

+    }

+

+    public void write(MockPolicy arg0, XMLStreamWriter arg1) throws ContributionWriteException, XMLStreamException {

+    }

+

+    public Class<MockPolicy> getModelType() {

+        return MockPolicy.class;

+    }

+

+    public void resolve(MockPolicy arg0, ModelResolver arg1) throws ContributionResolveException {

+

+    }

+

+}

diff --git a/sandbox/ant/sca/trunk/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml b/sandbox/ant/sca/trunk/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
new file mode 100644
index 0000000000..c59fb3537b
--- /dev/null
+++ b/sandbox/ant/sca/trunk/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
@@ -0,0 +1,206 @@
+<?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/200903" targetNamespace="http://test"

+    xmlns:test="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">

+

+    <!-- Extension Types Metadata -->

+    <implementationType type="sca:implementation.java" alwaysProvides="test:logging" mayProvide="test:tracing" />

+    <bindingType type="sca:binding.ws" alwaysProvides="test:confidentiality" mayProvide="test:integrity" />

+

+    <!-- Intents and Policysets to assume targetnamespace -->

+    <intent name="TestIntentOne" constrains="sca:binding">

+        <description>

+            Test Intent

+             </description>

+    </intent>

+

+    <intent name="TestIntentTwo" constrains="sca:binding" requires="test:TestIntentOne">

+        <description>

+            Protect messages from unauthorized reading or modification

+             </description>

+    </intent>

+

+    <policySet name="TestPolicySetOne" provides="test:TestIntentOne" appliesTo="sca:binding.ws"

+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+        <wsp:PolicyAttachment>

+            <!-- policy expression and policy subject for

+                 "basic authentication" -->

+        </wsp:PolicyAttachment>

+        <wsp:PolicyAttachment>

+            <!-- policy expression and policy subject for

+                "reliability" -->

+        </wsp:PolicyAttachment>

+    </policySet>

+

+    <!-- POLICY SETS -->

+    <policySet name="SecureReliablePolicy" provides="test:confidentiality.transport test:integrity" appliesTo="sca:binding.ws"

+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+        <wsp:PolicyAttachment>

+            <!-- policy expression and policy subject for

+                 "basic authentication" -->

+        </wsp:PolicyAttachment>

+        <wsp:PolicyAttachment>

+            <!-- policy expression and policy subject for

+                "reliability" -->

+        </wsp:PolicyAttachment>

+    </policySet>

+

+    <policySet name="SecureMessagingPolicies" provides="test:confidentiality" appliesTo="binding.ws"

+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+        <intentMap provides="test:confidentiality" default="transport">

+            <qualifier name="transport">

+                <wsp:PolicyAttachment>

+                    <!-- policy expression and policy subject for "transport" alternative -->

+                </wsp:PolicyAttachment>

+                <wsp:PolicyAttachment>...</wsp:PolicyAttachment>

+            </qualifier>

+            <qualifier name="message">

+                <wsp:PolicyAttachment>

+                    <!-- policy expression and policy subject for "message" alternative" -->

+                </wsp:PolicyAttachment>

+            </qualifier>

+        </intentMap>

+    </policySet>

+

+    <policySet name="SecurityPolicy" provides="test:confidentiality" appliesTo="binding.ws"

+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+        <intentMap provides="test:confidentiality" default="message">

+            <qualifier name="message">

+                <wsp:PolicyAttachment>

+                    <!-- policy attachment for body encryption -->

+                </wsp:PolicyAttachment>

+                <wsp:PolicyAttachment>

+                    <!-- policy attachment for whole message encryption -->

+                </wsp:PolicyAttachment>

+            </qualifier>

+            <qualifier name="transport">

+                <wsp:PolicyAttachment>

+                    <!-- policy attachment for transport encryption -->

+                </wsp:PolicyAttachment>

+            </qualifier>

+        </intentMap>

+    </policySet>

+

+    <policySet name="BasicAuthMsgProtSecurity" provides="test:authentication test:confidentiality" appliesTo="binding.ws"

+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903">

+        <policySetReference name="test:AuthenticationPolicies" />

+        <policySetReference name="test:ConfidentialityPolicies" />

+    </policySet>

+

+    <policySet name="AuthenticationPolicies" provides="test:authentication" appliesTo="binding.ws"

+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+        <wsp:PolicyAttachment>

+            <!-- policy expression and policy subject for "basic

+        authentication" -->

+        </wsp:PolicyAttachment>

+    </policySet>

+

+    <policySet name="ConfidentialityPolicies" provides="test:confidentiality" appliesTo="binding.ws"

+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+        <intentMap provides="test:confidentiality" default="transport">

+            <qualifier name="transport">

+                <wsp:PolicyAttachment>

+                    <!-- policy expression and policy subject for "transport"

+                alternative -->

+                </wsp:PolicyAttachment>

+                <wsp:PolicyAttachment>...</wsp:PolicyAttachment>

+            </qualifier>

+            <qualifier name="message">

+                <wsp:PolicyAttachment>

+                    <!-- policy expression and policy subject for "message"

+                alternative" -->

+                    ...

+                </wsp:PolicyAttachment>

+            </qualifier>

+        </intentMap>

+    </policySet>

+

+    <policySet name="SecureWSPolicy" provides="test:confidentiality" appliesTo="sca:binding.ws"

+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"

+        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+        <wsp:Policy>

+            <wsp:ExactlyOne>

+                <wsp:All>

+                    <sp:SecurityToken>

+                        <sp:TokenType>sp:X509v3</sp:TokenType>

+                    </sp:SecurityToken>

+                    <sp:UsernameToken />

+                    <sp:SignedParts />

+                    <sp:EncryptedParts>

+                        <sp:Body />

+                    </sp:EncryptedParts>

+                    <sp:TransportBinding>

+                        <sp:IncludeTimeStamp />

+                    </sp:TransportBinding>

+                </wsp:All>

+            </wsp:ExactlyOne>

+        </wsp:Policy>

+    </policySet>

+

+    <!-- profile intent -->

+    <intent name="reliableMessageProtection" constrains="sca:binding" requires="test:messageProtection">

+        <description>

+            Protect messages from unauthorized reading or modification

+             </description>

+    </intent>

+

+    <intent name="messageProtection" constrains="sca:binding" requires="test:confidentiality test:integrity">

+        <description>

+            Protect messages from unauthorized reading or modification

+             </description>

+    </intent>

+

+    <!-- simple intent -->

+    <intent name="confidentiality" constrains="sca:binding">

+        <description>

+            Communitcation thro this binding must prevent

+            unauthorized users from reading the messages.

+        </description>

+        <qualifier name="transport" />

+        <qualifier name="message" default="true" />

+    </intent>

+

+    <intent name="integrity" constrains="sca:binding">

+        <description>

+            Communitcation thro this binding must prevent

+            unauthorized modification of the messages.

+             </description>

+    </intent>

+

+    <intent name="authentication" constrains="sca:binding">

+        <description>

+            Communitcation thro this binding required

+            Authentication.

+             </description>

+    </intent>

+

+    <intent name="logging" constrains="sca:implementation">

+        <description>

+            All messages to and from this implementation must be logged

+             </description>

+    </intent>

+

+    <intent name="tracing" constrains="sca:implementation.java">

+        <description>

+            Need to figure out some description for this 

+             </description>

+    </intent>

+

+</definitions>
\ No newline at end of file