From c8b0020cd078fc42acb15086ac40b9eef63dc453 Mon Sep 17 00:00:00 2001 From: rfeng Date: Fri, 31 Oct 2008 17:34:39 +0000 Subject: Fix bundle import package git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@709500 13f79535-47bb-0310-9956-ffa450edef68 --- .../interface-java-xml/META-INF/MANIFEST.MF | 22 +++++++++++++--------- .../sca/interfacedef/java/xml/JavaConstants.java | 6 ++---- .../java/xml/JavaInterfaceProcessor.java | 6 ++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF index 6b733ead34..1c8360ca0e 100644 --- a/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF @@ -10,15 +10,19 @@ Bnd-LastModified: 1225397167906 Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: Apache Tuscany SCA Java Interface XML Model -Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan - y.sca.contribution.processor;version="1.4",org.apache.tuscany.sca.con - tribution.resolver;version="1.4",org.apache.tuscany.sca.core;version= - "1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org.apache.tu - scany.sca.interfacedef.java;version="1.4",org.apache.tuscany.sca.moni - tor;version="1.4",org.apache.tuscany.sca.assembly;version="1.4";resol - ution:=optional,org.apache.tuscany.sca.definitions;version="1.4";reso - lution:=optional,org.junit;resolution:=optional,org.apache.tuscany.sc - a.assembly.builder;version="1.4";resolution:=optional +Import-Package: javax.xml.namespace, + javax.xml.stream, + org.apache.tuscany.sca.assembly;version="1.4";resolution:=optional, + org.apache.tuscany.sca.assembly.builder;version="1.4";resolution:=optional, + org.apache.tuscany.sca.contribution.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.java;version="1.4", + org.apache.tuscany.sca.monitor;version="1.4", + org.apache.tuscany.sca.policy;version="1.4.0", + org.junit;resolution:=optional Bundle-SymbolicName: org.apache.tuscany.sca.interface.java.xml Bundle-DocURL: http://www.apache.org/ diff --git a/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java b/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java index 5d2d8ed51c..2b45eac7bc 100644 --- a/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java +++ b/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java @@ -20,17 +20,15 @@ package org.apache.tuscany.sca.interfacedef.java.xml; import javax.xml.namespace.QName; -import org.apache.tuscany.sca.assembly.xml.Constants; - /** * Interface Java XML Constants. * * @version $Rev$ $Date$ */ public interface JavaConstants { - + String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0"; String INTERFACE_JAVA = "interface.java"; - QName INTERFACE_JAVA_QNAME = new QName(Constants.SCA10_NS, "interface.java"); + QName INTERFACE_JAVA_QNAME = new QName(SCA10_NS, "interface.java"); String INTERFACE = "interface"; String CALLBACK_INTERFACE = "callbackInterface"; diff --git a/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java index 13b705a1f0..ed9b435e36 100644 --- a/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java +++ b/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java @@ -26,7 +26,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.contribution.processor.ContributionReadException; import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; @@ -41,14 +40,13 @@ import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; 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; /** * * @version $Rev$ $Date$ */ public class JavaInterfaceProcessor implements StAXArtifactProcessor, JavaConstants { - + private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0"; private JavaInterfaceFactory javaFactory; private Monitor monitor; @@ -120,7 +118,7 @@ public class JavaInterfaceProcessor implements StAXArtifactProcessor - writer.writeStartElement(Constants.SCA10_NS, INTERFACE_JAVA); + writer.writeStartElement(SCA10_NS, INTERFACE_JAVA); JavaInterface javaInterface = (JavaInterface)javaInterfaceContract.getInterface(); if (javaInterface != null && javaInterface.getName() != null) { -- cgit v1.2.3