99 files changed, 927 insertions, 686 deletions

diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java b/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
index a1de950045..3e45daaf49 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
+++ b/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
@@ -52,7 +52,6 @@ import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
 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.monitor.impl.ProblemImpl;
 import org.apache.tuscany.sca.policy.IntentAttachPoint;
 import org.apache.tuscany.sca.policy.IntentAttachPointType;
 
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF
index 136c0af34f..0502c76f96 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF
@@ -12,29 +12,45 @@ Bnd-LastModified: 1225397264250
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Atom Feed Binding Extension

-Import-Package: javax.servlet,javax.servlet.http,javax.xml.namespace,o

- rg.apache.abdera,org.apache.abdera.factory,org.apache.abdera.i18n.iri

- ,org.apache.abdera.model,org.apache.abdera.parser,org.apache.abdera.w

- riter,org.apache.commons.codec.binary,org.apache.commons.httpclient,o

- rg.apache.commons.httpclient.auth,org.apache.commons.httpclient.metho

- ds,org.apache.commons.httpclient.params,org.apache.tuscany.sca.assemb

- ly;version="1.4",org.apache.tuscany.sca.binding.atom;version="1.4",or

- g.apache.tuscany.sca.binding.atom.collection;version="1.4",org.apache

- .tuscany.sca.binding.http;version="1.4",org.apache.tuscany.sca.core;v

- ersion="1.4",org.apache.tuscany.sca.data.collection;version="1.4",org

- .apache.tuscany.sca.databinding;version="1.4",org.apache.tuscany.sca.

- databinding.impl;version="1.4",org.apache.tuscany.sca.host.http;versi

- on="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org.apache

- .tuscany.sca.interfacedef.impl;version="1.4",org.apache.tuscany.sca.i

- nterfacedef.util;version="1.4",org.apache.tuscany.sca.invocation;vers

- ion="1.4",org.apache.tuscany.sca.provider;version="1.4",org.apache.tu

- scany.sca.runtime;version="1.4",org.osoa.sca;version="1.4",org.osoa.s

- ca.annotations;version="1.4",org.apache.abdera.protocol.client.util;r

- esolution:=optional,org.apache.abdera.protocol.client;resolution:=opt

- ional,org.apache.abdera.protocol;resolution:=optional,org.apache.tusc

- any.sca.node;resolution:=optional,org.junit;resolution:=optional,java

- x.activation;version="1.1";resolution:=optional,junit.framework;resol

- ution:=optional

+Import-Package: javax.activation;version="1.1";resolution:=optional,

+ javax.servlet,

+ javax.servlet.http,

+ javax.xml.namespace,

+ junit.framework;resolution:=optional,

+ org.apache.abdera,

+ org.apache.abdera.factory,

+ org.apache.abdera.i18n.iri,

+ org.apache.abdera.model,

+ org.apache.abdera.parser,

+ org.apache.abdera.protocol;resolution:=optional,

+ org.apache.abdera.protocol.client;resolution:=optional,

+ org.apache.abdera.protocol.client.util;resolution:=optional,

+ org.apache.abdera.writer,

+ org.apache.commons.codec.binary,

+ org.apache.commons.httpclient,

+ org.apache.commons.httpclient.auth,

+ org.apache.commons.httpclient.methods,

+ org.apache.commons.httpclient.params,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.binding.atom;version="1.4",

+ org.apache.tuscany.sca.binding.atom.collection;version="1.4",

+ org.apache.tuscany.sca.binding.http;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.data.collection;version="1.4",

+ org.apache.tuscany.sca.databinding;version="1.4",

+ org.apache.tuscany.sca.databinding.impl;version="1.4",

+ org.apache.tuscany.sca.host.http;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.impl;version="1.4",

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.node;resolution:=optional,

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.junit;resolution:=optional,

+ org.osoa.sca;version="1.4",

+ org.osoa.sca.annotations;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.atom.abdera

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF
index 7f790504e8..2a00b9501b 100644
--- a/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF
@@ -12,13 +12,17 @@ Bnd-LastModified: 1225397128062
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA CORBA Binding Extension

-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan

- y.sca.assembly;version="1.4",org.apache.tuscany.sca.assembly.xml;vers

- ion="1.4",org.apache.tuscany.sca.binding.corba;version="1.4",org.apac

- he.tuscany.sca.contribution.processor;version="1.4",org.apache.tuscan

- y.sca.contribution.resolver;version="1.4",org.apache.tuscany.sca.core

- ;version="1.4",org.apache.tuscany.sca.host.corba;version="1.4",org.ap

- ache.tuscany.sca.policy;version="1.4"

+Import-Package: javax.xml.namespace,

+ javax.xml.stream,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.assembly.xml;version="1.4",

+ org.apache.tuscany.sca.binding.corba;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.host.corba;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4.0",

+ org.apache.tuscany.sca.policy;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.corba

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java b/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
index 0b79065cc3..8ccce730cf 100644
--- a/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
+++ b/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
@@ -22,13 +22,14 @@ package org.apache.tuscany.sca.binding.corba;
 import javax.xml.namespace.QName;
 
 import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.xml.Constants;
 
 /**
  * @version $Rev$ $Date$
  */
 public interface CorbaBinding extends Binding {
-    QName BINDING_CORBA_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "binding.corba");
+    String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+    String BINDING_CORBA = "binding.corba";
+    QName BINDING_CORBA_QNAME = new QName(SCA10_TUSCANY_NS, BINDING_CORBA);
 
     String getHost();
 
diff --git a/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java b/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
index e86d1a2bba..930a8d39d9 100644
--- a/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
+++ b/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
@@ -24,7 +24,6 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
 import org.apache.tuscany.sca.binding.corba.CorbaBinding;
 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
