From 95c83c38d814e6dbcceb9efdcd4b62d60a16c051 Mon Sep 17 00:00:00 2001 From: rfeng Date: Fri, 31 Oct 2008 04:01:44 +0000 Subject: 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 --- .../modules/domain-manager/META-INF/MANIFEST.MF | 59 ++++++++++++++-------- .../manager/impl/ContributionCollectionImpl.java | 1 - 2 files changed, 37 insertions(+), 23 deletions(-) (limited to 'branches/sca-equinox/modules/domain-manager') diff --git a/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF index c4126fa360..584cfe1e35 100644 --- a/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF @@ -27,28 +27,43 @@ Bnd-LastModified: 1225397422109 Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: Apache Tuscany SCA Domain Manager Application -Import-Package: javax.servlet,javax.servlet.http,javax.xml.namespace,j - avax.xml.parsers,javax.xml.stream,org.apache.commons.fileupload,org.a - pache.commons.fileupload.disk,org.apache.commons.fileupload.servlet,o - rg.apache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.sca.a - ssembly.builder;version="1.4",org.apache.tuscany.sca.binding.atom;ver - sion="1.4",org.apache.tuscany.sca.contribution;version="1.4",org.apac - he.tuscany.sca.contribution.processor;version="1.4",org.apache.tuscan - y.sca.contribution.resolver;version="1.4",org.apache.tuscany.sca.core - ;version="1.4",org.apache.tuscany.sca.core.assembly;version="1.4",org - .apache.tuscany.sca.core.context;version="1.4",org.apache.tuscany.sca - .core.invocation;version="1.4",org.apache.tuscany.sca.data.collection - ;version="1.4",org.apache.tuscany.sca.definitions;version="1.4",org.a - pache.tuscany.sca.domain.manager.impl;version="1.4",org.apache.tuscan - y.sca.domain.manager.launcher;version="1.4",org.apache.tuscany.sca.im - plementation.node;version="1.4",org.apache.tuscany.sca.interfacedef;v - ersion="1.4",org.apache.tuscany.sca.interfacedef.java;version="1.4",o - rg.apache.tuscany.sca.monitor;version="1.4",org.apache.tuscany.sca.no - de;version="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.apa - che.tuscany.sca.workspace;version="1.4",org.apache.tuscany.sca.worksp - ace.builder;version="1.4",org.apache.xml.serialize,org.osoa.sca;versi - on="1.4",org.osoa.sca.annotations;version="1.4",org.w3c.dom,junit.fra - mework;resolution:=optional +Import-Package: javax.servlet, + javax.servlet.http, + javax.xml.namespace, + javax.xml.parsers, + javax.xml.stream, + junit.framework;resolution:=optional, + org.apache.commons.fileupload, + org.apache.commons.fileupload.disk, + org.apache.commons.fileupload.servlet, + org.apache.tuscany.sca.assembly;version="1.4", + org.apache.tuscany.sca.assembly.builder;version="1.4", + org.apache.tuscany.sca.assembly.xml;version="1.4.0", + org.apache.tuscany.sca.binding.atom;version="1.4", + org.apache.tuscany.sca.contribution;version="1.4", + org.apache.tuscany.sca.contribution.processor;version="1.4", + org.apache.tuscany.sca.contribution.resolver;version="1.4", + org.apache.tuscany.sca.core;version="1.4", + org.apache.tuscany.sca.core.assembly;version="1.4", + org.apache.tuscany.sca.core.context;version="1.4", + org.apache.tuscany.sca.core.invocation;version="1.4", + org.apache.tuscany.sca.data.collection;version="1.4", + org.apache.tuscany.sca.definitions;version="1.4", + org.apache.tuscany.sca.domain.manager.impl;version="1.4", + org.apache.tuscany.sca.domain.manager.launcher;version="1.4", + org.apache.tuscany.sca.implementation.node;version="1.4", + org.apache.tuscany.sca.interfacedef;version="1.4", + org.apache.tuscany.sca.interfacedef.java;version="1.4", + org.apache.tuscany.sca.monitor;version="1.4", + org.apache.tuscany.sca.node;version="1.4", + org.apache.tuscany.sca.policy;version="1.4.0", + org.apache.tuscany.sca.runtime;version="1.4", + org.apache.tuscany.sca.workspace;version="1.4", + org.apache.tuscany.sca.workspace.builder;version="1.4", + org.apache.xml.serialize, + org.osoa.sca;version="1.4", + org.osoa.sca.annotations;version="1.4", + org.w3c.dom Bundle-SymbolicName: org.apache.tuscany.sca.domain.manager Bundle-DocURL: http://www.apache.org/ diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java b/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java index 68c5144d85..5321cc2dc1 100644 --- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java +++ b/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java @@ -83,7 +83,6 @@ import org.apache.tuscany.sca.workspace.WorkspaceFactory; import org.apache.tuscany.sca.workspace.builder.ContributionBuilder; import org.apache.tuscany.sca.workspace.builder.ContributionBuilderException; import org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint; -import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl; import org.apache.xml.serialize.OutputFormat; import org.apache.xml.serialize.XMLSerializer; import org.osoa.sca.ServiceRuntimeException; -- cgit v1.2.3