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 --- .../implementation-bpel/META-INF/MANIFEST.MF | 24 ++++++++++++++-------- .../bpel/xml/BPELDocumentProcessor.java | 6 +++--- .../bpel/xml/BPELImplementationProcessor.java | 12 +++++------ .../bpel/BPELImplementationProcessorTestCase.java | 3 --- 4 files changed, 23 insertions(+), 22 deletions(-) (limited to 'branches/sca-equinox/modules/implementation-bpel') diff --git a/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF index c81ec9d481..9be3a3a7b6 100644 --- a/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF @@ -13,15 +13,21 @@ Bnd-LastModified: 1225397433843 Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: Apache Tuscany SCA BPEL Implementation Extension -Import-Package: javax.wsdl,javax.wsdl.extensions,javax.xml.namespace,j - avax.xml.stream,org.apache.tuscany.sca.assembly;version="1.4",org.apa - che.tuscany.sca.assembly.impl;version="1.4",org.apache.tuscany.sca.co - ntribution.processor;version="1.4",org.apache.tuscany.sca.contributio - n.resolver;version="1.4",org.apache.tuscany.sca.core;version="1.4",or - g.apache.tuscany.sca.implementation.bpel;version="1.4",org.apache.tus - cany.sca.interfacedef;version="1.4",org.apache.tuscany.sca.interfaced - ef.wsdl;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",ju - nit.framework;resolution:=optional +Import-Package: javax.wsdl, + javax.wsdl.extensions, + javax.xml.namespace, + javax.xml.stream, + junit.framework;resolution:=optional, + org.apache.tuscany.sca.assembly;version="1.4", + org.apache.tuscany.sca.assembly.impl;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.implementation.bpel;version="1.4", + org.apache.tuscany.sca.interfacedef;version="1.4", + org.apache.tuscany.sca.interfacedef.wsdl;version="1.4", + org.apache.tuscany.sca.monitor;version="1.4", + org.apache.tuscany.sca.policy;version="1.4.0" Bundle-SymbolicName: org.apache.tuscany.sca.implementation.bpel Bundle-DocURL: http://www.apache.org/ diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java b/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java index 0e24b94a2e..43606cb216 100644 --- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java +++ b/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java @@ -54,7 +54,6 @@ import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject; 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; /** * BPEL document processor responsible for reading a BPEL file and producing necessary model info about it @@ -80,7 +79,8 @@ public class BPELDocumentProcessor extends BaseStAXArtifactProcessor implements private static final QName IMPORT_ELEMENT = new QName(BPEL_NS, "import"); private static final String LINKTYPE_NAME = "partnerLinkType"; private static final QName LINKTYPE_ELEMENT = new QName(BPEL_PLINK_NS, LINKTYPE_NAME); - public final static String NAME_ELEMENT = "name"; + private final static String NAME_ELEMENT = "name"; + private final static String TARGET_NAMESPACE = "targetNamespace"; private final static XMLInputFactory inputFactory = XMLInputFactory.newInstance(); @@ -359,7 +359,7 @@ public class BPELDocumentProcessor extends BaseStAXArtifactProcessor implements case START_ELEMENT: QName qname = reader.getName(); if (BPEL_PROCESS_DEFINITION.equals(qname) || BPEL_EXECUTABLE_DEFINITION.equals(qname)) { - QName processName = new QName(getString(reader, org.apache.tuscany.sca.assembly.xml.Constants.TARGET_NAMESPACE), getString(reader, NAME_ELEMENT)); + QName processName = new QName(getString(reader, TARGET_NAMESPACE), getString(reader, NAME_ELEMENT)); processDefinition.setName(processName); } else if (PARTNERLINK_ELEMENT.equals(qname)) { processDefinition.getPartnerLinks().add(processPartnerLinkElement(reader)); diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java b/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java index 112b908867..92c38123a1 100644 --- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java +++ b/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java @@ -37,7 +37,6 @@ import org.apache.tuscany.sca.assembly.Multiplicity; import org.apache.tuscany.sca.assembly.Property; import org.apache.tuscany.sca.assembly.Reference; import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.ContributionReadException; import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; @@ -45,7 +44,6 @@ import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.databinding.xml.DOMDataBinding; import org.apache.tuscany.sca.implementation.bpel.BPELFactory; import org.apache.tuscany.sca.implementation.bpel.BPELImplementation; import org.apache.tuscany.sca.implementation.bpel.BPELProcessDefinition; @@ -55,7 +53,6 @@ import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract; 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; /** * Implements a StAX artifact processor for BPEL implementations. @@ -68,9 +65,10 @@ import org.apache.tuscany.sca.monitor.impl.ProblemImpl; * @version $Rev$ $Date$ */ public class BPELImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor { - private static final String PROCESS = "process"; - private static final String IMPLEMENTATION_BPEL = "implementation.bpel"; - private static final QName IMPLEMENTATION_BPEL_QNAME = new QName(Constants.SCA10_NS, IMPLEMENTATION_BPEL); + private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0"; + private static final String PROCESS = "process"; + private static final String IMPLEMENTATION_BPEL = "implementation.bpel"; + private static final QName IMPLEMENTATION_BPEL_QNAME = new QName(SCA10_NS, IMPLEMENTATION_BPEL); private AssemblyFactory assemblyFactory; private BPELFactory bpelFactory; @@ -151,7 +149,7 @@ public class BPELImplementationProcessor extends BaseStAXArtifactProcessor imple //FIXME Deal with policy processing... // Write // policyProcessor.writePolicyPrefixes(bpelImplementation, writer); - writer.writeStartElement(Constants.SCA10_NS, IMPLEMENTATION_BPEL); + writer.writeStartElement(SCA10_NS, IMPLEMENTATION_BPEL); // policyProcessor.writePolicyAttributes(bpelImplementation, writer); if (bpelImplementation.getProcess() != null) { diff --git a/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java b/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java index 9e19788112..28cc562a3b 100644 --- a/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java +++ b/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java @@ -28,7 +28,6 @@ import javax.xml.stream.XMLStreamReader; import junit.framework.TestCase; import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint; import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; @@ -44,8 +43,6 @@ import org.apache.tuscany.sca.monitor.Problem; * @version $Rev$ $Date$ */ public class BPELImplementationProcessorTestCase extends TestCase { - - protected static final QName IMPLEMENTATION_BPEL = new QName(Constants.SCA10_NS, "implementation.bpel"); private static final String COMPOSITE = "" -- cgit v1.2.3