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 2014/10/27 20:48:23 UTC
[1/4] git commit: Update a mapping
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 5d4e8a6e7 -> ad2a189a1
Update a mapping
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ead72c59
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ead72c59
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ead72c59
Branch: refs/heads/2.7.x-fixes
Commit: ead72c592b8e87eb619cf5f5e67acd4175a68e2f
Parents: 5d4e8a6
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Oct 27 14:01:59 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Oct 27 14:01:59 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ead72c59/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 4ce1859..8053328 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -6,6 +6,7 @@ A rt/wsdl api
A rt/rs/description rt/frontend/jaxrs
A rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/
A core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils
+A rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractWSDLBindingFactory api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory
B 0011b05059467fcd6fbeeb859907d69a9d25efe2
B 003518b1d29250c59493d1b1965303aac8505475
B 003a0d420dca03b94d5ec111dab645669446a942
[2/4] git commit: [CXF-6059] Add a better error message if an invalid
wsdl is used.
Posted by dk...@apache.org.
[CXF-6059] Add a better error message if an invalid wsdl is used.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fe24026b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fe24026b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fe24026b
Branch: refs/heads/2.7.x-fixes
Commit: fe24026bba8cc9afef9cd672255285a194f997f0
Parents: ead72c5
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Oct 27 13:46:43 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Oct 27 14:04:04 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/cxf/binding/AbstractBindingFactory.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/fe24026b/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java b/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
index c0df284..42f700d 100644
--- a/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
+++ b/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
@@ -31,6 +31,7 @@ import javax.wsdl.extensions.ExtensibilityElement;
import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.service.model.AbstractPropertiesHolder;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
@@ -101,6 +102,10 @@ public abstract class AbstractBindingFactory extends AbstractBaseBindingFactory
copyExtensors(bop2.getOutput(), bop.getBindingOutput(), bop2);
}
for (BindingFault f : cast(bop.getBindingFaults().values(), BindingFault.class)) {
+ if (StringUtils.isEmpty(f.getName())) {
+ throw new IllegalArgumentException("wsdl:fault and soap:fault elements"
+ + " must have a name attribute.");
+ }
copyExtensors(bop2.getFault(new QName(service.getTargetNamespace(), f.getName())),
bop.getBindingFault(f.getName()), bop2);
}
[3/4] git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/01d7f1f3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/01d7f1f3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/01d7f1f3
Branch: refs/heads/2.7.x-fixes
Commit: 01d7f1f3ec19d7c375769e744180fbf0191baa9d
Parents: fe24026
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Oct 27 14:04:23 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Oct 27 14:04:23 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/01d7f1f3/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 8053328..dd27357 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1430,6 +1430,7 @@ B f206aab7a0b641388e608af91866b5ddb317bdd4
B f2284040e8269ae8fe4cabe54b1b916abd26016d
B f28f777f7a4cd31c32fa08d26fc7892e4bc1f89f
B f29557a3b144603eab65068b6776d823683dab87
+B f2bc4d4315ad661284946e3cd213d8e5f7cdd715
B f32709f86d7f1aefb23a60c705d6d658d7b958e2
B f34899128e0e27850a3cc31bbf58658290931506
B f3497b00bd89e2978d605425c98f93fd310f442e
@@ -1949,6 +1950,7 @@ M a3f7f142a17da0d0fecd4fa039c07ba6e2496d49
M a40358aedb488fdf517955ead872d0f832625ec6
M a4903d384fff5d10d24400750522e07dd158970a
M a4a5b4fb19362f33b5b1255aff61d9edf51628a1
+M a4d82fe2908471335bebd85a88728605aff15084
M a4e4ea126e7f68d4f7c5de02aad5eaab50ac2a96
M a5272604a833f7fb53514428ef04a3bc9a550e79
M a5b6a887d813d793a6b236162ff85211c35759ab
[4/4] git commit: [CXF-6034] Fix problems with mapping schema
locations to resolvable locations when generating the live wsdl
Posted by dk...@apache.org.
[CXF-6034] Fix problems with mapping schema locations to resolvable locations when generating the live wsdl
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ad2a189a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ad2a189a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ad2a189a
Branch: refs/heads/2.7.x-fixes
Commit: ad2a189a1e239cf09678e069fa88c4fd5944ed49
Parents: 01d7f1f
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Oct 27 15:45:26 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Oct 27 15:48:03 2014 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ad2a189a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index e39786e..5539afa 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -474,6 +474,9 @@ public class WSDLGetUtils {
if (!doneSchemas.containsKey(decodedStart)) {
String resolvedSchemaLocation = resolveWithCatalogs(catalogs, start, base);
if (resolvedSchemaLocation == null) {
+ resolvedSchemaLocation = resolveWithCatalogs(catalogs, imp.getSchemaLocationURI(), base);
+ }
+ if (resolvedSchemaLocation == null) {
try {
//check to see if it's already in a URL format. If so, leave it.
new URL(start);
@@ -485,6 +488,7 @@ public class WSDLGetUtils {
} else {
if (doneSchemas.put(decodedStart, imp) == null) {
doneSchemas.put(resolvedSchemaLocation, imp);
+ doneSchemas.put(imp.getSchemaLocationURI(), imp);
updateSchemaImports(bus, imp.getReferencedSchema(), docBase, doneSchemas, base);
}
}