3 files changed, 1 insertions, 29 deletions

diff --git a/java/sca/modules/assembly-xml/META-INF/MANIFEST.MF b/java/sca/modules/assembly-xml/META-INF/MANIFEST.MF
index f3ed6233e0..210611129b 100644
--- a/java/sca/modules/assembly-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/assembly-xml/META-INF/MANIFEST.MF
@@ -63,8 +63,6 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",

  org.apache.tuscany.sca.monitor;version="2.0.0",

  org.apache.tuscany.sca.policy;version="2.0.0",

- org.apache.tuscany.sca.policy.impl;version="2.0.0",

- org.apache.tuscany.sca.policy.util;version="2.0.0",

  org.w3c.dom,

  org.xml.sax;resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.assembly.xml

diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index bb3e88e8fb..c9b029a7ba 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
@@ -19,14 +19,11 @@
 
 package org.apache.tuscany.sca.assembly.xml;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URL;
-import java.util.Collection;
 
-import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -41,8 +38,6 @@ import org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.util.PolicyComputationUtils;
 
 /**
  * A composite processor.
@@ -51,8 +46,6 @@ import org.apache.tuscany.sca.policy.util.PolicyComputationUtils;
  */
 public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements URLArtifactProcessor<Composite> {
     private XMLInputFactory inputFactory;
-    private DocumentBuilderFactory documentBuilderFactory;
-    private Collection<PolicySet> domainPolicySets = null;
     private Monitor monitor;
 
     /**
@@ -66,7 +59,6 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements
                                       Monitor monitor) {
         super(modelFactories, staxProcessor, monitor);
         this.inputFactory = modelFactories.getFactory(ValidatingXMLInputFactory.class);
-        this.documentBuilderFactory = modelFactories.getFactory(DocumentBuilderFactory.class);
         this.monitor = monitor;
     }
     
@@ -103,23 +95,6 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements
             	monitor.setArtifactName(uri.toString());
             } //end if
             
-            byte[] transformedArtifactContent;
-            try {
-                if ( domainPolicySets != null ) {
-                    transformedArtifactContent =
-                        PolicyComputationUtils.addApplicablePolicySets(scdlStream, domainPolicySets, documentBuilderFactory);
-                    scdlStream = new ByteArrayInputStream(transformedArtifactContent);
-                } 
-            } catch ( IOException e ) {
-            	ContributionReadException ce = new ContributionReadException("Exception reading " + uri, e);
-            	error("ContributionReadException", scdlStream, ce);
-            	throw ce;
-            } catch ( Exception e ) {
-            	ContributionReadException ce = new ContributionReadException("Exception reading " + uri, e);
-            	error("ContributionReadException", scdlStream, ce);
-                //throw ce;
-            }
-            
             XMLStreamReader reader = inputFactory.createXMLStreamReader(scdlStream);
             
             reader.nextTag();
diff --git a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index fd11a944c7..ec19584dbd 100644
--- a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
+++ b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
@@ -54,7 +54,6 @@ 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.apache.tuscany.sca.policy.impl.ImplementationTypeImpl;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -142,7 +141,7 @@ public class ReadDocumentTestCase {
                     } else if (artifact instanceof BindingType) {
                         BindingType bindingType = (BindingType)artifact;
                         bindingTypesTable.put(bindingType.getType(), bindingType);
-                    } else if (artifact instanceof ImplementationTypeImpl) {
+                    } else if (artifact instanceof ImplementationType) {
                         ImplementationType implType = (ImplementationType)artifact;
                         implTypesTable.put(implType.getType(), implType);
                     }