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 2016/12/02 16:49:35 UTC
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 6187ae4e1 -> 1c9d9e4b1
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/1c9d9e4b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1c9d9e4b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1c9d9e4b
Branch: refs/heads/3.1.x-fixes
Commit: 1c9d9e4b190c6ea10285e8c45298d41141635a6b
Parents: 6fe5b5a
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Dec 2 11:46:39 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Dec 2 11:49:21 2016 -0500
----------------------------------------------------------------------
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/1c9d9e4b/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 59cc9bb..e15017a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -61,6 +61,7 @@ B 584df3ae111595da1b44ccd9db9567c2172bbb2e
B 59b8615053ddcad353fbebcd9a5b1109ae0897a1
B 5a57f4a89737a5cfa37ffb94f6643c08e2ab6eb1
B 5d73e20b4539bfa4c8ca607b27a1c1ea1850e095
+B 62060f8bc1f4d85b77ff136cb0576049312b8541
B 629af817f4762a12623e76fb7f7baefe98482719
B 65e1e07fdb810ec9de135530ca3e3d23821836a3
B 66447a377f0b2cafc2f337456b5fd41f832556e0
@@ -188,6 +189,7 @@ M 4b0868a8ee6f53d8543860a458821c35ec2a79a2
M 4f4ce80ba2de80219e13943cbd6edbf411117234
M 574b2a9997c94011794fa2e083181e23c9936f15
M 585df048b7730ee36644a4bb7c1a20fcf977d79e
+M 5954d4ce3c9713c17c3bbb8b730fad210aebfb3a
M 5b7b014cc1d24cba1191bc07fd48b13dbf4d4391
M 5cff82c735c7543ce6dfb6c52ac72f583dbb5d22
M 6242c682dfce4a2ba4869978c28b14f1472484c1
@@ -200,6 +202,7 @@ M 7690a1fd087aff24ad8e8e1ab2e0722e24bf3d81
M 804a957eb4225a1eaf65399881cdcd8552c00f52
M 80ca2370616c28b036c54c95af84ca62f1725a30
M 8118c5a301f22dea16c9d235ad378584a0ae2466
+M 847216a39ba3639f3170b8ad939548788fff4eb6
M 8583a24ac541dc373503d7a6c59cd90890acdae3
M 86667619dc61c8a84672fc5a583b4517f48176c5
M 896f1abec915897967905762d6e850cfb6bac3bc
[2/2] cxf git commit: [CXF-7156] added portName configuration option
to the Java2WSMojo to no longer have to use argline for the portname option
This closes #208
Posted by dk...@apache.org.
[CXF-7156] added portName configuration option to the Java2WSMojo to no longer have to use argline for the portname option
This closes #208
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6fe5b5a8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6fe5b5a8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6fe5b5a8
Branch: refs/heads/3.1.x-fixes
Commit: 6fe5b5a80d477ba460c223e62f4b73b825cd3771
Parents: 6187ae4
Author: Stefaan Dutry <st...@gmail.com>
Authored: Sun Nov 27 13:47:19 2016 +0100
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Dec 2 11:49:21 2016 -0500
----------------------------------------------------------------------
.../apache/cxf/maven_plugin/Java2WSMojo.java | 22 +++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6fe5b5a8/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
index f819aa4..b97c7d3 100644
--- a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
+++ b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
@@ -151,6 +151,12 @@ public class Java2WSMojo extends AbstractMojo {
private Boolean genWrapperbean;
/**
+ * @parameter
+ */
+ private String portName;
+
+
+ /**
* Attach the generated wsdl file to the list of files to be deployed
* on install. This means the wsdl file will be copied to the repository
* with groupId, artifactId and version of the project and type "wsdl".
@@ -283,12 +289,12 @@ public class Java2WSMojo extends AbstractMojo {
}
}
- if (frontend != null) {
+ if (!StringUtils.isEmpty(frontend)) {
args.add("-frontend");
args.add(frontend);
}
- if (databinding != null) {
+ if (!StringUtils.isEmpty(databinding)) {
args.add("-databinding");
args.add(databinding);
}
@@ -315,13 +321,13 @@ public class Java2WSMojo extends AbstractMojo {
}
// target namespace arg
- if (targetNamespace != null) {
+ if (!StringUtils.isEmpty(targetNamespace)) {
args.add("-t");
args.add(targetNamespace);
}
// servicename arg
- if (serviceName != null) {
+ if (!StringUtils.isEmpty(serviceName)) {
args.add("-servicename");
args.add(serviceName);
}
@@ -337,11 +343,17 @@ public class Java2WSMojo extends AbstractMojo {
}
// address arg
- if (address != null) {
+ if (!StringUtils.isEmpty(address)) {
args.add("-address");
args.add(address);
}
+ // portname arg
+ if (!StringUtils.isEmpty(portName)) {
+ args.add("-portname");
+ args.add(portName);
+ }
+
if (argline != null) {
StringTokenizer stoken = new StringTokenizer(argline, " ");
while (stoken.hasMoreTokens()) {