git commit: [CXF-5882]UDPTransportTest.testLargeRequest always failed on some machine
Repository: cxf
Updated Branches:
refs/heads/master 542e4160f - 766417839
[CXF-5882]UDPTransportTest.testLargeRequest always failed on some machine
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/76641783
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/76641783
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/76641783
Branch: refs/heads/master
Commit: 766417839bed9233550f3ac696dbd98389677fc0
Parents: 542e416
Author: Freeman Fang freeman.f...@gmail.com
Authored: Wed Jul 16 17:13:51 2014 +0800
Committer: Freeman Fang freeman.f...@gmail.com
Committed: Wed Jul 16 17:13:51 2014 +0800
--
.../test/java/org/apache/cxf/transport/udp/UDPTransportTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/76641783/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
--
diff --git
a/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
b/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
index 00e9b36..fea6ce1 100644
---
a/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
+++
b/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
@@ -104,7 +104,7 @@ public class UDPTransportTest extends
AbstractBusClientServerTestBase {
fact.setAddress(udp://localhost: + PORT);
Greeter g = fact.create(Greeter.class);
StringBuilder b = new StringBuilder(10);
-for (int x = 0; x 1; x++) {
+for (int x = 0; x 6500; x++) {
b.append(Hello );
}
assertEquals(Hello + b.toString(), g.greetMe(b.toString()));
git commit: CXF-5881 If a given wadl has a single schema with no target namespace then optionally support it
Repository: cxf
Updated Branches:
refs/heads/master 766417839 - 14ce0adf1
CXF-5881 If a given wadl has a single schema with no target namespace then
optionally support it
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/14ce0adf
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/14ce0adf
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/14ce0adf
Branch: refs/heads/master
Commit: 14ce0adf133d51a6080d434783669aa46cafe2f0
Parents: 7664178
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Jul 16 15:54:43 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Jul 16 15:54:43 2014 +0100
--
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 41 +---
.../tools/wadlto/jaxrs/JAXRSContainerTest.java | 26 +
.../wadl/resourceSchemaNoTargetNamespace.xml| 30 ++
3 files changed, 84 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/14ce0adf/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
--
diff --git
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index e91ef2f..a47b809 100644
---
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -401,7 +401,9 @@ public class SourceGenerator {
for (SchemaInfo schemaEl : schemaElements) {
populateElementTypeMap(app, schemaEl.getElement(),
schemaEl.getSystemId(), elementTypeMap);
}
-return new GrammarInfo(nsMap, elementTypeMap);
+boolean noTargetNamespace = schemaElements.size() == 1
+ schemaElements.get(0).getNamespaceURI().isEmpty();
+return new GrammarInfo(nsMap, elementTypeMap, noTargetNamespace);
}
private void populateElementTypeMap(Application app, Element schemaEl,
@@ -677,7 +679,7 @@ public class SourceGenerator {
ListElement requestEls = getWadlElements(methodEl, request);
Element firstRequestEl = requestEls.size() = 1 ? requestEls.get(0) :
null;
ListElement allRequestReps = getWadlElements(firstRequestEl,
representation);
-ListElement xmlRequestReps = getXmlReps(allRequestReps);
+ListElement xmlRequestReps = getXmlReps(allRequestReps,
info.getGrammarInfo());
final String methodNameLowerCase =
methodEl.getAttribute(name).toLowerCase();
String id = methodEl.getAttribute(id);
@@ -793,12 +795,14 @@ public class SourceGenerator {
|| methodNames.size() == 1
*.equals(methodNames.iterator().next());
}
-private ListElement getXmlReps(ListElement repElements) {
+private ListElement getXmlReps(ListElement repElements, GrammarInfo
gInfo) {
SetString values = new HashSetString(repElements.size());
ListElement xmlReps = new ArrayListElement();
for (Element el : repElements) {
String value = el.getAttribute(element);
-if (value.length() 0 value.contains(:)
!values.contains(value)) {
+if (value.length() 0
+ (value.contains(:) ||
gInfo.isSchemaWithoutTargetNamespace())
+ !values.contains(value)) {
xmlReps.add(el);
values.add(value);
}
@@ -921,7 +925,8 @@ public class SourceGenerator {
}
String elementName = responseRequired ? null : getElementRefName(
-getActualRepElement(repElements,
getXmlReps(repElements).get(0)), info, imports);
+getActualRepElement(repElements, getXmlReps(repElements,
info.getGrammarInfo()).get(0)),
+info, imports);
if (elementName != null) {
sbCode.append(elementName + );
} else {
@@ -1213,9 +1218,9 @@ public class SourceGenerator {
GrammarInfo gInfo = info.getGrammarInfo();
if (gInfo != null) {
String namespace = gInfo.getNsMap().get(prefix);
-if (namespace != null) {
-
-String packageName = getPackageFromNamespace(namespace);
+if (namespace != null || prefix.isEmpty()
gInfo.isSchemaWithoutTargetNamespace()) {
+String theNs = namespace != null ? namespace : ;
+String packageName = getPackageFromNamespace(theNs);
String clsName = getSchemaClassName(packageName, gInfo,
actualValue,
info.getTypeClassNames());
git commit: CXF-5881 If a given wadl has a single schema with no target namespace then optionally support it
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 7317872c3 - 3a1327776
CXF-5881 If a given wadl has a single schema with no target namespace then
optionally support it
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3a132777
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3a132777
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3a132777
Branch: refs/heads/2.7.x-fixes
Commit: 3a13277765261ad72701a7d7eb7be9e2035bff7b
Parents: 7317872
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Jul 16 15:54:43 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Jul 16 16:01:03 2014 +0100
--
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 41 +---
.../tools/wadlto/jaxrs/JAXRSContainerTest.java | 26 +
.../wadl/resourceSchemaNoTargetNamespace.xml| 30 ++
3 files changed, 84 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/3a132777/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
--
diff --git
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index a2ad31c..22e11cd 100644
---
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -401,7 +401,9 @@ public class SourceGenerator {
for (SchemaInfo schemaEl : schemaElements) {
populateElementTypeMap(app, schemaEl.getElement(),
schemaEl.getSystemId(), elementTypeMap);
}
-return new GrammarInfo(nsMap, elementTypeMap);
+boolean noTargetNamespace = schemaElements.size() == 1
+ schemaElements.get(0).getNamespaceURI().isEmpty();
+return new GrammarInfo(nsMap, elementTypeMap, noTargetNamespace);
}
private void populateElementTypeMap(Application app, Element schemaEl,
@@ -667,7 +669,7 @@ public class SourceGenerator {
ListElement requestEls = getWadlElements(methodEl, request);
Element firstRequestEl = requestEls.size() = 1 ? requestEls.get(0) :
null;
ListElement allRequestReps = getWadlElements(firstRequestEl,
representation);
-ListElement xmlRequestReps = getXmlReps(allRequestReps);
+ListElement xmlRequestReps = getXmlReps(allRequestReps,
info.getGrammarInfo());
final String methodNameLowerCase =
methodEl.getAttribute(name).toLowerCase();
String id = methodEl.getAttribute(id);
@@ -783,12 +785,14 @@ public class SourceGenerator {
|| methodNames.size() == 1
*.equals(methodNames.iterator().next());
}
-private ListElement getXmlReps(ListElement repElements) {
+private ListElement getXmlReps(ListElement repElements, GrammarInfo
gInfo) {
SetString values = new HashSetString(repElements.size());
ListElement xmlReps = new ArrayListElement();
for (Element el : repElements) {
String value = el.getAttribute(element);
-if (value.length() 0 value.contains(:)
!values.contains(value)) {
+if (value.length() 0
+ (value.contains(:) ||
gInfo.isSchemaWithoutTargetNamespace())
+ !values.contains(value)) {
xmlReps.add(el);
values.add(value);
}
@@ -911,7 +915,8 @@ public class SourceGenerator {
}
String elementName = responseRequired ? null : getElementRefName(
-getActualRepElement(repElements,
getXmlReps(repElements).get(0)), info, imports);
+getActualRepElement(repElements, getXmlReps(repElements,
info.getGrammarInfo()).get(0)),
+info, imports);
if (elementName != null) {
sbCode.append(elementName + );
} else {
@@ -1203,9 +1208,9 @@ public class SourceGenerator {
GrammarInfo gInfo = info.getGrammarInfo();
if (gInfo != null) {
String namespace = gInfo.getNsMap().get(prefix);
-if (namespace != null) {
-
-String packageName = getPackageFromNamespace(namespace);
+if (namespace != null || prefix.isEmpty()
gInfo.isSchemaWithoutTargetNamespace()) {
+String theNs = namespace != null ? namespace : ;
+String packageName = getPackageFromNamespace(theNs);
String clsName = getSchemaClassName(packageName, gInfo,
actualValue,
[2/2] git commit: Update to latest moxy release
Update to latest moxy release Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2328915a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2328915a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2328915a Branch: refs/heads/master Commit: 2328915ac6cde6365867967d82fb61a7eef4bb86 Parents: 4cb5fa9 Author: Daniel Kulp dk...@apache.org Authored: Wed Jul 16 12:19:42 2014 -0400 Committer: Daniel Kulp dk...@apache.org Committed: Wed Jul 16 12:26:26 2014 -0400 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/2328915a/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index d0bb3aa..50ab6a5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1836,7 +1836,7 @@ dependency groupIdorg.eclipse.persistence/groupId artifactIdorg.eclipse.persistence.moxy/artifactId -version2.5.2-M1/version +version2.5.2/version scopeprovided/scope optionaltrue/optional /dependency
[1/2] git commit: Change wsn to use the WSDL whenever possible instead of relying on the service/schemas to built from the class. That makes sure the proper schema is used for validation and JAXB cont
Repository: cxf
Updated Branches:
refs/heads/master 4cb5fa951 - 8364fbf72
Change wsn to use the WSDL whenever possible instead of relying on the
service/schemas to built from the class. That makes sure the proper schema is
used for validation and JAXB context creation and such. (and works around a
bug in Moxy)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8364fbf7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8364fbf7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8364fbf7
Branch: refs/heads/master
Commit: 8364fbf7208e7df11db6be71ffed9de70c09d0de
Parents: 2328915
Author: Daniel Kulp dk...@apache.org
Authored: Wed Jul 16 12:20:00 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Jul 16 12:26:26 2014 -0400
--
.../org/apache/cxf/wsn/client/Consumer.java | 6 -
.../org/apache/cxf/wsn/client/Publisher.java| 19 +-
.../org/apache/cxf/wsn/util/CXFWSNHelper.java | 24 +-
.../java/org/apache/cxf/wsn/util/WSNHelper.java | 24 ++
.../resources/org/apache/cxf/wsn/wsdl/wsn.wsdl | 18 +++---
.../org/apache/cxf/wsn/AbstractEndpoint.java| 9 ++-
.../org/apache/cxf/wsn/EndpointManager.java | 4 ++-
.../cxf/wsn/services/JaxwsCreatePullPoint.java | 4 +--
.../cxf/wsn/services/JaxwsEndpointManager.java | 26 +++-
.../wsn/services/JaxwsNotificationBroker.java | 4 +--
.../apache/cxf/wsn/services/JaxwsPublisher.java | 4 +--
.../apache/cxf/wsn/services/JaxwsPullPoint.java | 6 -
.../cxf/wsn/services/JaxwsSubscription.java | 6 -
.../wsn/services/OSGiJaxwsEndpointManager.java | 6 +++--
.../java/org/apache/cxf/wsn/WsnBrokerTest.java | 6 -
15 files changed, 135 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/8364fbf7/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Consumer.java
--
diff --git
a/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Consumer.java
b/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Consumer.java
index e894df1..4568ae7 100644
--- a/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Consumer.java
+++ b/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Consumer.java
@@ -33,7 +33,11 @@ import
org.oasis_open.docs.wsn.b_2.NotificationMessageHolderType;
import org.oasis_open.docs.wsn.b_2.Notify;
import org.oasis_open.docs.wsn.bw_2.NotificationConsumer;
-@WebService(endpointInterface =
org.oasis_open.docs.wsn.bw_2.NotificationConsumer)
+@WebService(endpointInterface =
org.oasis_open.docs.wsn.bw_2.NotificationConsumer,
+targetNamespace = http://cxf.apache.org/wsn/jaxws;,
+serviceName = NotificationConsumerService,
+portName = NotificationConsumerPort
+)
public class Consumer implements NotificationConsumer, Referencable {
public interface Callback {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8364fbf7/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java
--
diff --git
a/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java
b/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java
index d5748b3..64a13fa 100644
---
a/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java
+++
b/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java
@@ -26,6 +26,7 @@ import javax.xml.ws.Endpoint;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import org.apache.cxf.wsn.util.IdGenerator;
+import org.apache.cxf.wsn.util.WSNHelper;
import org.oasis_open.docs.wsn.b_2.GetCurrentMessage;
import org.oasis_open.docs.wsn.b_2.GetCurrentMessageResponse;
import org.oasis_open.docs.wsn.b_2.InvalidFilterFaultType;
@@ -61,7 +62,11 @@ import org.oasis_open.docs.wsrf.rw_2.ResourceUnknownFault;
* Demand-based publisher.
*
*/
-@WebService(endpointInterface =
org.oasis_open.docs.wsn.bw_2.NotificationProducer)
+@WebService(endpointInterface =
org.oasis_open.docs.wsn.bw_2.NotificationProducer,
+targetNamespace = http://cxf.apache.org/wsn/jaxws;,
+serviceName = NotificationProducerService,
+portName = NotificationProducerPort
+)
public class Publisher implements NotificationProducer, Referencable {
public static final String WSN_URI = http://docs.oasis-open.org/wsn/b-2;;
public static final QName QNAME_TOPIC_EXPRESSION = new QName(WSN_URI,
TopicExpression);
@@ -82,8 +87,7 @@ public class Publisher implements NotificationProducer,
Referencable {
if (callback == null || address == null) {
this.endpoint = null;
} else {
-this.endpoint
git commit: Fix unused import
Repository: cxf Updated Branches: refs/heads/master 8364fbf72 - 8bf20a7f2 Fix unused import Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8bf20a7f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8bf20a7f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8bf20a7f Branch: refs/heads/master Commit: 8bf20a7f2e176a7ac753faeb4cd9c711eda6d5ea Parents: 8364fbf Author: Daniel Kulp dk...@apache.org Authored: Wed Jul 16 12:46:56 2014 -0400 Committer: Daniel Kulp dk...@apache.org Committed: Wed Jul 16 12:46:56 2014 -0400 -- .../wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java| 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/8bf20a7f/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java -- diff --git a/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java b/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java index c9d8d52..e8f388d 100644 --- a/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java +++ b/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java @@ -36,7 +36,6 @@ import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; import org.apache.activemq.ActiveMQConnectionFactory; -import org.apache.cxf.staxutils.StaxUtils; import org.apache.cxf.wsn.client.Consumer; import org.apache.cxf.wsn.client.CreatePullPoint; import org.apache.cxf.wsn.client.NotificationBroker;
git commit: Moxy wraps some of the XMLStreamExceptions an extra layer deep.
Repository: cxf
Updated Branches:
refs/heads/master 8bf20a7f2 - 877b14d08
Moxy wraps some of the XMLStreamExceptions an extra layer deep.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/877b14d0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/877b14d0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/877b14d0
Branch: refs/heads/master
Commit: 877b14d0866a0d6e08b54662d23fc5fd4eb60e73
Parents: 8bf20a7
Author: Daniel Kulp dk...@apache.org
Authored: Wed Jul 16 13:03:45 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Jul 16 13:03:45 2014 -0400
--
.../apache/cxf/jaxrs/provider/AbstractJAXBProvider.java | 12 ++--
.../systest/jaxrs/JAXRSClientServerSpringBookTest.java | 2 +-
2 files changed, 11 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/877b14d0/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
index ff6d5a7..74646a6 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
@@ -82,6 +82,7 @@ import org.apache.cxf.jaxrs.utils.ResourceUtils;
import org.apache.cxf.jaxrs.utils.schemas.SchemaHandler;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptorChain;
+import org.apache.cxf.staxutils.DepthExceededStaxException;
import org.apache.cxf.staxutils.DepthRestrictingStreamReader;
import org.apache.cxf.staxutils.DepthXMLStreamReader;
import org.apache.cxf.staxutils.DocumentDepthProperties;
@@ -731,8 +732,15 @@ public abstract class AbstractJAXBProviderT extends
AbstractConfigurableProvid
StringBuilder sb = handleExceptionStart(e);
Throwable linked = e.getLinkedException();
if (linked != null linked.getMessage() != null) {
-if (read linked instanceof XMLStreamException
linked.getMessage().startsWith(Maximum Number)) {
-throw ExceptionUtils.toWebApplicationException(null,
JAXRSUtils.toResponse(413));
+Throwable cause = linked;
+while (read cause != null) {
+if (cause instanceof XMLStreamException
cause.getMessage().startsWith(Maximum Number)) {
+throw ExceptionUtils.toWebApplicationException(null,
JAXRSUtils.toResponse(413));
+}
+if (cause instanceof DepthExceededStaxException) {
+throw ExceptionUtils.toWebApplicationException(null,
JAXRSUtils.toResponse(413));
+}
+cause = cause.getCause();
}
sb.append(linked.getMessage()).append(. );
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/877b14d0/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
index f2da064..133c0f0 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
@@ -844,7 +844,7 @@ public class JAXRSClientServerSpringBookTest extends
AbstractBusClientServerTest
Response r = wc.post(is);
assertEquals(400, r.getStatus());
String content =
IOUtils.readStringFromStream((InputStream)r.getEntity());
-assertTrue(content.contains(Invalid content was found starting with
element 'id'));
+assertTrue(content, content.contains(Invalid content was found
starting with element));
}
private void doPost(String endpointAddress, int expectedStatus, String
contentType,
git commit: Flip to using xpath expressions instead of raw strings.
Repository: cxf
Updated Branches:
refs/heads/master c5379b9d7 - 10c0903e2
Flip to using xpath expressions instead of raw strings.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/10c0903e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/10c0903e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/10c0903e
Branch: refs/heads/master
Commit: 10c0903e2efaa8e5d05aaa2d11002b64167d089a
Parents: c5379b9
Author: Daniel Kulp dk...@apache.org
Authored: Wed Jul 16 14:01:21 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Jul 16 14:01:21 2014 -0400
--
...ServerResourceCreatedSpringProviderTest.java | 57 +---
1 file changed, 38 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/10c0903e/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
index 835fc54..48f526c 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.systest.jaxrs;
-import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -30,15 +29,18 @@ import java.net.Socket;
import java.net.URL;
import java.net.URLConnection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
-import javax.xml.stream.XMLStreamReader;
+import javax.xml.xpath.XPathConstants;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.helpers.IOUtils;
+import org.apache.cxf.helpers.XPathUtils;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
@@ -104,28 +106,45 @@ public class
JAXRSClientServerResourceCreatedSpringProviderTest extends Abstract
checkBookStoreInfo(resourceEls.get(0));
}
+private void assertValidType(XPathUtils xpu, String xpath, String type,
Element el) {
+String s = (String)xpu.getValue(xpath, el, XPathConstants.STRING);
+assertNotNull(s);
+assertTrue(Expected + type + but found + s, s.endsWith(type));
+}
+private void assertValid(XPathUtils xpu, String xpath, Element el) {
+assertNotNull(xpu.getValue(xpath, el, XPathConstants.NODE));
+}
@Test
public void testPetStoreWadl() throws Exception {
ListElement resourceEls = getWadlResourcesInfo(http://localhost:; +
PORT + /webapp/pets,
http://localhost:; + PORT + /webapp/pets/, 1);
checkPetStoreInfo(resourceEls.get(0));
-XMLStreamReader reader = StaxUtils.createXMLStreamReader(
- (Element)resourceEls.get(0).getParentNode().getParentNode());
-ByteArrayOutputStream bos = new ByteArrayOutputStream();
-StaxUtils.copy(reader, bos);
-String s = bos.toString();
-assertTrue(s.contains(xs:element name=\elstatus\
type=\petStoreStatusElement\/));
-assertTrue(s.contains(xs:element name=\status\
type=\status\/));
-assertTrue(s.contains(xs:element name=\statusType\
type=\statusType\/));
-assertTrue(s.contains(
-xs:element name=\statusImpl1\ substitutionGroup=\statusType\
type=\petStoreStatusImpl1\/));
-assertTrue(s.contains(
-xs:element name=\statusImpl2\ substitutionGroup=\statusType\
type=\petStoreStatusImpl2\/));
-assertTrue(s.contains(xs:element name=\statuses\));
-assertTrue(s.contains(element=\prefix1:status\));
-assertTrue(s.contains(element=\prefix1:elstatus\));
-assertTrue(s.contains(element=\prefix1:statuses\));
-assertTrue(s.contains(element=\prefix1:statusType\));
+
+Element el =
(Element)resourceEls.get(0).getParentNode().getParentNode();
+MapString, String namespaces = new HashMapString, String();
+namespaces.put(xsd, http://www.w3.org/2001/XMLSchema;);
+namespaces.put(ns, http://pets;);
+namespaces.put(wadl, http://wadl.dev.java.net/2009/02;);
+XPathUtils xpu = new XPathUtils(namespaces);
+assertValidType(xpu, //xsd:element[@name='elstatus']/@type,
petStoreStatusElement, el);
+assertValidType(xpu,
buildbot failure in ASF Buildbot on cxf-site-production
The Buildbot has detected a new failure on builder cxf-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/cxf-site-production/builds/2064 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: BUILD FAILED: failed compile sincerely, -The Buildbot
git commit: Upgrading Tomcat
Repository: cxf-fediz Updated Branches: refs/heads/master d6362d094 - 72eb6519b Upgrading Tomcat Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/72eb6519 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/72eb6519 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/72eb6519 Branch: refs/heads/master Commit: 72eb6519ba4a94f8895993c382ceac6d1955eb2a Parents: d6362d0 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Jul 16 22:27:15 2014 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Jul 16 22:27:15 2014 +0100 -- pom.xml | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/72eb6519/pom.xml -- diff --git a/pom.xml b/pom.xml index 9739e31..3778063 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,10 @@ version14/version /parent +prerequisites +maven3.0/maven +/prerequisites + properties commons.lang.version3.3.2/commons.lang.version commons.logging.version1.1.3/commons.logging.version @@ -52,7 +56,7 @@ slf4j.version1.7.7/slf4j.version spring.version3.2.6.RELEASE/spring.version spring.security.version3.1.4.RELEASE/spring.security.version -tomcat.version7.0.42/tomcat.version +tomcat.version7.0.54/tomcat.version wss4j.version2.0.0/wss4j.version bval.version0.5/bval.version
buildbot success in ASF Buildbot on cxf-site-production
The Buildbot has detected a restored build on builder cxf-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/cxf-site-production/builds/2065 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
git commit: [CXF-5882]UDPTransportTest.testLargeRequest always failed on some machine (cherry picked from commit 766417839bed9233550f3ac696dbd98389677fc0)
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 3a1327776 - 1bd129bb7
[CXF-5882]UDPTransportTest.testLargeRequest always failed on some machine
(cherry picked from commit 766417839bed9233550f3ac696dbd98389677fc0)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1bd129bb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1bd129bb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1bd129bb
Branch: refs/heads/2.7.x-fixes
Commit: 1bd129bb7aad4a97d583209e3bae3b67ee004220
Parents: 3a13277
Author: Freeman Fang freeman.f...@gmail.com
Authored: Wed Jul 16 17:13:51 2014 +0800
Committer: Freeman Fang freeman.f...@gmail.com
Committed: Thu Jul 17 10:44:29 2014 +0800
--
.../test/java/org/apache/cxf/transport/udp/UDPTransportTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1bd129bb/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
--
diff --git
a/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
b/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
index 00e9b36..fea6ce1 100644
---
a/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
+++
b/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
@@ -104,7 +104,7 @@ public class UDPTransportTest extends
AbstractBusClientServerTestBase {
fact.setAddress(udp://localhost: + PORT);
Greeter g = fact.create(Greeter.class);
StringBuilder b = new StringBuilder(10);
-for (int x = 0; x 1; x++) {
+for (int x = 0; x 6500; x++) {
b.append(Hello );
}
assertEquals(Hello + b.toString(), g.greetMe(b.toString()));