@@ -94,7 +93,7 @@ public class CorbaBindingProcessor implements StAXArtifactProcessor<CorbaBinding
      */
     public void write(CorbaBinding model, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
         // Write a <binding.corba>
-        writer.writeStartElement(Constants.SCA10_TUSCANY_NS, "binding.corba");
+        writer.writeStartElement(CorbaBinding.SCA10_TUSCANY_NS, CorbaBinding.BINDING_CORBA);
 
         if (model.getName() != null) {
             writer.writeAttribute("name", model.getName());
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
index 3c6bdf6093..952edebf5d 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
@@ -11,18 +11,33 @@ Bnd-LastModified: 1225397250828
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA EJB Binding Runtime

-Import-Package: javax.ejb,javax.ejb.spi,javax.naming,javax.rmi,javax.r

- mi.CORBA,net.sf.cglib.core,net.sf.cglib.proxy,org.apache.tuscany.sca.

- assembly;version="1.4",org.apache.tuscany.sca.binding.ejb;version="1.

- 4",org.apache.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.i

- nterfacedef;version="1.4",org.apache.tuscany.sca.interfacedef.java;ve

- rsion="1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apach

- e.tuscany.sca.provider;version="1.4",org.apache.tuscany.sca.runtime;v

- ersion="1.4",org.omg.CORBA,org.omg.CORBA.portable,org.omg.CORBA_2_3.p

- ortable,org.omg.CosNaming,org.omg.IOP,org.omg.PortableInterceptor,org

- .omg.stub.java.rmi,org.osoa.sca;version="1.4",org.osoa.sca.annotation

- s;version="1.4";resolution:=optional,junit.framework;resolution:=opti

- onal,org.apache.tuscany.sca.node;resolution:=optional

+Import-Package: javax.ejb,

+ javax.ejb.spi,

+ javax.naming,

+ javax.rmi,

+ javax.rmi.CORBA,

+ junit.framework;resolution:=optional,

+ net.sf.cglib.core,

+ net.sf.cglib.proxy,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.binding.ejb;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.node;resolution:=optional,

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.omg.CORBA,

+ org.omg.CORBA.portable,

+ org.omg.CORBA_2_3.portable,

+ org.omg.CosNaming,

+ org.omg.IOP,

+ org.omg.PortableInterceptor,

+ org.omg.stub.java.rmi,

+ org.osoa.sca;version="1.4",

+ org.osoa.sca.annotations;version="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ejb.runtime

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF
index 6e9468f4d2..33493eee71 100644
--- a/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF
@@ -11,13 +11,17 @@ Bnd-LastModified: 1225397146656
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA EJB Binding Model

-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan

- y.sca.assembly;version="1.4",org.apache.tuscany.sca.assembly.xml;vers

- ion="1.4",org.apache.tuscany.sca.binding.ejb;version="1.4",org.apache

- .tuscany.sca.contribution.processor;version="1.4",org.apache.tuscany.

- sca.contribution.resolver;version="1.4",org.apache.tuscany.sca.core;v

- ersion="1.4",org.apache.tuscany.sca.monitor;version="1.4",org.apache.

- tuscany.sca.policy;version="1.4"

+Import-Package: javax.xml.namespace,

+ javax.xml.stream,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.assembly.xml;version="1.4",

+ org.apache.tuscany.sca.binding.ejb;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4.0",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ejb

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
index 0fcb7735a4..dd0504b051 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
@@ -14,25 +14,39 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Gdata Binding Extension Runtime

   GSOC

-Import-Package: com.google.gdata.client,com.google.gdata.data,com.goog

- le.gdata.util,com.google.gdata.util.common.xml,javax.servlet,javax.se

- rvlet.http,javax.xml.namespace,org.apache.abdera.parser,org.apache.co

- mmons.codec.binary,org.apache.commons.httpclient,org.apache.commons.h

- ttpclient.auth,org.apache.commons.httpclient.methods,org.apache.commo

- ns.httpclient.params,org.apache.tuscany.sca.assembly;version="1.4",or

- g.apache.tuscany.sca.binding.gdata;version="1.4",org.apache.tuscany.s

- ca.binding.gdata.collection;version="1.4",org.apache.tuscany.sca.core

- ;version="1.4",org.apache.tuscany.sca.data.collection;version="1.4",o

- rg.apache.tuscany.sca.databinding;version="1.4",org.apache.tuscany.sc

- a.databinding.impl;version="1.4",org.apache.tuscany.sca.host.http;ver

- sion="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org.apac

- he.tuscany.sca.interfacedef.impl;version="1.4",org.apache.tuscany.sca

- .interfacedef.util;version="1.4",org.apache.tuscany.sca.invocation;ve

- rsion="1.4",org.apache.tuscany.sca.provider;version="1.4",org.apache.

- tuscany.sca.runtime;version="1.4",org.osoa.sca;version="1.4",org.osoa

- .sca.annotations;version="1.4",junit.framework;resolution:=optional,o

- rg.apache.tuscany.sca.node;resolution:=optional,org.junit;resolution:

- =optional

+Import-Package: com.google.gdata.client,

+ com.google.gdata.data,

+ com.google.gdata.util,

+ com.google.gdata.util.common.xml,

+ javax.servlet,

+ javax.servlet.http,

+ javax.xml.namespace,

+ junit.framework;resolution:=optional,

+ org.apache.abdera.parser,

+ org.apache.commons.codec.binary,

+ org.apache.commons.httpclient,

+ org.apache.commons.httpclient.auth,

+ org.apache.commons.httpclient.methods,

+ org.apache.commons.httpclient.params,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.binding.gdata;version="1.4",

+ org.apache.tuscany.sca.binding.gdata.collection;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.data.collection;version="1.4",

+ org.apache.tuscany.sca.databinding;version="1.4",

+ org.apache.tuscany.sca.databinding.impl;version="1.4",

+ org.apache.tuscany.sca.host.http;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.impl;version="1.4",

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.node;resolution:=optional,

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.junit;resolution:=optional,

+ org.osoa.sca;version="1.4",

+ org.osoa.sca.annotations;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.gdata.runtime

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF
index 3528e092fc..472a6c6617 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF
@@ -10,15 +10,20 @@ Bnd-LastModified: 1225397277718
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA HTTP Binding Runtime

-Import-Package: javax.servlet,javax.servlet.http,org.apache.tuscany.sc

- a.assembly;version="1.4",org.apache.tuscany.sca.binding.http;version=

- "1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.tuscany.sc

- a.host.http;version="1.4",org.apache.tuscany.sca.interfacedef;version

- ="1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apache.tus

- cany.sca.provider;version="1.4",org.apache.tuscany.sca.runtime;versio

- n="1.4",org.osoa.sca.annotations;version="1.4";resolution:=optional,j

- unit.framework;resolution:=optional,org.apache.tuscany.sca.node;resol

- ution:=optional

+Import-Package: javax.servlet,

+ javax.servlet.http,

+ junit.framework;resolution:=optional,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.binding.http;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.host.http;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.node;resolution:=optional,

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.osoa.sca.annotations;version="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.http.runtime

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF
index 10da1fcff8..77603a635d 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF
@@ -18,20 +18,30 @@ Bnd-LastModified: 1225397307750
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA JMS Binding Runtime

-Import-Package: javax.jms,javax.naming,javax.xml.stream;version="1.0",

- org.apache.axiom.om,org.apache.axiom.om.impl.builder,org.apache.tusca

- ny.sca.assembly;version="1.4",org.apache.tuscany.sca.binding.jms;vers

- ion="1.4",org.apache.tuscany.sca.binding.jms.provider;version="1.4",o

- rg.apache.tuscany.sca.binding.ws;version="1.4",org.apache.tuscany.sca

- .binding.ws.wsdlgen;version="1.4",org.apache.tuscany.sca.core;version

- ="1.4",org.apache.tuscany.sca.core.assembly;version="1.4",org.apache.

- tuscany.sca.core.invocation;version="1.4",org.apache.tuscany.sca.inte

- rfacedef;version="1.4",org.apache.tuscany.sca.interfacedef.java;versi

- on="1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apache.t

- uscany.sca.monitor;version="1.4",org.apache.tuscany.sca.provider;vers

- ion="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.apache.tus

- cany.sca.work;version="1.4",org.osoa.sca;version="1.4",org.osoa.sca.a

- nnotations;version="1.4";resolution:=optional

+Import-Package: javax.jms,

+ javax.naming,

+ javax.xml.stream;version="1.0",

+ org.apache.axiom.om,

+ org.apache.axiom.om.impl.builder,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.binding.jms;version="1.4",

+ org.apache.tuscany.sca.binding.jms.provider;version="1.4",

+ org.apache.tuscany.sca.binding.jms.xml;version="1.4.0",

+ org.apache.tuscany.sca.binding.ws;version="1.4",

+ org.apache.tuscany.sca.binding.ws.wsdlgen;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.core.assembly;version="1.4",

+ org.apache.tuscany.sca.core.invocation;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.apache.tuscany.sca.work;version="1.4",

+ org.osoa.sca;version="1.4",

+ org.osoa.sca.annotations;version="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.jms.runtime

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF
index 4621ed0960..f91d062184 100644
--- a/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.binding.jms;uses:="org.apache.t

- uscany.sca.assembly";version="1.4"

+Export-Package: org.apache.tuscany.sca.binding.jms;version="1.4";uses:="org.apache.tuscany.sca.assembly",

+ org.apache.tuscany.sca.binding.jms.xml;version="1.4"

 Private-Package: org.apache.tuscany.sca.binding.jms.impl;version="1.4"

  ,org.apache.tuscany.sca.binding.jms.xml;version="1.4"

 Tool: Bnd-0.0.255

@@ -12,13 +12,19 @@ Bnd-LastModified: 1225397280359
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA JMS Binding Model

-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan

- y.sca.assembly;version="1.4",org.apache.tuscany.sca.assembly.xml;vers

- ion="1.4",org.apache.tuscany.sca.binding.jms;version="1.4",org.apache

- .tuscany.sca.contribution.processor;version="1.4",org.apache.tuscany.

- sca.contribution.resolver;version="1.4",org.apache.tuscany.sca.core;v

- ersion="1.4",org.apache.tuscany.sca.monitor;version="1.4",org.apache.

- tuscany.sca.policy;version="1.4",junit.framework;resolution:=optional

+Import-Package: javax.xml.namespace,

+ javax.xml.stream,

+ junit.framework;resolution:=optional,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.assembly.xml;version="1.4",

+ org.apache.tuscany.sca.binding.jms;version="1.4",

+ org.apache.tuscany.sca.binding.jms.xml;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4.0",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.jms

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
index a6a23e3178..fbacdb21a3 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
@@ -15,19 +15,28 @@ Bnd-LastModified: 1225397318078
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA JSON-RPC Binding Runtime

-Import-Package: com.metaparadigm.jsonrpc,javax.servlet,javax.servlet.h

- ttp,org.apache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.

- sca.assembly.xml,org.apache.tuscany.sca.binding.jsonrpc;version="1.4"

- ,org.apache.tuscany.sca.binding.jsonrpc.provider;version="1.4",org.ap

- ache.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.host.http;

- version="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org.a

- pache.tuscany.sca.interfacedef.java;version="1.4",org.apache.tuscany.

- sca.invocation;version="1.4",org.apache.tuscany.sca.provider;version=

- "1.4",org.apache.tuscany.sca.runtime;version="1.4",org.json,org.osoa.

- sca;version="1.4",org.osoa.sca.annotations;version="1.4";resolution:=

- optional,junit.framework;resolution:=optional,com.meterware.httpunit;

- resolution:=optional,org.apache.tuscany.sca.node;resolution:=optional

- ,org.junit;resolution:=optional

+Import-Package: com.metaparadigm.jsonrpc,

+ com.meterware.httpunit;resolution:=optional,

+ javax.servlet,

+ javax.servlet.http,

+ junit.framework;resolution:=optional,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.assembly.xml,

+ org.apache.tuscany.sca.binding.jsonrpc;version="1.4",

+ org.apache.tuscany.sca.binding.jsonrpc.provider;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.host.http;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.node;resolution:=optional,

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.json,

+ org.junit;resolution:=optional,

+ org.osoa.sca;version="1.4",

+ org.osoa.sca.annotations;version="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.jsonrpc.runtime

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
index 33ebb1a33c..0a808d011f 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
@@ -10,17 +10,24 @@ Bnd-LastModified: 1225397324375
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA RMI Binding Extension

-Import-Package: net.sf.cglib.asm,net.sf.cglib.proxy,org.apache.tuscany

- .sca.assembly;version="1.4",org.apache.tuscany.sca.binding.rmi;versio

- n="1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.tuscany.

- sca.host.rmi;version="1.4",org.apache.tuscany.sca.interfacedef;versio

- n="1.4",org.apache.tuscany.sca.interfacedef.java;version="1.4",org.ap

- ache.tuscany.sca.interfacedef.java.impl;version="1.4",org.apache.tusc

- any.sca.invocation;version="1.4",org.apache.tuscany.sca.provider;vers

- ion="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.osoa.sca;v

- ersion="1.4",org.osoa.sca.annotations;version="1.4";resolution:=optio

- nal,junit.framework;resolution:=optional,org.apache.tuscany.sca.node;

- resolution:=optional,org.junit;resolution:=optional

+Import-Package: junit.framework;resolution:=optional,

+ net.sf.cglib.asm,

+ net.sf.cglib.proxy,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.binding.rmi;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.host.rmi;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java.impl;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.node;resolution:=optional,

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.junit;resolution:=optional,

+ org.osoa.sca;version="1.4",

+ org.osoa.sca.annotations;version="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.rmi.runtime

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF
index b6024e0c93..cc89338e1f 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF
@@ -10,21 +10,31 @@ Bnd-LastModified: 1225397329562
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA RSS Feed Binding Extension

-Import-Package: com.sun.syndication.feed.atom,com.sun.syndication.feed

- .synd,com.sun.syndication.io,javax.servlet,javax.servlet.http,javax.x

- ml.namespace,org.apache.commons.codec.binary,org.apache.tuscany.sca.a

- ssembly;version="1.4",org.apache.tuscany.sca.binding.rss;version="1.4

- ",org.apache.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.da

- ta.collection;version="1.4",org.apache.tuscany.sca.databinding;versio

- n="1.4",org.apache.tuscany.sca.databinding.impl;version="1.4",org.apa

- che.tuscany.sca.host.http;version="1.4",org.apache.tuscany.sca.interf

- acedef;version="1.4",org.apache.tuscany.sca.interfacedef.impl;version

- ="1.4",org.apache.tuscany.sca.interfacedef.util;version="1.4",org.apa

- che.tuscany.sca.invocation;version="1.4",org.apache.tuscany.sca.provi

- der;version="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.os

- oa.sca.annotations;version="1.4",org.apache.tuscany.sca.binding.rss.c

- ollection;resolution:=optional,org.apache.tuscany.sca.node;resolution

- :=optional

+Import-Package: com.sun.syndication.feed.atom,

+ com.sun.syndication.feed.synd,

+ com.sun.syndication.io,

+ javax.servlet,

+ javax.servlet.http,

+ javax.xml.namespace,

+ org.apache.commons.codec.binary,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.binding.rss;version="1.4",

+ org.apache.tuscany.sca.binding.rss.collection;resolution:=optional,

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.data.collection;version="1.4",

+ org.apache.tuscany.sca.databinding;version="1.4",

+ org.apache.tuscany.sca.databinding.impl;version="1.4",

+ org.apache.tuscany.sca.host.http;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.impl;version="1.4",

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.node;resolution:=optional,

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.jdom;version="1.0.0",

+ org.osoa.sca.annotations;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.rss.rome

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF
index f4cccb8b8a..f13a6f40d5 100644
--- a/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF
@@ -11,21 +11,29 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA CORBA-based Default Binding Ext

  ension

-Import-Package: javax.xml.namespace;version="1.0",javax.xml.stream;ver

- sion="1.0",org.apache.axiom.om,org.apache.axiom.om.impl.builder,org.a

- pache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.sca.bindi

- ng.corba.provider.exceptions;version="1.4",org.apache.tuscany.sca.bin

- ding.corba.provider.reference;version="1.4",org.apache.tuscany.sca.bi

- nding.corba.provider.service;version="1.4",org.apache.tuscany.sca.bin

- ding.corba.provider.types;version="1.4",org.apache.tuscany.sca.bindin

- g.sca;version="1.4",org.apache.tuscany.sca.binding.ws;version="1.4",o

- rg.apache.tuscany.sca.binding.ws.wsdlgen;version="1.4",org.apache.tus

- cany.sca.core;version="1.4",org.apache.tuscany.sca.host.corba;version

- ="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org.apache.t

- uscany.sca.interfacedef.util;version="1.4",org.apache.tuscany.sca.inv

- ocation;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",or

- g.apache.tuscany.sca.provider;version="1.4",org.apache.tuscany.sca.ru

- ntime;version="1.4",org.omg.CORBA,org.osoa.sca;version="1.4"

+Import-Package: javax.xml.namespace;version="1.0",

+ javax.xml.stream;version="1.0",

+ org.apache.axiom.om,

+ org.apache.axiom.om.impl.builder,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.binding.corba.provider.exceptions;version="1.4",

+ org.apache.tuscany.sca.binding.corba.provider.reference;version="1.4",

+ org.apache.tuscany.sca.binding.corba.provider.service;version="1.4",

+ org.apache.tuscany.sca.binding.corba.provider.types;version="1.4",

+ org.apache.tuscany.sca.binding.sca;version="1.4",

+ org.apache.tuscany.sca.binding.ws;version="1.4",

+ org.apache.tuscany.sca.binding.ws.wsdlgen;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.host.corba;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.omg.CORBA,

+ org.osoa.sca;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca.corba

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java b/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
index 6c742e3e00..257be80807 100644
--- a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
+++ b/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
@@ -28,7 +28,6 @@ import java.util.logging.Logger;
 import javax.xml.stream.XMLStreamException;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.llom.util.AXIOMUtil;
 import org.apache.tuscany.sca.binding.corba.provider.exceptions.RequestConfigurationException;
 import org.apache.tuscany.sca.binding.corba.provider.service.InvocationException;
 import org.apache.tuscany.sca.binding.corba.provider.service.InvocationProxy;
diff --git a/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF
index 781b18fc98..9b3d460a66 100644
--- a/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF
@@ -9,15 +9,20 @@ Bnd-LastModified: 1225397190578
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Default Binding XML Model

-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan

- y.sca.assembly;version="1.4",org.apache.tuscany.sca.assembly.xml;vers

- ion="1.4",org.apache.tuscany.sca.contribution.processor;version="1.4"

- ,org.apache.tuscany.sca.contribution.resolver;version="1.4",org.apach

- e.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.monitor;versi

- on="1.4",org.apache.tuscany.sca.policy;version="1.4",junit.framework;

- resolution:=optional,org.apache.tuscany.sca.definitions;version="1.4"

- ;resolution:=optional,org.apache.tuscany.sca.assembly.builder;version

- ="1.4";resolution:=optional,org.junit;resolution:=optional

+Import-Package: javax.xml.namespace,

+ javax.xml.stream,

+ junit.framework;resolution:=optional,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.assembly.builder;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.assembly.xml;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.definitions;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.interfacedef;version="1.4.0",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4",

+ org.junit;resolution:=optional

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

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/branches/sca-equinox/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
index ecb98ab7d6..268e6607fa 100644
--- a/branches/sca-equinox/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
+++ b/branches/sca-equinox/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
@@ -30,7 +30,7 @@ import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.assembly.SCABinding;
 import org.apache.tuscany.sca.assembly.SCABindingFactory;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
 import org.apache.tuscany.sca.assembly.xml.CompositeModelResolver;
 import org.apache.tuscany.sca.binding.sca.impl.SCABindingFactoryImpl;
 import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
@@ -38,9 +38,6 @@ import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
 import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
 import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
 import org.junit.Before;
 import org.junit.Test;
@@ -72,9 +69,7 @@ public class SCABindingTestCase {
         SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
         IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
 
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-        compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, mapper);
+        compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
         
     }
     
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF
index 032e020b9d..a913a5ea84 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF
@@ -41,42 +41,76 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Axis2-based WS Binding Extensio

  n

-Import-Package: javax.servlet,javax.servlet.http,javax.wsdl,javax.wsdl

- .extensions,javax.wsdl.extensions.soap,javax.wsdl.extensions.soap12,j

- avax.xml.namespace;version="1.0",javax.xml.stream;version="1.0",javax

- .xml.transform,javax.xml.transform.dom,org.apache.axiom.om,org.apache

- .axiom.om.impl.builder,org.apache.axiom.om.util,org.apache.axiom.soap

- ,org.apache.axis2,org.apache.axis2.addressing,org.apache.axis2.client

- ,org.apache.axis2.context,org.apache.axis2.deployment,org.apache.axis

- 2.deployment.util,org.apache.axis2.description,org.apache.axis2.engin

- e,org.apache.axis2.i18n,org.apache.axis2.receivers,org.apache.axis2.t

- ransport,org.apache.axis2.transport.http,org.apache.axis2.transport.h

- ttp.server,org.apache.axis2.transport.jms,org.apache.axis2.util,org.a

- pache.axis2.util.threadpool,org.apache.commons.httpclient,org.apache.

- commons.httpclient.params,org.apache.commons.logging,org.apache.tusca

- ny.sca.assembly;version="1.4",org.apache.tuscany.sca.binding.ws;versi

- on="1.4",org.apache.tuscany.sca.binding.ws.axis2;version="1.4",org.ap

- ache.tuscany.sca.contribution.processor;version="1.4",org.apache.tusc

- any.sca.core;version="1.4",org.apache.tuscany.sca.core.assembly;versi

- on="1.4",org.apache.tuscany.sca.databinding;version="1.4",org.apache.

- tuscany.sca.definitions;version="1.4",org.apache.tuscany.sca.host.htt

- p;version="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org

- .apache.tuscany.sca.interfacedef.java;version="1.4",org.apache.tuscan

- y.sca.interfacedef.util;version="1.4",org.apache.tuscany.sca.interfac

- edef.wsdl;version="1.4",org.apache.tuscany.sca.invocation;version="1.

- 4",org.apache.tuscany.sca.policy;version="1.4",org.apache.tuscany.sca

- .policy.authentication.basic;version="1.4",org.apache.tuscany.sca.pol

- icy.security.ws;version="1.4",org.apache.tuscany.sca.policy.util;vers

- ion="1.4",org.apache.tuscany.sca.provider;version="1.4",org.apache.tu

- scany.sca.runtime;version="1.4",org.apache.tuscany.sca.xsd;version="1

- .4",org.apache.tuscany.sca.xsd.xml;version="1.4",org.apache.ws.common

- s.schema,org.apache.ws.commons.schema.resolver,org.apache.ws.security

- ,org.apache.ws.security.handler,org.osoa.sca;version="1.4",org.w3c.do

- m,org.xml.sax,javax.security.auth.callback;resolution:=optional,org.o

- soa.sca.annotations;version="1.4";resolution:=optional,javax.wsdl.fac

- tory;resolution:=optional,org.apache.tuscany.sca.node;resolution:=opt

- ional,org.junit;resolution:=optional,junit.framework;resolution:=opti

- onal,javax.wsdl.xml;resolution:=optional

+Import-Package: javax.security.auth.callback;resolution:=optional,

+ javax.servlet,

+ javax.servlet.http,

+ javax.wsdl,

+ javax.wsdl.extensions,

+ javax.wsdl.extensions.soap,

+ javax.wsdl.extensions.soap12,

+ javax.wsdl.factory;resolution:=optional,

+ javax.wsdl.xml;resolution:=optional,

+ javax.xml.namespace;version="1.0",

+ javax.xml.stream;version="1.0",

+ javax.xml.transform,

+ javax.xml.transform.dom,

+ junit.framework;resolution:=optional,

+ org.apache.axiom.om,

+ org.apache.axiom.om.impl.builder,

+ org.apache.axiom.om.util,

+ org.apache.axiom.soap,

+ org.apache.axis2,

+ org.apache.axis2.addressing,

+ org.apache.axis2.client,

+ org.apache.axis2.context,

+ org.apache.axis2.deployment,

+ org.apache.axis2.deployment.util,

+ org.apache.axis2.description,

+ org.apache.axis2.engine,

+ org.apache.axis2.i18n,

+ org.apache.axis2.receivers,

+ org.apache.axis2.transport,

+ org.apache.axis2.transport.http,

+ org.apache.axis2.transport.http.server,

+ org.apache.axis2.transport.jms,

+ org.apache.axis2.util,

+ org.apache.axis2.util.threadpool,

+ org.apache.commons.httpclient,

+ org.apache.commons.httpclient.params,

+ org.apache.commons.logging,

+ org.apache.neethi,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.binding.ws;version="1.4",

+ org.apache.tuscany.sca.binding.ws.axis2;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.core.assembly;version="1.4",

+ org.apache.tuscany.sca.databinding;version="1.4",

+ org.apache.tuscany.sca.definitions;version="1.4",

+ org.apache.tuscany.sca.host.http;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java;version="1.4",

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.node;resolution:=optional,

+ org.apache.tuscany.sca.policy;version="1.4",

+ org.apache.tuscany.sca.policy.authentication.basic;version="1.4",

+ org.apache.tuscany.sca.policy.security.ws;version="1.4",

+ org.apache.tuscany.sca.policy.util;version="1.4",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.apache.tuscany.sca.xsd;version="1.4",

+ org.apache.tuscany.sca.xsd.xml;version="1.4",

+ org.apache.ws.commons.schema,

+ org.apache.ws.commons.schema.resolver,

+ org.apache.ws.security,

+ org.apache.ws.security.handler,

+ org.junit;resolution:=optional,

+ org.osoa.sca;version="1.4",

+ org.osoa.sca.annotations;version="1.4";resolution:=optional,

+ org.w3c.dom,

+ org.xml.sax

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.axis2

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
index 81db43c701..b73725c2e2 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
+++ b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
@@ -38,8 +38,6 @@ import org.apache.axis2.client.OperationClient;
 import org.apache.axis2.client.Options;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
 import org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.basic.Axis2BasicAuthenticationReferenceBindingConfigurator;
 import org.apache.tuscany.sca.interfacedef.util.FaultException;
@@ -58,15 +56,16 @@ import org.apache.tuscany.sca.runtime.ReferenceParameters;
  * @version $Rev$ $Date$
  */
 public class Axis2BindingInvoker implements Invoker, DataExchangeSemantics {
+    private final static String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
 
     public static final QName QNAME_WSA_FROM =
         new QName(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.WSA_FROM,
                   AddressingConstants.WSA_DEFAULT_PREFIX);
     public static final String TUSCANY_PREFIX = "tuscany";
     public static final QName CALLBACK_ID_REFPARM_QN =
-        new QName(Constants.SCA10_TUSCANY_NS, "CallbackID", TUSCANY_PREFIX);
+        new QName(SCA10_TUSCANY_NS, "CallbackID", TUSCANY_PREFIX);
     public static final QName CONVERSATION_ID_REFPARM_QN =
-        new QName(Constants.SCA10_TUSCANY_NS, "ConversationID", TUSCANY_PREFIX);
+        new QName(SCA10_TUSCANY_NS, "ConversationID", TUSCANY_PREFIX);
     
     private Axis2ServiceClient serviceClient;
     private QName wsdlOperationName;
@@ -130,7 +129,7 @@ public class Axis2BindingInvoker implements Invoker, DataExchangeSemantics {
         final OperationClient operationClient = createOperationClient(msg);
 
         // ensure connections are tracked so that they can be closed by the reference binding
-        MessageContext requestMC = operationClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
+        MessageContext requestMC = operationClient.getMessageContext("Out");
         requestMC.getOptions().setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Boolean.TRUE);
         requestMC.getOptions().setTimeOutInMilliSeconds(240000L);
 
@@ -156,7 +155,7 @@ public class Axis2BindingInvoker implements Invoker, DataExchangeSemantics {
             throw (AxisFault)e.getException();
         }
 
-        MessageContext responseMC = operationClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+        MessageContext responseMC = operationClient.getMessageContext("In");
         
         for ( PolicyHandler policyHandler : policyHandlerList ) {
             policyHandler.afterInvoke(msg, responseMC, operationClient);
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
index f8d0cf55b0..97eb3949af 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
+++ b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
@@ -28,7 +28,6 @@ import org.apache.axis2.client.OperationClient;
 import org.apache.axis2.client.Options;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.policy.util.PolicyHandler;
@@ -55,7 +54,7 @@ public class Axis2OneWayBindingInvoker extends Axis2BindingInvoker {
         OperationClient operationClient = createOperationClient(msg);
 
         // ensure connections are tracked so that they can be closed by the reference binding
-        MessageContext requestMC = operationClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
+        MessageContext requestMC = operationClient.getMessageContext("Out");
         //requestMC.getOptions().setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Boolean.TRUE);
         Options opt = requestMC.getOptions();
         opt.setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Boolean.TRUE);
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
index 01eddb89d1..50164d4114 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
+++ b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
@@ -69,7 +69,6 @@ import org.apache.axis2.transport.jms.JMSConstants;
 import org.apache.axis2.transport.jms.JMSListener;
 import org.apache.axis2.transport.jms.JMSSender;
 import org.apache.axis2.transport.jms.JMSUtils;
-import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.tuscany.sca.assembly.AbstractContract;
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
@@ -90,7 +89,6 @@ import org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy;
 import org.apache.tuscany.sca.policy.util.PolicyHandler;
 import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
 import org.apache.tuscany.sca.policy.util.PolicyHandlerUtils;
-import org.apache.tuscany.sca.provider.PolicyProvider;
 import org.apache.tuscany.sca.runtime.EndpointReference;
 import org.apache.tuscany.sca.runtime.ReferenceParameters;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
@@ -508,7 +506,7 @@ public class Axis2ServiceProvider {
         addSchemas(wsBinding.getWSDLDefinition(), axisService);
 
         // Use the existing WSDL
-        Parameter wsdlParam = new Parameter(WSDLConstants.WSDL_4_J_DEFINITION, null);
+        Parameter wsdlParam = new Parameter("wsdl4jDefinition", null);
         wsdlParam.setValue(definition);
         axisService.addParameter(wsdlParam);
         Parameter userWSDL = new Parameter("useOriginalwsdl", "true");
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
index 21fef3e5d8..ce3a0c33fb 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
+++ b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
@@ -20,15 +20,12 @@
 package org.apache.tuscany.sca.binding.ws.axis2;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -36,29 +33,13 @@ import javax.servlet.http.HttpServletResponse;
 import javax.wsdl.Definition;
 import javax.wsdl.Port;
 import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.axiom.attachments.utils.IOUtils;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
+
 import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.deployment.DeploymentConstants;
-import org.apache.axis2.description.AxisDescription;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.PolicyInclude;
 import org.apache.axis2.transport.http.ListingAgent;
 import org.apache.axis2.transport.http.server.HttpUtils;
-import org.apache.axis2.util.ExternalPolicySerializer;
 import org.apache.axis2.util.JavaUtils;
-import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.neethi.Policy;
-import org.apache.neethi.PolicyRegistry;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaExternal;
 
@@ -110,7 +91,7 @@ public class TuscanyListingAgent extends ListingAgent {
             HashMap services = configContext.getAxisConfiguration().getServices();
             if ((services != null) && !services.isEmpty()) {
                 AxisService axisService = (AxisService)services.get(serviceName);
-                Parameter wsld4jdefinition = axisService.getParameter(WSDLConstants.WSDL_4_J_DEFINITION);
+                Parameter wsld4jdefinition = axisService.getParameter("wsdl4jDefinition");
                 Definition definition = (Definition)wsld4jdefinition.getValue();
                 for (Object s : definition.getServices().values()) {
                     for (Object p : ((Service)s).getPorts().values()) {
diff --git a/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF
index 625c056274..dbbcd00f34 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF
@@ -9,19 +9,28 @@ Bnd-LastModified: 1225397333296
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA WS Binding XML Model

-Import-Package: javax.wsdl,javax.xml.namespace;version="1.0",javax.xml

- .parsers,javax.xml.stream;version="1.0",javax.xml.transform,javax.xml

- .transform.dom,org.apache.tuscany.sca.assembly;version="1.4",org.apac

- he.tuscany.sca.assembly.builder;version="1.4",org.apache.tuscany.sca.

- assembly.xml;version="1.4",org.apache.tuscany.sca.binding.ws;version=

- "1.4",org.apache.tuscany.sca.binding.ws.wsdlgen;version="1.4",org.apa

- che.tuscany.sca.contribution.processor;version="1.4",org.apache.tusca

- ny.sca.contribution.resolver;version="1.4",org.apache.tuscany.sca.cor

- e;version="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org

- .apache.tuscany.sca.interfacedef.wsdl;version="1.4",org.apache.tuscan

- y.sca.monitor;version="1.4",org.apache.tuscany.sca.policy;version="1.

- 4",org.w3c.dom,org.apache.tuscany.sca.definitions;version="1.4";resol

- ution:=optional,org.junit;resolution:=optional

+Import-Package: javax.wsdl,

+ javax.xml.namespace;version="1.0",

+ javax.xml.parsers,

+ javax.xml.stream;version="1.0",

+ javax.xml.transform,

+ javax.xml.transform.dom,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.assembly.builder;version="1.4",

+ org.apache.tuscany.sca.assembly.xml;version="1.4",

+ org.apache.tuscany.sca.binding.ws;version="1.4",

+ org.apache.tuscany.sca.binding.ws.wsdlgen;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.definitions;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4",

+ org.apache.tuscany.sca.xsd;version="1.4.0",

+ org.junit;resolution:=optional,

+ org.w3c.dom

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.xml

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF
index 6a9483de17..ed042fc9b2 100644
--- a/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF
@@ -13,13 +13,18 @@ Bnd-LastModified: 1225397112984
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Java Import/Export Model

-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan

- y.sca.contribution;version="1.4",org.apache.tuscany.sca.contribution.

- java;version="1.4",org.apache.tuscany.sca.contribution.processor;vers

- ion="1.4",org.apache.tuscany.sca.contribution.resolver;version="1.4",

- org.apache.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.exte

- nsibility;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",

- org.junit;resolution:=optional,junit.framework;resolution:=optional

+Import-Package: javax.xml.namespace,

+ javax.xml.stream,

+ junit.framework;resolution:=optional,

+ org.apache.tuscany.sca.assembly;version="1.4.0",

+ org.apache.tuscany.sca.contribution;version="1.4",

+ org.apache.tuscany.sca.contribution.java;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.extensibility;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.junit;resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.contribution.java

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java b/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
index 8a227d245b..6bf7c8f1d7 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
+++ b/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
@@ -38,7 +38,6 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 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.monitor.impl.ProblemImpl;
 
 /**
  * Artifact processor for Namespace export
diff --git a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java b/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
index 1c1e71b3d6..e258dcf874 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
+++ b/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
@@ -38,7 +38,6 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 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.monitor.impl.ProblemImpl;
 
 /**
  * Artifact processor for Namespace import
diff --git a/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF
index 759dd26a7b..a56da107f4 100644
--- a/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF
@@ -12,12 +12,16 @@ Bnd-LastModified: 1225397365937
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Resource Import/Export Model

-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan

- y.sca.contribution;version="1.4",org.apache.tuscany.sca.contribution.

- processor;version="1.4",org.apache.tuscany.sca.contribution.resolver;

- version="1.4",org.apache.tuscany.sca.contribution.resource;version="1

- .4",org.apache.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.

- monitor;version="1.4",org.junit;resolution:=optional

+Import-Package: javax.xml.namespace,

+ javax.xml.stream,

+ org.apache.tuscany.sca.assembly;version="1.4.0",

+ org.apache.tuscany.sca.contribution;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.contribution.resource;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.junit;resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.contribution.resource

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java b/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
index 454e890152..f5f9fad167 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
+++ b/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
@@ -38,7 +38,6 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 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.monitor.impl.ProblemImpl;
 
 /**
  * Artifact processor for Resource export
diff --git a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java b/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
index d36fe64330..7fdb74e256 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
+++ b/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
@@ -38,7 +38,6 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 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.monitor.impl.ProblemImpl;
 
 /**
  * Artifact processor for Namespace import
diff --git a/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF
index 775b81b625..556fefafe8 100644
--- a/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF
@@ -15,14 +15,20 @@ Bnd-LastModified: 1225397199187
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA XML Contribution Model

-Import-Package: javax.xml.namespace,javax.xml.parsers,javax.xml.stream

- ,org.apache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.sca

- .contribution;version="1.4",org.apache.tuscany.sca.contribution.proce

- ssor;version="1.4",org.apache.tuscany.sca.contribution.resolver;versi

- on="1.4",org.apache.tuscany.sca.contribution.xml;version="1.4",org.ap

- ache.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.monitor;ve

- rsion="1.4",org.w3c.dom,org.w3c.dom.traversal,org.junit;resolution:=o

- ptional

+Import-Package: javax.xml.namespace,

+ javax.xml.parsers,

+ javax.xml.stream,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.contribution;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.contribution.xml;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.junit;resolution:=optional,

+ org.w3c.dom,

+ org.w3c.dom.traversal

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

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java b/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
index dd60206e8c..38da7740cd 100644
--- a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
+++ b/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
@@ -40,7 +40,6 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 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.monitor.impl.ProblemImpl;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
diff --git a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java b/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
index 24f938b0a6..02c5d48eb3 100644
--- a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
+++ b/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
@@ -44,7 +44,6 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 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.monitor.impl.ProblemImpl;
 
 /**
  * Processor for contribution metadata
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
index 70e36fba82..d268c5b011 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
+++ b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
@@ -41,7 +41,6 @@ import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
 import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
 import org.apache.tuscany.sca.policy.PolicyFactory;
 
 /**
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
index bd9b106e88..bd38a609a6 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
+++ b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
@@ -40,7 +40,6 @@ import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
 import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
 
 /**
  * The default implementation of an extension point for StAX artifact processors.
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
index baa9d458b9..402d4aa151 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
+++ b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
@@ -38,7 +38,6 @@ import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
 import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
 
 
 /**
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
index 8c7c938fb2..163a428ab2 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
+++ b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
@@ -33,12 +33,10 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.apache.tuscany.sca.contribution.Constants;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 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.monitor.impl.ProblemImpl;
 
 /**
  * Implementation of an extensible StAX artifact processor.
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
index b3356ea957..48e80a073a 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
+++ b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
@@ -37,7 +37,6 @@ import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 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.monitor.impl.ProblemImpl;
 
 /**
  * Implementation of an extensible StAX attribute processor.
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
index 7f6ebbd0ba..cc31d2e073 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
+++ b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
@@ -25,7 +25,6 @@ import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 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.monitor.impl.ProblemImpl;
 
 /**
  * Implementation of an extensible URL artifact processor.
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
index 14110de049..ee8fbba5a5 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
+++ b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
@@ -30,16 +30,15 @@ import javax.xml.stream.util.StreamReaderDelegate;
 import javax.xml.validation.Schema;
 import javax.xml.validation.ValidatorHandler;
 
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.tuscany.sca.monitor.Problem.Severity;
 import org.xml.sax.Attributes;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.AttributesImpl;
-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.monitor.impl.ProblemImpl;
 
 /**
  * 
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
index d20737103b..b48742bcae 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
+++ b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
@@ -23,7 +23,6 @@ import java.lang.reflect.Constructor;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.tuscany.sca.assembly.Base;
 import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
index 69db8f40cb..4e71e1ac30 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
+++ b/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
@@ -18,9 +18,11 @@
  */
 package org.apache.tuscany.sca.contribution.scanner;
 
+import java.io.IOException;
 import java.net.URL;
 import java.util.List;
 
+import org.apache.tuscany.sca.contribution.processor.ContributionException;
 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
 
 /**
diff --git a/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
index 77c5880edc..2f381876ea 100644
--- a/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
@@ -12,24 +12,34 @@ Bnd-LastModified: 1225397235359
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Core/DataBinding Integration

-Import-Package: javax.xml.bind.annotation.adapters,javax.xml.namespace

- ,javax.xml.stream,javax.xml.transform,javax.xml.transform.stream,org.

- apache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.sca.cont

- ribution.resolver;version="1.4",org.apache.tuscany.sca.core;version="

- 1.4",org.apache.tuscany.sca.core.context;version="1.4",org.apache.tus

- cany.sca.databinding;version="1.4",org.apache.tuscany.sca.databinding

- .annotation;version="1.4",org.apache.tuscany.sca.databinding.impl;ver

- sion="1.4",org.apache.tuscany.sca.databinding.jaxb;version="1.4",org.

- apache.tuscany.sca.databinding.xml;version="1.4",org.apache.tuscany.s

- ca.interfacedef;version="1.4",org.apache.tuscany.sca.interfacedef.imp

- l;version="1.4",org.apache.tuscany.sca.interfacedef.java;version="1.4

- ",org.apache.tuscany.sca.interfacedef.java.introspect;version="1.4",o

- rg.apache.tuscany.sca.interfacedef.java.jaxws;version="1.4",org.apach

- e.tuscany.sca.interfacedef.util;version="1.4",org.apache.tuscany.sca.

- invocation;version="1.4",org.apache.tuscany.sca.runtime;version="1.4"

- ,org.apache.tuscany.sca.xsd;version="1.4",org.osoa.sca;version="1.4",

- org.osoa.sca.annotations;version="1.4",org.w3c.dom;resolution:=option

- al,org.junit;resolution:=optional

+Import-Package: javax.xml.bind.annotation.adapters,

+ javax.xml.namespace,

+ javax.xml.stream,

+ javax.xml.transform,

+ javax.xml.transform.stream,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.core.context;version="1.4",

+ org.apache.tuscany.sca.databinding;version="1.4",

+ org.apache.tuscany.sca.databinding.annotation;version="1.4",

+ org.apache.tuscany.sca.databinding.impl;version="1.4",

+ org.apache.tuscany.sca.databinding.jaxb;version="1.4",

+ org.apache.tuscany.sca.databinding.xml;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.impl;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java.introspect;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java.jaxws;version="1.4",

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.apache.tuscany.sca.xsd;version="1.4",

+ org.junit;resolution:=optional,

+ org.osoa.sca;version="1.4",

+ org.osoa.sca.annotations;version="1.4",

+ org.w3c.dom;resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.core.databinding

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF
index 012d96995f..1375fdb56b 100644
--- a/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF
@@ -25,16 +25,21 @@ Bnd-LastModified: 1225397108125
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Core SPI

-Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac

- he.tuscany.sca.context;version="1.4",org.apache.tuscany.sca.core;vers

- ion="1.4",org.apache.tuscany.sca.definitions;version="1.4",org.apache

- .tuscany.sca.endpointresolver;version="1.4",org.apache.tuscany.sca.ex

- tensibility;version="1.4",org.apache.tuscany.sca.interfacedef;version

- ="1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apache.tus

- cany.sca.management;version="1.4",org.apache.tuscany.sca.provider;ver

- sion="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.apache.tu

- scany.sca.work;version="1.4",org.osoa.sca;version="1.4",org.junit;res

- olution:=optional

+Import-Package: org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.context;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.definitions;version="1.4",

+ org.apache.tuscany.sca.endpointresolver;version="1.4",

+ org.apache.tuscany.sca.extensibility;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.management;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.apache.tuscany.sca.work;version="1.4",

+ org.junit;resolution:=optional,

+ org.osoa.sca;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.core.spi

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF
index 99ccbb2124..7e5c8eddaf 100644
--- a/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF
@@ -47,30 +47,43 @@ Bnd-LastModified: 1225397162265
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Core Runtime

-Import-Package: commonj.work,javax.naming,javax.security.auth,javax.xm

- l.namespace,javax.xml.stream,net.sf.cglib.proxy,org.apache.tuscany.sc

- a.assembly;version="1.4",org.apache.tuscany.sca.assembly.builder;vers

- ion="1.4",org.apache.tuscany.sca.assembly.impl;version="1.4",org.apac

- he.tuscany.sca.context;version="1.4",org.apache.tuscany.sca.contribut

- ion.processor;version="1.4",org.apache.tuscany.sca.contribution.resol

- ver;version="1.4",org.apache.tuscany.sca.core;version="1.4",org.apach

- e.tuscany.sca.core.assembly;version="1.4",org.apache.tuscany.sca.core

- .context;version="1.4",org.apache.tuscany.sca.core.conversation;versi

- on="1.4",org.apache.tuscany.sca.core.factory;version="1.4",org.apache

- .tuscany.sca.core.invocation;version="1.4",org.apache.tuscany.sca.cor

- e.scope;version="1.4",org.apache.tuscany.sca.core.work;version="1.4",

- org.apache.tuscany.sca.endpointresolver;version="1.4",org.apache.tusc

- any.sca.extensibility;version="1.4",org.apache.tuscany.sca.interfaced

- ef;version="1.4",org.apache.tuscany.sca.interfacedef.java;version="1.

- 4",org.apache.tuscany.sca.interfacedef.util;version="1.4",org.apache.

- tuscany.sca.invocation;version="1.4",org.apache.tuscany.sca.monitor;v

- ersion="1.4",org.apache.tuscany.sca.provider;version="1.4",org.apache

- .tuscany.sca.runtime;version="1.4",org.apache.tuscany.sca.work;versio

- n="1.4",org.osoa.sca;version="1.4",org.osoa.sca.annotations;version="

- 1.4",org.junit;resolution:=optional,junit.framework;resolution:=optio

- nal,org.apache.tuscany.sca.interfacedef.impl;version="1.4";resolution

- :=optional,org.apache.tuscany.sca.core.wire;version="1.4";resolution:

- =optional

+Import-Package: commonj.work,

+ javax.naming,

+ javax.security.auth,

+ javax.xml.namespace,

+ javax.xml.stream,

+ junit.framework;resolution:=optional,

+ net.sf.cglib.proxy,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.assembly.builder;version="1.4",

+ org.apache.tuscany.sca.assembly.impl;version="1.4",

+ org.apache.tuscany.sca.context;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.core.assembly;version="1.4",

+ org.apache.tuscany.sca.core.context;version="1.4",

+ org.apache.tuscany.sca.core.conversation;version="1.4",

+ org.apache.tuscany.sca.core.factory;version="1.4",

+ org.apache.tuscany.sca.core.invocation;version="1.4",

+ org.apache.tuscany.sca.core.scope;version="1.4",

+ org.apache.tuscany.sca.core.wire;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.core.work;version="1.4",

+ org.apache.tuscany.sca.endpointresolver;version="1.4",

+ org.apache.tuscany.sca.extensibility;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.impl;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.interfacedef.java;version="1.4",

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.apache.tuscany.sca.work;version="1.4",

+ org.junit;resolution:=optional,

+ org.osoa.sca;version="1.4",

+ org.osoa.sca.annotations;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.core

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF
index 3e84fa61d7..ff2fd1b220 100644
--- a/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF
@@ -10,17 +10,26 @@ Bnd-LastModified: 1225397312078
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Data Binding for JSON

-Import-Package: com.metaparadigm.jsonrpc,javax.xml.namespace,javax.xml

- .stream;version="1.0",org.apache.axiom.om,org.apache.tuscany.sca.data

- binding;version="1.4",org.apache.tuscany.sca.databinding.impl;version

- ="1.4",org.apache.tuscany.sca.databinding.xml;version="1.4",org.apach

- e.tuscany.sca.interfacedef;version="1.4",org.apache.tuscany.sca.inter

- facedef.util;version="1.4",org.codehaus.jettison.badgerfish,org.codeh

- aus.jettison.json,org.codehaus.jettison.mapped,org.json,org.osoa.sca.

- annotations;version="1.4",org.apache.tuscany.sca.databinding.json.axi

- om;resolution:=optional,org.junit;resolution:=optional,junit.framewor

- k;resolution:=optional,org.apache.tuscany.sca.interfacedef.impl;versi

- on="1.4";resolution:=optional

+Import-Package: com.metaparadigm.jsonrpc,

+ javax.xml.namespace,

+ javax.xml.stream;version="1.0",

+ junit.framework;resolution:=optional,

+ org.apache.axiom.om,

+ org.apache.tuscany.sca.databinding;version="1.4",

+ org.apache.tuscany.sca.databinding.impl;version="1.4",

+ org.apache.tuscany.sca.databinding.json;version="1.4.0",

+ org.apache.tuscany.sca.databinding.json.axiom;resolution:=optional,

+ org.apache.tuscany.sca.databinding.xml;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.impl;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.codehaus.jettison.badgerfish,

+ org.codehaus.jettison.json,

+ org.codehaus.jettison.mapped,

+ org.json,

+ org.junit;resolution:=optional,

+ org.osoa.sca.annotations;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.json

 Bundle-DocURL: http://www.apache.org/

+Export-Package: org.apache.tuscany.sca.databinding.json;version="1.4.0"

 

diff --git a/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF
index e37ae9b1ae..709b4c966a 100644
--- a/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF
@@ -23,26 +23,42 @@ Bnd-LastModified: 1225397376421
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Data Binding for SDO

-Import-Package: commonj.sdo;version="2.1",commonj.sdo.helper;version="

- 2.1",commonj.sdo.impl,javax.xml.namespace,javax.xml.stream,javax.xml.

- transform,javax.xml.transform.dom,org.apache.tuscany.sca.assembly.imp

- l;version="1.4",org.apache.tuscany.sca.contribution;version="1.4",org

- .apache.tuscany.sca.contribution.processor;version="1.4",org.apache.t

- uscany.sca.contribution.resolver;version="1.4",org.apache.tuscany.sca

- .core;version="1.4",org.apache.tuscany.sca.databinding;version="1.4",

- org.apache.tuscany.sca.databinding.impl;version="1.4",org.apache.tusc

- any.sca.databinding.sdo;version="1.4",org.apache.tuscany.sca.databind

- ing.util;version="1.4",org.apache.tuscany.sca.interfacedef;version="1

- .4",org.apache.tuscany.sca.interfacedef.impl;version="1.4",org.apache

- .tuscany.sca.interfacedef.util;version="1.4",org.apache.tuscany.sca.m

- onitor;version="1.4",org.apache.tuscany.sca.xsd;version="1.4",org.apa

- che.tuscany.sdo.api,org.apache.tuscany.sdo.helper,org.apache.tuscany.

- sdo.impl,org.apache.tuscany.sdo.model,org.apache.tuscany.sdo.model.im

- pl,org.apache.ws.commons.schema,org.eclipse.emf.ecore,org.eclipse.emf

- .ecore.util,org.osoa.sca;version="1.4",org.w3c.dom,org.w3c.dom.bootst

- rap,org.w3c.dom.ls,junit.framework;resolution:=optional,org.apache.tu

- scany.sca.databinding.xml;version="1.4";resolution:=optional,org.juni

- t;resolution:=optional

+Import-Package: commonj.sdo;version="2.1",

+ commonj.sdo.helper;version="2.1",

+ commonj.sdo.impl,

+ javax.xml.namespace,

+ javax.xml.stream,

+ javax.xml.transform,

+ javax.xml.transform.dom,

+ junit.framework;resolution:=optional,

+ org.apache.tuscany.sca.assembly;version="1.4.0",

+ org.apache.tuscany.sca.contribution;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.databinding;version="1.4",

+ org.apache.tuscany.sca.databinding.impl;version="1.4",

+ org.apache.tuscany.sca.databinding.sdo;version="1.4",

+ org.apache.tuscany.sca.databinding.util;version="1.4",

+ org.apache.tuscany.sca.databinding.xml;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.impl;version="1.4",

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.xsd;version="1.4",

+ org.apache.tuscany.sdo.api,

+ org.apache.tuscany.sdo.helper,

+ org.apache.tuscany.sdo.impl,

+ org.apache.tuscany.sdo.model,

+ org.apache.tuscany.sdo.model.impl,

+ org.apache.ws.commons.schema,

+ org.eclipse.emf.ecore,

+ org.eclipse.emf.ecore.util,

+ org.junit;resolution:=optional,

+ org.osoa.sca;version="1.4",

+ org.w3c.dom,

+ org.w3c.dom.bootstrap,

+ org.w3c.dom.ls

 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.sdo

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java b/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
index 30a3e1c3a9..7afb7d9463 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
+++ b/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.databinding.sdo;
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.assembly.impl.BaseImpl;
+import org.apache.tuscany.sca.assembly.Base;
 
 import commonj.sdo.helper.HelperContext;
 
@@ -30,13 +30,22 @@ import commonj.sdo.helper.HelperContext;
  * 
  * @version $Rev$ $Date$
  */
-public class ImportSDO extends BaseImpl {
+public class ImportSDO implements Base {
     public static final QName IMPORT_SDO =
         new QName("http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0", "import.sdo");
 
     private HelperContext helperContext;
     private String factoryClassName;
     private String schemaLocation;
+    private boolean unresolved;
+    
+    public boolean isUnresolved() {
+        return unresolved;
+    }
+
+    public void setUnresolved(boolean undefined) {
+        this.unresolved = undefined;
+    }
 
     public ImportSDO(HelperContext helperContext) {
         super();
diff --git a/branches/sca-equinox/modules/databinding/pom.xml b/branches/sca-equinox/modules/databinding/pom.xml
index 162daa7eaa..3851356afc 100644
--- a/branches/sca-equinox/modules/databinding/pom.xml
+++ b/branches/sca-equinox/modules/databinding/pom.xml
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>xmlunit</groupId>
             <artifactId>xmlunit</artifactId>
-            <version>1.1</version>
+            <version>1.2</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF
index c4126fa360..584cfe1e35 100644
--- a/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF
@@ -27,28 +27,43 @@ Bnd-LastModified: 1225397422109
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Domain Manager Application

-Import-Package: javax.servlet,javax.servlet.http,javax.xml.namespace,j

- avax.xml.parsers,javax.xml.stream,org.apache.commons.fileupload,org.a

- pache.commons.fileupload.disk,org.apache.commons.fileupload.servlet,o

- rg.apache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.sca.a

- ssembly.builder;version="1.4",org.apache.tuscany.sca.binding.atom;ver

- sion="1.4",org.apache.tuscany.sca.contribution;version="1.4",org.apac

- he.tuscany.sca.contribution.processor;version="1.4",org.apache.tuscan

- y.sca.contribution.resolver;version="1.4",org.apache.tuscany.sca.core

- ;version="1.4",org.apache.tuscany.sca.core.assembly;version="1.4",org

- .apache.tuscany.sca.core.context;version="1.4",org.apache.tuscany.sca

- .core.invocation;version="1.4",org.apache.tuscany.sca.data.collection

- ;version="1.4",org.apache.tuscany.sca.definitions;version="1.4",org.a

- pache.tuscany.sca.domain.manager.impl;version="1.4",org.apache.tuscan

- y.sca.domain.manager.launcher;version="1.4",org.apache.tuscany.sca.im

- plementation.node;version="1.4",org.apache.tuscany.sca.interfacedef;v

- ersion="1.4",org.apache.tuscany.sca.interfacedef.java;version="1.4",o

- rg.apache.tuscany.sca.monitor;version="1.4",org.apache.tuscany.sca.no

- de;version="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.apa

- che.tuscany.sca.workspace;version="1.4",org.apache.tuscany.sca.worksp

- ace.builder;version="1.4",org.apache.xml.serialize,org.osoa.sca;versi

- on="1.4",org.osoa.sca.annotations;version="1.4",org.w3c.dom,junit.fra

- mework;resolution:=optional

+Import-Package: javax.servlet,

+ javax.servlet.http,

+ javax.xml.namespace,

+ javax.xml.parsers,

+ javax.xml.stream,

+ junit.framework;resolution:=optional,

+ org.apache.commons.fileupload,

+ org.apache.commons.fileupload.disk,

+ org.apache.commons.fileupload.servlet,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.assembly.builder;version="1.4",

+ org.apache.tuscany.sca.assembly.xml;version="1.4.0",

+ org.apache.tuscany.sca.binding.atom;version="1.4",

+ org.apache.tuscany.sca.contribution;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.core.assembly;version="1.4",

+ org.apache.tuscany.sca.core.context;version="1.4",

+ org.apache.tuscany.sca.core.invocation;version="1.4",

+ org.apache.tuscany.sca.data.collection;version="1.4",

+ org.apache.tuscany.sca.definitions;version="1.4",

+ org.apache.tuscany.sca.domain.manager.impl;version="1.4",

+ org.apache.tuscany.sca.domain.manager.launcher;version="1.4",

+ org.apache.tuscany.sca.implementation.node;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.node;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.apache.tuscany.sca.workspace;version="1.4",

+ org.apache.tuscany.sca.workspace.builder;version="1.4",

+ org.apache.xml.serialize,

+ org.osoa.sca;version="1.4",

+ org.osoa.sca.annotations;version="1.4",

+ org.w3c.dom

 Bundle-SymbolicName: org.apache.tuscany.sca.domain.manager

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java b/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
index 68c5144d85..5321cc2dc1 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
+++ b/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
@@ -83,7 +83,6 @@ import org.apache.tuscany.sca.workspace.WorkspaceFactory;
 import org.apache.tuscany.sca.workspace.builder.ContributionBuilder;
 import org.apache.tuscany.sca.workspace.builder.ContributionBuilderException;
 import org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
 import org.apache.xml.serialize.OutputFormat;
 import org.apache.xml.serialize.XMLSerializer;
 import org.osoa.sca.ServiceRuntimeException;
diff --git a/branches/sca-equinox/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java b/branches/sca-equinox/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
index b262f51d45..dcee1b84a9 100644
--- a/branches/sca-equinox/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
+++ b/branches/sca-equinox/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
@@ -32,9 +32,8 @@ import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
 import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
@@ -55,10 +54,8 @@ import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory;
 import org.apache.tuscany.sca.endpoint.impl.EndpointResolverFactoryImpl;
 import org.apache.tuscany.sca.endpointresolver.EndpointResolver;
 import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -122,10 +119,7 @@ public class EndpointTestCase {
         modelResolver = new ExtensibleModelResolver(null, modelResolvers, modelFactories);
                
         // Create a composite builder
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class);
-        compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, contractMapper);
+        compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
         
         // Runtime Init ===================
 /*        
diff --git a/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF
index c81ec9d481..9be3a3a7b6 100644
--- a/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF
@@ -13,15 +13,21 @@ Bnd-LastModified: 1225397433843
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA BPEL Implementation Extension

-Import-Package: javax.wsdl,javax.wsdl.extensions,javax.xml.namespace,j

- avax.xml.stream,org.apache.tuscany.sca.assembly;version="1.4",org.apa

- che.tuscany.sca.assembly.impl;version="1.4",org.apache.tuscany.sca.co

- ntribution.processor;version="1.4",org.apache.tuscany.sca.contributio

- n.resolver;version="1.4",org.apache.tuscany.sca.core;version="1.4",or

- g.apache.tuscany.sca.implementation.bpel;version="1.4",org.apache.tus

- cany.sca.interfacedef;version="1.4",org.apache.tuscany.sca.interfaced

- ef.wsdl;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",ju

- nit.framework;resolution:=optional

+Import-Package: javax.wsdl,

+ javax.wsdl.extensions,

+ javax.xml.namespace,

+ javax.xml.stream,

+ junit.framework;resolution:=optional,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.assembly.impl;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.implementation.bpel;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4.0"

 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.bpel

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java b/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
index 0e24b94a2e..43606cb216 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
+++ b/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
@@ -54,7 +54,6 @@ import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject;
 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.monitor.impl.ProblemImpl;
 
 /**
  * BPEL document processor responsible for reading a BPEL file and producing necessary model info about it
@@ -80,7 +79,8 @@ public class BPELDocumentProcessor extends BaseStAXArtifactProcessor implements
     private static final QName IMPORT_ELEMENT = new QName(BPEL_NS, "import");
     private static final String LINKTYPE_NAME = "partnerLinkType";
     private static final QName LINKTYPE_ELEMENT = new QName(BPEL_PLINK_NS, LINKTYPE_NAME);
-    public final static String NAME_ELEMENT = "name";
+    private final static String NAME_ELEMENT = "name";
+    private final static String TARGET_NAMESPACE = "targetNamespace";
     
     private final static XMLInputFactory inputFactory = XMLInputFactory.newInstance();
     
@@ -359,7 +359,7 @@ public class BPELDocumentProcessor extends BaseStAXArtifactProcessor implements
                     case START_ELEMENT:
                         QName qname = reader.getName();
                         if (BPEL_PROCESS_DEFINITION.equals(qname) || BPEL_EXECUTABLE_DEFINITION.equals(qname)) {
-                            QName processName = new QName(getString(reader, org.apache.tuscany.sca.assembly.xml.Constants.TARGET_NAMESPACE), getString(reader, NAME_ELEMENT));
+                            QName processName = new QName(getString(reader, TARGET_NAMESPACE), getString(reader, NAME_ELEMENT));
                             processDefinition.setName(processName);
                         } else if (PARTNERLINK_ELEMENT.equals(qname)) {
                             processDefinition.getPartnerLinks().add(processPartnerLinkElement(reader));
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java b/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
index 112b908867..92c38123a1 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
+++ b/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
@@ -37,7 +37,6 @@ import org.apache.tuscany.sca.assembly.Multiplicity;
 import org.apache.tuscany.sca.assembly.Property;
 import org.apache.tuscany.sca.assembly.Reference;
 import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
 import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
@@ -45,7 +44,6 @@ 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.databinding.xml.DOMDataBinding;
 import org.apache.tuscany.sca.implementation.bpel.BPELFactory;
 import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;
 import org.apache.tuscany.sca.implementation.bpel.BPELProcessDefinition;
@@ -55,7 +53,6 @@ import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
 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.monitor.impl.ProblemImpl;
 
 /**
  * Implements a StAX artifact processor for BPEL implementations.
@@ -68,9 +65,10 @@ import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
  *  @version $Rev$ $Date$
  */
 public class BPELImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<BPELImplementation> {
-	private static final String PROCESS = "process";
-	private static final String IMPLEMENTATION_BPEL = "implementation.bpel";
-	private static final QName IMPLEMENTATION_BPEL_QNAME = new QName(Constants.SCA10_NS, IMPLEMENTATION_BPEL);
+    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
+    private static final String PROCESS = "process";
+    private static final String IMPLEMENTATION_BPEL = "implementation.bpel";
+    private static final QName IMPLEMENTATION_BPEL_QNAME = new QName(SCA10_NS, IMPLEMENTATION_BPEL);
     
     private AssemblyFactory assemblyFactory;
     private BPELFactory bpelFactory;
@@ -151,7 +149,7 @@ public class BPELImplementationProcessor extends BaseStAXArtifactProcessor imple
         //FIXME Deal with policy processing...
         // Write <implementation.bpel process="..."/>
         // policyProcessor.writePolicyPrefixes(bpelImplementation, writer);
-        writer.writeStartElement(Constants.SCA10_NS, IMPLEMENTATION_BPEL);
+        writer.writeStartElement(SCA10_NS, IMPLEMENTATION_BPEL);
         // policyProcessor.writePolicyAttributes(bpelImplementation, writer);
         
         if (bpelImplementation.getProcess() != null) {
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java b/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
index 9e19788112..28cc562a3b 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
+++ b/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
@@ -28,7 +28,6 @@ import javax.xml.stream.XMLStreamReader;
 import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
 import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
@@ -44,8 +43,6 @@ import org.apache.tuscany.sca.monitor.Problem;
  * @version $Rev$ $Date$
  */
 public class BPELImplementationProcessorTestCase extends TestCase {
-    
-    protected static final QName IMPLEMENTATION_BPEL = new QName(Constants.SCA10_NS, "implementation.bpel");
 
     private static final String COMPOSITE =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
diff --git a/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF
index 69baef9314..7d3b34d5f3 100644
--- a/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF
@@ -13,12 +13,16 @@ Bnd-LastModified: 1225397453750
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Script Implementation Model

-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan

- y.sca.assembly;version="1.4",org.apache.tuscany.sca.contribution;vers

- ion="1.4",org.apache.tuscany.sca.contribution.processor;version="1.4"

- ,org.apache.tuscany.sca.contribution.resolver;version="1.4",org.apach

- e.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.implementatio

- n.script;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",

+Import-Package: javax.xml.namespace,

+ javax.xml.stream,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.assembly.xml;version="1.4.0",

+ org.apache.tuscany.sca.contribution;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.implementation.script;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.script

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
index 29cf3fab66..f58a160d87 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
@@ -10,17 +10,22 @@ Bnd-LastModified: 1225397415984
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Widget Implementation Runtime

-Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac

- he.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.implementati

- on.widget;version="1.4",org.apache.tuscany.sca.interfacedef;version="

- 1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apache.tusca

- ny.sca.provider;version="1.4",org.apache.tuscany.sca.runtime;version=

- "1.4",org.w3c.dom,org.apache.abdera.factory;resolution:=optional,org.

- apache.tuscany.sca.binding.atom.collection;resolution:=optional,org.o

- soa.sca.annotations;version="1.4";resolution:=optional,junit.framewor

- k;resolution:=optional,org.apache.abdera.model;resolution:=optional,o

- rg.apache.tuscany.sca.node;resolution:=optional,org.apache.abdera;res

- olution:=optional

+Import-Package: junit.framework;resolution:=optional,

+ org.apache.abdera;resolution:=optional,

+ org.apache.abdera.factory;resolution:=optional,

+ org.apache.abdera.model;resolution:=optional,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.binding.atom.collection;resolution:=optional,

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.implementation.widget;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.node;resolution:=optional,

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.osoa.sca.annotations;version="1.4";resolution:=optional,

+ org.w3c.dom

 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.widget.runt

  ime

 Bundle-DocURL: http://www.apache.org/

diff --git a/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF
index 8ee8107efc..18a2f3ce3b 100644
--- a/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF
@@ -15,15 +15,20 @@ Bnd-LastModified: 1225397413234
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Widget Implementation Model

-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan

- y.sca.assembly;version="1.4",org.apache.tuscany.sca.contribution;vers

- ion="1.4",org.apache.tuscany.sca.contribution.processor;version="1.4"

- ,org.apache.tuscany.sca.contribution.resolver;version="1.4",org.apach

- e.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.data.collecti

- on;version="1.4",org.apache.tuscany.sca.implementation.widget;version

- ="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org.apache.t

- uscany.sca.interfacedef.java;version="1.4",org.apache.tuscany.sca.mon

- itor;version="1.4"

+Import-Package: javax.xml.namespace,

+ javax.xml.stream,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.assembly.xml;version="1.4.0",

+ org.apache.tuscany.sca.contribution;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.data.collection;version="1.4",

+ org.apache.tuscany.sca.implementation.widget;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4.0"

 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.widget

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF
index ab2b0d1206..2aecd6d78c 100644
--- a/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF
@@ -23,25 +23,40 @@ Bnd-LastModified: 1225397469781
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA XQuery Implementation Extension

-Import-Package: javax.xml.namespace,javax.xml.stream,javax.xml.transfo

- rm,javax.xml.transform.dom,javax.xml.transform.stream,net.sf.saxon,ne

- t.sf.saxon.event,net.sf.saxon.om,net.sf.saxon.query,net.sf.saxon.tran

- s,net.sf.saxon.value,org.apache.tuscany.sca.assembly;version="1.4",or

- g.apache.tuscany.sca.assembly.impl;version="1.4",org.apache.tuscany.s

- ca.contribution;version="1.4",org.apache.tuscany.sca.contribution.pro

- cessor;version="1.4",org.apache.tuscany.sca.contribution.resolver;ver

- sion="1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.tusca

- ny.sca.core.factory;version="1.4",org.apache.tuscany.sca.databinding;

- version="1.4",org.apache.tuscany.sca.databinding.impl;version="1.4",o

- rg.apache.tuscany.sca.databinding.saxon;version="1.4",org.apache.tusc

- any.sca.databinding.saxon.collection;version="1.4",org.apache.tuscany

- .sca.implementation.java.injection;version="1.4",org.apache.tuscany.s

- ca.implementation.xquery;version="1.4",org.apache.tuscany.sca.interfa

- cedef;version="1.4",org.apache.tuscany.sca.interfacedef.java;version=

- "1.4",org.apache.tuscany.sca.interfacedef.util;version="1.4",org.apac

- he.tuscany.sca.invocation;version="1.4",org.apache.tuscany.sca.monito

- r;version="1.4",org.apache.tuscany.sca.provider;version="1.4",org.apa

- che.tuscany.sca.runtime;version="1.4",org.w3c.dom

+Import-Package: javax.xml.namespace,

+ javax.xml.stream,

+ javax.xml.transform,

+ javax.xml.transform.dom,

+ javax.xml.transform.stream,

+ net.sf.saxon,

+ net.sf.saxon.event,

+ net.sf.saxon.om,

+ net.sf.saxon.query,

+ net.sf.saxon.trans,

+ net.sf.saxon.value,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.assembly.impl;version="1.4",

+ org.apache.tuscany.sca.contribution;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.core.factory;version="1.4",

+ org.apache.tuscany.sca.databinding;version="1.4",

+ org.apache.tuscany.sca.databinding.impl;version="1.4",

+ org.apache.tuscany.sca.databinding.saxon;version="1.4",

+ org.apache.tuscany.sca.databinding.saxon.collection;version="1.4",

+ org.apache.tuscany.sca.implementation.java.injection;version="1.4",

+ org.apache.tuscany.sca.implementation.xquery;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java;version="1.4",

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.osoa.sca;version="1.4.0",

+ org.w3c.dom

 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.xquery

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF
index f9e3696f6a..0d8fb40c59 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF
@@ -17,22 +17,33 @@ Bnd-LastModified: 1225397232156
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany Java Interface for JAXWS

-Import-Package: javax.jws,javax.jws.soap,javax.xml.bind.annotation,jav

- ax.xml.bind.annotation.adapters,javax.xml.namespace,javax.xml.ws,org.

- apache.tuscany.sca.databinding;version="1.4",org.apache.tuscany.sca.d

- atabinding.annotation;version="1.4",org.apache.tuscany.sca.databindin

- g.jaxb;version="1.4",org.apache.tuscany.sca.interfacedef;version="1.4

- ",org.apache.tuscany.sca.interfacedef.impl;version="1.4",org.apache.t

- uscany.sca.interfacedef.java;version="1.4",org.apache.tuscany.sca.int

- erfacedef.java.impl;version="1.4",org.apache.tuscany.sca.interfacedef

- .java.introspect;version="1.4",org.apache.tuscany.sca.interfacedef.ja

- va.jaxws;version="1.4",org.apache.tuscany.sca.interfacedef.util;versi

- on="1.4",org.objectweb.asm;version="3.1",org.osoa.sca;version="1.4",j

- unit.framework;resolution:=optional,org.objectweb.asm.util;version="3

- .1";resolution:=optional,org.osoa.sca.annotations;version="1.4";resol

- ution:=optional,org.junit;resolution:=optional,javax.xml.transform;re

- solution:=optional,javax.xml.transform.stream;resolution:=optional,ja

- vax.xml.bind;resolution:=optional

+Import-Package: javax.jws,

+ javax.jws.soap,

+ javax.xml.bind;resolution:=optional,

+ javax.xml.bind.annotation,

+ javax.xml.bind.annotation.adapters,

+ javax.xml.namespace,

+ javax.xml.transform;resolution:=optional,

+ javax.xml.transform.stream;resolution:=optional,

+ javax.xml.ws,

+ junit.framework;resolution:=optional,

+ org.apache.tuscany.sca.assembly;version="1.4.0",

+ org.apache.tuscany.sca.databinding;version="1.4",

+ org.apache.tuscany.sca.databinding.annotation;version="1.4",

+ org.apache.tuscany.sca.databinding.jaxb;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.impl;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java.impl;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java.introspect;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java.jaxws;version="1.4",

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.junit;resolution:=optional,

+ org.objectweb.asm;version="3.1",

+ org.objectweb.asm.util;version="3.1";resolution:=optional,

+ org.osoa.sca;version="1.4",

+ org.osoa.sca.annotations;version="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.interface.java.jaxws

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF
index a41df60f4b..b2a155183c 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF
@@ -10,25 +10,32 @@ Bnd-LastModified: 1225397292156
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA WSDL Interface XML Model

-Import-Package: javax.wsdl,javax.wsdl.extensions,javax.wsdl.extensions

- .schema,javax.wsdl.factory,javax.wsdl.xml,javax.xml.namespace,javax.x

- ml.stream,org.apache.tuscany.sca.contribution;version="1.4",org.apach

- e.tuscany.sca.contribution.namespace;version="1.4",org.apache.tuscany

- .sca.contribution.processor;version="1.4",org.apache.tuscany.sca.cont

- ribution.resolver;version="1.4",org.apache.tuscany.sca.core;version="

- 1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org.apache.tus

- cany.sca.interfacedef.wsdl;version="1.4",org.apache.tuscany.sca.monit

- or;version="1.4",org.apache.tuscany.sca.xsd;version="1.4",org.apache.

- tuscany.sca.xsd.xml;version="1.4",org.apache.ws.commons.schema,org.w3

- c.dom,org.xml.sax,org.apache.tuscany.sca.interfacedef.util;version="1

- .4";resolution:=optional,org.apache.tuscany.sca.definitions;version="

- 1.4";resolution:=optional,org.apache.tuscany.sca.interfacedef.wsdl.im

- pl;resolution:=optional,org.apache.tuscany.sca.policy;version="1.4";r

- esolution:=optional,junit.framework;resolution:=optional,org.apache.t

- uscany.sca.assembly.builder;version="1.4";resolution:=optional,org.ap

- ache.tuscany.sca.assembly;version="1.4";resolution:=optional,org.apac

- he.tuscany.sca.assembly.builder.impl;resolution:=optional,org.junit;r

- esolution:=optional

+Import-Package: javax.wsdl,

+ javax.wsdl.extensions,

+ javax.wsdl.extensions.schema,

+ javax.wsdl.factory,

+ javax.wsdl.xml,

+ javax.xml.namespace,

+ javax.xml.stream,

+ junit.framework;resolution:=optional,

+ org.apache.tuscany.sca.assembly;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.assembly.builder;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.contribution;version="1.4",

+ org.apache.tuscany.sca.contribution.namespace;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.definitions;version="1.4.0";resolution:=optional,

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4";resolution:=optional,

+ org.apache.tuscany.sca.xsd;version="1.4",

+ org.apache.tuscany.sca.xsd.xml;version="1.4",

+ org.apache.ws.commons.schema,

+ org.junit;resolution:=optional,

+ org.w3c.dom,

+ org.xml.sax

 Bundle-SymbolicName: org.apache.tuscany.sca.interface.wsdl.xml

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java b/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
index f9ddda6d98..82d18ca319 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
+++ b/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
@@ -20,17 +20,15 @@ package org.apache.tuscany.sca.interfacedef.wsdl.xml;
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.assembly.xml.Constants;
-
 /**
  * Constants for WSDL.
  *
  * @version $Rev$ $Date$
  */
 public interface WSDLConstants {
-
+    String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
     String INTERFACE_WSDL = "interface.wsdl";
-    QName INTERFACE_WSDL_QNAME = new QName(Constants.SCA10_NS, "interface.wsdl");
+    QName INTERFACE_WSDL_QNAME = new QName(SCA10_NS, "interface.wsdl");
     String INTERFACE = "interface";
     String CALLBACK_INTERFACE = "callbackInterface";
     String WSDL_LOCATION = "wsdlLocation";
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java b/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
index 7f9f6b0146..8331215067 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
+++ b/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
@@ -43,9 +43,8 @@ import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
 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.monitor.impl.ProblemImpl;
-import org.apache.tuscany.sca.xsd.XSDefinition;
 import org.apache.tuscany.sca.xsd.XSDFactory;
+import org.apache.tuscany.sca.xsd.XSDefinition;
 
 /**
  * An ArtifactProcessor for WSDL documents.
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
index 6a364fe164..d40aac9434 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
+++ b/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
@@ -27,7 +27,6 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
 import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
 import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
@@ -43,7 +42,6 @@ import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject;
 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.monitor.impl.ProblemImpl;
 
 /**
  *
@@ -162,7 +160,7 @@ public class WSDLInterfaceProcessor implements StAXArtifactProcessor<WSDLInterfa
     
     public void write(WSDLInterfaceContract wsdlInterfaceContract, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
         // Write an <interface.wsdl>
-        writer.writeStartElement(Constants.SCA10_NS, INTERFACE_WSDL);
+        writer.writeStartElement(WSDLConstants.SCA10_NS, INTERFACE_WSDL);
 
         // Write interface name
         WSDLInterface wsdlInterface = (WSDLInterface)wsdlInterfaceContract.getInterface();
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java b/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
index 21e8e44046..7f17f7463f 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
+++ b/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
@@ -26,22 +26,17 @@ import javax.xml.stream.XMLStreamReader;
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.assembly.ComponentType;
 import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
 import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
 import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
 import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
 
 /**
  * Test reading WSDL interfaces.
@@ -62,12 +57,7 @@ public class ReadTestCase extends TestCase {
         staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
         
         FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, mapper);
+        compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
     }
 
     public void testReadComponentType() throws Exception {
diff --git a/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF
index 06f9fee31c..a81cf445c1 100644
--- a/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF
@@ -15,14 +15,24 @@ Bnd-LastModified: 1225397282593
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA WSDL Interface Model

-Import-Package: javax.wsdl,javax.wsdl.extensions,javax.xml.namespace,o

- rg.apache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.sca.c

- ontribution.resolver;version="1.4",org.apache.tuscany.sca.core;versio

- n="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org.apache.

- tuscany.sca.interfacedef.impl;version="1.4",org.apache.tuscany.sca.in

- terfacedef.util;version="1.4",org.apache.tuscany.sca.interfacedef.wsd

- l;version="1.4",org.apache.tuscany.sca.policy;version="1.4",org.apach

- e.tuscany.sca.xsd;version="1.4",org.apache.ws.commons.schema

+Import-Package: javax.wsdl,

+ javax.wsdl.extensions,

+ javax.xml.namespace,

+ junit.framework;resolution:=optional,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.contribution;version="1.4.0";resolution:=optional,

+ org.apache.tuscany.sca.contribution.processor;version="1.4.0";resolution:=optional,

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.impl;version="1.4",

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4.0";resolution:=optional,

+ org.apache.tuscany.sca.policy;version="1.4",

+ org.apache.tuscany.sca.xsd;version="1.4",

+ org.apache.ws.commons.schema,

+ org.junit;resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.interface.wsdl

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java b/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
index 8ed7ba395b..8ed7ba395b 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
+++ b/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java b/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
index dc7e1ced38..dc7e1ced38 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
+++ b/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java b/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
index c392b92f8a..c392b92f8a 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
+++ b/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java b/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
index cf379a1b11..cf379a1b11 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
+++ b/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java b/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
index ff18c65c69..ff18c65c69 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
+++ b/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
diff --git a/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF
index c39a3fb99d..2a45bd9c7c 100644
--- a/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF
@@ -19,22 +19,30 @@ Bnd-LastModified: 1225397240796
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Node Implementation

-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan

- y.sca.assembly;version="1.4",org.apache.tuscany.sca.assembly.builder;

- version="1.4",org.apache.tuscany.sca.contribution;version="1.4",org.a

- pache.tuscany.sca.contribution.processor;version="1.4",org.apache.tus

- cany.sca.contribution.resolver;version="1.4",org.apache.tuscany.sca.c

- ore;version="1.4",org.apache.tuscany.sca.core.assembly;version="1.4",

- org.apache.tuscany.sca.core.invocation;version="1.4",org.apache.tusca

- ny.sca.definitions;version="1.4",org.apache.tuscany.sca.implementatio

- n.node;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",org

- .apache.tuscany.sca.node;version="1.4",org.apache.tuscany.sca.node.im

- pl;version="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.apa

- che.tuscany.sca.work;version="1.4",org.apache.tuscany.sca.workspace;v

- ersion="1.4",org.apache.tuscany.sca.workspace.builder;version="1.4",o

- rg.osoa.sca;version="1.4",org.osoa.sca.annotations;version="1.4";reso

- lution:=optional,junit.framework;resolution:=optional,org.junit;resol

- ution:=optional

+Import-Package: javax.xml.namespace,

+ javax.xml.stream,

+ junit.framework;resolution:=optional,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.assembly.builder;version="1.4",

+ org.apache.tuscany.sca.contribution;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.core.assembly;version="1.4",

+ org.apache.tuscany.sca.core.invocation;version="1.4",

+ org.apache.tuscany.sca.definitions;version="1.4",

+ org.apache.tuscany.sca.implementation.node;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.node;version="1.4",

+ org.apache.tuscany.sca.node.impl;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4.0",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.apache.tuscany.sca.work;version="1.4",

+ org.apache.tuscany.sca.workspace;version="1.4",

+ org.apache.tuscany.sca.workspace.builder;version="1.4",

+ org.junit;resolution:=optional,

+ org.osoa.sca;version="1.4",

+ org.osoa.sca.annotations;version="1.4";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.node.impl

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
index 7be1e14988..10d3e14838 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
+++ b/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
@@ -113,31 +113,9 @@ final class NodeLauncherUtil {
             if (file.exists()) {
                 File jarDirectory = file.getParentFile();
                 if (jarDirectory != null && jarDirectory.exists()) {
-
-                    // Collect JAR files from the directory containing the input JAR
-                    // (e.g. the Tuscany modules directory)
-                    URL jarDirectoryURL = jarDirectory.toURI().toURL(); 
-                    jarDirectoryURLs.add(jarDirectoryURL);
-                    collectJARFiles(jarDirectory, jarURLs, filter);
-                    
                     File homeDirectory = jarDirectory.getParentFile();
                     if (homeDirectory != null && homeDirectory.exists()) {
-                        
-                        // Collect JARs from the ../modules directory
-                        File modulesDirectory = new File(homeDirectory, "modules");
-                        URL modulesDirectoryURL = modulesDirectory.toURI().toURL(); 
-                        if (!jarDirectoryURLs.contains(modulesDirectoryURL) && modulesDirectory.exists()) {
-                            jarDirectoryURLs.add(modulesDirectoryURL);
-                            collectJARFiles(modulesDirectory, jarURLs, filter);
-                        }
-
-                        // Collect JARs from the ../lib directory
-                        File libDirectory = new File(homeDirectory, "lib");
-                        URL libDirectoryURL = libDirectory.toURI().toURL(); 
-                        if (!jarDirectoryURLs.contains(libDirectoryURL) && libDirectory.exists()) {
-                            jarDirectoryURLs.add(libDirectoryURL);
-                            collectJARFiles(libDirectory, jarURLs, filter);
-                        }
+                        collectJARFiles(jarDirectory.getPath(), jarDirectoryURLs, jarURLs, filter);
                     }
                 }
             }
@@ -199,14 +177,14 @@ final class NodeLauncherUtil {
             
             // Collect files under $TUSCANY_HOME
             jarDirectoryURLs.add(directoryURL);
-            collectJARFiles(directoryFile, jarURLs, filter);
+            collectJARFiles(directoryFile, jarURLs, filter, false);
             
             // Collect files under $TUSCANY_HOME/modules
             File modulesDirectory = new File(directoryFile, "modules");
             URL modulesDirectoryURL = modulesDirectory.toURI().toURL(); 
             if (!jarDirectoryURLs.contains(modulesDirectoryURL) && modulesDirectory.exists()) {
                 jarDirectoryURLs.add(modulesDirectoryURL);
-                collectJARFiles(modulesDirectory, jarURLs, filter);
+                collectJARFiles(modulesDirectory, jarURLs, filter, true);
             }
 
             // Collect files under $TUSCANY_HOME/lib
@@ -214,7 +192,7 @@ final class NodeLauncherUtil {
             URL libDirectoryURL = libDirectory.toURI().toURL(); 
             if (!jarDirectoryURLs.contains(libDirectoryURL) && libDirectory.exists()) {
                 jarDirectoryURLs.add(libDirectoryURL);
-                collectJARFiles(libDirectory, jarURLs, filter);
+                collectJARFiles(libDirectory, jarURLs, filter, true);
             }
         }
     }
@@ -224,17 +202,20 @@ final class NodeLauncherUtil {
      * @param directory
      * @param urls
      * @param filter
+     * @param recursive 
      * @throws MalformedURLException
      */
-    private static void collectJARFiles(File directory, List<URL> urls, FilenameFilter filter) throws MalformedURLException {
-        String[] files = directory.list(filter);
+    private static void collectJARFiles(File directory, List<URL> urls, FilenameFilter filter, boolean recursive) throws MalformedURLException {
+        File[] files = directory.listFiles(filter);
         if (files != null) {
-            URL directoryURL = new URL(directory.toURI().toString() + "/");
             int count = 0;
-            for (String file: files) {
-                URL url = new URL(directoryURL, file);
-                urls.add(url);
-                count++;
+            for (File file: files) {
+                if (recursive && file.isDirectory()) {
+                    collectJARFiles(file, urls, filter, recursive);
+                } else if (file.isFile()) {
+                    urls.add(file.toURI().toURL());
+                    count++;
+                }
             }
             if (count != 0) {
                 logger.fine("Runtime classpath: "+ count + " JAR" + (count > 1? "s":"")+ " from " + directory.toString());
@@ -248,6 +229,9 @@ final class NodeLauncherUtil {
     private static class StandAloneJARFileNameFilter implements FilenameFilter {
         
         public boolean accept(File dir, String name) {
+            if(new File(dir, name).isDirectory()) {
+                return true;
+            }
             name = name.toLowerCase(); 
             
             // Exclude tuscany-sca-all and tuscany-sca-manifest as they duplicate
diff --git a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java b/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
index 731b2d8d62..b9ae619d11 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
+++ b/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
@@ -22,7 +22,6 @@ import java.util.logging.Level;
 

 import javax.xml.namespace.QName;

 

-import org.apache.tuscany.sca.assembly.xml.Constants;

 import org.apache.tuscany.sca.policy.Policy;

 

 /**

@@ -32,7 +31,9 @@ import org.apache.tuscany.sca.policy.Policy;
  * @version $Rev$ $Date$

  */

 public class JDKLoggingPolicy implements Policy {

-    private static final QName JDK_LOGGING_POLICY_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "jdkLogger");

+    static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";

+    static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";

+    private static final QName JDK_LOGGING_POLICY_QNAME = new QName(SCA10_TUSCANY_NS, "jdkLogger");

 

     private String loggerName;

     private String resourceBundleName;

diff --git a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java b/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
index 58a6d21ee7..9a21f1e559 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
+++ b/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
@@ -25,7 +25,6 @@ import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Interceptor;
 import org.apache.tuscany.sca.invocation.Invoker;
@@ -40,7 +39,7 @@ import org.apache.tuscany.sca.policy.PolicySet;
  */
 public class JDKLoggingPolicyInterceptor implements Interceptor {
     public static final String loggingPolicy = "JDKLoggingPolicy";
-    public static final QName policySetQName = new QName(Constants.SCA10_TUSCANY_NS, loggingPolicy);
+    public static final QName policySetQName = new QName(JDKLoggingPolicy.SCA10_TUSCANY_NS, loggingPolicy);
     private Logger logger = null;
 
     private Invoker next;
diff --git a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java b/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
index 55e14736d1..5fd7a37a26 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
+++ b/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
@@ -28,7 +28,6 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
 import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
 import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
@@ -42,7 +41,7 @@ import org.apache.tuscany.sca.monitor.Monitor;
  * @version $Rev$ $Date$
  */
 public class JDKLoggingPolicyProcessor implements StAXArtifactProcessor<JDKLoggingPolicy> {
-    private static final QName JDK_LOGGING_POLICY_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "jdkLogger");
+    private static final QName JDK_LOGGING_POLICY_QNAME = new QName(JDKLoggingPolicy.SCA10_TUSCANY_NS, "jdkLogger");
     private static final String LOG_LEVEL = "logLevel";
     private static final String RESOURCE_BUNDLE = "resourceBundle";
     private static final String USE_PARENT_HANDLERS = "useParentHandlers";
@@ -68,7 +67,7 @@ public class JDKLoggingPolicyProcessor implements StAXArtifactProcessor<JDKLoggi
                 case START_ELEMENT : {
                     name = reader.getName();
                     if ( name.equals(JDK_LOGGING_POLICY_QNAME) ) {
-                        String loggerName = reader.getAttributeValue(null, Constants.NAME);
+                        String loggerName = reader.getAttributeValue(null, "name");
                         policy.setLoggerName(loggerName);
                     } else if ( LOG_LEVEL.equals(name.getLocalPart()) ) {
                         policy.setLogLevel(Level.parse(reader.getElementText()));
@@ -102,10 +101,10 @@ public class JDKLoggingPolicyProcessor implements StAXArtifactProcessor<JDKLoggi
         writer.writeStartElement(prefix, 
                                  JDK_LOGGING_POLICY_QNAME.getLocalPart(),
                                  JDK_LOGGING_POLICY_QNAME.getNamespaceURI());
-        writer.writeNamespace("tuscany", Constants.SCA10_TUSCANY_NS);
+        writer.writeNamespace("tuscany", JDKLoggingPolicy.SCA10_TUSCANY_NS);
         
         if (policy.getLoggerName() != null) {
-            writer.writeAttribute(Constants.NAME, policy.getLoggerName());
+            writer.writeAttribute("name", policy.getLoggerName());
         }
         if ( policy.getLogLevel() != null ) {
             writer.writeStartElement(prefix, 
diff --git a/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java b/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
index 13129efe5b..cc64a89935 100644
--- a/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
+++ b/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
@@ -24,7 +24,6 @@ import java.util.Map;
 import javax.xml.namespace.QName;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.policy.Policy;
 
 /**
@@ -34,7 +33,8 @@ import org.apache.tuscany.sca.policy.Policy;
  * @version $Rev$ $Date$
  */
 public class Axis2ConfigParamPolicy implements Policy {
-    public static final QName NAME = new QName(Constants.SCA10_TUSCANY_NS, "wsConfigParam");
+    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+    public static final QName NAME = new QName(SCA10_TUSCANY_NS, "wsConfigParam");
     private Map<String, OMElement> paramElements = new Hashtable<String, OMElement>();
     
     public Map<String, OMElement> getParamElements() {
diff --git a/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java b/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
index ffb1bca440..d67413eb81 100644
--- a/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
+++ b/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
@@ -30,7 +30,6 @@ import javax.xml.stream.XMLStreamWriter;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
 import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
 import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
@@ -65,7 +64,7 @@ public class Axis2ConfigParamPolicyProcessor implements StAXArtifactProcessor<Ax
                 case START_ELEMENT : {
                     name = reader.getName();
                     if ( PARAMETER.equals(name.getLocalPart()) ) {
-                        paramName = reader.getAttributeValue(null, Constants.NAME);
+                        paramName = reader.getAttributeValue(null, "name");
                         parameterElement = loadElement(reader);
                         policy.getParamElements().put(paramName, parameterElement);
                     }
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
index 14bff2dca6..eb0da76acf 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
+++ b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
@@ -20,7 +20,6 @@ package org.apache.tuscany.sca.policy.authentication.basic;
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.policy.Policy;
 
 /**
@@ -30,7 +29,9 @@ import org.apache.tuscany.sca.policy.Policy;
  * @version $Rev$ $Date$
  */
 public class BasicAuthenticationPolicy implements Policy {
-    public static final QName BASIC_AUTHENTICATION_POLICY_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "basicAuthentication");
+    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+
+    public static final QName BASIC_AUTHENTICATION_POLICY_QNAME = new QName(SCA10_TUSCANY_NS, "basicAuthentication");
     public static final String BASIC_AUTHENTICATION_USERNAME = "username";
     public static final String BASIC_AUTHENTICATION_PASSWORD = "password";
 
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
index f85889ea21..0b3dfd5539 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
+++ b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
@@ -21,14 +21,11 @@ package org.apache.tuscany.sca.policy.authentication.basic;
 import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
 import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
 
-import java.util.logging.Level;
-
 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.assembly.xml.Constants;
 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
 import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
 import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
@@ -42,7 +39,8 @@ import org.apache.tuscany.sca.monitor.Monitor;
  * @version $Rev$ $Date$
  */
 public class BasicAuthenticationPolicyProcessor implements StAXArtifactProcessor<BasicAuthenticationPolicy> {
-    
+    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+
     private static final String USER_NAME = "userName";
     private static final String PASSWORD = "password";
 
@@ -97,7 +95,7 @@ public class BasicAuthenticationPolicyProcessor implements StAXArtifactProcessor
         writer.writeStartElement(prefix, 
                                  getArtifactType().getLocalPart(),
                                  getArtifactType().getNamespaceURI());
-        writer.writeNamespace("tuscany", Constants.SCA10_TUSCANY_NS);
+        writer.writeNamespace("tuscany", SCA10_TUSCANY_NS);
 
         if ( policy.getUserName() != null ) {
             writer.writeStartElement(prefix, 
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
index 83b1d20e9e..c0ed282276 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
+++ b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
@@ -18,19 +18,12 @@
  */
 package org.apache.tuscany.sca.policy.authentication.basic;
 
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Interceptor;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.Policy;
 import org.apache.tuscany.sca.policy.PolicySet;
 
 /**
@@ -40,7 +33,8 @@ import org.apache.tuscany.sca.policy.PolicySet;
  * @version $Rev$ $Date$
  */
 public class BasicAuthenticationReferencePolicyInterceptor implements Interceptor {
-    public static final QName policySetQName = new QName(Constants.SCA10_TUSCANY_NS, "wsBasicAuthentication");
+    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+    public static final QName policySetQName = new QName(SCA10_TUSCANY_NS, "wsBasicAuthentication");
 
     private Invoker next;
     private Operation operation;
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
index 1b8ceb1515..6c0f7d48d0 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
+++ b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
@@ -21,7 +21,6 @@ package org.apache.tuscany.sca.policy.authentication.basic;
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Interceptor;
 import org.apache.tuscany.sca.invocation.Invoker;
@@ -35,7 +34,8 @@ import org.apache.tuscany.sca.policy.PolicySet;
  * @version $Rev$ $Date$
  */
 public class BasicAuthenticationServicePolicyInterceptor implements Interceptor {
-    public static final QName policySetQName = new QName(Constants.SCA10_TUSCANY_NS, "wsBasicAuthentication");
+    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+    public static final QName policySetQName = new QName(SCA10_TUSCANY_NS, "wsBasicAuthentication");
 
     private Invoker next;
     private Operation operation;
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
index d58fa51256..dfb6fee180 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
+++ b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
@@ -24,7 +24,6 @@ import java.util.List;
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.policy.Policy;
 
 /**
@@ -33,7 +32,9 @@ import org.apache.tuscany.sca.policy.Policy;
  * @version $Rev$ $Date$
  */
 public class AuthorizationPolicy implements Policy {
-    public static final QName NAME = new QName(Constants.SCA10_NS, "authorization");
+    private final static String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
+    // private final static String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+    public static final QName NAME = new QName(SCA10_NS, "authorization");
 
     public static enum AcessControl {
         permitAll, denyAll, allow
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
index 6e5d453bd9..d78c0fc2e3 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
+++ b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
@@ -37,7 +37,6 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 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.monitor.impl.ProblemImpl;
 
 /**
  *
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
index 8f848ef06a..e4c4794c52 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
+++ b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
@@ -21,7 +21,6 @@ package org.apache.tuscany.sca.policy.identity;
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.policy.Policy;
 
 /**
@@ -30,7 +29,8 @@ import org.apache.tuscany.sca.policy.Policy;
  * @version $Rev$ $Date$
  */
 public class SecurityIdentityPolicy implements Policy {
-    public static final QName NAME = new QName(Constants.SCA10_NS, "securityIdentity");
+    private final static String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";    
+    public static final QName NAME = new QName(SCA10_NS, "securityIdentity");
 
     private boolean useCallerIdentity;
 
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
index 8a84d244f2..0ccda91364 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
+++ b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
@@ -35,7 +35,6 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 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.monitor.impl.ProblemImpl;
 
 /**
  *
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
index f41d36194a..e1ef32f36c 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
+++ b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
@@ -21,7 +21,6 @@ package org.apache.tuscany.sca.policy.security.jaas;
 

 import javax.xml.namespace.QName;

 

-import org.apache.tuscany.sca.assembly.xml.Constants;

 import org.apache.tuscany.sca.policy.Policy;

 

 /**

@@ -29,7 +28,8 @@ import org.apache.tuscany.sca.policy.Policy;
  * @version $Rev$ $Date$

  */

 public class JaasAuthenticationPolicy implements Policy {

-    public static final QName NAME = new QName(Constants.SCA10_TUSCANY_NS, "jaasAuthentication");

+    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";

+    public static final QName NAME = new QName(SCA10_TUSCANY_NS, "jaasAuthentication");

 

     private String configurationName = "other";

     private String callbackHandlerClassName;

diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
index b7736fa817..edff316700 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
+++ b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
@@ -23,7 +23,6 @@ import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.login.LoginContext;

 import javax.xml.namespace.QName;

 

-import org.apache.tuscany.sca.assembly.xml.Constants;

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

 import org.apache.tuscany.sca.policy.util.PolicyHandler;

 

@@ -34,7 +33,8 @@ import org.apache.tuscany.sca.policy.util.PolicyHandler;
  */

 public class JaasAuthenticationPolicyHandler implements PolicyHandler {

     private static final String jaasPolicy = "JaasPolicy";

-    public static final QName policySetQName = new QName(Constants.SCA10_TUSCANY_NS, jaasPolicy);

+    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";

+    public static final QName policySetQName = new QName(SCA10_TUSCANY_NS, jaasPolicy);

     private PolicySet applicablePolicySet = null;

 

     public void setUp(Object... context) {

diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
index 69534f59b1..7466001035 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
+++ b/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
@@ -26,7 +26,6 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
 import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
 import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
@@ -37,7 +36,6 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 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.monitor.impl.ProblemImpl;
 
 /**
  *
@@ -46,10 +44,9 @@ import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
 public class JaasAuthenticationPolicyProcessor implements StAXArtifactProcessor<JaasAuthenticationPolicy> {
     private static final QName JAAS_AUTHENTICATION_POLICY_QNAME = JaasAuthenticationPolicy.NAME;
     private static final String callbackHandler = "callbackHandler";
-    public static final QName CALLBACK_HANDLER_QNAME = new QName(Constants.SCA10_TUSCANY_NS,
-                                                               callbackHandler);
-    public static final QName CONFIGURATION_QNAME = new QName(Constants.SCA10_TUSCANY_NS,
-                                                                 "configurationName");
+    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+    public static final QName CALLBACK_HANDLER_QNAME = new QName(SCA10_TUSCANY_NS, callbackHandler);
+    public static final QName CONFIGURATION_QNAME = new QName(SCA10_TUSCANY_NS, "configurationName");
     private Monitor monitor;
     
     public QName getArtifactType() {
@@ -122,7 +119,7 @@ public class JaasAuthenticationPolicyProcessor implements StAXArtifactProcessor<
         writer.writeStartElement(prefix, 
                                  JAAS_AUTHENTICATION_POLICY_QNAME.getLocalPart(),
                                  JAAS_AUTHENTICATION_POLICY_QNAME.getNamespaceURI());
-        writer.writeNamespace("tuscany", Constants.SCA10_TUSCANY_NS);
+        writer.writeNamespace("tuscany", SCA10_TUSCANY_NS);
         
        
         writer.writeEndElement();
diff --git a/branches/sca-equinox/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java b/branches/sca-equinox/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
index 2414fd777e..07695f19a9 100644
--- a/branches/sca-equinox/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
+++ b/branches/sca-equinox/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
@@ -33,7 +33,6 @@ import javax.xml.stream.XMLStreamReader;
 
 import junit.framework.Assert;
 
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy;
 import org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;
@@ -45,6 +44,7 @@ import org.junit.Test;
  * @version $Rev$ $Date$
  */
 public class PolicyProcessorTestCase {
+    private final static String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
     private final static List<String> SEQ =
         Arrays.asList("permitAll",
                       "allow [r1, r2]",
@@ -62,10 +62,10 @@ public class PolicyProcessorTestCase {
         Map<QName, StAXArtifactProcessor> processors = new HashMap<QName, StAXArtifactProcessor>();
         processors.put(AuthorizationPolicy.NAME, new AuthorizationPolicyProcessor(null,null));
         processors.put(SecurityIdentityPolicy.NAME, new SecurityIdentityPolicyProcessor(null,null));
-        processors.put(new QName(Constants.SCA10_NS, "allow"), new AuthorizationPolicyProcessor(null,null));
-        processors.put(new QName(Constants.SCA10_NS, "permitAll"), new AuthorizationPolicyProcessor(null,null));
-        processors.put(new QName(Constants.SCA10_NS, "denyAll"), new AuthorizationPolicyProcessor(null,null));
-        processors.put(new QName(Constants.SCA10_NS, "runAs"), new SecurityIdentityPolicyProcessor(null,null));
+        processors.put(new QName(SCA10_NS, "allow"), new AuthorizationPolicyProcessor(null,null));
+        processors.put(new QName(SCA10_NS, "permitAll"), new AuthorizationPolicyProcessor(null,null));
+        processors.put(new QName(SCA10_NS, "denyAll"), new AuthorizationPolicyProcessor(null,null));
+        processors.put(new QName(SCA10_NS, "runAs"), new SecurityIdentityPolicyProcessor(null,null));
         InputStream is = getClass().getResourceAsStream("mock_policy_definitions.xml");
         XMLInputFactory factory = XMLInputFactory.newInstance();
         XMLStreamReader reader = factory.createXMLStreamReader(is);
diff --git a/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF
index 6fccae51ba..f2d58f098c 100644
--- a/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF
@@ -18,20 +18,28 @@ Bnd-LastModified: 1225397486843
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Transaction Policy Model

-Import-Package: javax.transaction;version="1.0.1",javax.xml.namespace,

- javax.xml.stream,org.apache.geronimo.transaction.log,org.apache.geron

- imo.transaction.manager,org.apache.tuscany.sca.assembly;version="1.4"

- ,org.apache.tuscany.sca.contribution.processor;version="1.4",org.apac

- he.tuscany.sca.contribution.resolver;version="1.4",org.apache.tuscany

- .sca.core;version="1.4",org.apache.tuscany.sca.definitions;version="1

- .4",org.apache.tuscany.sca.definitions.util;version="1.4",org.apache.

- tuscany.sca.interfacedef;version="1.4",org.apache.tuscany.sca.invocat

- ion;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",org.ap

- ache.tuscany.sca.policy;version="1.4",org.apache.tuscany.sca.policy.t

- ransaction;version="1.4",org.apache.tuscany.sca.provider;version="1.4

- ",org.apache.tuscany.sca.runtime;version="1.4",junit.framework;resolu

- tion:=optional,javax.transaction.xa;version="1.1";resolution:=optiona

- l

+Import-Package: javax.resource.spi,

+ javax.transaction;version="1.0.1",

+ javax.transaction.xa;version="1.1";resolution:=optional,

+ javax.xml.namespace,

+ javax.xml.stream,

+ junit.framework;resolution:=optional,

+ org.apache.geronimo.transaction.log,

+ org.apache.geronimo.transaction.manager,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.definitions;version="1.4",

+ org.apache.tuscany.sca.definitions.util;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4",

+ org.apache.tuscany.sca.policy.transaction;version="1.4",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.objectweb.howl.log;version="1.0.1"

 Bundle-SymbolicName: org.apache.tuscany.sca.policy.transaction

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java b/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
index a13748f232..3a397e10d0 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
+++ b/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
@@ -21,7 +21,6 @@ package org.apache.tuscany.sca.policy.transaction;
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.policy.Policy;
 
 /**
@@ -30,7 +29,8 @@ import org.apache.tuscany.sca.policy.Policy;
  * @version $Rev$ $Date$
  */
 public interface TransactionPolicy extends Policy {
-    QName NAME = new QName(Constants.SCA10_TUSCANY_NS, "transactionPolicy");
+    String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+    QName NAME = new QName(SCA10_TUSCANY_NS, "transactionPolicy");
 
     enum Action {
         PROPAGATE, SUSPEND, REQUIRE_GLOBAL, REQUIRE_LOCAL, REQUIRE_NONE
diff --git a/branches/sca-equinox/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java b/branches/sca-equinox/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
index 63f6035433..4194b4e79f 100644
--- a/branches/sca-equinox/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
+++ b/branches/sca-equinox/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
@@ -26,10 +26,10 @@ import junit.framework.TestCase;
 import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.contribution.ContributionFactory;
 import org.apache.tuscany.sca.contribution.DefaultContributionFactory;
+import org.apache.tuscany.sca.contribution.namespace.DefaultNamespaceImportExportFactory;
 import org.apache.tuscany.sca.contribution.namespace.NamespaceExport;
 import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
 import org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory;
-import org.apache.tuscany.sca.contribution.namespace.impl.NamespaceImportExportFactoryImpl;
 import org.apache.tuscany.sca.workspace.DefaultWorkspaceFactory;
 import org.apache.tuscany.sca.workspace.Workspace;
 import org.apache.tuscany.sca.workspace.WorkspaceFactory;
@@ -49,7 +49,7 @@ public class ContributionDependencyBuilderTestCase extends TestCase {
     public void setUp() throws Exception {
         contributionFactory = new DefaultContributionFactory();
         workspaceFactory = new DefaultWorkspaceFactory();
-        importExportFactory = new NamespaceImportExportFactoryImpl();
+        importExportFactory = new DefaultNamespaceImportExportFactory();
     }
 
     @Override
diff --git a/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF
index 5ae125e862..dea71c40a5 100644
--- a/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF
@@ -9,12 +9,16 @@ Bnd-LastModified: 1225397197140
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Domain Workspace XML Model

-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan

- y.sca.contribution;version="1.4",org.apache.tuscany.sca.contribution.

- processor;version="1.4",org.apache.tuscany.sca.contribution.resolver;

- version="1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.tu

- scany.sca.monitor;version="1.4",org.apache.tuscany.sca.workspace;vers

- ion="1.4",org.junit;resolution:=optional

+Import-Package: javax.xml.namespace,

+ javax.xml.stream,

+ org.apache.tuscany.sca.assembly;version="1.4.0",

+ org.apache.tuscany.sca.contribution;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.workspace;version="1.4",

+ org.junit;resolution:=optional

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

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java b/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
index a76d4a3209..91a6b8dcea 100644
--- a/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
+++ b/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
@@ -37,7 +37,6 @@ import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 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.monitor.impl.ProblemImpl;
 import org.apache.tuscany.sca.workspace.Workspace;
 
 /**
diff --git a/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF
index 305df48550..e9a9bf0742 100644
--- a/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF
@@ -14,12 +14,15 @@ Bnd-LastModified: 1225397195718
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Domain Workspace Model

-Import-Package: org.apache.tuscany.sca.contribution;version="1.4",org.

- apache.tuscany.sca.contribution.resolver;version="1.4",org.apache.tus

- cany.sca.core;version="1.4",org.apache.tuscany.sca.extensibility;vers

- ion="1.4",org.apache.tuscany.sca.monitor;version="1.4",org.apache.tus

- cany.sca.workspace;version="1.4",org.apache.tuscany.sca.workspace.bui

- lder;version="1.4"

+Import-Package: org.apache.tuscany.sca.assembly;version="1.4.0",

+ org.apache.tuscany.sca.contribution;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.extensibility;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4.0",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.workspace;version="1.4",

+ org.apache.tuscany.sca.workspace.builder;version="1.4"

 Bundle-SymbolicName: org.apache.tuscany.sca.workspace

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF
index 6bdf997286..73d6bfbe99 100644
--- a/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF
@@ -15,15 +15,23 @@ Bnd-LastModified: 1225397288437
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA XSD XML Processor

-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan

- y.sca.contribution;version="1.4",org.apache.tuscany.sca.contribution.

- namespace;version="1.4",org.apache.tuscany.sca.contribution.processor

- ;version="1.4",org.apache.tuscany.sca.contribution.resolver;version="

- 1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.tuscany.sca

- .monitor;version="1.4",org.apache.tuscany.sca.xsd;version="1.4",org.a

- pache.tuscany.sca.xsd.xml;version="1.4",org.apache.ws.commons.schema,

- org.apache.ws.commons.schema.resolver,org.w3c.dom,org.xml.sax,org.jun

- it;resolution:=optional,junit.framework;resolution:=optional

+Import-Package: javax.xml.namespace,

+ javax.xml.stream,

+ junit.framework;resolution:=optional,

+ org.apache.tuscany.sca.assembly;version="1.4.0",

+ org.apache.tuscany.sca.contribution;version="1.4",

+ org.apache.tuscany.sca.contribution.namespace;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.xsd;version="1.4",

+ org.apache.tuscany.sca.xsd.xml;version="1.4",

+ org.apache.ws.commons.schema,

+ org.apache.ws.commons.schema.resolver,

+ org.junit;resolution:=optional,

+ org.w3c.dom,

+ org.xml.sax

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

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java b/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
index d6bf4e840a..ef4b5aa0bc 100644
--- a/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
+++ b/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
@@ -32,7 +32,6 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 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.monitor.impl.ProblemImpl;
 import org.apache.tuscany.sca.xsd.XSDFactory;
 import org.apache.tuscany.sca.xsd.XSDefinition;