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/06/13 23:09:04 UTC
[1/3] git commit: Update for the rt/wsdl dirs
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes d104812df -> beaa13d18
Update for the rt/wsdl dirs
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d02107aa
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d02107aa
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d02107aa
Branch: refs/heads/2.7.x-fixes
Commit: d02107aae3a79bdf281b13798dab756282f492da
Parents: d104812
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Jun 13 17:08:24 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jun 13 17:08:24 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d02107aa/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d46b88a..ea082d5 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,6 +1,8 @@
origin/master
A core api
A core rt/core
+A rt/wsdl rt/core
+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
[2/3] git commit: [CXF-5623] Fix a typo
Posted by dk...@apache.org.
[CXF-5623] Fix a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e353470f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e353470f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e353470f
Branch: refs/heads/2.7.x-fixes
Commit: e353470fe04248d876149981652ada7ef985b022
Parents: d02107a
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Jun 13 16:52:16 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jun 13 17:08:43 2014 -0400
----------------------------------------------------------------------
rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e353470f/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
----------------------------------------------------------------------
diff --git a/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java b/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
index c225023..755581f 100644
--- a/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
+++ b/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
@@ -125,7 +125,7 @@ public final class SchemaUtil {
}
String systemId = def.getDocumentBaseURI() + "#types" + schemaCount;
if (def.getDocumentBaseURI() != null
- && def.getDocumentBaseURI().toUpperCase().endsWith(".xsd")
+ && def.getDocumentBaseURI().toUpperCase().endsWith(".XSD")
&& def.getTargetNamespace() == null
&& obj instanceof Schema
&& ((Schema)obj).getDocumentBaseURI().equals(def.getDocumentBaseURI())) {
[3/3] 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/beaa13d1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/beaa13d1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/beaa13d1
Branch: refs/heads/2.7.x-fixes
Commit: beaa13d185126d67d751a009ac34436b69b2c7e0
Parents: e353470
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Jun 13 17:08:44 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jun 13 17:08:44 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/beaa13d1/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index ea082d5..c97d41c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1508,6 +1508,7 @@ M a6eaa6b0ed6e2407a85d9314a7a05f10ce2de0d3
M a77d464bb106ec0bef076cf2a2ad62fb921fdad9
M a82d9b4fee15bf518c98d60d77b9b745cc5340bc
M a8e21dff62f609ab08ef34ec013e1dcdea2cdc62
+M a9264b0a50812538913a82640be51ee143797225
M a9f3c9416b33a7688cb0c8922619b713ea6b1c7c
M aa0179d0182f0e0a81b4396ceb6b5d89ddb82bae
M aa86b3a23576a639577d7afd86205b61ac5c1891