Author: rfeng
Date: Fri Oct 31 10:34:39 2008
New Revision: 709500
URL: http://svn.apache.org/viewvc?rev=709500&view=rev
Log:
Fix bundle import package
Modified:
tuscany/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF
tuscany/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
tuscany/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
Modified:
tuscany/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF?rev=709500&r1=709499&r2=709500&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF
(original)
+++
tuscany/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF
Fri Oct 31 10:34:39 2008
@@ -10,15 +10,19 @@
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/
Modified:
tuscany/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java?rev=709500&r1=709499&r2=709500&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
(original)
+++
tuscany/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
Fri Oct 31 10:34:39 2008
@@ -20,17 +20,15 @@
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";
Modified:
tuscany/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java?rev=709500&r1=709499&r2=709500&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
(original)
+++
tuscany/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
Fri Oct 31 10:34:39 2008
@@ -26,7 +26,6 @@
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.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<JavaInterfaceContract>, 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 void write(JavaInterfaceContract javaInterfaceContract,
XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
// Write an <interface.java>
- writer.writeStartElement(Constants.SCA10_NS, INTERFACE_JAVA);
+ writer.writeStartElement(SCA10_NS, INTERFACE_JAVA);
JavaInterface javaInterface =
(JavaInterface)javaInterfaceContract.getInterface();
if (javaInterface != null && javaInterface.getName() != null) {
