You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/10/31 05:01:47 UTC

svn commit: r709339 [1/3] - in /tuscany/branches/sca-equinox/modules: assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ binding-atom-abdera/META-INF/ binding-corba/META-INF/ binding-corba/src/main/java/org/apache/tuscany/sca/binding/...

Author: rfeng
Date: Thu Oct 30 21:01:44 2008
New Revision: 709339

URL: http://svn.apache.org/viewvc?rev=709339&view=rev
Log:
Resolve a lot of OSGi access violations. More to be fixed.

Added:
    tuscany/branches/sca-equinox/modules/interface-wsdl/src/test/
    tuscany/branches/sca-equinox/modules/interface-wsdl/src/test/java/
    tuscany/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/
    tuscany/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/
    tuscany/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/
    tuscany/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/
    tuscany/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/
    tuscany/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/
    tuscany/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java   (props changed)
      - copied unchanged from r709292, tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
    tuscany/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/   (props changed)
      - copied from r709292, tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/
Removed:
    tuscany/branches/sca-equinox/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/
    tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
    tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/
Modified:
    tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
    tuscany/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
    tuscany/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
    tuscany/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
    tuscany/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
    tuscany/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
    tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
    tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
    tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
    tuscany/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
    tuscany/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
    tuscany/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
    tuscany/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
    tuscany/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
    tuscany/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
    tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
    tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
    tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
    tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
    tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
    tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
    tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
    tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
    tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
    tuscany/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
    tuscany/branches/sca-equinox/modules/databinding/pom.xml
    tuscany/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
    tuscany/branches/sca-equinox/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
    tuscany/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
    tuscany/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
    tuscany/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
    tuscany/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
    tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
    tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
    tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
    tuscany/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
    tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
    tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
    tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
    tuscany/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
    tuscany/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
    tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
    tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
    tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
    tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
    tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
    tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
    tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
    tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
    tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
    tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
    tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
    tuscany/branches/sca-equinox/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
    tuscany/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
    tuscany/branches/sca-equinox/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
    tuscany/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
    tuscany/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF
    tuscany/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java

Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java Thu Oct 30 21:01:44 2008
@@ -52,7 +52,6 @@
 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;
 

Modified: tuscany/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -12,29 +12,45 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -12,13 +12,17 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java Thu Oct 30 21:01:44 2008
@@ -22,13 +22,14 @@
 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();
 

Modified: tuscany/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java Thu Oct 30 21:01:44 2008
@@ -24,7 +24,6 @@
 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 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());

Modified: tuscany/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -11,18 +11,33 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -11,13 +11,17 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -14,25 +14,39 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -10,15 +10,20 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -18,20 +18,30 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -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 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -15,19 +15,28 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -10,17 +10,24 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -10,21 +10,31 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -11,21 +11,29 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java Thu Oct 30 21:01:44 2008
@@ -28,7 +28,6 @@
 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;

Modified: tuscany/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -9,15 +9,20 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java Thu Oct 30 21:01:44 2008
@@ -30,7 +30,7 @@
 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.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 @@
         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");
         
     }
     

Modified: tuscany/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -41,42 +41,76 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java Thu Oct 30 21:01:44 2008
@@ -38,8 +38,6 @@
 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 @@
  * @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 @@
         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 @@
             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);

Modified: tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java Thu Oct 30 21:01:44 2008
@@ -28,7 +28,6 @@
 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 @@
         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);

Modified: tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java Thu Oct 30 21:01:44 2008
@@ -69,7 +69,6 @@
 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.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 @@
         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");

Modified: tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java Thu Oct 30 21:01:44 2008
@@ -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.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 @@
             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()) {

Modified: tuscany/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -9,19 +9,28 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -13,13 +13,18 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java Thu Oct 30 21:01:44 2008
@@ -38,7 +38,6 @@
 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

Modified: tuscany/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java Thu Oct 30 21:01:44 2008
@@ -38,7 +38,6 @@
 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

Modified: tuscany/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -12,12 +12,16 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java Thu Oct 30 21:01:44 2008
@@ -38,7 +38,6 @@
 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

Modified: tuscany/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java Thu Oct 30 21:01:44 2008
@@ -38,7 +38,6 @@
 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

Modified: tuscany/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -15,14 +15,20 @@
 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/
 

Modified: tuscany/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java Thu Oct 30 21:01:44 2008
@@ -40,7 +40,6 @@
 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;

Modified: tuscany/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java Thu Oct 30 21:01:44 2008
@@ -44,7 +44,6 @@
 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

Modified: tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java (original)
+++ tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java Thu Oct 30 21:01:44 2008
@@ -41,7 +41,6 @@
 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;
 
 /**

Modified: tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java (original)
+++ tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java Thu Oct 30 21:01:44 2008
@@ -40,7 +40,6 @@
 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.

Modified: tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java (original)
+++ tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java Thu Oct 30 21:01:44 2008
@@ -38,7 +38,6 @@
 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;
 
 
 /**