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 2017/04/04 18:26:48 UTC
[1/2] cxf git commit: [CXF-7303] Convert URI to a File object to
determine path needed by jibx
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 4d9dbe907 -> 0e66c891d
[CXF-7303] Convert URI to a File object to determine path needed by jibx
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/44a27dac
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/44a27dac
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/44a27dac
Branch: refs/heads/3.0.x-fixes
Commit: 44a27dacaae2c1dfac1788b9908083b3f946728a
Parents: 4d9dbe9
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Apr 4 14:24:01 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Apr 4 14:26:43 2017 -0400
----------------------------------------------------------------------
.../apache/cxf/jibx/tools/JibxToolingDataBinding.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/44a27dac/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java b/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
index 561f2d5..8966cce 100644
--- a/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
+++ b/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
@@ -140,7 +140,17 @@ public class JibxToolingDataBinding implements DataBindingProfile {
if (bindingFiles == null || bindingFiles.length == 0) {
customRoot = defaultSchemasetCustom(schemaMap);
} else {
- customRoot = SchemasetCustom.loadCustomizations(bindingFiles[0], handler);
+ System.out.println();
+ String path = bindingFiles[0];
+ try {
+ File file = new File(new java.net.URI(bindingFiles[0]));
+ if (file.exists()) {
+ path = file.getAbsolutePath();
+ }
+ } catch (Throwable t) {
+ //ignore
+ }
+ customRoot = SchemasetCustom.loadCustomizations(path, handler);
}
// force to retrain types information in the generated binding model
forceTypes(customRoot);
[2/2] cxf 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/0e66c891
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0e66c891
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0e66c891
Branch: refs/heads/3.0.x-fixes
Commit: 0e66c891d2235a493f4e1ff2e452143c50d93452
Parents: 44a27da
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Apr 4 14:26:44 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Apr 4 14:26:44 2017 -0400
----------------------------------------------------------------------
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e66c891/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 706d11a..c4f3bfd 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -134,6 +134,7 @@ B 15c7bcde4ff8a741a79af1444e7d67442c48fd7a
B 15ce3e7fb4db8eafca9a263349bc94f1e9516f7f
B 15e4db9688617af6764f82c234e5a9582692a6e2
B 15ebdfafcd3c54406bcb7ca3405f8aa4fe13ae35
+B 15ed5d4f8d4e2443a668c29d96626debcd01a8db
B 161e10bb2d87573974b8a1748f023c47ebbe5d49
B 162bbb5ea63cfeb6c258d750627c77c9e694f928
B 163e1d2361643251b31b6fdf7def0b52542577dd
@@ -1216,6 +1217,7 @@ B b7562ded6c0b54d02615298c975c54585aebf298
B b75705c1510b13df2dd387e69d52da3efa50cfc9
B b7657a47aca211d46df04998bf79a9e2ca76a545
B b79272c09949cea80572fb86bc170cb344a9b731
+B b7cd8559dfd6a178af0945d0151f21c48f153522
B b7ce0bf1e5106b7913269c1aa24c4ab3aa5631ee
B b7d89466ab1c0ef68156cef6deb5a911fbf511f2
B b7e9d2e0dc0c9f4248fbc8a8448c37b510c9a96c