This is an automated email from the ASF dual-hosted git repository.
sergeyb pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
new d5aa021 Renaming wadltojava 'authorization' option to
'authentication' as agreed on the users list
d5aa021 is described below
commit d5aa02185aa6228e6c9748861ff63c22ea68bd61
Author: Sergey Beryozkin <sberyoz...@gmail.com>
AuthorDate: Thu Oct 19 12:27:43 2017 +0100
Renaming wadltojava 'authorization' option to 'authentication' as agreed on
the users list
---
.../java/org/apache/cxf/tools/wadlto/WadlToolConstants.java | 2 +-
.../org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java | 12 ++++++------
.../org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java | 10 +++++-----
.../org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml | 8 ++++----
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WadlToolConstants.java
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WadlToolConstants.java
index c2c2471..2cee00d 100644
---
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WadlToolConstants.java
+++
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WadlToolConstants.java
@@ -47,7 +47,7 @@ public final class WadlToolConstants {
public static final String CFG_CATALOG = ToolConstants.CFG_CATALOG;
public static final String CFG_BINDING = ToolConstants.CFG_BINDING;
- public static final String CFG_AUTHORIZATION = "authorization";
+ public static final String CFG_AUTHENTICATION = "authentication";
public static final String CFG_NO_TYPES = ToolConstants.CFG_NO_TYPES;
public static final String CFG_NO_VOID_FOR_EMPTY_RESPONSES =
"noVoidForEmptyResponses";
diff --git
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
index 463fe49..854720f 100644
---
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
+++
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
@@ -114,8 +114,8 @@ public class JAXRSContainer extends
AbstractCXFToolContainer {
private void processWadl() {
File outDir = new
File((String)context.get(WadlToolConstants.CFG_OUTPUTDIR));
String wadlURL = getAbsoluteWadlURL();
- String authorization =
(String)context.get(WadlToolConstants.CFG_AUTHORIZATION);
- String wadl = readWadl(wadlURL, authorization);
+ String authentication =
(String)context.get(WadlToolConstants.CFG_AUTHENTICATION);
+ String wadl = readWadl(wadlURL, authentication);
SourceGenerator sg = new SourceGenerator();
sg.setBus(getBus());
@@ -128,7 +128,7 @@ public class JAXRSContainer extends
AbstractCXFToolContainer {
sg.setPackageName((String)context.get(WadlToolConstants.CFG_PACKAGENAME));
sg.setResourceName((String)context.get(WadlToolConstants.CFG_RESOURCENAME));
sg.setEncoding((String)context.get(WadlToolConstants.CFG_ENCODING));
- sg.setAuthorization(authorization);
+ sg.setAuthentication(authentication);
String wadlNs =
(String)context.get(WadlToolConstants.CFG_WADL_NAMESPACE);
if (wadlNs != null) {
@@ -206,12 +206,12 @@ public class JAXRSContainer extends
AbstractCXFToolContainer {
}
- protected String readWadl(String wadlURI, String authorization) {
+ protected String readWadl(String wadlURI, String authentication) {
try {
URL url = new URL(wadlURI);
InputStream is = null;
- if (wadlURI.startsWith("https") && authorization != null) {
- is = SecureConnectionHelper.getStreamFromSecureConnection(url,
authorization);
+ if (wadlURI.startsWith("https") && authentication != null) {
+ is = SecureConnectionHelper.getStreamFromSecureConnection(url,
authentication);
} else {
is = url.openStream();
}
diff --git
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index c1f17a1..150857e 100644
---
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -225,7 +225,7 @@ public class SourceGenerator {
private boolean validateWadl;
private SchemaCollection schemaCollection = new SchemaCollection();
private String encoding;
- private String authorization;
+ private String authentication;
private boolean createJavaDocs;
public SourceGenerator() {
@@ -1868,8 +1868,8 @@ public class SourceGenerator {
}
if (is == null) {
URL url = URI.create(href).toURL();
- if (href.startsWith("https") && authorization != null) {
- is =
SecureConnectionHelper.getStreamFromSecureConnection(url, authorization);
+ if (href.startsWith("https") && authentication != null) {
+ is =
SecureConnectionHelper.getStreamFromSecureConnection(url, authentication);
} else {
is = url.openStream();
}
@@ -2038,8 +2038,8 @@ public class SourceGenerator {
this.supportBeanValidation = supportBeanValidation;
}
- public void setAuthorization(String authorization) {
- this.authorization = authorization;
+ public void setAuthentication(String authentication) {
+ this.authentication = authentication;
}
private static class GrammarInfo {
diff --git
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml
index a4c6569..7476251 100644
---
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml
+++
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml
@@ -259,15 +259,15 @@ Examples:
<annotation>Convert WADL doc elements to JavaDocs</annotation>
<switch>javaDocs</switch>
</option>
- <option id="authorization" maxOccurs="1">
+ <option id="authentication" maxOccurs="1">
<annotation>
Specifies a colon separated user name and password for
retrieving the
- remote WADL content from the servers requiring Basic
authentication
+ remote WADL content from the servers requiring the
authentication
</annotation>
<associatedArgument placement="afterSpace">
- <annotation>authorization</annotation>
+ <annotation>authentication</annotation>
</associatedArgument>
- <switch>authorization</switch>
+ <switch>authentication</switch>
</option>
</optionGroup>
<optionGroup id="common_options">
--
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <commits@cxf.apache.org>'].
