TUSCANY-3264 - Moving all wstx dependencies to 3.2.4 where the prefix handling issue WSTX-135 is fixed
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@812727 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
c177a7dc86
commit
7457dc4a8c
7 changed files with 9 additions and 15 deletions
branches/sca-java-1.x
itest/late-reference-resolution
modules
binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml
contribution-jee-impl
contribution-jee
implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget
samples
|
@ -100,7 +100,7 @@
|
|||
<dependency>
|
||||
<groupId>org.codehaus.woodstox</groupId>
|
||||
<artifactId>wstx-asl</artifactId>
|
||||
<version>3.2.1</version>
|
||||
<version>3.2.4</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
|
|
|
@ -134,8 +134,6 @@ public class HTTPBindingProcessor extends BaseStAXArtifactProcessor implements S
|
|||
}
|
||||
|
||||
public void write(HTTPBinding httpBinding, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
|
||||
//writer.writeStartElement(Constants.SCA10_NS, BINDING_HTTP);
|
||||
|
||||
writeStart(writer, BINDING_HTTP_QNAME.getNamespaceURI(), BINDING_HTTP_QNAME.getLocalPart());
|
||||
|
||||
//write policies
|
||||
|
@ -159,7 +157,6 @@ public class HTTPBindingProcessor extends BaseStAXArtifactProcessor implements S
|
|||
extensionProcessor.write(httpBinding.getOperationSelector(), writer);
|
||||
}
|
||||
writeEnd(writer);
|
||||
//writer.writeEndElement();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -78,7 +78,7 @@
|
|||
<dependency>
|
||||
<groupId>org.codehaus.woodstox</groupId>
|
||||
<artifactId>wstx-asl</artifactId>
|
||||
<version>3.2.1</version>
|
||||
<version>3.2.4</version>
|
||||
<scope>runtime</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
|
|
|
@ -67,7 +67,7 @@
|
|||
<dependency>
|
||||
<groupId>org.codehaus.woodstox</groupId>
|
||||
<artifactId>wstx-asl</artifactId>
|
||||
<version>3.2.1</version>
|
||||
<version>3.2.4</version>
|
||||
<scope>runtime</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
|
|
|
@ -33,6 +33,7 @@ import org.apache.tuscany.sca.assembly.xml.Constants;
|
|||
import org.apache.tuscany.sca.contribution.Artifact;
|
||||
import org.apache.tuscany.sca.contribution.ContributionFactory;
|
||||
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
|
||||
import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
|
||||
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
|
||||
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
|
||||
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
|
||||
|
@ -41,7 +42,6 @@ import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
|
|||
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;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -49,7 +49,7 @@ import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
|
|||
*
|
||||
* @version $Rev$ $Date$
|
||||
*/
|
||||
public class WidgetImplementationProcessor implements StAXArtifactProcessor<WidgetImplementation> {
|
||||
public class WidgetImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<WidgetImplementation> {
|
||||
private static final QName IMPLEMENTATION_WIDGET = new QName(Constants.SCA10_TUSCANY_NS, "implementation.widget");
|
||||
|
||||
private AssemblyFactory assemblyFactory;
|
||||
|
@ -160,16 +160,13 @@ public class WidgetImplementationProcessor implements StAXArtifactProcessor<Widg
|
|||
}
|
||||
|
||||
public void write(WidgetImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
|
||||
|
||||
// Write <implementation.widget>
|
||||
writer.writeStartElement(IMPLEMENTATION_WIDGET.getNamespaceURI(), IMPLEMENTATION_WIDGET.getLocalPart());
|
||||
writer.writeNamespace("widget",IMPLEMENTATION_WIDGET.getNamespaceURI());
|
||||
|
||||
writeStart(writer, IMPLEMENTATION_WIDGET.getNamespaceURI(), IMPLEMENTATION_WIDGET.getLocalPart());
|
||||
|
||||
if (implementation.getLocation() != null) {
|
||||
writer.writeAttribute("location", implementation.getLocation());
|
||||
}
|
||||
|
||||
writer.writeEndElement();
|
||||
writeEnd(writer);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -93,7 +93,7 @@
|
|||
<dependency>
|
||||
<groupId>org.codehaus.woodstox</groupId>
|
||||
<artifactId>wstx-asl</artifactId>
|
||||
<version>3.2.1</version>
|
||||
<version>3.2.4</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
|
|
|
@ -101,7 +101,7 @@
|
|||
<dependency>
|
||||
<groupId>org.codehaus.woodstox</groupId>
|
||||
<artifactId>wstx-asl</artifactId>
|
||||
<version>3.2.1</version>
|
||||
<version>3.2.4</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue