You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/07/23 23:33:38 UTC
svn commit: r797231 - in /cxf/trunk: integration/jbi/ parent/
rt/bindings/jbi/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/
rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/
rt/transports/jbi/ systests/ tools/javato/ws/sr...
Author: dkulp
Date: Thu Jul 23 21:33:34 2009
New Revision: 797231
URL: http://svn.apache.org/viewvc?rev=797231&view=rev
Log:
Update to latest version of JAXB, jetty, others
Build with latest version of ServiceMix jbi api jar
Test with 5.1.0 of ActiveMQ. 5.2.0 causes a hang in the transaction
system test. Not sure why yet.
Modified:
cxf/trunk/integration/jbi/pom.xml
cxf/trunk/parent/pom.xml
cxf/trunk/rt/bindings/jbi/pom.xml
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
cxf/trunk/rt/transports/jbi/pom.xml
cxf/trunk/systests/pom.xml
cxf/trunk/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl
Modified: cxf/trunk/integration/jbi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jbi/pom.xml?rev=797231&r1=797230&r2=797231&view=diff
==============================================================================
--- cxf/trunk/integration/jbi/pom.xml (original)
+++ cxf/trunk/integration/jbi/pom.xml Thu Jul 23 21:33:34 2009
@@ -74,15 +74,17 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-jbi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<scm>
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=797231&r1=797230&r2=797231&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Thu Jul 23 21:33:34 2009
@@ -49,13 +49,13 @@
<!-- please maintain alphabetical order here -->
<abdera.version>0.4.0-incubating</abdera.version>
- <activemq.version>4.1.1</activemq.version>
+ <activemq.version>5.1.0</activemq.version>
<derby.version>10.2.2.0</derby.version>
<jaxb.version>2.1</jaxb.version>
- <jaxb.impl.version>2.1.9</jaxb.impl.version>
- <jaxb.xjc.version>2.1.9</jaxb.xjc.version>
+ <jaxb.impl.version>2.1.12</jaxb.impl.version>
+ <jaxb.xjc.version>2.1.12</jaxb.xjc.version>
<jdom.version>1.0</jdom.version>
- <jetty.version>6.1.18</jetty.version>
+ <jetty.version>6.1.19</jetty.version>
<msv.version>2009.1</msv.version>
<rhino.version>1.7R1</rhino.version>
<saaj.version>1.3</saaj.version>
@@ -72,7 +72,6 @@
<spring.validation.mode>VALIDATION_AUTO</spring.validation.mode>
<downloadSources>true</downloadSources>
- <servicemix.version>3.2.3</servicemix.version>
<pmd.eclipse.ruleset>cxf-pmd-ruleset.xml</pmd.eclipse.ruleset>
</properties>
@@ -480,24 +479,10 @@
<version>1.4.2</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-jbi</artifactId>
- <version>${servicemix.version}</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
+ <version>1.3.0</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>servicemix</groupId>
- <artifactId>jaxp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -574,7 +559,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.5.6</version>
+ <version>1.5.8</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
Modified: cxf/trunk/rt/bindings/jbi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/jbi/pom.xml?rev=797231&r1=797230&r2=797231&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/jbi/pom.xml (original)
+++ cxf/trunk/rt/bindings/jbi/pom.xml Thu Jul 23 21:33:34 2009
@@ -73,10 +73,11 @@
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-jbi</artifactId>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
<scope>provided</scope>
</dependency>
+
</dependencies>
<build>
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java?rev=797231&r1=797230&r2=797231&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java Thu Jul 23 21:33:34 2009
@@ -31,6 +31,7 @@
import java.util.Collection;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -51,6 +52,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.jaxrs.utils.InjectionUtils;
import org.apache.cxf.jaxrs.utils.schemas.SchemaHandler;
@@ -387,26 +389,60 @@
}
protected static class IgnoreMixedContentWriter extends DelegatingXMLStreamWriter {
- boolean lastWriteChars;
+ String lastText;
+ boolean isMixed;
+ List<Boolean> mixed = new LinkedList<Boolean>();
public IgnoreMixedContentWriter(XMLStreamWriter writer) {
super(writer);
}
public void writeCharacters(String text) throws XMLStreamException {
- if (!lastWriteChars || text.trim().length() > 0) {
- if (lastWriteChars) {
- text = text.trim();
- }
- super.writeCharacters(text);
- lastWriteChars = true;
+ if (StringUtils.isEmpty(text.trim())) {
+ lastText = text;
+ } else if (lastText != null) {
+ lastText += text;
+ } else if (!isMixed) {
+ super.writeCharacters(text);
}
}
-
- public void writeStartElement(String prefix, String localName, String namespaceURI)
- throws XMLStreamException {
- super.writeStartElement(prefix, localName, namespaceURI);
- lastWriteChars = false;
+
+ public void writeStartElement(String prefix, String local, String uri) throws XMLStreamException {
+ if (lastText != null) {
+ isMixed = true;
+ }
+ mixed.add(0, isMixed);
+ lastText = null;
+ isMixed = false;
+ super.writeStartElement(prefix, local, uri);
+ }
+ public void writeStartElement(String uri, String local) throws XMLStreamException {
+ if (lastText != null) {
+ isMixed = true;
+ }
+ mixed.add(0, isMixed);
+ lastText = null;
+ isMixed = false;
+ super.writeStartElement(uri, local);
+ }
+ public void writeStartElement(String local) throws XMLStreamException {
+ if (lastText != null) {
+ isMixed = true;
+ }
+ mixed.add(0, isMixed);
+ lastText = null;
+ isMixed = false;
+ super.writeStartElement(local);
+ }
+ public void writeEndElement() throws XMLStreamException {
+ if (lastText != null && !isMixed) {
+ super.writeCharacters(lastText);
+ }
+ super.writeEndElement();
+ isMixed = mixed.get(0);
+ mixed.remove(0);
}
+
+
}
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java?rev=797231&r1=797230&r2=797231&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java Thu Jul 23 21:33:34 2009
@@ -310,6 +310,7 @@
}
@Test
+ @Ignore("This is hitting http://jira.codehaus.org/browse/JETTISON-44")
public void testWriteMixedContent() throws Exception {
doTestMixedContent("{\"Book\":{\"name\":\"CXF\",\"id\":125,\"$\":\"\\n \\n\"}}",
false, "book.xml");
Modified: cxf/trunk/rt/transports/jbi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jbi/pom.xml?rev=797231&r1=797230&r2=797231&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jbi/pom.xml (original)
+++ cxf/trunk/rt/transports/jbi/pom.xml Thu Jul 23 21:33:34 2009
@@ -64,10 +64,9 @@
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-jbi</artifactId>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/pom.xml?rev=797231&r1=797230&r2=797231&view=diff
==============================================================================
--- cxf/trunk/systests/pom.xml (original)
+++ cxf/trunk/systests/pom.xml Thu Jul 23 21:33:34 2009
@@ -528,7 +528,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
- <version>${servicemix.version}</version>
+ <version>3.3.1</version>
<exclusions>
<exclusion>
<groupId>jaxen</groupId>
Modified: cxf/trunk/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl?rev=797231&r1=797230&r2=797231&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl (original)
+++ cxf/trunk/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl Thu Jul 23 21:33:34 2009
@@ -31,7 +31,7 @@
xmlns="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified">
- <element name="responseType" type="xsd:string"/>
+ <element name="responseType" type="xsd:string" nillable="true"/>
<element name="requestType" type="xsd:string"/>
<element name="myComplexStruct" type="x1:myComplexStructType"/>
Modified: cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl?rev=797231&r1=797230&r2=797231&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl (original)
+++ cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl Thu Jul 23 21:33:34 2009
@@ -19,49 +19,51 @@
-->
<wsdl:definitions name="GreeterService" targetNamespace="http://apache.org/fault" xmlns:tns="http://apache.org/fault" xmlns:ns1="http://apache.org/fault/types" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://apache.org/fault/types" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/fault/types">
-<xs:element name="BadRecordLit" nillable="true" type="xs:string"/>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://apache.org/fault/types" elementFormDefault="qualified" targetNamespace="http://apache.org/fault/types" version="1.0">
+<xs:element name="BadRecordLit" type="xs:string"/>
<xs:element name="NoSuchCodeLit">
<xs:complexType>
<xs:sequence>
-<xs:element form="qualified" name="code" type="tns:ErrorCode"/>
+<xs:element name="code" type="tns:ErrorCode"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="greetMe">
<xs:complexType>
<xs:sequence>
-<xs:element form="qualified" name="requestType" type="xs:string"/>
+<xs:element name="requestType" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="greetMeResponse">
<xs:complexType>
<xs:sequence>
-<xs:element form="qualified" name="responseType" type="xs:string"/>
+<xs:element name="responseType" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="testDocLitFault">
<xs:complexType>
<xs:sequence>
-<xs:element form="qualified" name="faultType" type="xs:string"/>
+<xs:element name="faultType" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="testDocLitFaultResponse">
-<xs:complexType/>
+<xs:complexType>
+<xs:sequence/>
+</xs:complexType>
</xs:element>
<xs:complexType name="ErrorCode">
<xs:sequence>
-<xs:element form="qualified" name="minor" type="xs:short"/>
-<xs:element form="qualified" name="major" type="xs:short"/>
+<xs:element name="minor" type="xs:short"/>
+<xs:element name="major" type="xs:short"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="BadRecord">
<xs:sequence>
-<xs:element form="qualified" name="reason" type="xs:string"/>
-<xs:element form="qualified" name="code" type="xs:short"/>
+<xs:element name="reason" type="xs:string"/>
+<xs:element name="code" type="xs:short"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
Modified: cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl?rev=797231&r1=797230&r2=797231&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl (original)
+++ cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl Thu Jul 23 21:33:34 2009
@@ -19,15 +19,15 @@
-->
<wsdl:definitions name="GreeterService" targetNamespace="http://apache.org/xml_bare" xmlns:tns="http://apache.org/xml_bare" xmlns:ns1="http://apache.org/xml_bare/types" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://apache.org/xml_bare/types" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/xml_bare/types">
-<xs:element name="myComplexStruct" nillable="true" type="tns:myComplexStructType"/>
-<xs:element name="requestType" nillable="true" type="xs:string"/>
-<xs:element name="responseType" nillable="true" type="xs:string"/>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://apache.org/xml_bare/types" elementFormDefault="qualified" targetNamespace="http://apache.org/xml_bare/types" version="1.0">
+<xs:element name="myComplexStruct" type="tns:myComplexStructType"/>
+<xs:element name="requestType" type="xs:string"/>
+<xs:element name="responseType" type="xs:string"/>
<xs:complexType name="myComplexStructType">
<xs:sequence>
-<xs:element form="qualified" name="elem1" type="xs:string"/>
-<xs:element form="qualified" name="elem2" type="xs:string"/>
-<xs:element form="qualified" name="elem3" type="xs:int"/>
+<xs:element name="elem1" type="xs:string"/>
+<xs:element name="elem2" type="xs:string"/>
+<xs:element name="elem3" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
Modified: cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl?rev=797231&r1=797230&r2=797231&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl (original)
+++ cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl Thu Jul 23 21:33:34 2009
@@ -19,8 +19,8 @@
-->
<wsdl:definitions name="HeaderTesterService" targetNamespace="http://apache.org/samples/headers" xmlns:tns="http://apache.org/samples/headers" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://apache.org/samples/headers" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/samples/headers">
-<xs:element name="SOAPHeaderInfo" nillable="true" type="tns:SOAPHeaderData"/>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://apache.org/samples/headers" targetNamespace="http://apache.org/samples/headers" version="1.0">
+<xs:element name="SOAPHeaderInfo" type="tns:SOAPHeaderData"/>
<xs:element name="inHeader">
<xs:complexType>
<xs:sequence>