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/databinding-sdo/META-INF/MANIFEST.MF | 56 ++++++++++++++-------- .../tuscany/sca/databinding/sdo/ImportSDO.java | 13 ++++- 2 files changed, 47 insertions(+), 22 deletions(-) (limited to 'branches/sca-equinox/modules/databinding-sdo') diff --git a/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF index e37ae9b1ae..709b4c966a 100644 --- a/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF @@ -23,26 +23,42 @@ Bnd-LastModified: 1225397376421 Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: Apache Tuscany SCA Data Binding for SDO -Import-Package: commonj.sdo;version="2.1",commonj.sdo.helper;version=" - 2.1",commonj.sdo.impl,javax.xml.namespace,javax.xml.stream,javax.xml. - transform,javax.xml.transform.dom,org.apache.tuscany.sca.assembly.imp - l;version="1.4",org.apache.tuscany.sca.contribution;version="1.4",org - .apache.tuscany.sca.contribution.processor;version="1.4",org.apache.t - uscany.sca.contribution.resolver;version="1.4",org.apache.tuscany.sca - .core;version="1.4",org.apache.tuscany.sca.databinding;version="1.4", - org.apache.tuscany.sca.databinding.impl;version="1.4",org.apache.tusc - any.sca.databinding.sdo;version="1.4",org.apache.tuscany.sca.databind - ing.util;version="1.4",org.apache.tuscany.sca.interfacedef;version="1 - .4",org.apache.tuscany.sca.interfacedef.impl;version="1.4",org.apache - .tuscany.sca.interfacedef.util;version="1.4",org.apache.tuscany.sca.m - onitor;version="1.4",org.apache.tuscany.sca.xsd;version="1.4",org.apa - che.tuscany.sdo.api,org.apache.tuscany.sdo.helper,org.apache.tuscany. - sdo.impl,org.apache.tuscany.sdo.model,org.apache.tuscany.sdo.model.im - pl,org.apache.ws.commons.schema,org.eclipse.emf.ecore,org.eclipse.emf - .ecore.util,org.osoa.sca;version="1.4",org.w3c.dom,org.w3c.dom.bootst - rap,org.w3c.dom.ls,junit.framework;resolution:=optional,org.apache.tu - scany.sca.databinding.xml;version="1.4";resolution:=optional,org.juni - t;resolution:=optional +Import-Package: commonj.sdo;version="2.1", + commonj.sdo.helper;version="2.1", + commonj.sdo.impl, + javax.xml.namespace, + javax.xml.stream, + javax.xml.transform, + javax.xml.transform.dom, + junit.framework;resolution:=optional, + org.apache.tuscany.sca.assembly;version="1.4.0", + org.apache.tuscany.sca.contribution;version="1.4", + org.apache.tuscany.sca.contribution.processor;version="1.4", + org.apache.tuscany.sca.contribution.resolver;version="1.4", + org.apache.tuscany.sca.core;version="1.4", + org.apache.tuscany.sca.databinding;version="1.4", + org.apache.tuscany.sca.databinding.impl;version="1.4", + org.apache.tuscany.sca.databinding.sdo;version="1.4", + org.apache.tuscany.sca.databinding.util;version="1.4", + org.apache.tuscany.sca.databinding.xml;version="1.4";resolution:=optional, + org.apache.tuscany.sca.interfacedef;version="1.4", + org.apache.tuscany.sca.interfacedef.impl;version="1.4", + org.apache.tuscany.sca.interfacedef.util;version="1.4", + org.apache.tuscany.sca.monitor;version="1.4", + org.apache.tuscany.sca.xsd;version="1.4", + org.apache.tuscany.sdo.api, + org.apache.tuscany.sdo.helper, + org.apache.tuscany.sdo.impl, + org.apache.tuscany.sdo.model, + org.apache.tuscany.sdo.model.impl, + org.apache.ws.commons.schema, + org.eclipse.emf.ecore, + org.eclipse.emf.ecore.util, + org.junit;resolution:=optional, + org.osoa.sca;version="1.4", + org.w3c.dom, + org.w3c.dom.bootstrap, + org.w3c.dom.ls Bundle-SymbolicName: org.apache.tuscany.sca.databinding.sdo Bundle-DocURL: http://www.apache.org/ diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java b/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java index 30a3e1c3a9..7afb7d9463 100644 --- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java +++ b/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.databinding.sdo; import javax.xml.namespace.QName; -import org.apache.tuscany.sca.assembly.impl.BaseImpl; +import org.apache.tuscany.sca.assembly.Base; import commonj.sdo.helper.HelperContext; @@ -30,13 +30,22 @@ import commonj.sdo.helper.HelperContext; * * @version $Rev$ $Date$ */ -public class ImportSDO extends BaseImpl { +public class ImportSDO implements Base { public static final QName IMPORT_SDO = new QName("http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0", "import.sdo"); private HelperContext helperContext; private String factoryClassName; private String schemaLocation; + private boolean unresolved; + + public boolean isUnresolved() { + return unresolved; + } + + public void setUnresolved(boolean undefined) { + this.unresolved = undefined; + } public ImportSDO(HelperContext helperContext) { super(); -- cgit v1.2.3