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/26 18:10:26 UTC
[1/3] git commit: [CXF-5825] Fix the "verbose" logic in the tools
Repository: cxf
Updated Branches:
refs/heads/2.6.x-fixes 5ef5d91a8 -> 3df773fdc
[CXF-5825] Fix the "verbose" logic in the tools
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6f2bda48
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6f2bda48
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6f2bda48
Branch: refs/heads/2.6.x-fixes
Commit: 6f2bda483ffba734732de60628ce45d19ebaeda9
Parents: 5ef5d91
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Jun 26 11:05:46 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Jun 26 12:10:13 2014 -0400
----------------------------------------------------------------------
api/src/main/java/org/apache/cxf/common/util/Compiler.java | 3 ---
.../src/main/java/org/apache/cxf/tools/common/ToolContext.java | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f2bda48/api/src/main/java/org/apache/cxf/common/util/Compiler.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/common/util/Compiler.java b/api/src/main/java/org/apache/cxf/common/util/Compiler.java
index 57aeaee..2fa4b21 100644
--- a/api/src/main/java/org/apache/cxf/common/util/Compiler.java
+++ b/api/src/main/java/org/apache/cxf/common/util/Compiler.java
@@ -69,9 +69,6 @@ public class Compiler {
}
protected void addArgs(List<String> list) {
- if (verbose) {
- list.add("-verbose");
- }
if (!StringUtils.isEmpty(encoding)) {
list.add("-encoding");
list.add(encoding);
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f2bda48/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
index 0e6ca33..c3535dc 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
@@ -160,11 +160,11 @@ public class ToolContext {
}
public boolean isVerbose() {
- Object verboseProperty = get(ToolConstants.CFG_VERBOSE);
+ String verboseProperty = get(ToolConstants.CFG_VERBOSE, String.class);
if (verboseProperty == null) {
return false;
} else {
- return ToolConstants.CFG_VERBOSE.equals(verboseProperty);
+ return ToolConstants.CFG_VERBOSE.equals(verboseProperty) || Boolean.parseBoolean(verboseProperty);
}
}
[2/3] git commit: [CXF-5783] Fix client code generation
Posted by dk...@apache.org.
[CXF-5783] Fix client code generation
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/29b6bd0a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/29b6bd0a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/29b6bd0a
Branch: refs/heads/2.6.x-fixes
Commit: 29b6bd0a90dce881a201f0ceec5d006febfc2e16
Parents: 6f2bda4
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Jun 26 11:09:47 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Jun 26 12:10:16 2014 -0400
----------------------------------------------------------------------
.../org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/29b6bd0a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
index 1666ce0..f6dc7b4 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
@@ -77,7 +77,7 @@ public final class ${clientClassName} {
}
$service.Name ss = new ${service.Name}(wsdlURL, SERVICE_NAME);
- $intf.Name port = ss.get${port.Name}();
+ $intf.Name port = ss.${port.MethodName}();
#foreach ($method in $intf.Methods)
{
[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/3df773fd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3df773fd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3df773fd
Branch: refs/heads/2.6.x-fixes
Commit: 3df773fdca372fca05eef60dc536999c7b7b5aa3
Parents: 29b6bd0
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Jun 26 12:10:16 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Jun 26 12:10:16 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/3df773fd/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index be5b77c..ee74f4f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -121,6 +121,7 @@ B 18fb77d0040f363145e4e29c14bd3486471a997b
B 19333e6ad33bc8070684f92212f49fe9cad5601f
B 193848b290f9cc213293f9ad1f6a6ebffa496591
B 1986d0cf1a67d4c60742ad034b9c7274b9d8b266
+B 1a04b1c6a706cc4b6c2992cfa3be33e4a450b2ae
B 1a233d97a4d0bc36b0d504da3831ba8eca849dcb
B 1a5ec8ca715ce69187d288e817281ee52decde80
B 1a60a057ccb822558e62912c47c5fd95bdaff0ef
@@ -312,6 +313,7 @@ B 43b14ae04361948bebc5dc63b8ecfab020927fa3
B 43f74bc07b043490649ad56e0f157779559ad3c3
B 4405c4b41e594a45606a98310196d1e3e8e3aa8c
B 440642b8cb546fd3510f39032a693faff462fea6
+B 449255214716339a275f33656f149177f6def60d
B 449abe830c52533e79035365a7126e87fc948fb5
B 44a589046eebe0c20c0c5557966ab9f695f19abb
B 44d9a96049f4d98db75caa29354125dc99b60b5d
@@ -350,6 +352,7 @@ B 4b77fddec1876f973784df2e0e87e2a1e5f6106b
B 4b8bbe90e5a7629709b027da711e0a82b87e9f70
B 4ba78268ef7a6424bec9a8733fb4fd886b833271
B 4bf1ec021bdae5d3df9acf3e7241750569e060e4
+B 4d02e15acdd651acd16874afea8dc9459469cb0e
B 4ddb76c33e9f46f042645edbeac95a016aa415f0
B 4de31b6f878b52bb5b5a3a5f80509927fcb5a0e5
B 4df9abc38ce4fb6f96f39c7665bf8fa9193e06df
@@ -623,6 +626,7 @@ B 8850fd5795caf82667377848bbbd66c86d142afa
B 88801791734d1674c1865de3557a4730262735ed
B 888dd73fc73fbfe5e90a0fd7c3f9faf4bf387c29
B 889c2c3593773d4b26a3ee62b004792f3083da4d
+B 88c98e8a3e300040007bc6552a2986b142204347
B 88f22b6c58766a5dc2ee9abd2c7dda188228a22f
B 890389dd26ba329159841e18236e757929704b84
B 897b73a9c9a2d1fcc6978ddac79845341b79d4c9
@@ -838,6 +842,7 @@ B b5d3c8154057a45d2e0b15e80d2b639ca89ba524
B b5d74e98b4635a3feb3092e460babd496dd63dea
B b5fa6478c64f0c50361408f99dd7b02a71004e0c
B b612282510ceb074afef6094ac2a1467980dac16
+B b6436430930ef11460538270836fe6cd5aa1fabb
B b8669c9a39b4d6c8e178fe0303afbaff92323735
B b86d56a10d41f3e470db2105775aec2b16178628
B b8700e9305c0e201ab694aecd0e1dcceb0cdc9a6
@@ -965,6 +970,7 @@ B d32a83895a9d5d643c2953f2d7e002113d57c459
B d3962f78c52bcee36bb14ca97bbe03f111367637
B d3aa4f3a09a8643d69cf7c1406e0d726e67e51c9
B d479c1b40f1f5d39d018cf808ebbdf7331c8f816
+B d4d674cb26679597760e6275a43c53a702ba0ab9
B d501a7707fe3b013c5a6d7e66d1c6f3fa6a59264
B d504ce8a300ab15d4dc768a12a2cb73d8e7507b7
B d524ecdc529792413504392dad4ab366352c6f2b
@@ -1120,6 +1126,7 @@ B f67a10f1090a45825285ff8e368376117cb2bb9a
B f69d44ebca26bc1ae9e173d9a7135cd847deeb37
B f6fba516e77d46c3c848dbafd1116d3621033e2c
B f7165daa3c96fd3b9efea4a2c468e0e523edf01b
+B f72da13cb5c5b41121fb32221d2c7f664c940dd7
B f76a1ffdb22d613e15395731003a975891f4a65f
B f78aef598e4b525a75dbfd6c82e6a42856d76a88
B f7de9739c5d215ba2ef3265fb9f736bdd56c9c47