date:20170724

cxf-fediz git commit: Make sure we have an IdP token

2017-07-24 Thread coheigea

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.3.x-fixes 7ab93afa1 -> e8b7aac0b


Make sure we have an IdP token


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

Branch: refs/heads/1.3.x-fixes
Commit: e8b7aac0b3950d67c71e22430e7a3cb610c61313
Parents: 7ab93af
Author: Colm O hEigeartaigh 
Authored: Mon Jul 24 17:38:48 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 24 17:52:32 2017 +0100

--
 .../org/apache/cxf/fediz/service/idp/beans/STSClientAction.java  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e8b7aac0/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
--
diff --git 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
index 0d6c37d..ba1ba18 100644
--- 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
+++ 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
@@ -182,6 +182,10 @@ public class STSClientAction {
 throws Exception {
 
 SecurityToken idpToken = getSecurityToken(context, homeRealm);
+if (idpToken == null || idpToken.getToken() == null) {
+LOG.warn("No IdPToken is found");
+throw new ProcessingException(TYPE.BAD_REQUEST);
+}
 
 Bus cxfBus = getBus();
 Idp idpConfig = (Idp) WebUtils.getAttributeFromFlowScope(context, 
"idpConfig");

cxf-fediz git commit: Make sure we have an IdP token

2017-07-24 Thread coheigea

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.4.x-fixes 79b693c64 -> c107ceaf4


Make sure we have an IdP token


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

Branch: refs/heads/1.4.x-fixes
Commit: c107ceaf45237b93fd776ee89fc786dfc07e606e
Parents: 79b693c
Author: Colm O hEigeartaigh 
Authored: Mon Jul 24 17:38:48 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 24 17:39:12 2017 +0100

--
 .../org/apache/cxf/fediz/service/idp/beans/STSClientAction.java  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c107ceaf/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
--
diff --git 
a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
 
b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
index 3817380..258bbde 100644
--- 
a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
+++ 
b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
@@ -184,6 +184,10 @@ public class STSClientAction {
 public Element submit(RequestContext context, String realm, String 
homeRealm) throws Exception {
 
 SecurityToken idpToken = getSecurityToken(context, homeRealm);
+if (idpToken == null || idpToken.getToken() == null) {
+LOG.warn("No IdPToken is found");
+throw new ProcessingException(TYPE.BAD_REQUEST);
+}
 
 Bus cxfBus = getBus();
 Idp idpConfig = (Idp)WebUtils.getAttributeFromFlowScope(context, 
"idpConfig");

cxf-fediz git commit: Make sure we have an IdP token

2017-07-24 Thread coheigea

Repository: cxf-fediz
Updated Branches:
  refs/heads/master c3d34d5a3 -> 5865dcf58


Make sure we have an IdP token


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

Branch: refs/heads/master
Commit: 5865dcf58da7d9f318519436d0a5f0924f2e874c
Parents: c3d34d5
Author: Colm O hEigeartaigh 
Authored: Mon Jul 24 17:38:48 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 24 17:38:48 2017 +0100

--
 .../org/apache/cxf/fediz/service/idp/beans/STSClientAction.java  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5865dcf5/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
--
diff --git 
a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
 
b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
index 3817380..258bbde 100644
--- 
a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
+++ 
b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
@@ -184,6 +184,10 @@ public class STSClientAction {
 public Element submit(RequestContext context, String realm, String 
homeRealm) throws Exception {
 
 SecurityToken idpToken = getSecurityToken(context, homeRealm);
+if (idpToken == null || idpToken.getToken() == null) {
+LOG.warn("No IdPToken is found");
+throw new ProcessingException(TYPE.BAD_REQUEST);
+}
 
 Bus cxfBus = getBus();
 Idp idpConfig = (Idp)WebUtils.getAttributeFromFlowScope(context, 
"idpConfig");

cxf git commit: Recording .gitmergeinfo Changes

2017-07-24 Thread coheigea

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 4f83a2d69 -> b7c14d5c3


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

Branch: refs/heads/3.0.x-fixes
Commit: b7c14d5c39dbdcc72147d2e20bb302b451f4f8e3
Parents: 4f83a2d
Author: Colm O hEigeartaigh 
Authored: Mon Jul 24 17:22:10 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 24 17:22:10 2017 +0100

--
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b7c14d5c/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1a97d37..983f342 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -123,6 +123,7 @@ B 1214338f24a3a7973f2bd72ca01fc57644bcc45a
 B 12206c314d34f2e210f7292fcb7a3e894fafd4e7
 B 12225d4f560c30839fd8f2ecb6657663d7559a27
 B 123ef5edea1195093ca768f1f5698e5b657f5667
+B 1252e2e88e4668603e4e8147505b1f3b21190a24
 B 12b8e711d2068044caa9ceb57e3fe038e4e92cfc
 B 12be7dddaa5cd9102a8b4f26d28f907daa6b7150
 B 12c325a12e897b3fac6afbd9ec2fe34dcaaa9d02
@@ -639,6 +640,7 @@ B 557538025eecaf6a46ae03713ac053f3934a244f
 B 5577461dfa57cb8c7c49d788276afbd9253d81c5
 B 557dc292f63176ba971ebc8c8e23e1fb74c5c4a1
 B 55829d69db9c132f72eab41baff6b6da6d1869e5
+B 558c0ffe3a433fc895c9db8fdd6ae1a6cd71949a
 B 55adad16d0172531fabb0dea3e527d7a152596e5
 B 55bda33699ea1c2e84a125253edd594cc2a32ea3
 B 55c72f2257e9afaacfcd9de8fe0635ea0de6d786

[1/2] cxf git commit: Recording .gitmergeinfo Changes

2017-07-24 Thread coheigea

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 16a275642 -> 558c0ffe3


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

Branch: refs/heads/3.1.x-fixes
Commit: 558c0ffe3a433fc895c9db8fdd6ae1a6cd71949a
Parents: 1252e2e
Author: Colm O hEigeartaigh 
Authored: Mon Jul 24 17:20:11 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 24 17:20:11 2017 +0100

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/558c0ffe/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index e9c6b70..3f0e48e 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -531,6 +531,7 @@ M 59c2f5ab18b7b39f1e1cdf74910a6de03dcc8a31
 M 59cab46f45733b07b1b90c4510d4466d97447323
 M 5afec44d741580762fb5d6f4f4fac7d34446ae95
 M 5b7b014cc1d24cba1191bc07fd48b13dbf4d4391
+M 5c7031e8f555686ba6fe6d37e23db229dd4b73c7
 M 5cff82c735c7543ce6dfb6c52ac72f583dbb5d22
 M 5e17bc043723353937ee7f1f9ac1c51c83b74679
 M 5f6cb0745adc5d8cb6dd53a46751f56f42928d94

cxf git commit: Fixing some whitespace issues with log messages in the STS

2017-07-24 Thread coheigea

Repository: cxf
Updated Branches:
  refs/heads/master 1502f6ca3 -> 5c7031e8f


Fixing some whitespace issues with log messages in the STS


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

Branch: refs/heads/master
Commit: 5c7031e8f555686ba6fe6d37e23db229dd4b73c7
Parents: 1502f6c
Author: Colm O hEigeartaigh 
Authored: Mon Jul 24 17:06:45 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 24 17:06:45 2017 +0100

--
 .../cxf/sts/token/provider/SAMLTokenProvider.java   | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5c7031e8/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
index 82a30a6..275d1df 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
@@ -330,8 +330,8 @@ public class SAMLTokenProvider extends 
AbstractSAMLTokenProvider implements Toke
 if (statementBean != null) {
 if (LOG.isLoggable(Level.FINE)) {
 LOG.fine(
-"AttributeStatements" + statementBean.toString()
-+ "returned by AttributeStatementProvider "
+"AttributeStatements " + statementBean.toString()
++ " returned by AttributeStatementProvider "
 + statementProvider.getClass().getName()
 );
 }
@@ -350,8 +350,8 @@ public class SAMLTokenProvider extends 
AbstractSAMLTokenProvider implements Toke
 if (statementBean != null) {
 if (LOG.isLoggable(Level.FINE)) {
 LOG.fine(
-"AuthenticationStatement" + 
statementBean.toString()
-+ "returned by AuthenticationStatementProvider "
+"AuthenticationStatement " + 
statementBean.toString()
++ " returned by AuthenticationStatementProvider "
 + statementProvider.getClass().getName()
 );
 }
@@ -371,8 +371,8 @@ public class SAMLTokenProvider extends 
AbstractSAMLTokenProvider implements Toke
 if (statementBean != null) {
 if (LOG.isLoggable(Level.FINE)) {
 LOG.fine(
-"AuthDecisionStatement" + statementBean.toString()
-+ "returned by AuthDecisionStatementProvider "
+"AuthDecisionStatement " + statementBean.toString()
++ " returned by AuthDecisionStatementProvider "
 + statementProvider.getClass().getName()
 );
 }

cxf git commit: Keeping ParseConfiguration emptu for now

2017-07-24 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes ad8d74672 -> 16a275642


Keeping ParseConfiguration emptu for now


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

Branch: refs/heads/3.1.x-fixes
Commit: 16a275642f2621ce23772bacfd88a4bd93334e20
Parents: ad8d746
Author: Sergey Beryozkin 
Authored: Mon Jul 24 15:49:21 2017 +0300
Committer: Sergey Beryozkin 
Committed: Mon Jul 24 15:50:07 2017 +0300

--
 .../jaxrs/swagger/parse/ParseConfiguration.java | 22 
 .../jaxrs/swagger/parse/SwaggerParseUtils.java  | 21 ---
 2 files changed, 14 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/16a27564/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/ParseConfiguration.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/ParseConfiguration.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/ParseConfiguration.java
index 18e5b67..bf1f8e4 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/ParseConfiguration.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/ParseConfiguration.java
@@ -18,30 +18,8 @@
  */
 package org.apache.cxf.jaxrs.swagger.parse;
 
-import org.apache.cxf.Bus;
-
 public class ParseConfiguration {
-private String docLocation;
-private Bus bus;
 
 public ParseConfiguration() {
 }
-
-public ParseConfiguration(String docLocation, Bus bus) {
-this.docLocation = docLocation;
-this.bus = bus;
-}
-
-public String getDocLocation() {
-return docLocation;
-}
-public void setDocLocation(String docLocation) {
-this.docLocation = docLocation;
-}
-public Bus getBus() {
-return bus;
-}
-public void setBus(Bus bus) {
-this.bus = bus;
-}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/16a27564/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java
index 06aa761..fe8a96e 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java
@@ -69,25 +69,32 @@ public final class SwaggerParseUtils {
 return getUserApplication(loc, BusFactory.getThreadDefaultBus());
 }
 public static UserApplication getUserApplication(String loc, Bus bus) {
-return getUserApplication(new ParseConfiguration(loc, bus));
+return getUserApplication(loc, bus, new ParseConfiguration());
 }
-public static UserApplication getUserApplication(ParseConfiguration cfg) { 
   
+public static UserApplication getUserApplication(String loc, Bus bus, 
ParseConfiguration cfg) {
 try {
-InputStream is = 
ResourceUtils.getResourceStream(cfg.getDocLocation(),
- cfg.getBus());
+InputStream is = ResourceUtils.getResourceStream(loc, bus);
 if (is == null) {
 return null;
 }
-return getUserApplicationFromStream(is);
+return getUserApplicationFromStream(is, cfg);
 } catch (Exception ex) {
-LOG.warning("Problem with processing a user model at " + 
cfg.getDocLocation());
+LOG.warning("Problem with processing a user model at " + loc);
 }
 return null;
 }
 public static UserApplication getUserApplicationFromStream(InputStream is) 
throws IOException {
-return getUserApplicationFromJson(IOUtils.readStringFromStream(is));
+return getUserApplicationFromStream(is, new ParseConfiguration());
+}
+public static UserApplication getUserApplicationFromStream(InputStream is,
+   
ParseConfiguration cfg) throws IOException {
+return getUserApplicationFromJson(IOUtils.readStringFromStream(is), 
cfg);
 }
 public static UserApplication getUserApplicationFromJson(String json) {
+return getUserApplicationFromJson(json, new ParseConfiguration());

cxf git commit: Keeping ParseConfiguration emptu for now

2017-07-24 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/master f33f5f5bf -> 1502f6ca3


Keeping ParseConfiguration emptu for now


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

Branch: refs/heads/master
Commit: 1502f6ca31914b33364774da1211cff397b0ed54
Parents: f33f5f5
Author: Sergey Beryozkin 
Authored: Mon Jul 24 15:49:21 2017 +0300
Committer: Sergey Beryozkin 
Committed: Mon Jul 24 15:49:21 2017 +0300

--
 .../jaxrs/swagger/parse/ParseConfiguration.java | 22 
 .../jaxrs/swagger/parse/SwaggerParseUtils.java  | 21 ---
 2 files changed, 14 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1502f6ca/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/ParseConfiguration.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/ParseConfiguration.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/ParseConfiguration.java
index 18e5b67..bf1f8e4 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/ParseConfiguration.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/ParseConfiguration.java
@@ -18,30 +18,8 @@
  */
 package org.apache.cxf.jaxrs.swagger.parse;
 
-import org.apache.cxf.Bus;
-
 public class ParseConfiguration {
-private String docLocation;
-private Bus bus;
 
 public ParseConfiguration() {
 }
-
-public ParseConfiguration(String docLocation, Bus bus) {
-this.docLocation = docLocation;
-this.bus = bus;
-}
-
-public String getDocLocation() {
-return docLocation;
-}
-public void setDocLocation(String docLocation) {
-this.docLocation = docLocation;
-}
-public Bus getBus() {
-return bus;
-}
-public void setBus(Bus bus) {
-this.bus = bus;
-}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/1502f6ca/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java
index d728bdf..bfa4301 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java
@@ -69,25 +69,32 @@ public final class SwaggerParseUtils {
 return getUserApplication(loc, BusFactory.getThreadDefaultBus());
 }
 public static UserApplication getUserApplication(String loc, Bus bus) {
-return getUserApplication(new ParseConfiguration(loc, bus));
+return getUserApplication(loc, bus, new ParseConfiguration());
 }
-public static UserApplication getUserApplication(ParseConfiguration cfg) { 
   
+public static UserApplication getUserApplication(String loc, Bus bus, 
ParseConfiguration cfg) {
 try {
-InputStream is = 
ResourceUtils.getResourceStream(cfg.getDocLocation(),
- cfg.getBus());
+InputStream is = ResourceUtils.getResourceStream(loc, bus);
 if (is == null) {
 return null;
 }
-return getUserApplicationFromStream(is);
+return getUserApplicationFromStream(is, cfg);
 } catch (Exception ex) {
-LOG.warning("Problem with processing a user model at " + 
cfg.getDocLocation());
+LOG.warning("Problem with processing a user model at " + loc);
 }
 return null;
 }
 public static UserApplication getUserApplicationFromStream(InputStream is) 
throws IOException {
-return getUserApplicationFromJson(IOUtils.readStringFromStream(is));
+return getUserApplicationFromStream(is, new ParseConfiguration());
+}
+public static UserApplication getUserApplicationFromStream(InputStream is,
+   
ParseConfiguration cfg) throws IOException {
+return getUserApplicationFromJson(IOUtils.readStringFromStream(is), 
cfg);
 }
 public static UserApplication getUserApplicationFromJson(String json) {
+return getUserApplicationFromJson(json, new ParseConfiguration());
+}
+

cxf git commit: Renaming SwaggerUtils to SwaggerParseUtils, moving it to swagger.parse subpackage, introducing ParseConfiguration (to be enhanced)

2017-07-24 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e43a31162 -> ad8d74672


Renaming SwaggerUtils to SwaggerParseUtils, moving it to swagger.parse 
subpackage, introducing ParseConfiguration (to be enhanced)


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

Branch: refs/heads/3.1.x-fixes
Commit: ad8d7467279ca94f27af72a873c05a4ee42d12c4
Parents: e43a311
Author: Sergey Beryozkin 
Authored: Mon Jul 24 15:35:51 2017 +0300
Committer: Sergey Beryozkin 
Committed: Mon Jul 24 15:41:30 2017 +0300

--
 .../apache/cxf/jaxrs/swagger/SwaggerUtils.java  | 199 -
 .../jaxrs/swagger/parse/ParseConfiguration.java |  47 +++
 .../jaxrs/swagger/parse/SwaggerParseUtils.java  | 203 +
 .../cxf/jaxrs/swagger/SwaggerUtilsTest.java | 410 ---
 .../swagger/parse/SwaggerParseUtilsTest.java| 410 +++
 .../AbstractSwagger2ServiceDescriptionTest.java |   4 +-
 6 files changed, 662 insertions(+), 611 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ad8d7467/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
deleted file mode 100644
index da2216b..000
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.jaxrs.swagger;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Logger;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.common.classloader.ClassLoaderUtils;
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.helpers.CastUtils;
-import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.jaxrs.json.basic.JsonMapObjectReaderWriter;
-import org.apache.cxf.jaxrs.model.Parameter;
-import org.apache.cxf.jaxrs.model.ParameterType;
-import org.apache.cxf.jaxrs.model.UserApplication;
-import org.apache.cxf.jaxrs.model.UserOperation;
-import org.apache.cxf.jaxrs.model.UserResource;
-import org.apache.cxf.jaxrs.utils.ResourceUtils;
-
-public final class SwaggerUtils {
-private static final Logger LOG = 
LogUtils.getL7dLogger(ResourceUtils.class);
-private static final Map SWAGGER_TYPE_MAP;
-static {
-SWAGGER_TYPE_MAP = new HashMap();
-SWAGGER_TYPE_MAP.put("string", String.class);
-SWAGGER_TYPE_MAP.put("integer", long.class);
-SWAGGER_TYPE_MAP.put("float", float.class);
-SWAGGER_TYPE_MAP.put("double", double.class);
-SWAGGER_TYPE_MAP.put("int", int.class);
-SWAGGER_TYPE_MAP.put("long", long.class);
-SWAGGER_TYPE_MAP.put("byte", byte.class);
-SWAGGER_TYPE_MAP.put("boolean", boolean.class);
-SWAGGER_TYPE_MAP.put("date", java.util.Date.class);
-SWAGGER_TYPE_MAP.put("dateTime", java.util.Date.class);
-SWAGGER_TYPE_MAP.put("File", java.io.InputStream.class);
-SWAGGER_TYPE_MAP.put("file", java.io.InputStream.class);
-}
-private SwaggerUtils() {
-
-}
-public static UserApplication getUserApplication(String loc) {
-return getUserApplication(loc, BusFactory.getThreadDefaultBus());
-}
-public static UserApplication getUserApplication(String loc, Bus bus) {
-try {
-InputStream is =

cxf-xjc-utils git commit: Update commons-lang3 to 3.6

2017-07-24 Thread deki

Repository: cxf-xjc-utils
Updated Branches:
  refs/heads/master 2bca998bb -> 571b6555e


Update commons-lang3 to 3.6


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

Branch: refs/heads/master
Commit: 571b6555ef5312154a5c5d8bad69b2e681967461
Parents: 2bca998
Author: Dennis Kieselhorst 
Authored: Mon Jul 24 13:48:25 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Mon Jul 24 13:48:25 2017 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/571b6555/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 3fc7f02..448a9b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,7 @@
 
 org.apache.commons
 commons-lang3
-3.5
+3.6
 
 
 wsdl4j

cxf git commit: re-enabled integration test

2017-07-24 Thread deki

Repository: cxf
Updated Branches:
  refs/heads/master fd16ded59 -> d3214b660


re-enabled integration test


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

Branch: refs/heads/master
Commit: d3214b660a1f4fb38819913cca949c52d4167a47
Parents: fd16ded
Author: Dennis Kieselhorst 
Authored: Mon Jul 24 13:42:20 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Mon Jul 24 13:42:54 2017 +0200

--
 systests/wsdl_maven/codegen/pom.xml | 54 ++--
 .../wsdl_maven/codegen/src/it/cxf-4004/pom.xml  |  7 ++-
 .../wsdl_maven/codegen/src/it/it-parent/pom.xml |  1 +
 3 files changed, 33 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d3214b66/systests/wsdl_maven/codegen/pom.xml
--
diff --git a/systests/wsdl_maven/codegen/pom.xml 
b/systests/wsdl_maven/codegen/pom.xml
index ff46dda..3850959 100644
--- a/systests/wsdl_maven/codegen/pom.xml
+++ b/systests/wsdl_maven/codegen/pom.xml
@@ -102,34 +102,32 @@
 
 
 
-
+
+org.apache.maven.plugins
+maven-invoker-plugin
+3.0.0
+
+src/it
+
${project.build.directory}/it
+setup
+verify
+
${project.build.directory}/local-repo
+src/it/settings.xml
+
+*/pom.xml
+
+
+
+
+integration-test
+
+install
+integration-test
+verify
+
+
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d3214b66/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml
--
diff --git a/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml 
b/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml
index b867edc..53b0ae5 100644
--- a/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml
+++ b/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml
@@ -35,7 +35,7 @@
 
 org.apache.cxf.xjcplugins
 cxf-xjc-ts
-2.4.0
+${cxf.xjc-utils.version}
 
 
 net.java.dev.jaxb2-commons
@@ -80,5 +80,10 @@
 cxf-rt-transports-http
 ${cxf.version}
 
+
+org.apache.cxf.xjc-utils
+cxf-xjc-runtime
+${cxf.xjc-utils.version}
+
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d3214b66/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
--
diff --git a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml 
b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
index 28148e9..fa22e6f 100644
--- a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
+++ b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
@@ -25,6 +25,7 @@
 pom
 
 @project.version@
+3.1.0

cxf-fediz git commit: Make sure we have an IdP token

cxf-fediz git commit: Make sure we have an IdP token

cxf-fediz git commit: Make sure we have an IdP token

cxf git commit: Recording .gitmergeinfo Changes

[1/2] cxf git commit: Recording .gitmergeinfo Changes

cxf git commit: Fixing some whitespace issues with log messages in the STS

cxf git commit: Keeping ParseConfiguration emptu for now

cxf git commit: Keeping ParseConfiguration emptu for now

cxf git commit: Renaming SwaggerUtils to SwaggerParseUtils, moving it to swagger.parse subpackage, introducing ParseConfiguration (to be enhanced)

cxf-xjc-utils git commit: Update commons-lang3 to 3.6

cxf git commit: re-enabled integration test

11 matches

Site Navigation

Mail list logo

Footer information