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 17:55:11 UTC

[1/3] git commit: [CXF-5783] Fix client code generation

Repository: cxf
Updated Branches:
  refs/heads/master 53270bde1 -> cd058a977


[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/1a8809a0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1a8809a0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1a8809a0

Branch: refs/heads/master
Commit: 1a8809a01df93eef947d69d740b921652b687c15
Parents: f24a5be
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 11:55:04 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/1a8809a0/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: We should NOT be keeping the runtime folders. Causes massive disk usage in target dir

Posted by dk...@apache.org.
We should NOT be keeping the runtime folders.  Causes massive disk usage in target dir


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cd058a97
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cd058a97
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cd058a97

Branch: refs/heads/master
Commit: cd058a9772ad8148cd4f67782f7692d9b4770b63
Parents: 1a8809a
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Jun 26 11:25:58 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Jun 26 11:55:05 2014 -0400

----------------------------------------------------------------------
 .../test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java   | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/cd058a97/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index 4e144de..468f4cb 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -64,7 +64,6 @@ import static org.ops4j.pax.exam.CoreOptions.when;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
 
 /**
  * 
@@ -113,7 +112,6 @@ public class CXFOSGiTestSupport {
                              .name("Apache Karaf")
                              .useDeployFolder(false)
                              .unpackDirectory(new File("target/paxexam/")),
-                         keepRuntimeFolder(),
                          features(cxfUrl, "cxf-core", "cxf-jaxws"),
                          systemProperty("java.awt.headless").value("true"),
                          when(localRepo != null)


[2/3] git commit: [CXF-5825] Fix the "verbose" logic in the tools

Posted by dk...@apache.org.
[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/f24a5bec
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f24a5bec
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f24a5bec

Branch: refs/heads/master
Commit: f24a5bec9d7236f9b4b7f208b1f570cdf0381a61
Parents: 53270bd
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 11:55:04 2014 -0400

----------------------------------------------------------------------
 core/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/f24a5bec/core/src/main/java/org/apache/cxf/common/util/Compiler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/Compiler.java b/core/src/main/java/org/apache/cxf/common/util/Compiler.java
index 1567b70..e0247d8 100644
--- a/core/src/main/java/org/apache/cxf/common/util/Compiler.java
+++ b/core/src/main/java/org/apache/cxf/common/util/Compiler.java
@@ -85,9 +85,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/f24a5bec/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);
         }
     }