Author: dkulp
Date: Tue Apr 21 03:13:23 2009
New Revision: 766962
URL: http://svn.apache.org/viewvc?rev=766962&view=rev
Log:
Update XmlSchema, Jettison, WSS4J to latest versions
Modified:
cxf/trunk/common/common/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
cxf/trunk/parent/pom.xml
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
cxf/trunk/rt/ws/security/pom.xml
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
cxf/trunk/systests/src/test/resources/jaxrs/WEB-INF/beans.xml
Modified:
cxf/trunk/common/common/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java?rev=766962&r1=766961&r2=766962&view=diff
==============================================================================
---
cxf/trunk/common/common/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
(original)
+++
cxf/trunk/common/common/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
Tue Apr 21 03:13:23 2009
@@ -134,13 +134,12 @@
/*
* Notice that no imports have been added. In an ideal world,
XmlSchema would do this for us.
*/
- boolean threw = false;
try {
tryToParseSchemas();
+ fail("Expected an exception");
} catch (DOMErrorException e) {
- threw = true;
+ //ignore, expected
}
- assertTrue(threw);
LOG.info("adding imports");
collection.addCrossImports();
tryToParseSchemas();
@@ -198,7 +197,9 @@
private XmlSchema newSchema(String uri) {
XmlSchema schema = collection.newXmlSchemaInCollection(uri);
- schema.setNamespaceContext(new NamespaceMap());
+ NamespaceMap map = new NamespaceMap();
+ map.add("", XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ schema.setNamespaceContext(map);
return schema;
}
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=766962&r1=766961&r2=766962&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Tue Apr 21 03:13:23 2009
@@ -64,7 +64,7 @@
<stax.impl.version>3.2.8</stax.impl.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<xmlbeans.version>2.4.0</xmlbeans.version>
- <xmlschema.version>1.4.4</xmlschema.version>
+ <xmlschema.version>1.4.5</xmlschema.version>
<checkstyle.extension />
<spring.validation.mode>VALIDATION_AUTO</spring.validation.mode>
@@ -547,7 +547,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.0.1</version>
+ <version>1.1</version>
<exclusions>
<exclusion>
<groupId>stax</groupId>
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=766962&r1=766961&r2=766962&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
Tue Apr 21 03:13:23 2009
@@ -46,7 +46,6 @@
MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String,
Object>(), os);
String s = os.toString();
- System.out.println(s);
assertEquals(
"{\"Tags\":{\"list\":[{\"group\":\"b\",\"name\":\"a\"},{\"group\":\"d\",\"name\":\"c\"}]}}",
s);
@@ -56,6 +55,7 @@
public void testWriteToListWithSingleValue() throws Exception {
JSONProvider p = new JSONProvider();
p.setSerializeAsArray(true);
+ p.setArrayKeys(Collections.singletonList("list"));
Tags tags = new Tags();
tags.addTag(createTag("a", "b"));
@@ -65,7 +65,6 @@
MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String,
Object>(), os);
String s = os.toString();
- System.out.println(s);
assertEquals(
"{\"Tags\":{\"list\":[{\"group\":\"b\",\"name\":\"a\"}]}}",
s);
@@ -75,7 +74,7 @@
public void testManyTags() throws Exception {
JSONProvider p = new JSONProvider();
p.setSerializeAsArray(true);
- p.setArrayKeys(Collections.singletonList("tags"));
+ p.setArrayKeys(Collections.singletonList("list"));
Tags tags = new Tags();
tags.addTag(createTag("a", "b"));
@@ -88,7 +87,6 @@
MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String,
Object>(), os);
String s = os.toString();
- System.out.println(s);
assertEquals(
"{\"ManyTags\":{\"tags\":{\"list\":[{\"group\":\"b\",\"name\":\"a\"}]}}}",
s);
Modified: cxf/trunk/rt/ws/security/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/pom.xml?rev=766962&r1=766961&r2=766962&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/pom.xml (original)
+++ cxf/trunk/rt/ws/security/pom.xml Tue Apr 21 03:13:23 2009
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>1.5.6</version>
+ <version>1.5.7</version>
<exclusions>
<exclusion>
<groupId>axis</groupId>
Modified:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java?rev=766962&r1=766961&r2=766962&view=diff
==============================================================================
---
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
(original)
+++
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
Tue Apr 21 03:13:23 2009
@@ -39,7 +39,7 @@
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookServerSpring.class));
+ launchServer(BookServerSpring.class, true));
}
@Test
Modified: cxf/trunk/systests/src/test/resources/jaxrs/WEB-INF/beans.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/resources/jaxrs/WEB-INF/beans.xml?rev=766962&r1=766961&r2=766962&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/resources/jaxrs/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/src/test/resources/jaxrs/WEB-INF/beans.xml Tue Apr 21
03:13:23 2009
@@ -113,7 +113,7 @@
</util:map>
<util:list id="jsonKeys">
- <value>Books</value>
+ <value>books</value>
</util:list>
<bean id="jsonProvider" class="org.apache.cxf.jaxrs.provider.JSONProvider">
