You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/10/31 05:01:47 UTC
svn commit: r709339 [2/3] - in /tuscany/branches/sca-equinox/modules:
assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/
binding-atom-abdera/META-INF/ binding-corba/META-INF/
binding-corba/src/main/java/org/apache/tuscany/sca/binding/...
Modified: tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java Thu Oct 30 21:01:44 2008
@@ -33,12 +33,10 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.tuscany.sca.contribution.Constants;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
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;
/**
* Implementation of an extensible StAX artifact processor.
Modified: tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java Thu Oct 30 21:01:44 2008
@@ -37,7 +37,6 @@
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;
/**
* Implementation of an extensible StAX attribute processor.
Modified: tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java Thu Oct 30 21:01:44 2008
@@ -25,7 +25,6 @@
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;
/**
* Implementation of an extensible URL artifact processor.
Modified: tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java (original)
+++ tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java Thu Oct 30 21:01:44 2008
@@ -30,16 +30,15 @@
import javax.xml.validation.Schema;
import javax.xml.validation.ValidatorHandler;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.tuscany.sca.monitor.Problem.Severity;
import org.xml.sax.Attributes;
import org.xml.sax.ErrorHandler;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.AttributesImpl;
-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;
/**
*
Modified: tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java (original)
+++ tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java Thu Oct 30 21:01:44 2008
@@ -23,7 +23,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.tuscany.sca.assembly.Base;
import org.apache.tuscany.sca.contribution.Contribution;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
Modified: tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java (original)
+++ tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java Thu Oct 30 21:01:44 2008
@@ -18,9 +18,11 @@
*/
package org.apache.tuscany.sca.contribution.scanner;
+import java.io.IOException;
import java.net.URL;
import java.util.List;
+import org.apache.tuscany.sca.contribution.processor.ContributionException;
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
/**
Modified: tuscany/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -12,24 +12,34 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA Core/DataBinding Integration
-Import-Package: javax.xml.bind.annotation.adapters,javax.xml.namespace
- ,javax.xml.stream,javax.xml.transform,javax.xml.transform.stream,org.
- apache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.sca.cont
- ribution.resolver;version="1.4",org.apache.tuscany.sca.core;version="
- 1.4",org.apache.tuscany.sca.core.context;version="1.4",org.apache.tus
- cany.sca.databinding;version="1.4",org.apache.tuscany.sca.databinding
- .annotation;version="1.4",org.apache.tuscany.sca.databinding.impl;ver
- sion="1.4",org.apache.tuscany.sca.databinding.jaxb;version="1.4",org.
- apache.tuscany.sca.databinding.xml;version="1.4",org.apache.tuscany.s
- ca.interfacedef;version="1.4",org.apache.tuscany.sca.interfacedef.imp
- l;version="1.4",org.apache.tuscany.sca.interfacedef.java;version="1.4
- ",org.apache.tuscany.sca.interfacedef.java.introspect;version="1.4",o
- rg.apache.tuscany.sca.interfacedef.java.jaxws;version="1.4",org.apach
- e.tuscany.sca.interfacedef.util;version="1.4",org.apache.tuscany.sca.
- invocation;version="1.4",org.apache.tuscany.sca.runtime;version="1.4"
- ,org.apache.tuscany.sca.xsd;version="1.4",org.osoa.sca;version="1.4",
- org.osoa.sca.annotations;version="1.4",org.w3c.dom;resolution:=option
- al,org.junit;resolution:=optional
+Import-Package: javax.xml.bind.annotation.adapters,
+ javax.xml.namespace,
+ javax.xml.stream,
+ javax.xml.transform,
+ javax.xml.transform.stream,
+ org.apache.tuscany.sca.assembly;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.context;version="1.4",
+ org.apache.tuscany.sca.databinding;version="1.4",
+ org.apache.tuscany.sca.databinding.annotation;version="1.4",
+ org.apache.tuscany.sca.databinding.impl;version="1.4",
+ org.apache.tuscany.sca.databinding.jaxb;version="1.4",
+ org.apache.tuscany.sca.databinding.xml;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.java;version="1.4",
+ org.apache.tuscany.sca.interfacedef.java.introspect;version="1.4",
+ org.apache.tuscany.sca.interfacedef.java.jaxws;version="1.4",
+ org.apache.tuscany.sca.interfacedef.util;version="1.4",
+ org.apache.tuscany.sca.invocation;version="1.4",
+ org.apache.tuscany.sca.policy;version="1.4.0",
+ org.apache.tuscany.sca.runtime;version="1.4",
+ org.apache.tuscany.sca.xsd;version="1.4",
+ org.junit;resolution:=optional,
+ org.osoa.sca;version="1.4",
+ org.osoa.sca.annotations;version="1.4",
+ org.w3c.dom;resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.core.databinding
Bundle-DocURL: http://www.apache.org/
Modified: tuscany/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -25,16 +25,21 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA Core SPI
-Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac
- he.tuscany.sca.context;version="1.4",org.apache.tuscany.sca.core;vers
- ion="1.4",org.apache.tuscany.sca.definitions;version="1.4",org.apache
- .tuscany.sca.endpointresolver;version="1.4",org.apache.tuscany.sca.ex
- tensibility;version="1.4",org.apache.tuscany.sca.interfacedef;version
- ="1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apache.tus
- cany.sca.management;version="1.4",org.apache.tuscany.sca.provider;ver
- sion="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.apache.tu
- scany.sca.work;version="1.4",org.osoa.sca;version="1.4",org.junit;res
- olution:=optional
+Import-Package: org.apache.tuscany.sca.assembly;version="1.4",
+ org.apache.tuscany.sca.context;version="1.4",
+ org.apache.tuscany.sca.core;version="1.4",
+ org.apache.tuscany.sca.definitions;version="1.4",
+ org.apache.tuscany.sca.endpointresolver;version="1.4",
+ org.apache.tuscany.sca.extensibility;version="1.4",
+ org.apache.tuscany.sca.interfacedef;version="1.4",
+ org.apache.tuscany.sca.invocation;version="1.4",
+ org.apache.tuscany.sca.management;version="1.4",
+ org.apache.tuscany.sca.policy;version="1.4.0",
+ org.apache.tuscany.sca.provider;version="1.4",
+ org.apache.tuscany.sca.runtime;version="1.4",
+ org.apache.tuscany.sca.work;version="1.4",
+ org.junit;resolution:=optional,
+ org.osoa.sca;version="1.4"
Bundle-SymbolicName: org.apache.tuscany.sca.core.spi
Bundle-DocURL: http://www.apache.org/
Modified: tuscany/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -47,30 +47,43 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA Core Runtime
-Import-Package: commonj.work,javax.naming,javax.security.auth,javax.xm
- l.namespace,javax.xml.stream,net.sf.cglib.proxy,org.apache.tuscany.sc
- a.assembly;version="1.4",org.apache.tuscany.sca.assembly.builder;vers
- ion="1.4",org.apache.tuscany.sca.assembly.impl;version="1.4",org.apac
- he.tuscany.sca.context;version="1.4",org.apache.tuscany.sca.contribut
- ion.processor;version="1.4",org.apache.tuscany.sca.contribution.resol
- ver;version="1.4",org.apache.tuscany.sca.core;version="1.4",org.apach
- e.tuscany.sca.core.assembly;version="1.4",org.apache.tuscany.sca.core
- .context;version="1.4",org.apache.tuscany.sca.core.conversation;versi
- on="1.4",org.apache.tuscany.sca.core.factory;version="1.4",org.apache
- .tuscany.sca.core.invocation;version="1.4",org.apache.tuscany.sca.cor
- e.scope;version="1.4",org.apache.tuscany.sca.core.work;version="1.4",
- org.apache.tuscany.sca.endpointresolver;version="1.4",org.apache.tusc
- any.sca.extensibility;version="1.4",org.apache.tuscany.sca.interfaced
- ef;version="1.4",org.apache.tuscany.sca.interfacedef.java;version="1.
- 4",org.apache.tuscany.sca.interfacedef.util;version="1.4",org.apache.
- tuscany.sca.invocation;version="1.4",org.apache.tuscany.sca.monitor;v
- ersion="1.4",org.apache.tuscany.sca.provider;version="1.4",org.apache
- .tuscany.sca.runtime;version="1.4",org.apache.tuscany.sca.work;versio
- n="1.4",org.osoa.sca;version="1.4",org.osoa.sca.annotations;version="
- 1.4",org.junit;resolution:=optional,junit.framework;resolution:=optio
- nal,org.apache.tuscany.sca.interfacedef.impl;version="1.4";resolution
- :=optional,org.apache.tuscany.sca.core.wire;version="1.4";resolution:
- =optional
+Import-Package: commonj.work,
+ javax.naming,
+ javax.security.auth,
+ javax.xml.namespace,
+ javax.xml.stream,
+ junit.framework;resolution:=optional,
+ net.sf.cglib.proxy,
+ org.apache.tuscany.sca.assembly;version="1.4",
+ org.apache.tuscany.sca.assembly.builder;version="1.4",
+ org.apache.tuscany.sca.assembly.impl;version="1.4",
+ org.apache.tuscany.sca.context;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.conversation;version="1.4",
+ org.apache.tuscany.sca.core.factory;version="1.4",
+ org.apache.tuscany.sca.core.invocation;version="1.4",
+ org.apache.tuscany.sca.core.scope;version="1.4",
+ org.apache.tuscany.sca.core.wire;version="1.4";resolution:=optional,
+ org.apache.tuscany.sca.core.work;version="1.4",
+ org.apache.tuscany.sca.endpointresolver;version="1.4",
+ org.apache.tuscany.sca.extensibility;version="1.4",
+ org.apache.tuscany.sca.interfacedef;version="1.4",
+ org.apache.tuscany.sca.interfacedef.impl;version="1.4";resolution:=optional,
+ org.apache.tuscany.sca.interfacedef.java;version="1.4",
+ org.apache.tuscany.sca.interfacedef.util;version="1.4",
+ org.apache.tuscany.sca.invocation;version="1.4",
+ org.apache.tuscany.sca.monitor;version="1.4",
+ org.apache.tuscany.sca.policy;version="1.4.0",
+ org.apache.tuscany.sca.provider;version="1.4",
+ org.apache.tuscany.sca.runtime;version="1.4",
+ org.apache.tuscany.sca.work;version="1.4",
+ org.junit;resolution:=optional,
+ org.osoa.sca;version="1.4",
+ org.osoa.sca.annotations;version="1.4"
Bundle-SymbolicName: org.apache.tuscany.sca.core
Bundle-DocURL: http://www.apache.org/
Modified: tuscany/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -10,17 +10,26 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA Data Binding for JSON
-Import-Package: com.metaparadigm.jsonrpc,javax.xml.namespace,javax.xml
- .stream;version="1.0",org.apache.axiom.om,org.apache.tuscany.sca.data
- binding;version="1.4",org.apache.tuscany.sca.databinding.impl;version
- ="1.4",org.apache.tuscany.sca.databinding.xml;version="1.4",org.apach
- e.tuscany.sca.interfacedef;version="1.4",org.apache.tuscany.sca.inter
- facedef.util;version="1.4",org.codehaus.jettison.badgerfish,org.codeh
- aus.jettison.json,org.codehaus.jettison.mapped,org.json,org.osoa.sca.
- annotations;version="1.4",org.apache.tuscany.sca.databinding.json.axi
- om;resolution:=optional,org.junit;resolution:=optional,junit.framewor
- k;resolution:=optional,org.apache.tuscany.sca.interfacedef.impl;versi
- on="1.4";resolution:=optional
+Import-Package: com.metaparadigm.jsonrpc,
+ javax.xml.namespace,
+ javax.xml.stream;version="1.0",
+ junit.framework;resolution:=optional,
+ org.apache.axiom.om,
+ org.apache.tuscany.sca.databinding;version="1.4",
+ org.apache.tuscany.sca.databinding.impl;version="1.4",
+ org.apache.tuscany.sca.databinding.json;version="1.4.0",
+ org.apache.tuscany.sca.databinding.json.axiom;resolution:=optional,
+ org.apache.tuscany.sca.databinding.xml;version="1.4",
+ org.apache.tuscany.sca.interfacedef;version="1.4",
+ org.apache.tuscany.sca.interfacedef.impl;version="1.4";resolution:=optional,
+ org.apache.tuscany.sca.interfacedef.util;version="1.4",
+ org.codehaus.jettison.badgerfish,
+ org.codehaus.jettison.json,
+ org.codehaus.jettison.mapped,
+ org.json,
+ org.junit;resolution:=optional,
+ org.osoa.sca.annotations;version="1.4"
Bundle-SymbolicName: org.apache.tuscany.sca.databinding.json
Bundle-DocURL: http://www.apache.org/
+Export-Package: org.apache.tuscany.sca.databinding.json;version="1.4.0"
Modified: tuscany/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -23,26 +23,42 @@
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/
Modified: tuscany/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java (original)
+++ tuscany/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java Thu Oct 30 21:01:44 2008
@@ -21,7 +21,7 @@
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 @@
*
* @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();
Modified: tuscany/branches/sca-equinox/modules/databinding/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding/pom.xml?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/databinding/pom.xml Thu Oct 30 21:01:44 2008
@@ -81,7 +81,7 @@
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -27,28 +27,43 @@
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/
Modified: tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java Thu Oct 30 21:01:44 2008
@@ -83,7 +83,6 @@
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;
Modified: tuscany/branches/sca-equinox/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java (original)
+++ tuscany/branches/sca-equinox/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java Thu Oct 30 21:01:44 2008
@@ -32,9 +32,8 @@
import org.apache.tuscany.sca.assembly.ComponentReference;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
import org.apache.tuscany.sca.contribution.Contribution;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
@@ -55,10 +54,8 @@
import org.apache.tuscany.sca.endpoint.impl.EndpointResolverFactoryImpl;
import org.apache.tuscany.sca.endpointresolver.EndpointResolver;
import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -122,10 +119,7 @@
modelResolver = new ExtensibleModelResolver(null, modelResolvers, modelFactories);
// Create a composite builder
- SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
- IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
- InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class);
- compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, contractMapper);
+ compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
// Runtime Init ===================
/*
Modified: tuscany/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -13,15 +13,21 @@
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/
Modified: tuscany/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java Thu Oct 30 21:01:44 2008
@@ -54,7 +54,6 @@
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 @@
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 @@
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));
Modified: tuscany/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java Thu Oct 30 21:01:44 2008
@@ -37,7 +37,6 @@
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.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.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 @@
* @version $Rev$ $Date$
*/
public class BPELImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<BPELImplementation> {
- 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 @@
//FIXME Deal with policy processing...
// Write <implementation.bpel process="..."/>
// 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) {
Modified: tuscany/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java Thu Oct 30 21:01:44 2008
@@ -28,7 +28,6 @@
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 @@
* @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 =
"<?xml version=\"1.0\" encoding=\"ASCII\"?>"
Modified: tuscany/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -13,12 +13,16 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA Script Implementation Model
-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
- y.sca.assembly;version="1.4",org.apache.tuscany.sca.contribution;vers
- ion="1.4",org.apache.tuscany.sca.contribution.processor;version="1.4"
- ,org.apache.tuscany.sca.contribution.resolver;version="1.4",org.apach
- e.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.implementatio
- n.script;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",
+Import-Package: javax.xml.namespace,
+ javax.xml.stream,
+ org.apache.tuscany.sca.assembly;version="1.4",
+ org.apache.tuscany.sca.assembly.xml;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.implementation.script;version="1.4",
+ org.apache.tuscany.sca.monitor;version="1.4"
Bundle-SymbolicName: org.apache.tuscany.sca.implementation.script
Bundle-DocURL: http://www.apache.org/
Modified: tuscany/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -10,17 +10,22 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA Widget Implementation Runtime
-Import-Package: org.apache.tuscany.sca.assembly;version="1.4",org.apac
- he.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.implementati
- on.widget;version="1.4",org.apache.tuscany.sca.interfacedef;version="
- 1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apache.tusca
- ny.sca.provider;version="1.4",org.apache.tuscany.sca.runtime;version=
- "1.4",org.w3c.dom,org.apache.abdera.factory;resolution:=optional,org.
- apache.tuscany.sca.binding.atom.collection;resolution:=optional,org.o
- soa.sca.annotations;version="1.4";resolution:=optional,junit.framewor
- k;resolution:=optional,org.apache.abdera.model;resolution:=optional,o
- rg.apache.tuscany.sca.node;resolution:=optional,org.apache.abdera;res
- olution:=optional
+Import-Package: junit.framework;resolution:=optional,
+ org.apache.abdera;resolution:=optional,
+ org.apache.abdera.factory;resolution:=optional,
+ org.apache.abdera.model;resolution:=optional,
+ org.apache.tuscany.sca.assembly;version="1.4",
+ org.apache.tuscany.sca.binding.atom.collection;resolution:=optional,
+ org.apache.tuscany.sca.core;version="1.4",
+ org.apache.tuscany.sca.implementation.widget;version="1.4",
+ org.apache.tuscany.sca.interfacedef;version="1.4",
+ org.apache.tuscany.sca.invocation;version="1.4",
+ org.apache.tuscany.sca.node;resolution:=optional,
+ org.apache.tuscany.sca.policy;version="1.4.0",
+ org.apache.tuscany.sca.provider;version="1.4",
+ org.apache.tuscany.sca.runtime;version="1.4",
+ org.osoa.sca.annotations;version="1.4";resolution:=optional,
+ org.w3c.dom
Bundle-SymbolicName: org.apache.tuscany.sca.implementation.widget.runt
ime
Bundle-DocURL: http://www.apache.org/
Modified: tuscany/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -15,15 +15,20 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA Widget Implementation Model
-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
- y.sca.assembly;version="1.4",org.apache.tuscany.sca.contribution;vers
- ion="1.4",org.apache.tuscany.sca.contribution.processor;version="1.4"
- ,org.apache.tuscany.sca.contribution.resolver;version="1.4",org.apach
- e.tuscany.sca.core;version="1.4",org.apache.tuscany.sca.data.collecti
- on;version="1.4",org.apache.tuscany.sca.implementation.widget;version
- ="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org.apache.t
- uscany.sca.interfacedef.java;version="1.4",org.apache.tuscany.sca.mon
- itor;version="1.4"
+Import-Package: javax.xml.namespace,
+ javax.xml.stream,
+ org.apache.tuscany.sca.assembly;version="1.4",
+ org.apache.tuscany.sca.assembly.xml;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.data.collection;version="1.4",
+ org.apache.tuscany.sca.implementation.widget;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.policy;version="1.4.0"
Bundle-SymbolicName: org.apache.tuscany.sca.implementation.widget
Bundle-DocURL: http://www.apache.org/
Modified: tuscany/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -23,25 +23,40 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA XQuery Implementation Extension
-Import-Package: javax.xml.namespace,javax.xml.stream,javax.xml.transfo
- rm,javax.xml.transform.dom,javax.xml.transform.stream,net.sf.saxon,ne
- t.sf.saxon.event,net.sf.saxon.om,net.sf.saxon.query,net.sf.saxon.tran
- s,net.sf.saxon.value,org.apache.tuscany.sca.assembly;version="1.4",or
- g.apache.tuscany.sca.assembly.impl;version="1.4",org.apache.tuscany.s
- ca.contribution;version="1.4",org.apache.tuscany.sca.contribution.pro
- cessor;version="1.4",org.apache.tuscany.sca.contribution.resolver;ver
- sion="1.4",org.apache.tuscany.sca.core;version="1.4",org.apache.tusca
- ny.sca.core.factory;version="1.4",org.apache.tuscany.sca.databinding;
- version="1.4",org.apache.tuscany.sca.databinding.impl;version="1.4",o
- rg.apache.tuscany.sca.databinding.saxon;version="1.4",org.apache.tusc
- any.sca.databinding.saxon.collection;version="1.4",org.apache.tuscany
- .sca.implementation.java.injection;version="1.4",org.apache.tuscany.s
- ca.implementation.xquery;version="1.4",org.apache.tuscany.sca.interfa
- cedef;version="1.4",org.apache.tuscany.sca.interfacedef.java;version=
- "1.4",org.apache.tuscany.sca.interfacedef.util;version="1.4",org.apac
- he.tuscany.sca.invocation;version="1.4",org.apache.tuscany.sca.monito
- r;version="1.4",org.apache.tuscany.sca.provider;version="1.4",org.apa
- che.tuscany.sca.runtime;version="1.4",org.w3c.dom
+Import-Package: javax.xml.namespace,
+ javax.xml.stream,
+ javax.xml.transform,
+ javax.xml.transform.dom,
+ javax.xml.transform.stream,
+ net.sf.saxon,
+ net.sf.saxon.event,
+ net.sf.saxon.om,
+ net.sf.saxon.query,
+ net.sf.saxon.trans,
+ net.sf.saxon.value,
+ org.apache.tuscany.sca.assembly;version="1.4",
+ org.apache.tuscany.sca.assembly.impl;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.factory;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.saxon;version="1.4",
+ org.apache.tuscany.sca.databinding.saxon.collection;version="1.4",
+ org.apache.tuscany.sca.implementation.java.injection;version="1.4",
+ org.apache.tuscany.sca.implementation.xquery;version="1.4",
+ org.apache.tuscany.sca.interfacedef;version="1.4",
+ org.apache.tuscany.sca.interfacedef.java;version="1.4",
+ org.apache.tuscany.sca.interfacedef.util;version="1.4",
+ org.apache.tuscany.sca.invocation;version="1.4",
+ org.apache.tuscany.sca.monitor;version="1.4",
+ org.apache.tuscany.sca.policy;version="1.4.0",
+ org.apache.tuscany.sca.provider;version="1.4",
+ org.apache.tuscany.sca.runtime;version="1.4",
+ org.osoa.sca;version="1.4.0",
+ org.w3c.dom
Bundle-SymbolicName: org.apache.tuscany.sca.implementation.xquery
Bundle-DocURL: http://www.apache.org/
Modified: tuscany/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -17,22 +17,33 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany Java Interface for JAXWS
-Import-Package: javax.jws,javax.jws.soap,javax.xml.bind.annotation,jav
- ax.xml.bind.annotation.adapters,javax.xml.namespace,javax.xml.ws,org.
- apache.tuscany.sca.databinding;version="1.4",org.apache.tuscany.sca.d
- atabinding.annotation;version="1.4",org.apache.tuscany.sca.databindin
- g.jaxb;version="1.4",org.apache.tuscany.sca.interfacedef;version="1.4
- ",org.apache.tuscany.sca.interfacedef.impl;version="1.4",org.apache.t
- uscany.sca.interfacedef.java;version="1.4",org.apache.tuscany.sca.int
- erfacedef.java.impl;version="1.4",org.apache.tuscany.sca.interfacedef
- .java.introspect;version="1.4",org.apache.tuscany.sca.interfacedef.ja
- va.jaxws;version="1.4",org.apache.tuscany.sca.interfacedef.util;versi
- on="1.4",org.objectweb.asm;version="3.1",org.osoa.sca;version="1.4",j
- unit.framework;resolution:=optional,org.objectweb.asm.util;version="3
- .1";resolution:=optional,org.osoa.sca.annotations;version="1.4";resol
- ution:=optional,org.junit;resolution:=optional,javax.xml.transform;re
- solution:=optional,javax.xml.transform.stream;resolution:=optional,ja
- vax.xml.bind;resolution:=optional
+Import-Package: javax.jws,
+ javax.jws.soap,
+ javax.xml.bind;resolution:=optional,
+ javax.xml.bind.annotation,
+ javax.xml.bind.annotation.adapters,
+ javax.xml.namespace,
+ javax.xml.transform;resolution:=optional,
+ javax.xml.transform.stream;resolution:=optional,
+ javax.xml.ws,
+ junit.framework;resolution:=optional,
+ org.apache.tuscany.sca.assembly;version="1.4.0",
+ org.apache.tuscany.sca.databinding;version="1.4",
+ org.apache.tuscany.sca.databinding.annotation;version="1.4",
+ org.apache.tuscany.sca.databinding.jaxb;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.java;version="1.4",
+ org.apache.tuscany.sca.interfacedef.java.impl;version="1.4",
+ org.apache.tuscany.sca.interfacedef.java.introspect;version="1.4",
+ org.apache.tuscany.sca.interfacedef.java.jaxws;version="1.4",
+ org.apache.tuscany.sca.interfacedef.util;version="1.4",
+ org.apache.tuscany.sca.policy;version="1.4.0",
+ org.junit;resolution:=optional,
+ org.objectweb.asm;version="3.1",
+ org.objectweb.asm.util;version="3.1";resolution:=optional,
+ org.osoa.sca;version="1.4",
+ org.osoa.sca.annotations;version="1.4";resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.interface.java.jaxws
Bundle-DocURL: http://www.apache.org/
Modified: tuscany/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -10,25 +10,32 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA WSDL Interface XML Model
-Import-Package: javax.wsdl,javax.wsdl.extensions,javax.wsdl.extensions
- .schema,javax.wsdl.factory,javax.wsdl.xml,javax.xml.namespace,javax.x
- ml.stream,org.apache.tuscany.sca.contribution;version="1.4",org.apach
- e.tuscany.sca.contribution.namespace;version="1.4",org.apache.tuscany
- .sca.contribution.processor;version="1.4",org.apache.tuscany.sca.cont
- ribution.resolver;version="1.4",org.apache.tuscany.sca.core;version="
- 1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org.apache.tus
- cany.sca.interfacedef.wsdl;version="1.4",org.apache.tuscany.sca.monit
- or;version="1.4",org.apache.tuscany.sca.xsd;version="1.4",org.apache.
- tuscany.sca.xsd.xml;version="1.4",org.apache.ws.commons.schema,org.w3
- c.dom,org.xml.sax,org.apache.tuscany.sca.interfacedef.util;version="1
- .4";resolution:=optional,org.apache.tuscany.sca.definitions;version="
- 1.4";resolution:=optional,org.apache.tuscany.sca.interfacedef.wsdl.im
- pl;resolution:=optional,org.apache.tuscany.sca.policy;version="1.4";r
- esolution:=optional,junit.framework;resolution:=optional,org.apache.t
- uscany.sca.assembly.builder;version="1.4";resolution:=optional,org.ap
- ache.tuscany.sca.assembly;version="1.4";resolution:=optional,org.apac
- he.tuscany.sca.assembly.builder.impl;resolution:=optional,org.junit;r
- esolution:=optional
+Import-Package: javax.wsdl,
+ javax.wsdl.extensions,
+ javax.wsdl.extensions.schema,
+ javax.wsdl.factory,
+ javax.wsdl.xml,
+ javax.xml.namespace,
+ javax.xml.stream,
+ junit.framework;resolution:=optional,
+ 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;version="1.4",
+ org.apache.tuscany.sca.contribution.namespace;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.definitions;version="1.4.0";resolution:=optional,
+ 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";resolution:=optional,
+ org.apache.tuscany.sca.xsd;version="1.4",
+ org.apache.tuscany.sca.xsd.xml;version="1.4",
+ org.apache.ws.commons.schema,
+ org.junit;resolution:=optional,
+ org.w3c.dom,
+ org.xml.sax
Bundle-SymbolicName: org.apache.tuscany.sca.interface.wsdl.xml
Bundle-DocURL: http://www.apache.org/
Modified: tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java (original)
+++ tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java Thu Oct 30 21:01:44 2008
@@ -20,17 +20,15 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-
/**
* Constants for WSDL.
*
* @version $Rev$ $Date$
*/
public interface WSDLConstants {
-
+ String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
String INTERFACE_WSDL = "interface.wsdl";
- QName INTERFACE_WSDL_QNAME = new QName(Constants.SCA10_NS, "interface.wsdl");
+ QName INTERFACE_WSDL_QNAME = new QName(SCA10_NS, "interface.wsdl");
String INTERFACE = "interface";
String CALLBACK_INTERFACE = "callbackInterface";
String WSDL_LOCATION = "wsdlLocation";
Modified: tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java Thu Oct 30 21:01:44 2008
@@ -43,9 +43,8 @@
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;
-import org.apache.tuscany.sca.xsd.XSDefinition;
import org.apache.tuscany.sca.xsd.XSDFactory;
+import org.apache.tuscany.sca.xsd.XSDefinition;
/**
* An ArtifactProcessor for WSDL documents.
Modified: tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java Thu Oct 30 21:01:44 2008
@@ -27,7 +27,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;
@@ -43,7 +42,6 @@
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;
/**
*
@@ -162,7 +160,7 @@
public void write(WSDLInterfaceContract wsdlInterfaceContract, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
// Write an <interface.wsdl>
- writer.writeStartElement(Constants.SCA10_NS, INTERFACE_WSDL);
+ writer.writeStartElement(WSDLConstants.SCA10_NS, INTERFACE_WSDL);
// Write interface name
WSDLInterface wsdlInterface = (WSDLInterface)wsdlInterfaceContract.getInterface();
Modified: tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java (original)
+++ tuscany/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java Thu Oct 30 21:01:44 2008
@@ -26,22 +26,17 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.ComponentType;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
/**
* Test reading WSDL interfaces.
@@ -62,12 +57,7 @@
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
- AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
- SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
- UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
- InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
- IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
- compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, mapper);
+ compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
}
public void testReadComponentType() throws Exception {
Modified: tuscany/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -15,14 +15,24 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA WSDL Interface Model
-Import-Package: javax.wsdl,javax.wsdl.extensions,javax.xml.namespace,o
- rg.apache.tuscany.sca.assembly;version="1.4",org.apache.tuscany.sca.c
- ontribution.resolver;version="1.4",org.apache.tuscany.sca.core;versio
- n="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org.apache.
- tuscany.sca.interfacedef.impl;version="1.4",org.apache.tuscany.sca.in
- terfacedef.util;version="1.4",org.apache.tuscany.sca.interfacedef.wsd
- l;version="1.4",org.apache.tuscany.sca.policy;version="1.4",org.apach
- e.tuscany.sca.xsd;version="1.4",org.apache.ws.commons.schema
+Import-Package: javax.wsdl,
+ javax.wsdl.extensions,
+ javax.xml.namespace,
+ junit.framework;resolution:=optional,
+ org.apache.tuscany.sca.assembly;version="1.4",
+ org.apache.tuscany.sca.contribution;version="1.4.0";resolution:=optional,
+ org.apache.tuscany.sca.contribution.processor;version="1.4.0";resolution:=optional,
+ org.apache.tuscany.sca.contribution.resolver;version="1.4",
+ org.apache.tuscany.sca.core;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.interfacedef.wsdl;version="1.4",
+ org.apache.tuscany.sca.monitor;version="1.4.0";resolution:=optional,
+ org.apache.tuscany.sca.policy;version="1.4",
+ org.apache.tuscany.sca.xsd;version="1.4",
+ org.apache.ws.commons.schema,
+ org.junit;resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.interface.wsdl
Bundle-DocURL: http://www.apache.org/
Propchange: tuscany/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 30 21:01:44 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java:671193
+/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java:694855
Propchange: tuscany/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 30 21:01:44 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect:671193
+/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect:694855
Modified: tuscany/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008
@@ -19,22 +19,30 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA Node Implementation
-Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan
- y.sca.assembly;version="1.4",org.apache.tuscany.sca.assembly.builder;
- version="1.4",org.apache.tuscany.sca.contribution;version="1.4",org.a
- pache.tuscany.sca.contribution.processor;version="1.4",org.apache.tus
- cany.sca.contribution.resolver;version="1.4",org.apache.tuscany.sca.c
- ore;version="1.4",org.apache.tuscany.sca.core.assembly;version="1.4",
- org.apache.tuscany.sca.core.invocation;version="1.4",org.apache.tusca
- ny.sca.definitions;version="1.4",org.apache.tuscany.sca.implementatio
- n.node;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",org
- .apache.tuscany.sca.node;version="1.4",org.apache.tuscany.sca.node.im
- pl;version="1.4",org.apache.tuscany.sca.runtime;version="1.4",org.apa
- che.tuscany.sca.work;version="1.4",org.apache.tuscany.sca.workspace;v
- ersion="1.4",org.apache.tuscany.sca.workspace.builder;version="1.4",o
- rg.osoa.sca;version="1.4",org.osoa.sca.annotations;version="1.4";reso
- lution:=optional,junit.framework;resolution:=optional,org.junit;resol
- ution:=optional
+Import-Package: javax.xml.namespace,
+ javax.xml.stream,
+ junit.framework;resolution:=optional,
+ org.apache.tuscany.sca.assembly;version="1.4",
+ org.apache.tuscany.sca.assembly.builder;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.invocation;version="1.4",
+ org.apache.tuscany.sca.definitions;version="1.4",
+ org.apache.tuscany.sca.implementation.node;version="1.4",
+ org.apache.tuscany.sca.monitor;version="1.4",
+ org.apache.tuscany.sca.node;version="1.4",
+ org.apache.tuscany.sca.node.impl;version="1.4",
+ org.apache.tuscany.sca.policy;version="1.4.0",
+ org.apache.tuscany.sca.runtime;version="1.4",
+ org.apache.tuscany.sca.work;version="1.4",
+ org.apache.tuscany.sca.workspace;version="1.4",
+ org.apache.tuscany.sca.workspace.builder;version="1.4",
+ org.junit;resolution:=optional,
+ org.osoa.sca;version="1.4",
+ org.osoa.sca.annotations;version="1.4";resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.node.impl
Bundle-DocURL: http://www.apache.org/
Modified: tuscany/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java (original)
+++ tuscany/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java Thu Oct 30 21:01:44 2008
@@ -113,31 +113,9 @@
if (file.exists()) {
File jarDirectory = file.getParentFile();
if (jarDirectory != null && jarDirectory.exists()) {
-
- // Collect JAR files from the directory containing the input JAR
- // (e.g. the Tuscany modules directory)
- URL jarDirectoryURL = jarDirectory.toURI().toURL();
- jarDirectoryURLs.add(jarDirectoryURL);
- collectJARFiles(jarDirectory, jarURLs, filter);
-
File homeDirectory = jarDirectory.getParentFile();
if (homeDirectory != null && homeDirectory.exists()) {
-
- // Collect JARs from the ../modules directory
- File modulesDirectory = new File(homeDirectory, "modules");
- URL modulesDirectoryURL = modulesDirectory.toURI().toURL();
- if (!jarDirectoryURLs.contains(modulesDirectoryURL) && modulesDirectory.exists()) {
- jarDirectoryURLs.add(modulesDirectoryURL);
- collectJARFiles(modulesDirectory, jarURLs, filter);
- }
-
- // Collect JARs from the ../lib directory
- File libDirectory = new File(homeDirectory, "lib");
- URL libDirectoryURL = libDirectory.toURI().toURL();
- if (!jarDirectoryURLs.contains(libDirectoryURL) && libDirectory.exists()) {
- jarDirectoryURLs.add(libDirectoryURL);
- collectJARFiles(libDirectory, jarURLs, filter);
- }
+ collectJARFiles(jarDirectory.getPath(), jarDirectoryURLs, jarURLs, filter);
}
}
}
@@ -199,14 +177,14 @@
// Collect files under $TUSCANY_HOME
jarDirectoryURLs.add(directoryURL);
- collectJARFiles(directoryFile, jarURLs, filter);
+ collectJARFiles(directoryFile, jarURLs, filter, false);
// Collect files under $TUSCANY_HOME/modules
File modulesDirectory = new File(directoryFile, "modules");
URL modulesDirectoryURL = modulesDirectory.toURI().toURL();
if (!jarDirectoryURLs.contains(modulesDirectoryURL) && modulesDirectory.exists()) {
jarDirectoryURLs.add(modulesDirectoryURL);
- collectJARFiles(modulesDirectory, jarURLs, filter);
+ collectJARFiles(modulesDirectory, jarURLs, filter, true);
}
// Collect files under $TUSCANY_HOME/lib
@@ -214,7 +192,7 @@
URL libDirectoryURL = libDirectory.toURI().toURL();
if (!jarDirectoryURLs.contains(libDirectoryURL) && libDirectory.exists()) {
jarDirectoryURLs.add(libDirectoryURL);
- collectJARFiles(libDirectory, jarURLs, filter);
+ collectJARFiles(libDirectory, jarURLs, filter, true);
}
}
}
@@ -224,17 +202,20 @@
* @param directory
* @param urls
* @param filter
+ * @param recursive
* @throws MalformedURLException
*/
- private static void collectJARFiles(File directory, List<URL> urls, FilenameFilter filter) throws MalformedURLException {
- String[] files = directory.list(filter);
+ private static void collectJARFiles(File directory, List<URL> urls, FilenameFilter filter, boolean recursive) throws MalformedURLException {
+ File[] files = directory.listFiles(filter);
if (files != null) {
- URL directoryURL = new URL(directory.toURI().toString() + "/");
int count = 0;
- for (String file: files) {
- URL url = new URL(directoryURL, file);
- urls.add(url);
- count++;
+ for (File file: files) {
+ if (recursive && file.isDirectory()) {
+ collectJARFiles(file, urls, filter, recursive);
+ } else if (file.isFile()) {
+ urls.add(file.toURI().toURL());
+ count++;
+ }
}
if (count != 0) {
logger.fine("Runtime classpath: "+ count + " JAR" + (count > 1? "s":"")+ " from " + directory.toString());
@@ -248,6 +229,9 @@
private static class StandAloneJARFileNameFilter implements FilenameFilter {
public boolean accept(File dir, String name) {
+ if(new File(dir, name).isDirectory()) {
+ return true;
+ }
name = name.toLowerCase();
// Exclude tuscany-sca-all and tuscany-sca-manifest as they duplicate
Modified: tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java (original)
+++ tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java Thu Oct 30 21:01:44 2008
@@ -22,7 +22,6 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.policy.Policy;
/**
@@ -32,7 +31,9 @@
* @version $Rev$ $Date$
*/
public class JDKLoggingPolicy implements Policy {
- private static final QName JDK_LOGGING_POLICY_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "jdkLogger");
+ static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
+ static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+ private static final QName JDK_LOGGING_POLICY_QNAME = new QName(SCA10_TUSCANY_NS, "jdkLogger");
private String loggerName;
private String resourceBundleName;
Modified: tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java (original)
+++ tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java Thu Oct 30 21:01:44 2008
@@ -25,7 +25,6 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Interceptor;
import org.apache.tuscany.sca.invocation.Invoker;
@@ -40,7 +39,7 @@
*/
public class JDKLoggingPolicyInterceptor implements Interceptor {
public static final String loggingPolicy = "JDKLoggingPolicy";
- public static final QName policySetQName = new QName(Constants.SCA10_TUSCANY_NS, loggingPolicy);
+ public static final QName policySetQName = new QName(JDKLoggingPolicy.SCA10_TUSCANY_NS, loggingPolicy);
private Logger logger = null;
private Invoker next;
Modified: tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java Thu Oct 30 21:01:44 2008
@@ -28,7 +28,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;
@@ -42,7 +41,7 @@
* @version $Rev$ $Date$
*/
public class JDKLoggingPolicyProcessor implements StAXArtifactProcessor<JDKLoggingPolicy> {
- private static final QName JDK_LOGGING_POLICY_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "jdkLogger");
+ private static final QName JDK_LOGGING_POLICY_QNAME = new QName(JDKLoggingPolicy.SCA10_TUSCANY_NS, "jdkLogger");
private static final String LOG_LEVEL = "logLevel";
private static final String RESOURCE_BUNDLE = "resourceBundle";
private static final String USE_PARENT_HANDLERS = "useParentHandlers";
@@ -68,7 +67,7 @@
case START_ELEMENT : {
name = reader.getName();
if ( name.equals(JDK_LOGGING_POLICY_QNAME) ) {
- String loggerName = reader.getAttributeValue(null, Constants.NAME);
+ String loggerName = reader.getAttributeValue(null, "name");
policy.setLoggerName(loggerName);
} else if ( LOG_LEVEL.equals(name.getLocalPart()) ) {
policy.setLogLevel(Level.parse(reader.getElementText()));
@@ -102,10 +101,10 @@
writer.writeStartElement(prefix,
JDK_LOGGING_POLICY_QNAME.getLocalPart(),
JDK_LOGGING_POLICY_QNAME.getNamespaceURI());
- writer.writeNamespace("tuscany", Constants.SCA10_TUSCANY_NS);
+ writer.writeNamespace("tuscany", JDKLoggingPolicy.SCA10_TUSCANY_NS);
if (policy.getLoggerName() != null) {
- writer.writeAttribute(Constants.NAME, policy.getLoggerName());
+ writer.writeAttribute("name", policy.getLoggerName());
}
if ( policy.getLogLevel() != null ) {
writer.writeStartElement(prefix,
Modified: tuscany/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java (original)
+++ tuscany/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java Thu Oct 30 21:01:44 2008
@@ -24,7 +24,6 @@
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.policy.Policy;
/**
@@ -34,7 +33,8 @@
* @version $Rev$ $Date$
*/
public class Axis2ConfigParamPolicy implements Policy {
- public static final QName NAME = new QName(Constants.SCA10_TUSCANY_NS, "wsConfigParam");
+ private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+ public static final QName NAME = new QName(SCA10_TUSCANY_NS, "wsConfigParam");
private Map<String, OMElement> paramElements = new Hashtable<String, OMElement>();
public Map<String, OMElement> getParamElements() {
Modified: tuscany/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java?rev=709339&r1=709338&r2=709339&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java Thu Oct 30 21:01:44 2008
@@ -30,7 +30,6 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-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;
@@ -65,7 +64,7 @@
case START_ELEMENT : {
name = reader.getName();
if ( PARAMETER.equals(name.getLocalPart()) ) {
- paramName = reader.getAttributeValue(null, Constants.NAME);
+ paramName = reader.getAttributeValue(null, "name");
parameterElement = loadElement(reader);
policy.getParamElements().put(paramName, parameterElement);
}