Resolve a lot of OSGi access violations. More to be fixed.

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

3 files changed, 10 insertions, 8 deletions

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