You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2009/09/09 01:45:20 UTC
svn commit: r812727 - in /tuscany/branches/sca-java-1.x:
itest/late-reference-resolution/
modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/
modules/contribution-jee-impl/ modules/contribution-jee/
modules/implementation-widget...
Author: lresende
Date: Tue Sep 8 23:45:19 2009
New Revision: 812727
URL: http://svn.apache.org/viewvc?rev=812727&view=rev
Log:
TUSCANY-3264 - Moving all wstx dependencies to 3.2.4 where the prefix handling issue WSTX-135 is fixed
Modified:
tuscany/branches/sca-java-1.x/itest/late-reference-resolution/pom.xml
tuscany/branches/sca-java-1.x/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
tuscany/branches/sca-java-1.x/modules/contribution-jee-impl/pom.xml
tuscany/branches/sca-java-1.x/modules/contribution-jee/pom.xml
tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
tuscany/branches/sca-java-1.x/samples/calculator-distributed/pom.xml
tuscany/branches/sca-java-1.x/samples/helloworld-bpel/pom.xml
Modified: tuscany/branches/sca-java-1.x/itest/late-reference-resolution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/late-reference-resolution/pom.xml?rev=812727&r1=812726&r2=812727&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/late-reference-resolution/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/itest/late-reference-resolution/pom.xml Tue Sep 8 23:45:19 2009
@@ -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>
Modified: tuscany/branches/sca-java-1.x/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java?rev=812727&r1=812726&r2=812727&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java Tue Sep 8 23:45:19 2009
@@ -134,8 +134,6 @@
}
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 @@
extensionProcessor.write(httpBinding.getOperationSelector(), writer);
}
writeEnd(writer);
- //writer.writeEndElement();
}
Modified: tuscany/branches/sca-java-1.x/modules/contribution-jee-impl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/contribution-jee-impl/pom.xml?rev=812727&r1=812726&r2=812727&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/contribution-jee-impl/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/contribution-jee-impl/pom.xml Tue Sep 8 23:45:19 2009
@@ -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>
Modified: tuscany/branches/sca-java-1.x/modules/contribution-jee/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/contribution-jee/pom.xml?rev=812727&r1=812726&r2=812727&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/contribution-jee/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/contribution-jee/pom.xml Tue Sep 8 23:45:19 2009
@@ -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>
Modified: tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java?rev=812727&r1=812726&r2=812727&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java Tue Sep 8 23:45:19 2009
@@ -33,6 +33,7 @@
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.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 @@
*
* @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 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);
}
}
Modified: tuscany/branches/sca-java-1.x/samples/calculator-distributed/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-distributed/pom.xml?rev=812727&r1=812726&r2=812727&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-distributed/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/calculator-distributed/pom.xml Tue Sep 8 23:45:19 2009
@@ -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>
Modified: tuscany/branches/sca-java-1.x/samples/helloworld-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-bpel/pom.xml?rev=812727&r1=812726&r2=812727&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-bpel/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-bpel/pom.xml Tue Sep 8 23:45:19 2009
@@ -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>