[3/3] cxf git commit: Recording .gitmergeinfo Changes

[dkulp]

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

Branch: refs/heads/2.7.x-fixes
Commit: 54f638684489186375aa5affd7fa49b1c7de381f
Parents: 81e728a
Author: Daniel Kulp 
Authored: Mon Oct 12 15:32:45 2015 -0400
Committer: Daniel Kulp 
Committed: Mon Oct 12 15:32:45 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/54f63868/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9725d4c..1c90b36 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -24,6 +24,7 @@ B 013abc6cc200b44a5cb4db78b7ba35295795380a
 B 0146d65aa1aa2681d358928f8e4ac918bf2b0305
 B 0189ff6cbe2be511b1940e4dfa6ab90d92f23113
 B 01ad820abd4d4dd172c1c6b19bf5a93f828decfe
+B 01aee323072d8644c85cedab4d93adcaab2bc176
 B 01c77bd95a0b302b98f5dc8dc649d78d78afb56f
 B 01c79cfc4f335477d3460729782cc243d6f55196
 B 01f06dc19334b42c83efa839643a99c9502b3e5a
@@ -120,6 +121,7 @@ B 0cffef8fc445a8a367315521b03620a14bb8c60a
 B 0d19ce6ae178b3baa850483b4243f5bc6f4886b8
 B 0d2ea5d32f4504d9697364c883ea975f962108e7
 B 0d3318d2cb5fc0e7c20e14dcc242865ef11175d5
+B 0d8d92c90f0b02b08892838c69a365b453314206
 B 0da3215d1530c3100b33f3eb4b05637845374bac
 B 0db1e238fedaa359b62387465f9d95ba0805e56e
 B 0dd17b9c51c92a943f27983033bbc05e7e8614eb
@@ -139,6 +141,7 @@ B 0ee29500ca1d031490bbc245908cf3a44b42730e
 B 0ef8f352e25ca1a15754a34af948a49ffc7e1fbc
 B 0f2a9fa0ab2026123f08f101452ece1be9601442
 B 0f3d4a6f0b6469e89fa1a3338c40ce54c47fbc2e
+B 0f45b4dce39e9674876c3ea1a6fae65f24fd47e1
 B 0f65c53f8e82600b64ebd83afaf00637a70fc8eb
 B 0f941edd39a0f5e31298ba4757019fabd3044809
 B 0fa7477274ea6c430f764d5c6a013bb09cae9409
@@ -184,6 +187,7 @@ B 143293760b2228a8d8e67f04d8f5c63dc27e5261
 B 14585ed2de2c51a7683e392523db1a5c8c2621d5
 B 148bbc8f4a30ecd801e87db7b6621c5d39deb478
 B 14949c37fc9ac90a410137721c5ab46ff71367c1
+B 149836a341b37a494a86b251e63b136f2150f5e8
 B 149bfbdc9b63c456a0c0bdb52b2890dbf3b87359
 B 149dcf004a4d095fbfee6f12ed048de2257a5b57
 B 14a29e1f411ff362f8899d3e9276d8239faf33cd
@@ -242,10 +246,12 @@ B 1900e1f4ace53bc112c16f36d846f25905daab4c
 B 190b89b8630ca5f630c6af377f83db39e2cb1273
 B 190f6e24de6404ae937a02a4530e17fea8434f42
 B 191fbf01488c1bff9603a1196f65aaa859ee3178
+B 19798b44a349b761bdc0616ae4201399ebbab2a2
 B 19a66ba7cdadc06cad4bbb4b5b2d61d8b19e279b
 B 19ba5d083a1819af6695aeccdb44503d3dcb3c96
 B 19d2c8ce5304d9aab5c4d0e71a6b1fd6f4434cd3
 B 19d7e7275c680451273669004afa2a3f2f615ef3
+B 19e3be79a2c508666985014dcecb8dfa64c10e9b
 B 19e7643b6c7bab7a01bfaede067aaed5e59008d5
 B 1a6a69574c777eccfceec8aad9c043e98b2f2439
 B 1aa01b2efdc6befbea4f786272215bcc28d842e0
@@ -439,6 +445,7 @@ B 2d2800ba52421c3e4a52dcf561b8f00b6f07f3d6
 B 2d2a45a7e5051dad207a02ccd1cc3e3206fb3dd1
 B 2d48a26644651f34f94aae2a0e0563d556f1d987
 B 2d4c98545ef4ff66d6f97b514eaeca3bad2664e1
+B 2d6414108cac3ec6208e9f961d24d0d1d49289c7
 B 2d81cd8f04a8c52daa142b37fd0e042ec6a1fbab
 B 2d8264aff8c1b26d60f6d4dee3bcb572927cc81a
 B 2d92576212e60146e57c1050fa9a63342fe05bee
@@ -502,6 +509,7 @@ B 338c66a5a3ec9fa76cbcf707eaadeff7117cc9b2
 B 33fd35ee5b841e0eb80bfa9cb029a1be5f5a2213
 B 341507ae77002786170a0d135dce3d257cf814c7
 B 341b0f3bb1b7393ec2264fed5aebc10513697182
+B 34359c952209dd5b66ede5255f83bcdd729b53de
 B 3456770325b97a5754aa655c1de99e33744e694d
 B 345ccc2198303421a9e1428bd96632e4b8a2ff23
 B 34740261e05c177014826d822646d5e76428985b
@@ -528,6 +536,7 @@ B 374c8ad502993e87763fe6dcef0f132714431d76
 B 37a9b1f838670705504221aa0d7bac15957f0529
 B 37c01ad36716f51935588b5f3c9a670a1dfff6c7
 B 37c8e1a1078e13d578692905746932d1e6f5a693
+B 37d49fb307cc83c72d2c06b9711b0d523c921d5a
 B 37e834fa2460f5fd33fbf9588f21451c2d2c513a
 B 382d6f75aec9c5fd2ba69870bbc1c2916b4a6ceb
 B 3832db055cbc8b7341bdb6fe4ba8ef5efb6be105
@@ -864,6 +873,7 @@ B 5d5caa1825588a0b874903736c1d322aa44839d3
 B 5d6e1bc5d3fb83a6457acc933e2e0675eae4d856
 B 5daca2d2bc1e771468fcad6d22c6b0db843e24cb
 B 5db6a0382e3706afd9fa69277efc9f2fabbf1c44
+B 5dbd6cb3500d767129bd1cfdd2b84e6866ba195d
 B 5dc29c16f921f7dedf604bc082cf9069c11f120c
 B 5dcb1f334dacda20a5c0d04f131e7a1007c74a40
 B 5e673228d95f317c2d9f394011a0b6af6d481d0d
@@ -920,6 +930,7 @@ B 62ab4a9354e97f96ffc5f6446a32382a8c8acb8a
 B 6304eb5a5a35e613d6d7a496267931ac1f4dbe47
 B 6336e4a60ed6cfe5a2ab3aea78c6556a359d7c3c
 B 6339b4e9fa011680be2c22385e928b63493b838e
+B 6346b963ef9c6060e08076d958920d19f19d6708
 B 634ca89799c838b1c2eb1927b55789251c7c5bff
 B 6351c76dc86a2b2ddb4c6b8916e726ac8e084c6d
 B 636c6ec7d183c765a48265ec4c54548b5570d792
@@ -970,6 +981,7 @@ B 67a469588ef287aa9c423b271552befaf5a3a243
 B 67c

[1/3] cxf git commit: Don't create the special factory for abstract classes. Also, log that it's doing that as the user could avoid it via a default constructor.

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes d4f745333 -> 54f638684


Don't create the special factory for abstract classes.  Also, log that it's 
doing that as the user could avoid it via a default constructor.


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

Branch: refs/heads/2.7.x-fixes
Commit: 381a24e243dd903ea7d4ae25419d52464cea1112
Parents: d4f7453
Author: Daniel Kulp 
Authored: Tue Jun 2 15:33:26 2015 -0400
Committer: Daniel Kulp 
Committed: Mon Oct 12 15:30:25 2015 -0400

--
 .../java/org/apache/cxf/jaxb/JAXBContextInitializer.java| 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/381a24e2/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
--
diff --git 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
index fd9173a..17d6763 100644
--- 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
+++ 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
@@ -34,6 +34,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.logging.Logger;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -47,6 +48,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 
 import org.apache.cxf.common.classloader.JAXBClassLoaderUtils;
 import org.apache.cxf.common.jaxb.JAXBUtils;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.ASMHelper;
 import org.apache.cxf.common.util.ASMHelper.ClassWriter;
 import org.apache.cxf.common.util.ASMHelper.MethodVisitor;
@@ -64,7 +66,7 @@ import org.apache.cxf.service.model.UnwrappedOperationInfo;
  * Walks the service model and sets up the classes for the context.
  */
 class JAXBContextInitializer extends ServiceModelVisitor {
-
+private static final Logger LOG = 
LogUtils.getL7dLogger(JAXBContextInitializer.class);
 private Set> classes;
 private Collection typeReferences;
 private Set> globalAdapters = new HashSet>();
@@ -303,7 +305,10 @@ class JAXBContextInitializer extends ServiceModelVisitor {
 return;
 } else {
 Class cls = JAXBUtils.getValidClass(claz);
-if (cls == null && 
ReflectionUtil.getDeclaredConstructors(claz).length > 0) {
+if (cls == null 
+&& ReflectionUtil.getDeclaredConstructors(claz).length > 0 
+&& !Modifier.isAbstract(claz.getModifiers())) {
+LOG.info("Class " + claz.getName() + " does not have a default 
constructor which JAXB requires.");
 //there is no init(), but other constructors
 Object factory = createFactory(claz, 
ReflectionUtil.getDeclaredConstructors(claz)[0]);
 unmarshallerProperties.put("com.sun.xml.bind.ObjectFactory", 
factory);

[2/3] cxf git commit: [CXF-6632] Fix problem of WSDL's loaded from WSDLManager possibly holding onto themselves strongly and thus resulting in a memory leak.

[dkulp]

[CXF-6632] Fix problem of WSDL's loaded from WSDLManager possibly holding onto 
themselves strongly and thus resulting in a memory leak.


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

Branch: refs/heads/2.7.x-fixes
Commit: 81e728ae0dbcb34557f4fe013c351573bdf020ff
Parents: 381a24e
Author: Daniel Kulp 
Authored: Mon Oct 12 15:05:36 2015 -0400
Committer: Daniel Kulp 
Committed: Mon Oct 12 15:32:45 2015 -0400

--
 .../src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java  | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/81e728ae/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
--
diff --git a/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java 
b/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
index e294429..4a8d506 100644
--- a/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
+++ b/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
@@ -234,6 +234,13 @@ public class WSDLManagerImpl implements WSDLManager {
 reader.setFeature("javax.wsdl.verbose", false);
 reader.setFeature("javax.wsdl.importDocuments", true);
 reader.setExtensionRegistry(registry);
+
+//we'll create a new String here to make sure the passed in key is not 
referenced in the loading of
+//the wsdl and thus would be held onto from the cached map from both 
the weak reference (key) and 
+//from the strong reference (Definition).  For example, the Definition 
sometimes keeps the original
+//string as the documentBaseLocation which would result in it being 
held onto strongly 
+//from the definition.  With this, the String the definition holds 
onto would be unique 
+url = new String(url);
 CatalogWSDLLocator catLocator = new CatalogWSDLLocator(url, bus);
 ResourceManagerWSDLLocator wsdlLocator = new 
ResourceManagerWSDLLocator(url,

 catLocator,

[3/3] cxf git commit: Recording .gitmergeinfo Changes

[dkulp]

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

Branch: refs/heads/3.0.x-fixes
Commit: 75cae0f76c17915f4797894a51095e1450e334ba
Parents: 2fe6d50
Author: Daniel Kulp 
Authored: Mon Oct 12 15:29:01 2015 -0400
Committer: Daniel Kulp 
Committed: Mon Oct 12 15:29:01 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/75cae0f7/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index cb668cb..ed00020 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -86,6 +86,7 @@ B 2fe88ec153b6193a8c80f7c1226db19600e0839a
 B 3019c331c0f069ed63611b5263df3ee4d427e4a7
 B 3051c2a54adc909be8d63c690b1444eb2f9e5e35
 B 30853113b4c4d47200bcf5305e5e88735f32cc8f
+B 315e357e850407e9f3233259bab33ea765633271
 B 321b2f8b66bf6b9d1fa68aba086c8cddf18070e3
 B 33083c0682d2bdf2f42df7f4021d18bd7ccc34a4
 B 3309231e467225b18b24d90d77153a0c572a17e0
@@ -190,12 +191,14 @@ B 665eb259fced741f65de061bb026c3ab65a8d99c
 B 66cc4a4e3c0e92d9e6931a5d416f11c2f07f268c
 B 67432aef1adb8e330c054431de9d0955e3993472
 B 67755ea99b1baf4c567196ac6f1e00d342d38132
+B 677d43af382f491af4c3ef8205e5570fb9f87734
 B 68a567632a063c6f9bb27a73c151d21f6e855f50
 B 69176e3dd7c69901d03f6d93bb365df784f06525
 B 698227f4a2a9341e2d4de2de6a7d827f1958fd90
 B 698cd0483b99f9638ce05557e1137ffce86d4185
 B 6994a35eaf0a71dc392dcb094a6f418ef37a12f4
 B 6a77cd049fc39bfd27dfe364fc7c1970e58cc455
+B 6a9b6a5ebae8a1810374457eca74d09005a920cc
 B 6bdc9257b691e140f435a567e0b4f566c71be6cf
 B 6c58f0c8861c9e9a922d337da4ea8282c75255c1
 B 6c9fb62220345bce0b19561d95b38d5507f75e71
@@ -238,6 +241,7 @@ B 7e82d2f10a1ca14a939d2c63ca4e620f8870e256
 B 7e8d0b4b1cd868272380ca5779e67a15e46cf799
 B 7e95279dd1170f5878687d7eea27f7d7f03a434b
 B 7f7cc3c390b95f9d7589eb192538551416c313db
+B 7faee992154aadf83dde26942f424db4c764b5fd
 B 7fb966c9150652273c69852af79d90c3ed7b030e
 B 7fbbd1d13bbb7ccbbc1213ed86a456794583fd3e
 B 80014cf0e6fb1ba62ffdb3766acffd2130eef9d6
@@ -356,6 +360,7 @@ B bdd359af4de505f7bbe50bf9990da5788e12fd71
 B be4e40a46784d81c559b073b487255cf87334a77
 B bea22d764138e365513856c23be760a7719530a0
 B beb4af748ff260ccbe2ac29a0a251ebcbe77ab8c
+B bec40a5178e4ce6a434830589d5e44f62961cabb
 B bee2c0d849c4cffd396eaafbe710ddfb499c7a18
 B bef3d8408feb07365e17ca6960db7b4b2f1436ec
 B bf3d1faa9ea33419f0e1bac90cecc7bba112dd5c
@@ -384,6 +389,7 @@ B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c
 B d1c7f1f6be4ce14bd0e99ec9672d9c1957515f35
 B d391d9371d8505c7774308c4fbbb9bc57ffd34a6
 B d3e9295d3acfe3c970a325bbbafdba83a0d6e83c
+B d3fc22efa8153a1edc1880c05ede6d44208fa03a
 B d4de0ced8b53599229a7a3e43ad3bb5cf70b401b
 B d4f9674baa811936429271cbf64c4a558282c764
 B d50ffd09c30e606524fb6ed92119d85ccfa13491

[2/3] cxf git commit: [CXF-6632] Fix problem of WSDL's loaded from WSDLManager possibly holding onto themselves strongly and thus resulting in a memory leak.

[dkulp]

[CXF-6632] Fix problem of WSDL's loaded from WSDLManager possibly holding onto 
themselves strongly and thus resulting in a memory leak.


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

Branch: refs/heads/3.0.x-fixes
Commit: 2fe6d503780983ae7eec9b66bd1d7eda5041cdbd
Parents: e061ffa
Author: Daniel Kulp 
Authored: Mon Oct 12 15:05:36 2015 -0400
Committer: Daniel Kulp 
Committed: Mon Oct 12 15:29:01 2015 -0400

--
 .../src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java  | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2fe6d503/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
--
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
index f04fb05..75e3ff7 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
@@ -195,6 +195,13 @@ public class WSDLManagerImpl implements WSDLManager {
 reader.setFeature("javax.wsdl.verbose", false);
 reader.setFeature("javax.wsdl.importDocuments", true);
 reader.setExtensionRegistry(registry);
+
+//we'll create a new String here to make sure the passed in key is not 
referenced in the loading of
+//the wsdl and thus would be held onto from the cached map from both 
the weak reference (key) and 
+//from the strong reference (Definition).  For example, the Definition 
sometimes keeps the original
+//string as the documentBaseLocation which would result in it being 
held onto strongly 
+//from the definition.  With this, the String the definition holds 
onto would be unique 
+url = new String(url);
 CatalogWSDLLocator catLocator = new CatalogWSDLLocator(url, bus);
 ResourceManagerWSDLLocator wsdlLocator = new 
ResourceManagerWSDLLocator(url,

 catLocator,

[1/3] cxf git commit: Make sure stream is closed (and file unlocked) if exception is thrown

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes d117a9502 -> 75cae0f76


Make sure stream is closed (and file unlocked) if exception is thrown


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

Branch: refs/heads/3.0.x-fixes
Commit: e061ffaba9b0642536642de146e1071cfb088e47
Parents: d117a95
Author: Daniel Kulp 
Authored: Fri Oct 9 10:50:32 2015 -0400
Committer: Daniel Kulp 
Committed: Mon Oct 12 15:28:50 2015 -0400

--
 core/src/main/java/org/apache/cxf/io/CachedWriter.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e061ffab/core/src/main/java/org/apache/cxf/io/CachedWriter.java
--
diff --git a/core/src/main/java/org/apache/cxf/io/CachedWriter.java 
b/core/src/main/java/org/apache/cxf/io/CachedWriter.java
index 3444c05..25e35b7 100644
--- a/core/src/main/java/org/apache/cxf/io/CachedWriter.java
+++ b/core/src/main/java/org/apache/cxf/io/CachedWriter.java
@@ -628,6 +628,7 @@ public class CachedWriter extends Writer {
 ciphers = new CipherPair(cipherTransformation);
 }
 } catch (GeneralSecurityException e) {
+out.close();
 throw new IOException(e.getMessage(), e);
 }
 out = new CipherOutputStream(out, ciphers.getEncryptor()) {

cxf git commit: [CXF-6632] Fix problem of WSDL's loaded from WSDLManager possibly holding onto themselves strongly and thus resulting in a memory leak.

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master 315e357e8 -> 88fb9ee70


[CXF-6632] Fix problem of WSDL's loaded from WSDLManager possibly holding onto 
themselves strongly and thus resulting in a memory leak.


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

Branch: refs/heads/master
Commit: 88fb9ee704cea1a3004947d8ce50c6c4882af399
Parents: 315e357
Author: Daniel Kulp 
Authored: Mon Oct 12 15:05:36 2015 -0400
Committer: Daniel Kulp 
Committed: Mon Oct 12 15:05:36 2015 -0400

--
 .../src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java  | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/88fb9ee7/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
--
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
index f04fb05..75e3ff7 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
@@ -195,6 +195,13 @@ public class WSDLManagerImpl implements WSDLManager {
 reader.setFeature("javax.wsdl.verbose", false);
 reader.setFeature("javax.wsdl.importDocuments", true);
 reader.setExtensionRegistry(registry);
+
+//we'll create a new String here to make sure the passed in key is not 
referenced in the loading of
+//the wsdl and thus would be held onto from the cached map from both 
the weak reference (key) and 
+//from the strong reference (Definition).  For example, the Definition 
sometimes keeps the original
+//string as the documentBaseLocation which would result in it being 
held onto strongly 
+//from the definition.  With this, the String the definition holds 
onto would be unique 
+url = new String(url);
 CatalogWSDLLocator catLocator = new CatalogWSDLLocator(url, bus);
 ResourceManagerWSDLLocator wsdlLocator = new 
ResourceManagerWSDLLocator(url,

 catLocator,

cxf git commit: Rest of eclipse errors

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master d3fc22efa -> 315e357e8


Rest of eclipse errors


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

Branch: refs/heads/master
Commit: 315e357e850407e9f3233259bab33ea765633271
Parents: d3fc22e
Author: Daniel Kulp 
Authored: Mon Oct 12 14:35:02 2015 -0400
Committer: Daniel Kulp 
Committed: Mon Oct 12 14:35:02 2015 -0400

--
 .../interceptor/Soap11FaultOutInterceptor.java  |  2 +-
 .../interceptor/Soap12FaultOutInterceptor.java  |  2 +-
 .../soap/MustUnderstandInterceptorTest.java |  2 +-
 .../org/apache/cxf/jaxb/JAXBDataBinding.java|  2 +-
 .../apache/cxf/jaxrs/impl/LinkBuilderImpl.java  |  2 +-
 .../cxf/jaxrs/impl/PropertyHolderFactory.java   |  2 +-
 .../apache/cxf/jaxrs/impl/UriBuilderImpl.java   |  2 +-
 .../org/apache/cxf/jaxrs/model/URITemplate.java |  2 +-
 .../cxf/jaxrs/provider/MultipartProvider.java   | 12 ++--
 .../cxf/jaxrs/provider/ProviderFactory.java |  2 +-
 .../jaxrs/provider/ServerProviderFactory.java   |  4 ++--
 .../provider/StreamingResponseProvider.java | 10 +-
 .../cxf/jaxrs/provider/XSLTJaxbProvider.java|  2 +-
 .../cxf/jaxrs/provider/SourceProviderTest.java  |  2 +-
 .../java/org/apache/cxf/jaxws/EndpointImpl.java |  4 ++--
 .../apache/cxf/jaxws/JaxwsResponseCallback.java |  2 +-
 .../logical/LogicalHandlerOutInterceptor.java   |  2 +-
 .../interceptors/MessageModeInInterceptor.java  |  2 +-
 .../HttpServletResponseAdapter.java |  2 +-
 .../client/ui/browser/SelectableTable.java  |  2 +-
 .../ResponseTimeMessageInvokerInterceptor.java  |  2 +-
 .../jaxrs/client/ThreadLocalClientState.java|  2 +-
 .../cxf/jaxrs/model/wadl/WadlGenerator.java | 13 ++---
 .../cxf/jaxrs/swagger/SwaggerFeature.java   |  2 +-
 .../jaxrs/provider/json/utils/JSONUtils.java|  2 +-
 .../jaxrs/provider/json/JSONProviderTest.java   |  2 +-
 .../jaxrs/ext/search/QueryContextProvider.java  |  2 +-
 .../cxf/jaxrs/ext/search/fiql/FiqlParser.java   |  2 +-
 .../SearchContextImplCustomParserTest.java  |  2 +-
 .../ext/search/SimpleSearchConditionTest.java   |  4 ++--
 .../oauth2/grants/TokenGrantHandlerTest.java|  6 +++---
 .../rs/security/xml/XmlSecInInterceptor.java|  2 +-
 .../rs/security/xml/XmlSecOutInterceptor.java   |  2 +-
 .../http/URLConnectionHTTPConduit.java  |  6 +++---
 .../transport/http/osgi/ServletExporter.java|  2 +-
 .../https/SSLSocketFactoryWrapper.java  |  2 +-
 .../cxf/transport/local/LocalDestination.java   |  2 +-
 .../transport/udp/IoSessionOutputStream.java|  2 +-
 .../cxf/transport/udp/UDPDestination.java   |  4 ++--
 .../cxf/transport/websocket/WebSocketUtils.java |  2 +-
 .../ws/addressing/impl/MAPAggregatorTest.java   |  2 +-
 .../org/apache/cxf/ws/mex/MEXInInterceptor.java |  2 +-
 .../cxf/ws/rm/RMCaptureOutInterceptor.java  |  4 ++--
 .../apache/cxf/ws/rm/ManagedRMManagerTest.java  |  2 +-
 .../cxf/ws/rm/RMManagerConfigurationTest.java   |  2 +-
 .../SecureConversationInInterceptor.java|  4 ++--
 .../SecureConversationOutInterceptor.java   |  2 +-
 .../SpnegoContextTokenInInterceptor.java|  2 +-
 .../SpnegoContextTokenOutInterceptor.java   |  2 +-
 .../security/tokenstore/MemoryTokenStore.java   |  2 +-
 .../security/trust/STSStaxTokenValidator.java   |  2 +-
 .../ws/security/trust/STSTokenValidator.java|  2 +-
 .../ws/security/wss4j/WSS4JOutInterceptor.java  |  2 +-
 .../security/wss4j/WSS4JStaxOutInterceptor.java |  2 +-
 .../factory/XercesXsdValidationImpl.java|  2 +-
 .../java/org/apache/cxf/wsdl11/NSManager.java   |  2 +-
 .../internal/WSDiscoveryServiceImpl.java|  2 +-
 .../org/apache/cxf/systest/jaxrs/OrderBean.java |  2 +-
 .../JAXRSClientConduitWebSocketTest.java|  2 +-
 .../jaxrs/websocket/WebSocketTestClient.java|  4 ++--
 .../systest/dispatch/TestDispatchFeature.java   |  4 ++--
 .../cxf/systest/http_jetty/ThreadPoolTest.java  |  2 +-
 .../ws/rm/MessageCallbackOnewayTest.java|  2 +-
 .../cxf/systest/ws/rm/MessageLossSimulator.java |  2 +-
 .../ws/rm/RobustServiceWithFaultTest.java   |  2 +-
 .../apache/cxf/systest/ws/rm/SequenceTest.java  |  4 ++--
 .../apache/cxf/systest/ws/wssc/WSSCTest.java|  4 ++--
 .../systest/ws/wssec10/WSSecurity10Test.java|  2 +-
 .../systest/ws/wssec11/WSSecurity111Test.java   |  2 +-
 .../systest/ws/wssec11/WSSecurity112Test.java   |  2 +-
 .../ws/addr_fromjava/WSAFromJavaTest.java   |  2 +-
 .../cxf/testutil/common/ServerLauncher.java |  2 +-
 .../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 20 ++--
 .../jaxws/customization/JAXWSBindingParser.java |  2 +-
 74 files changed, 111 insertions(+), 112 deletions(-)

cxf git commit: Under 100 errors

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master 677d43af3 -> d3fc22efa


Under 100 errors


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

Branch: refs/heads/master
Commit: d3fc22efa8153a1edc1880c05ede6d44208fa03a
Parents: 677d43a
Author: Daniel Kulp 
Authored: Mon Oct 12 13:05:19 2015 -0400
Committer: Daniel Kulp 
Committed: Mon Oct 12 13:05:19 2015 -0400

--
 .../binding/coloc/ColocMessageObserverTest.java |  2 +-
 .../CorbaObjectReferenceEventProducer.java  |  4 ++--
 .../apache/cxf/jaxb/JAXBSchemaInitializer.java  | 10 
 .../cxf/xmlbeans/XmlBeansSchemaInitializer.java |  8 +++
 .../apache/cxf/ext/logging/osgi/Activator.java  |  2 +-
 .../org/apache/cxf/jaxrs/ext/xml/XMLSource.java |  2 +-
 .../apache/cxf/jaxrs/ext/xml/XSLTTransform.java |  2 +-
 .../jaxrs/servlet/CXFNonSpringJaxrsServlet.java |  2 +-
 .../jaxrs/provider/JAXBElementProviderTest.java |  2 +-
 .../cxf/jaxws/AbstractJAXWSMethodInvoker.java   |  2 +-
 .../apache/cxf/jaxws/JaxwsClientCallback.java   |  2 +-
 .../cxf/jaxws/context/WrappedAttachments.java   |  4 ++--
 .../LogicalHandlerFaultOutInterceptor.java  |  2 +-
 .../HttpServletRequestAdapter.java  |  2 +-
 .../cxf/jaxws/ConfiguredEndpointTest.java   |  2 +-
 .../cxf/jaxws/dispatch/DispatchOpTest.java  |  2 +-
 .../cxf/frontend/spring/ClientServerTest.java   |  2 +-
 .../browser/client/service/browser/Entry.java   |  2 +-
 .../web/logging/atom/AtomPullServer.java|  2 +-
 .../cxf/jaxrs/model/doc/JavaDocProvider.java|  4 ++--
 .../cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 14 ++--
 .../jaxrs/provider/json/utils/JSONUtils.java|  4 ++--
 .../jaxrs/provider/json/JSONProviderTest.java   |  2 +-
 .../cxf/jaxrs/ext/search/fiql/FiqlParser.java   |  4 ++--
 .../cors/CrossOriginResourceSharingFilter.java  |  2 +-
 .../netty/server/NettyHttpDestinationTest.java  | 18 +++
 .../osgi/ConfigAdminHttpConduitConfigurer.java  |  2 +-
 .../transport/servlet/AbstractHTTPServlet.java  |  6 ++---
 .../transport/servlet/CXFNonSpringServlet.java  |  2 +-
 .../cxf/transport/jms/MessageStreamUtil.java|  2 +-
 .../cxf/transport/jms/uri/JMSURIParser.java |  2 +-
 .../websocket/ahc/AhcWebSocketConduit.java  |  4 ++--
 .../atmosphere/DefaultProtocolInterceptor.java  |  2 +-
 .../jetty9/Jetty9WebSocketDestination.java  |  2 +-
 ...mosphereWebSocketServletDestinationTest.java |  4 ++--
 .../EventSinkInterfaceNotificationTask.java |  2 +-
 .../IgnorablePolicyInterceptorProvider.java |  2 +-
 .../HttpsTokenInterceptorProvider.java  |  4 ++--
 .../IssuedTokenInterceptorProvider.java |  4 ++--
 .../security/tokenstore/EHCacheTokenStore.java  |  2 +-
 .../ws/security/trust/AbstractSTSClient.java|  2 +-
 .../AuthPolicyValidatingInterceptorTest.java|  2 +-
 .../cxf/wsdl/service/factory/ClassReader.java   |  2 +-
 .../cxf/wsdl/service/factory/ParamReader.java   |  2 +-
 .../cxf/systest/aegis/AegisJaxWsWsdlNs.java |  2 +-
 .../systest/jaxrs/BookContinuationStore.java|  2 +-
 .../apache/cxf/systest/jaxrs/BookServer.java|  2 +-
 .../org/apache/cxf/systest/jaxrs/BookStore.java | 12 +-
 .../jaxrs/JAXRSMultithreadedClientTest.java | 24 ++--
 .../JAXRSClientServerWebSocketTest.java |  2 +-
 .../jaxws/DocLitBareCodeFirstService.java   |  2 +-
 .../jaxws/DocLitWrappedCodeFirstService.java|  8 +++
 .../kerberos/jaxrs/kerberos/BookStore.java  |  3 +--
 .../jaxrs/security/xml/JAXRSXmlSecTest.java |  2 +-
 .../systest/jms/shared/JMSSharedQueueTest.java  |  2 +-
 .../https/ciphersuites/CipherSuitesTest.java|  3 +--
 .../java/org/apache/cxf/test/XPathAssert.java   |  2 +-
 .../corba/processors/idl/ArrayVisitor.java  |  6 ++---
 58 files changed, 111 insertions(+), 113 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d3fc22ef/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
--
diff --git 
a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
 
b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
index 68bd388..7cbc32d 100644
--- 
a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
+++ 
b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
@@ -138,7 +138,7 @@ public class ColocMessageObserverTest extends Assert {
 }
 
 class TestColocMessageObserver extends ColocMessageObserver {
-public TestColocMessageO

[4/4] cxf git commit: Start working on fixing the 400+ errors the latest eclipse upgrades flags

[dkulp]

Start working on fixing the 400+ errors the latest eclipse upgrades flags


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

Branch: refs/heads/master
Commit: 7faee992154aadf83dde26942f424db4c764b5fd
Parents: 7d06130
Author: Daniel Kulp 
Authored: Mon Oct 12 12:18:55 2015 -0400
Committer: Daniel Kulp 
Committed: Mon Oct 12 12:56:38 2015 -0400

--
 core/src/main/java/org/apache/cxf/Bus.java  |  2 +-
 .../java/org/apache/cxf/annotations/FactoryType.java|  2 +-
 .../main/java/org/apache/cxf/annotations/Policy.java|  2 +-
 .../org/apache/cxf/annotations/SchemaValidation.java|  2 +-
 .../org/apache/cxf/annotations/WSDLDocumentation.java   |  2 +-
 .../java/org/apache/cxf/attachment/AttachmentUtil.java  |  2 +-
 .../org/apache/cxf/bus/blueprint/ConfigurerImpl.java|  2 +-
 .../apache/cxf/bus/managers/WorkQueueManagerImpl.java   |  8 
 .../java/org/apache/cxf/common/logging/Log4jLogger.java |  2 +-
 .../main/java/org/apache/cxf/common/util/ASMHelper.java |  4 ++--
 .../cxf/common/util/ReflectionInvokationHandler.java|  2 +-
 .../java/org/apache/cxf/common/util/SortedArraySet.java |  2 +-
 .../java/org/apache/cxf/common/util/StringUtils.java|  2 +-
 .../apache/cxf/configuration/spring/ConfigurerImpl.java |  2 +-
 .../apache/cxf/databinding/stax/StaxDataBinding.java|  2 +-
 .../apache/cxf/endpoint/AbstractConduitSelector.java|  2 +-
 .../cxf/helpers/LoadingByteArrayOutputStream.java   |  2 +-
 .../apache/cxf/interceptor/LoggingOutInterceptor.java   |  4 ++--
 core/src/main/java/org/apache/cxf/io/CachedWriter.java  |  2 +-
 .../org/apache/cxf/phase/PhaseInterceptorChain.java |  2 +-
 .../java/org/apache/cxf/service/model/MessageInfo.java  |  2 +-
 .../staxutils/transform/DelegatingNamespaceContext.java |  2 +-
 .../apache/cxf/staxutils/transform/ElementProperty.java |  2 +-
 .../apache/cxf/staxutils/transform/ParsingEvent.java|  2 +-
 .../org/apache/cxf/staxutils/transform/QNamesMap.java   |  2 +-
 .../cxf/staxutils/validation/Stax2ValidationUtils.java  |  2 +-
 .../cxf/staxutils/validation/W3CMultiSchemaFactory.java |  2 +-
 .../cxf/transport/common/gzip/GZIPOutInterceptor.java   |  4 ++--
 .../apache/cxf/ws/addressing/WSAddressingFeature.java   |  2 +-
 .../cxf/attachment/AttachmentDeserializerTest.java  |  2 +-
 .../org/apache/cxf/bus/extension/ExtensionTest.java |  2 +-
 .../org/apache/cxf/bus/spring/SpringBusFactoryTest.java |  6 +++---
 .../cxf/common/injection/ResourceInjectorTest.java  |  2 +-
 .../cxf/configuration/spring/ConfigurerImplTest.java|  4 ++--
 .../cxf/databinding/source/XMLStreamDataReaderTest.java |  2 +-
 .../security/RolePrefixSecurityContextImplTest.java |  2 +-
 .../java/org/apache/cxf/io/CachedStreamTestBase.java|  2 +-
 .../apache/cxf/service/model/MessagePartInfoTest.java   |  8 
 .../java/org/apache/cxf/staxutils/StaxUtilsTest.java|  2 +-
 .../cxf/transport/ChainInitiationObserverTest.java  |  2 +-
 .../org/apache/cxf/jca/core/classloader/Handler.java|  2 +-
 .../org/apache/cxf/jca/cxf/ManagedConnectionImpl.java   |  2 +-
 .../cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java  |  2 +-
 .../cxf/jca/cxf/handlers/InvokingInvocationHandler.java |  2 +-
 .../java/org/apache/cxf/jca/servant/EJBInvoker.java |  3 +--
 .../ManagedConnectionFactoryImplTest.java   |  4 ++--
 .../java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java  |  2 +-
 .../cxf/binding/corba/types/CorbaAnyEventProducer.java  |  2 +-
 .../corba/types/CorbaObjectReferenceEventProducer.java  |  6 +++---
 .../java/org/apache/cxf/binding/soap/SoapMessage.java   |  2 +-
 .../apache/cxf/binding/soap/blueprint/Activator.java|  2 +-
 .../soap/interceptor/MustUnderstandInterceptor.java |  2 +-
 .../soap/interceptor/ReadHeadersInterceptor.java|  2 +-
 .../apache/cxf/aegis/type/encoded/SoapArrayType.java|  2 +-
 .../cxf/aegis/type/array/DuplicateArrayService.java |  2 +-
 .../org/apache/cxf/jaxb/JAXBContextInitializer.java |  2 +-
 .../java/org/apache/cxf/jaxb/io/DataWriterImpl.java |  2 +-
 .../main/java/org/apache/cxf/sdo/SDOClassCollector.java |  2 +-
 .../org/apache/cxf/clustering/blueprint/Activator.java  |  2 +-
 .../cxf/ext/logging/AbstractLoggingInterceptor.java |  2 +-
 .../apache/cxf/ext/logging/LoggingOutInterceptor.java   |  2 +-
 .../java/org/apache/cxf/jaxrs/blueprint/Activator.java  |  2 +-
 .../java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java |  2 +-
 .../apache/cxf/jaxrs/provider/AbstractJAXBProvider.java |  2 +-
 .../jaxrs/provider/RequestDispatcherProviderTest.java   |  2 +-
 .../org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java  |  2 +-
 .../java/org/apache/cxf/jaxws/blueprint/Activator.java  | 

[1/4] cxf git commit: More eclipse errors

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master 7d06130d4 -> 677d43af3


More eclipse errors


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

Branch: refs/heads/master
Commit: 677d43af382f491af4c3ef8205e5570fb9f87734
Parents: 7faee99
Author: Daniel Kulp 
Authored: Mon Oct 12 12:56:27 2015 -0400
Committer: Daniel Kulp 
Committed: Mon Oct 12 12:56:38 2015 -0400

--
 .../cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java | 6 +++---
 .../cxf/rs/security/jose/jwe/AesCbcHmacJweEncryption.java  | 2 +-
 .../cxf/rs/security/oauth/filters/AbstractAuthFilter.java  | 2 +-
 .../org/apache/cxf/transport/http/asyncclient/Activator.java   | 2 +-
 .../apache/cxf/transport/http_jetty/JettyHTTPDestination.java  | 4 ++--
 .../cxf/transport/http_jetty/JettyHTTPDestinationTest.java | 4 ++--
 .../org/apache/cxf/transport/servlet/AbstractHTTPServlet.java  | 2 +-
 .../test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java | 2 +-
 .../transport/websocket/ahc/AhcWebSocketConduitRequest.java| 2 +-
 .../atmosphere/AtmosphereWebSocketJettyDestination.java| 2 +-
 .../transport/websocket/jetty/JettyWebSocketDestination.java   | 4 ++--
 .../cxf/transport/websocket/jetty/JettyWebSocketHandler.java   | 2 +-
 .../cxf/transport/websocket/jetty9/JettyWebSocketHandler.java  | 4 ++--
 .../websocket/jetty/JettyWebSocketDestinationTest.java | 6 +++---
 .../policy/interceptors/KerberosTokenInterceptorProvider.java  | 6 +++---
 .../security/wss4j/policyhandlers/AbstractBindingBuilder.java  | 2 +-
 .../wss4j/policyhandlers/AbstractStaxBindingHandler.java   | 2 +-
 .../java/org/apache/cxf/wsdl/service/factory/ParamReader.java  | 6 +++---
 .../cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java  | 2 +-
 .../apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java  | 4 ++--
 .../apache/cxf/systest/jaxrs/JAXRSCxfContinuationsTest.java| 2 +-
 .../org/apache/cxf/systest/jaxrs/JAXRSLocalTransportTest.java  | 4 ++--
 .../apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java | 4 ++--
 .../java/org/apache/cxf/systest/jms/JMSClientServerTest.java   | 2 +-
 .../org/apache/cxf/systest/jms/shared/JMSSharedQueueTest.java  | 4 ++--
 25 files changed, 41 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/677d43af/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java
--
diff --git 
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java
 
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java
index e7cfd61..e9e6b6c 100644
--- 
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java
+++ 
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectReaderWriter.java
@@ -265,7 +265,7 @@ public class JsonMapObjectReaderWriter {
 }
 private static class JsonObjectSettable implements Settable {
 private JsonMapObject obj;
-public JsonObjectSettable(JsonMapObject obj) {
+JsonObjectSettable(JsonMapObject obj) {
 this.obj = obj;
 }
 public void put(String key, Object value) {
@@ -277,7 +277,7 @@ public class JsonMapObjectReaderWriter {
 }
 private class StringBuilderOutput implements Output {
 private StringBuilder sb;
-public StringBuilderOutput(StringBuilder sb) {
+StringBuilderOutput(StringBuilder sb) {
 this.sb = sb;
 }
 @Override
@@ -289,7 +289,7 @@ public class JsonMapObjectReaderWriter {
 }
 private class StreamOutput implements Output {
 private OutputStream os;
-public StreamOutput(OutputStream os) {
+StreamOutput(OutputStream os) {
 this.os = os;
 }
 @Override

http://git-wip-us.apache.org/repos/asf/cxf/blob/677d43af/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesCbcHmacJweEncryption.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesCbcHmacJweEncryption.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesCbcHmacJweEncryption.java
index 80a8630..8f1e4bc 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesCbcHmacJweEncryption.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesCbcHmacJweEncryption.java
@@ -147,7 +147,7 @

[3/4] cxf git commit: Start working on fixing the 400+ errors the latest eclipse upgrades flags

[dkulp]

http://git-wip-us.apache.org/repos/asf/cxf/blob/7faee992/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
--
diff --git 
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
 
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
index 419dfbf..3a892e2 100644
--- 
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
+++ 
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
@@ -247,22 +247,22 @@ public class JaxWsServiceFactoryBeanTest extends 
AbstractJaxWsTest {
 
 
 assertValid("/wsdl:definitions/wsdl:message[@name='setMessage']" 
-+ "/wsdl:part[@name = 
'parameters'][@element='ns1:setMessage']" , wsdl);
++ "/wsdl:part[@name = 
'parameters'][@element='ns1:setMessage']", wsdl);
 
 assertValid("/wsdl:definitions/wsdl:message[@name='echoCharResponse']" 
-+ "/wsdl:part[@name = 'y'][@element='ns1:charEl_y']" , 
wsdl);
++ "/wsdl:part[@name = 'y'][@element='ns1:charEl_y']", 
wsdl);
 
 assertValid("/wsdl:definitions/wsdl:message[@name='echoCharResponse']" 
-+ "/wsdl:part[@name = 
'return'][@element='ns1:charEl_return']" , wsdl);
++ "/wsdl:part[@name = 
'return'][@element='ns1:charEl_return']", wsdl);
 
 assertValid("/wsdl:definitions/wsdl:message[@name='echoCharResponse']" 
-+ "/wsdl:part[@name = 'z'][@element='ns1:charEl_z']" , 
wsdl);
++ "/wsdl:part[@name = 'z'][@element='ns1:charEl_z']", 
wsdl);
 
 assertValid("/wsdl:definitions/wsdl:message[@name='echoChar']" 
-+ "/wsdl:part[@name = 'x'][@element='ns1:charEl_x']" , 
wsdl);
++ "/wsdl:part[@name = 'x'][@element='ns1:charEl_x']", 
wsdl);
 
 assertValid("/wsdl:definitions/wsdl:message[@name='echoChar']" 
-+ "/wsdl:part[@name = 'y'][@element='ns1:charEl_y']" , 
wsdl);
++ "/wsdl:part[@name = 'y'][@element='ns1:charEl_y']", 
wsdl);
 }
 
 @Test

http://git-wip-us.apache.org/repos/asf/cxf/blob/7faee992/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 
b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
index cb0b313..768d8d9 100644
--- 
a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
+++ 
b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
@@ -368,7 +368,7 @@ public class DynamicClientFactory {
 
 List srcFiles = FileUtils.getFilesRecurse(src, ".+\\.java$"); 
 if (srcFiles.size() > 0 && !compileJavaSrc(classPath.toString(), 
srcFiles, classes.toString())) {
-LOG.log(Level.SEVERE , new Message("COULD_NOT_COMPILE_SRC", LOG, 
wsdlUrl).toString());
+LOG.log(Level.SEVERE, new Message("COULD_NOT_COMPILE_SRC", LOG, 
wsdlUrl).toString());
 }
 FileUtils.removeDir(src);
 URL[] urls = null;
@@ -767,7 +767,7 @@ public class DynamicClientFactory {
 static class RelativeEntityResolver implements EntityResolver {
 private String baseURI;
 
-public RelativeEntityResolver(String baseURI) {
+RelativeEntityResolver(String baseURI) {
 super();
 this.baseURI = baseURI;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/7faee992/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index 2579cf8..822233e 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -418,8 +418,7 @@ public class WSDLGetUtils {
 }
 }
 
-public void updateWSDLPublishedEndpointAddress(Definition def, 
EndpointInfo endpointInfo)
-{
+public void updateWSDLPublishedEndpointAddress(Definition def, 
EndpointInfo endpointInfo) {
 synchronized (def) {
 //writing a def is not threadsafe.  Sync on it to make sure
 //we don't get any ConcurrentModificationExceptions

http://git-wip-us.apache.org/repos/asf/cxf/blob/7faee992/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/Activator.java
-

[2/4] cxf git commit: Start working on fixing the 400+ errors the latest eclipse upgrades flags

[dkulp]

http://git-wip-us.apache.org/repos/asf/cxf/blob/7faee992/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java
index 62bbc8e..37757c3 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java
@@ -114,6 +114,6 @@ public class STSClientTest extends 
AbstractBusClientServerTestBase {
 
 private static void doubleIt(DoubleItPortType port, int numToDouble) {
 int resp = port.doubleIt(numToDouble);
-assertEquals(numToDouble * 2 , resp);
+assertEquals(numToDouble * 2, resp);
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/7faee992/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
index a3fc528..f761de4 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
@@ -363,6 +363,6 @@ public class SymmetricBindingTest extends 
AbstractBusClientServerTestBase {
 
 private static void doubleIt(DoubleItPortType port, int numToDouble) {
 int resp = port.doubleIt(numToDouble);
-assertEquals(numToDouble * 2 , resp);
+assertEquals(numToDouble * 2, resp);
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/7faee992/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
index a9105de..bc84260 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
@@ -366,6 +366,6 @@ public class TemplateTest extends 
AbstractBusClientServerTestBase {
 
 private static void doubleIt(DoubleItPortType port, int numToDouble) {
 int resp = port.doubleIt(numToDouble);
-assertEquals(numToDouble * 2 , resp);
+assertEquals(numToDouble * 2, resp);
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/7faee992/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
index ea4ace1..735827a 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
@@ -456,6 +456,6 @@ public class TransportBindingTest extends 
AbstractBusClientServerTestBase {
 
 private static void doubleIt(DoubleItPortType port, int numToDouble) {
 int resp = port.doubleIt(numToDouble);
-assertEquals(numToDouble * 2 , resp);
+assertEquals(numToDouble * 2, resp);
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/7faee992/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java
index 1132d52..e6089ec 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java
@@ -206,6 +206,6 @@ public class X509SymmetricBindingTest extends 
AbstractBusClientServerTestBase {
 
 private static void doubleIt(DoubleItPortType 

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes f3bdf12be -> d4f745333


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

Branch: refs/heads/2.7.x-fixes
Commit: d4f74533375aac2664c32b4e045597622197e46f
Parents: f3bdf12
Author: Colm O hEigeartaigh 
Authored: Mon Oct 12 17:30:34 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 12 17:30:34 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/d4f74533/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 0ae9203..9725d4c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -164,6 +164,7 @@ B 11bccec4f48f65f36907cd04230b1b751a34d0e1
 B 11f1414fed14e737c033122086bc95bbfd24d286
 B 1224a400fbbcb08e47b86c8079477f3eddf7b49f
 B 124d5731716007c1d9098da54a3de7d920acf6ad
+B 12a73a9486961dce563f25b376626d9ae3453005
 B 12c2906a1958a1e669c6dd9ff8b7555719bee898
 B 12c910c524c8dd40149b087312763b3d2a4434b0
 B 12d19ffe7af4b18472aa571c5bb9531c8a68e9b0
@@ -240,6 +241,7 @@ B 18b5bd970c0d44d26fa215c5917f5ba7502dc9cf
 B 1900e1f4ace53bc112c16f36d846f25905daab4c
 B 190b89b8630ca5f630c6af377f83db39e2cb1273
 B 190f6e24de6404ae937a02a4530e17fea8434f42
+B 191fbf01488c1bff9603a1196f65aaa859ee3178
 B 19a66ba7cdadc06cad4bbb4b5b2d61d8b19e279b
 B 19ba5d083a1819af6695aeccdb44503d3dcb3c96
 B 19d2c8ce5304d9aab5c4d0e71a6b1fd6f4434cd3
@@ -316,6 +318,7 @@ B 202da725e8e3870d7c215db93f2558750f486910
 B 203a6cf561d22b99dd58a2c7f20b3662391667b8
 B 203b64d1769cb5ce25f68f4200618f6706f16239
 B 20657583f395bdc2a3c693a1c0655b6e19fafe28
+B 20723dbc198538345b9e7a7a35d19aca973810d4
 B 207d64cb377e47b535a7a2ffe04ffddabdc796e6
 B 20d61c8c0fafe96e372a97988eaf26f97ba8487e
 B 20e77dfc529387ed3557a02d87246a73d87f190c
@@ -1896,6 +1899,7 @@ B d0b86402feb49d1a0d1c8082127a280da727ba51
 B d0c54eacbda2b96eae6175acfd5265288b8722bf
 B d0f40121063a8924bc02fd31b84d99fd06513573
 B d114bd9d19861efb4c777410763bdf22104b83e3
+B d117a9502e2dfcce96cbb3e5d8aaad58ee2d4de8
 B d11b7d2524c225f9f4c1cb0f7e772c3956e66eda
 B d14382ca55d4b74cc581ebbd9aa6676545ff0dda
 B d19a85fb9a63c7db5f414e8d62324b2b36fca5ea
@@ -2070,6 +2074,7 @@ B e455d4f2723f67dbb51d1dfa7d709b2582d2c7fa
 B e45e550d1f9deb86e646038449fa8eefce9ae38f
 B e4659a5873859af350bc1f60181befa2f2937a07
 B e47151b425ea9dc305b6ffaa07b223b93dfcc0b5
+B e474a7b8516372883d3b8131c6022d6eefae6392
 B e4801064af6316d7632dccad4e4b7b121777488d
 B e491ca37c48638bce56812d6a101b53226d9ed87
 B e4c0c87081a03429afc9fb03cdeb995f3e5e9ee4
@@ -2247,6 +2252,7 @@ B f7326964676a63a89a62892f9994d95aae16a68d
 B f748f268e59874f741a667bbc3db6b5cf4b708c4
 B f761107ca5f9e2172fa159d31317df1a6fbd5df5
 B f7d259db9bb0b1a0a4d83fb9af65fbaef4d999d6
+B f7d923a5313f15a152802b1f01c1a2738add462a
 B f7da95111fb36494e8e81a671a9bb422f61b215a
 B f87cf431822b8fea158ee56efe1edd03803b455a
 B f8c17ef0a99195ea18c54c8718fa3f1d5e7cb41c

cxf git commit: Fixing build

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 191fbf014 -> d117a9502


Fixing build


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

Branch: refs/heads/3.0.x-fixes
Commit: d117a9502e2dfcce96cbb3e5d8aaad58ee2d4de8
Parents: 191fbf0
Author: Colm O hEigeartaigh 
Authored: Mon Oct 12 17:29:57 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 12 17:29:57 2015 +0100

--
 .../apache/cxf/rs/security/jose/jaxrs/JwtTokenSecurityContext.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d117a950/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtTokenSecurityContext.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtTokenSecurityContext.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtTokenSecurityContext.java
index f100228..427ad73 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtTokenSecurityContext.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtTokenSecurityContext.java
@@ -39,7 +39,7 @@ public class JwtTokenSecurityContext implements 
LoginSecurityContext {
 principal = new SimplePrincipal(jwt.getClaims().getSubject());
 this.token = jwt;
 if (roleClaim != null && jwt.getClaims().containsProperty(roleClaim)) {
-roles = new HashSet<>();
+roles = new HashSet();
 String role = jwt.getClaims().getStringProperty(roleClaim).trim();
 for (String r : role.split(",")) {
 roles.add(new SimpleGroup(r));

[3/4] cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

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

Branch: refs/heads/3.0.x-fixes
Commit: e474a7b8516372883d3b8131c6022d6eefae6392
Parents: 20723db
Author: Colm O hEigeartaigh 
Authored: Mon Oct 12 17:26:21 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 12 17:26:21 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/e474a7b8/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 10abaca..cb668cb 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -230,6 +230,7 @@ B 7a52636862d2d920a2a6d5c5f00821611b7faa37
 B 7b9f72bd7c3dc778da9bee85d54f36f99c0feb23
 B 7c8124a5696de6c20ff5837531aff937eedccf0f
 B 7cd4cf67ba5b8a0ddc36c8008bf096b469408f48
+B 7d06130d4801e9dc5a01ac830de9bfa5ad8aabc6
 B 7d1f30f76d95f9eddf0bed995120c71bf1a393b3
 B 7e318c4fbfae35680965082a491ca842a23ffd8c
 B 7e4eb471fd6b19d73b2e91748a736f6205fc393f
@@ -649,6 +650,7 @@ M cda58270486b4d394b98a1a1a1d5bfcb366af2c1
 M ce6444508e279e9941fdc23f80889f44a27b9d95
 M cf879076498614de7424fc4ec63e62324e0055a6
 M d25e4c94c518cb79af1e05a32fb8ded52a951324
+M d2d8f6d6e2773025e0dd1c51c6b5e5d2e721def8
 M d2dec5b87788b8cb5059d3719cf3dfd7135a1280
 M d4a35c40d53fde17fec3d08c25215c7533dcb667
 M d5315e072b8dd5222ede6f8e47c1e3e645209f59

[2/4] cxf git commit: Allow role processing from JWT tokens

[coheigea]

Allow role processing from JWT tokens

Conflicts:

rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java


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

Branch: refs/heads/3.0.x-fixes
Commit: 20723dbc198538345b9e7a7a35d19aca973810d4
Parents: f7d923a
Author: Colm O hEigeartaigh 
Authored: Mon Oct 12 14:44:27 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 12 17:26:19 2015 +0100

--
 .../jose/jaxrs/JwtAuthenticationFilter.java | 26 -
 .../jose/jaxrs/JwtTokenSecurityContext.java | 59 ++--
 2 files changed, 78 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/20723dbc/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
index 295879d..3c68633 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
@@ -45,7 +45,11 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 private static final String DEFAULT_AUTH_SCHEME = "JWT";
 private String expectedAuthScheme = DEFAULT_AUTH_SCHEME;
 private int clockOffset;
+<<< HEAD
 private int ttl;
+===
+private String roleClaim;
+>>> d2d8f6d... Allow role processing from JWT tokens
 
 @Override
 public void filter(ContainerRequestContext requestContext) throws 
IOException {
@@ -56,9 +60,19 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 }
 JwtToken token = super.getJwtToken(parts[1]);
 JoseUtils.setMessageContextProperty(token.getHeaders());
-JAXRSUtils.getCurrentMessage().put(SecurityContext.class, new 
JwtTokenSecurityContext(token));
+
+SecurityContext securityContext = configureSecurityContext(token);
+if (securityContext != null) {
+JAXRSUtils.getCurrentMessage().put(SecurityContext.class, 
securityContext);
+}
+
 }
 
+protected SecurityContext configureSecurityContext(JwtToken jwt) {
+return new JwtTokenSecurityContext(jwt, roleClaim);
+}
+
+
 public void setExpectedAuthScheme(String expectedAuthScheme) {
 this.expectedAuthScheme = expectedAuthScheme;
 }
@@ -83,6 +97,7 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 public void setClockOffset(int clockOffset) {
 this.clockOffset = clockOffset;
 }
+<<< HEAD
 
 public int getTtl() {
 return ttl;
@@ -90,5 +105,14 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 
 public void setTtl(int ttl) {
 this.ttl = ttl;
+===
+
+public String getRoleClaim() {
+return roleClaim;
+}
+
+public void setRoleClaim(String roleClaim) {
+this.roleClaim = roleClaim;
+>>> d2d8f6d... Allow role processing from JWT tokens
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/20723dbc/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtTokenSecurityContext.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtTokenSecurityContext.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtTokenSecurityContext.java
index 11a2c94..f100228 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtTokenSecurityContext.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtTokenSecurityContext.java
@@ -18,17 +18,64 @@
  */
 package org.apache.cxf.rs.security.jose.jaxrs;
 
-import org.apache.cxf.common.security.SimpleSecurityContext;
+import java.security.Principal;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.security.auth.Subject;
+
+import org.apache.cxf.common.security.SimpleGroup;
+import org.apache.cxf.common.security.SimplePrincipal;
 import org.apache.cxf.rs.security.jose.jwt.JwtToken;
+import org.apache.cxf.security.LoginSecurityContext;
 
-public class JwtTokenSecurityContext extends SimpleSecurityContext {
-private JwtToke

[1/4] cxf git commit: Use a Constants to refer to the JWT Token

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 1f7509eb5 -> 191fbf014


Use a Constants to refer to the JWT Token


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

Branch: refs/heads/3.0.x-fixes
Commit: f7d923a5313f15a152802b1f01c1a2738add462a
Parents: 1f7509e
Author: Colm O hEigeartaigh 
Authored: Mon Oct 12 12:06:12 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 12 17:26:14 2015 +0100

--
 .../cxf/rs/security/jose/jaxrs/JwtAuthenticationClientFilter.java | 3 ++-
 .../java/org/apache/cxf/rs/security/jose/jwt/JwtConstants.java| 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f7d923a5/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationClientFilter.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationClientFilter.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationClientFilter.java
index d2f7cc6..8f87119 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationClientFilter.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationClientFilter.java
@@ -35,6 +35,7 @@ import org.apache.cxf.rs.security.jose.JoseUtils;
 import org.apache.cxf.rs.security.jose.jwe.JweHeaders;
 import org.apache.cxf.rs.security.jose.jwt.AbstractJoseJwtProducer;
 import org.apache.cxf.rs.security.jose.jwt.JwtClaims;
+import org.apache.cxf.rs.security.jose.jwt.JwtConstants;
 import org.apache.cxf.rs.security.jose.jwt.JwtToken;
 import org.apache.cxf.rt.security.crypto.CryptoUtils;
 
@@ -68,7 +69,7 @@ public class JwtAuthenticationClientFilter extends 
AbstractJoseJwtProducer
   authScheme + " " + data);
 }
 protected JwtToken getJwtToken(ClientRequestContext requestContext) {
-return (JwtToken)requestContext.getProperty("jwt.token");
+return (JwtToken)requestContext.getProperty(JwtConstants.JWT_TOKEN);
 }
 protected String getContextPropertyValue() {
 return 
Base64UrlUtility.encode(CryptoUtils.generateSecureRandomBytes(16));

http://git-wip-us.apache.org/repos/asf/cxf/blob/f7d923a5/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtConstants.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtConstants.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtConstants.java
index 2f23e2c..bdbb544 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtConstants.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtConstants.java
@@ -29,6 +29,8 @@ public final class JwtConstants {
 public static final String CLAIM_ISSUED_AT = "iat";
 public static final String CLAIM_JWT_ID = "jti";
 
+public static final String JWT_TOKEN = "jwt.token";
+
 
 private JwtConstants() {
 

[4/4] cxf git commit: Fixing merge

[coheigea]

Fixing merge


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

Branch: refs/heads/3.0.x-fixes
Commit: 191fbf01488c1bff9603a1196f65aaa859ee3178
Parents: e474a7b
Author: Colm O hEigeartaigh 
Authored: Mon Oct 12 17:26:49 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 12 17:26:49 2015 +0100

--
 .../cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java   | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/191fbf01/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
index 3c68633..1cc56c46 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
@@ -45,11 +45,8 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 private static final String DEFAULT_AUTH_SCHEME = "JWT";
 private String expectedAuthScheme = DEFAULT_AUTH_SCHEME;
 private int clockOffset;
-<<< HEAD
 private int ttl;
-===
 private String roleClaim;
->>> d2d8f6d... Allow role processing from JWT tokens
 
 @Override
 public void filter(ContainerRequestContext requestContext) throws 
IOException {
@@ -97,7 +94,6 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 public void setClockOffset(int clockOffset) {
 this.clockOffset = clockOffset;
 }
-<<< HEAD
 
 public int getTtl() {
 return ttl;
@@ -105,7 +101,7 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 
 public void setTtl(int ttl) {
 this.ttl = ttl;
-===
+}
 
 public String getRoleClaim() {
 return roleClaim;
@@ -113,6 +109,5 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 
 public void setRoleClaim(String roleClaim) {
 this.roleClaim = roleClaim;
->>> d2d8f6d... Allow role processing from JWT tokens
 }
 }

cxf git commit: Adding new poms for rt modules

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 0ca573916 -> 7d06130d4


Adding new poms for rt modules


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

Branch: refs/heads/master
Commit: 7d06130d4801e9dc5a01ac830de9bfa5ad8aabc6
Parents: 0ca5739
Author: Colm O hEigeartaigh 
Authored: Mon Oct 12 17:09:45 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 12 17:09:45 2015 +0100

--
 rt/databinding/pom.xml | 39 +++
 rt/features/pom.xml| 38 ++
 rt/frontend/pom.xml| 38 ++
 rt/pom.xml | 45 ++---
 rt/rs/pom.xml  | 40 
 rt/rs/security/pom.xml | 40 
 rt/transports/pom.xml  | 43 +++
 rt/ws/pom.xml  | 40 
 8 files changed, 284 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7d06130d/rt/databinding/pom.xml
--
diff --git a/rt/databinding/pom.xml b/rt/databinding/pom.xml
new file mode 100644
index 000..98e7465
--- /dev/null
+++ b/rt/databinding/pom.xml
@@ -0,0 +1,39 @@
+
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+cxf-rt-databinding
+pom
+Apache CXF Databinding Runtime
+Apache CXF Databinding Runtime
+http://cxf.apache.org
+
+org.apache.cxf
+cxf-rt
+3.1.4-SNAPSHOT
+
+
+jaxb
+xmlbeans
+aegis
+sdo
+jibx
+
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/7d06130d/rt/features/pom.xml
--
diff --git a/rt/features/pom.xml b/rt/features/pom.xml
new file mode 100644
index 000..f071ea6
--- /dev/null
+++ b/rt/features/pom.xml
@@ -0,0 +1,38 @@
+
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+cxf-rt-features
+pom
+Apache CXF Features Runtime
+Apache CXF Features Runtime
+http://cxf.apache.org
+
+org.apache.cxf
+cxf-rt
+3.1.4-SNAPSHOT
+
+
+clustering
+logging
+metrics
+throttling
+
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/7d06130d/rt/frontend/pom.xml
--
diff --git a/rt/frontend/pom.xml b/rt/frontend/pom.xml
new file mode 100644
index 000..a532cdf
--- /dev/null
+++ b/rt/frontend/pom.xml
@@ -0,0 +1,38 @@
+
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+cxf-rt-frontend
+pom
+Apache CXF Frontend Runtime
+Apache CXF Frontend Runtime
+http://cxf.apache.org
+
+org.apache.cxf
+cxf-rt
+3.1.4-SNAPSHOT
+
+
+simple
+jaxws
+jaxrs
+js
+
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/7d06130d/rt/pom.xml
--
diff --git a/rt/pom.xml b/rt/pom.xml
index da2bfe9..3e481a9 100644
--- a/rt/pom.xml
+++ b/rt/pom.xml
@@ -31,46 +31,13 @@
 
 
 wsdl
-transports/local
-databinding/jaxb
-databinding/xmlbeans
-databinding/aegis
-databinding/sdo
-databinding/jibx
+transports
+databinding
 bindings
-features/clustering
-features/logging
-features/metrics
-features/throttling
-frontend/simple
-frontend/jaxws
-frontend/jaxrs
-frontend/js
-transports/http
-transports/http-jetty
-transports/http-hc
-transports/http-netty/netty-server
-transports/http-netty/netty-client
-transports/jms
-transports/udp
-transports/websocket
-ws/policy
-ws/addr
-ws/security
-ws/rm
-ws/mex
-ws/eventing
-rs/client
-rs/http-sci
-rs/description
-rs/extensions/providers
-rs/extensions/search
-rs/security/xml
-rs/se

cxf git commit: Fixing the master build

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 9f8ed96ae -> 1f7509eb5


Fixing the master build


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

Branch: refs/heads/3.0.x-fixes
Commit: 1f7509eb554a8d3fef35a69b38d89e92bab66577
Parents: 9f8ed96
Author: Sergey Beryozkin 
Authored: Mon Oct 12 15:27:52 2015 +0100
Committer: Sergey Beryozkin 
Committed: Mon Oct 12 15:29:53 2015 +0100

--
 .../oauth2/grants/jwt/AbstractJwtHandler.java   | 20 +---
 .../oauth2/tokens/jwt/JwtAccessTokenUtils.java  |  8 
 2 files changed, 13 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1f7509eb/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandler.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandler.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandler.java
index baafd5f..4f966c2 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandler.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandler.java
@@ -38,8 +38,8 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
 public abstract class AbstractJwtHandler extends AbstractGrantHandler {
 private Set supportedIssuers; 
 private JwsSignatureVerifier jwsVerifier;
-private int ttl = 300;
-private int futureTTL;
+private int ttl;
+private int clockOffset;
 
 protected AbstractJwtHandler(List grants) {
 super(grants);
@@ -59,15 +59,13 @@ public abstract class AbstractJwtHandler extends 
AbstractGrantHandler {
 
 // If we have no issued time then we need to have an expiry
 boolean expiredRequired = claims.getIssuedAt() == null;
-JwtUtils.validateJwtExpiry(claims, expiredRequired);
+JwtUtils.validateJwtExpiry(claims, clockOffset, expiredRequired);
 
-JwtUtils.validateJwtNotBefore(claims, futureTTL, false);
+JwtUtils.validateJwtNotBefore(claims, clockOffset, false);
 
 // If we have no expiry then we must have an issued at
 boolean issuedAtRequired = claims.getExpiryTime() == null;
-if (issuedAtRequired) {
-JwtUtils.validateJwtTTL(claims, ttl, issuedAtRequired);
-}
+JwtUtils.validateJwtIssuedAt(claims, ttl, clockOffset, 
issuedAtRequired);
 }
 
 protected void validateIssuer(String issuer) {
@@ -104,11 +102,11 @@ public abstract class AbstractJwtHandler extends 
AbstractGrantHandler {
 this.ttl = ttl;
 }
 
-public int getFutureTTL() {
-return futureTTL;
+public int getClockOffset() {
+return clockOffset;
 }
 
-public void setFutureTTL(int futureTTL) {
-this.futureTTL = futureTTL;
+public void setClockOffset(int clockOffset) {
+this.clockOffset = clockOffset;
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f7509eb/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java
index a88d96f..c413d00 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java
@@ -110,19 +110,19 @@ public final class JwtAccessTokenUtils {
 throw new SecurityException();
 }
 }
-public static void validateJwtClaims(JwtClaims claims, int ttl, int 
futureTTL, Client c) {
+public static void validateJwtClaims(JwtClaims claims, int ttl, int 
clockOffset, Client c) {
 validateJwtSubjectAndAudience(claims, c);
 
 // If we have no issued time then we need to have an expiry
 boolean expiredRequired = claims.getIssuedAt() == null;
-JwtUtils.validateJwtExpiry(claims, expiredRequired);
+JwtUtils.validateJwtExpiry(claims, clockOffset, expiredRequired);
 
-JwtUtils.validateJwtNotBefore(claims

cxf git commit: Fixing the master build

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 3ce1e1fcc -> 0ca573916


Fixing the master build


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

Branch: refs/heads/master
Commit: 0ca573916675d00cb2dc083ed1b0dba47a17d1ef
Parents: 3ce1e1f
Author: Sergey Beryozkin 
Authored: Mon Oct 12 15:27:52 2015 +0100
Committer: Sergey Beryozkin 
Committed: Mon Oct 12 15:27:52 2015 +0100

--
 .../oauth2/grants/jwt/AbstractJwtHandler.java   | 20 +---
 .../oauth2/tokens/jwt/JwtAccessTokenUtils.java  |  8 
 2 files changed, 13 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0ca57391/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandler.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandler.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandler.java
index baafd5f..4f966c2 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandler.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandler.java
@@ -38,8 +38,8 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
 public abstract class AbstractJwtHandler extends AbstractGrantHandler {
 private Set supportedIssuers; 
 private JwsSignatureVerifier jwsVerifier;
-private int ttl = 300;
-private int futureTTL;
+private int ttl;
+private int clockOffset;
 
 protected AbstractJwtHandler(List grants) {
 super(grants);
@@ -59,15 +59,13 @@ public abstract class AbstractJwtHandler extends 
AbstractGrantHandler {
 
 // If we have no issued time then we need to have an expiry
 boolean expiredRequired = claims.getIssuedAt() == null;
-JwtUtils.validateJwtExpiry(claims, expiredRequired);
+JwtUtils.validateJwtExpiry(claims, clockOffset, expiredRequired);
 
-JwtUtils.validateJwtNotBefore(claims, futureTTL, false);
+JwtUtils.validateJwtNotBefore(claims, clockOffset, false);
 
 // If we have no expiry then we must have an issued at
 boolean issuedAtRequired = claims.getExpiryTime() == null;
-if (issuedAtRequired) {
-JwtUtils.validateJwtTTL(claims, ttl, issuedAtRequired);
-}
+JwtUtils.validateJwtIssuedAt(claims, ttl, clockOffset, 
issuedAtRequired);
 }
 
 protected void validateIssuer(String issuer) {
@@ -104,11 +102,11 @@ public abstract class AbstractJwtHandler extends 
AbstractGrantHandler {
 this.ttl = ttl;
 }
 
-public int getFutureTTL() {
-return futureTTL;
+public int getClockOffset() {
+return clockOffset;
 }
 
-public void setFutureTTL(int futureTTL) {
-this.futureTTL = futureTTL;
+public void setClockOffset(int clockOffset) {
+this.clockOffset = clockOffset;
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/0ca57391/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java
index a88d96f..c413d00 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java
@@ -110,19 +110,19 @@ public final class JwtAccessTokenUtils {
 throw new SecurityException();
 }
 }
-public static void validateJwtClaims(JwtClaims claims, int ttl, int 
futureTTL, Client c) {
+public static void validateJwtClaims(JwtClaims claims, int ttl, int 
clockOffset, Client c) {
 validateJwtSubjectAndAudience(claims, c);
 
 // If we have no issued time then we need to have an expiry
 boolean expiredRequired = claims.getIssuedAt() == null;
-JwtUtils.validateJwtExpiry(claims, expiredRequired);
+JwtUtils.validateJwtExpiry(claims, clockOffset, expiredRequired);
 
-JwtUtils.validateJwtNotBefore(claims, futureTT

cxf git commit: Fixing 3.0.x build failure

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 27feb0916 -> 9f8ed96ae


Fixing 3.0.x build failure


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

Branch: refs/heads/3.0.x-fixes
Commit: 9f8ed96ae3a393434b2854a0fb0b8396b4c9fd41
Parents: 27feb09
Author: Sergey Beryozkin 
Authored: Mon Oct 12 15:17:56 2015 +0100
Committer: Sergey Beryozkin 
Committed: Mon Oct 12 15:17:56 2015 +0100

--
 .../java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java | 6 +++---
 .../java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9f8ed96a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index f335eec..0824fa8 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -72,7 +72,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature {
 protected void addSwaggerResource(Server server) {
 List cris = Collections.emptyList();
 if (!runAsFilter) {
-List serviceBeans = new ArrayList<>();
+List serviceBeans = new ArrayList();
 ApiListingResource apiListingResource = new ApiListingResource();
 serviceBeans.add(apiListingResource);
 JAXRSServiceFactoryBean sfb =
@@ -85,7 +85,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature {
 }
 }
 }
-List providers = new ArrayList<>();
+List providers = new ArrayList();
 if (runAsFilter) {
 providers.add(new SwaggerContainerRequestFilter());
 }
@@ -220,7 +220,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 DefaultReaderConfig rc = new DefaultReaderConfig();
 rc.setScanAllResources(true);
 if (ignoreRoutesParam != null) {
-Set routes = new LinkedHashSet<>();
+Set routes = new LinkedHashSet();
 for (String route : StringUtils.split(ignoreRoutesParam, ",")) 
{
 routes.add(route.trim());
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/9f8ed96a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
index 83ef3dc..c67ce85 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Serializers.java
@@ -88,8 +88,9 @@ public class Swagger2Serializers extends SwaggerSerializers {
 }
 
 if (replaceTags || javadocProvider != null) {
-Map operations = new HashMap<>();
-Map, OperationResourceInfo> methods = new 
HashMap<>();
+Map operations = new HashMap();
+Map, OperationResourceInfo> methods = 
+new HashMap, OperationResourceInfo>();
 for (ClassResourceInfo cri : cris) {
 for (OperationResourceInfo ori : 
cri.getMethodDispatcher().getOperationResourceInfos()) {
 StringBuilder fullPath = new StringBuilder().

[3/3] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf

[coheigea]

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf

Conflicts:

rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java


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

Branch: refs/heads/master
Commit: 3ce1e1fcc18ecce2f7039db047a9d98e3cfe4c95
Parents: d2d8f6d 168b101
Author: Colm O hEigeartaigh 
Authored: Mon Oct 12 14:54:23 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 12 14:54:23 2015 +0100

--
 .../security/jose/jaxrs/JwtAuthenticationFilter.java   | 11 ++-
 .../org/apache/cxf/rs/security/jose/jwt/JwtUtils.java  | 13 +
 .../rs/security/oidc/rp/AbstractTokenValidator.java| 11 ++-
 3 files changed, 29 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3ce1e1fc/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
--
diff --cc 
rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
index d2ead25,295879d..3c64890
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
@@@ -45,7 -45,7 +45,8 @@@ public class JwtAuthenticationFilter ex
  private static final String DEFAULT_AUTH_SCHEME = "JWT";
  private String expectedAuthScheme = DEFAULT_AUTH_SCHEME;
  private int clockOffset;
 +private String roleClaim;
+ private int ttl;
  
  @Override
  public void filter(ContainerRequestContext requestContext) throws 
IOException {
@@@ -93,12 -83,12 +94,20 @@@
  public void setClockOffset(int clockOffset) {
  this.clockOffset = clockOffset;
  }
 +
 +public String getRoleClaim() {
 +return roleClaim;
 +}
 +
 +public void setRoleClaim(String roleClaim) {
 +this.roleClaim = roleClaim;
 +}
+ 
+ public int getTtl() {
+ return ttl;
+ }
+ 
+ public void setTtl(int ttl) {
+ this.ttl = ttl;
+ }
  }

[2/3] cxf git commit: Allow role processing from JWT tokens

[coheigea]

Allow role processing from JWT tokens


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

Branch: refs/heads/master
Commit: d2d8f6d6e2773025e0dd1c51c6b5e5d2e721def8
Parents: cc1fac2
Author: Colm O hEigeartaigh 
Authored: Mon Oct 12 14:44:27 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 12 14:44:27 2015 +0100

--
 .../jose/jaxrs/JwtAuthenticationFilter.java | 21 ++-
 .../jose/jaxrs/JwtTokenSecurityContext.java | 59 ++--
 2 files changed, 73 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d2d8f6d6/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
index dfbbc57..d2ead25 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
@@ -45,6 +45,7 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 private static final String DEFAULT_AUTH_SCHEME = "JWT";
 private String expectedAuthScheme = DEFAULT_AUTH_SCHEME;
 private int clockOffset;
+private String roleClaim;
 
 @Override
 public void filter(ContainerRequestContext requestContext) throws 
IOException {
@@ -55,8 +56,18 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 }
 JwtToken token = super.getJwtToken(parts[1]);
 JoseUtils.setMessageContextProperty(token.getHeaders());
-JAXRSUtils.getCurrentMessage().put(SecurityContext.class, new 
JwtTokenSecurityContext(token));
+
+SecurityContext securityContext = configureSecurityContext(token);
+if (securityContext != null) {
+JAXRSUtils.getCurrentMessage().put(SecurityContext.class, 
securityContext);
+}
+
+}
+
+protected SecurityContext configureSecurityContext(JwtToken jwt) {
+return new JwtTokenSecurityContext(jwt, roleClaim);
 }
+
 
 public void setExpectedAuthScheme(String expectedAuthScheme) {
 this.expectedAuthScheme = expectedAuthScheme;
@@ -82,4 +93,12 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 public void setClockOffset(int clockOffset) {
 this.clockOffset = clockOffset;
 }
+
+public String getRoleClaim() {
+return roleClaim;
+}
+
+public void setRoleClaim(String roleClaim) {
+this.roleClaim = roleClaim;
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d2d8f6d6/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtTokenSecurityContext.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtTokenSecurityContext.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtTokenSecurityContext.java
index 11a2c94..f100228 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtTokenSecurityContext.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtTokenSecurityContext.java
@@ -18,17 +18,64 @@
  */
 package org.apache.cxf.rs.security.jose.jaxrs;
 
-import org.apache.cxf.common.security.SimpleSecurityContext;
+import java.security.Principal;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.security.auth.Subject;
+
+import org.apache.cxf.common.security.SimpleGroup;
+import org.apache.cxf.common.security.SimplePrincipal;
 import org.apache.cxf.rs.security.jose.jwt.JwtToken;
+import org.apache.cxf.security.LoginSecurityContext;
 
-public class JwtTokenSecurityContext extends SimpleSecurityContext {
-private JwtToken token;
-public JwtTokenSecurityContext(JwtToken jwt) {
-super(jwt.getClaims().getSubject());
+public class JwtTokenSecurityContext implements LoginSecurityContext {
+private final JwtToken token;
+private final Principal principal;
+private final Set roles;
+
+public JwtTokenSecurityContext(JwtToken jwt, String roleClaim) {
+principal = new SimplePrincipal(jwt.getClaims().getSubject());
 this.token = jwt;
+if (roleClaim != null && jwt.getClaims().containsProperty(roleCla

[1/3] cxf git commit: Use a Constants to refer to the JWT Token

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 168b10164 -> 3ce1e1fcc


Use a Constants to refer to the JWT Token


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

Branch: refs/heads/master
Commit: cc1fac2c9b251f8be75a40912c2bd26d02c84e2c
Parents: 8654f83
Author: Colm O hEigeartaigh 
Authored: Mon Oct 12 12:06:12 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 12 14:14:19 2015 +0100

--
 .../cxf/rs/security/jose/jaxrs/JwtAuthenticationClientFilter.java | 3 ++-
 .../java/org/apache/cxf/rs/security/jose/jwt/JwtConstants.java| 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/cc1fac2c/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationClientFilter.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationClientFilter.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationClientFilter.java
index a618857..dc77d15 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationClientFilter.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationClientFilter.java
@@ -34,6 +34,7 @@ import org.apache.cxf.rs.security.jose.JoseUtils;
 import org.apache.cxf.rs.security.jose.jwe.JweHeaders;
 import org.apache.cxf.rs.security.jose.jwt.AbstractJoseJwtProducer;
 import org.apache.cxf.rs.security.jose.jwt.JwtClaims;
+import org.apache.cxf.rs.security.jose.jwt.JwtConstants;
 import org.apache.cxf.rs.security.jose.jwt.JwtToken;
 import org.apache.cxf.rt.security.crypto.CryptoUtils;
 
@@ -67,7 +68,7 @@ public class JwtAuthenticationClientFilter extends 
AbstractJoseJwtProducer
   authScheme + " " + data);
 }
 protected JwtToken getJwtToken(ClientRequestContext requestContext) {
-return (JwtToken)requestContext.getProperty("jwt.token");
+return (JwtToken)requestContext.getProperty(JwtConstants.JWT_TOKEN);
 }
 protected String getContextPropertyValue() {
 return 
Base64UrlUtility.encode(CryptoUtils.generateSecureRandomBytes(16));

http://git-wip-us.apache.org/repos/asf/cxf/blob/cc1fac2c/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtConstants.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtConstants.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtConstants.java
index 2f23e2c..bdbb544 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtConstants.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtConstants.java
@@ -29,6 +29,8 @@ public final class JwtConstants {
 public static final String CLAIM_ISSUED_AT = "iat";
 public static final String CLAIM_JWT_ID = "jti";
 
+public static final String JWT_TOKEN = "jwt.token";
+
 
 private JwtConstants() {
 

cxf git commit: Reintroducing a ttl property for validation JWT issuedAt, more to come...

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes db71abb3b -> 27feb0916


Reintroducing a ttl property for validation JWT issuedAt, more to come...


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

Branch: refs/heads/3.0.x-fixes
Commit: 27feb091601c7fb2bb416e0c88119775ff579223
Parents: db71abb
Author: Sergey Beryozkin 
Authored: Mon Oct 12 14:46:11 2015 +0100
Committer: Sergey Beryozkin 
Committed: Mon Oct 12 14:49:58 2015 +0100

--
 .../security/jose/jaxrs/JwtAuthenticationFilter.java   | 11 ++-
 .../org/apache/cxf/rs/security/jose/jwt/JwtUtils.java  | 13 +
 .../rs/security/oidc/rp/AbstractTokenValidator.java| 11 ++-
 3 files changed, 29 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/27feb091/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
index dfbbc57..295879d 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
@@ -45,6 +45,7 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 private static final String DEFAULT_AUTH_SCHEME = "JWT";
 private String expectedAuthScheme = DEFAULT_AUTH_SCHEME;
 private int clockOffset;
+private int ttl;
 
 @Override
 public void filter(ContainerRequestContext requestContext) throws 
IOException {
@@ -72,7 +73,7 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 
 // If we have no expiry then we must have an issued at
 boolean issuedAtRequired = jwt.getClaims().getExpiryTime() == null;
-JwtUtils.validateJwtIssuedAt(jwt.getClaims(), clockOffset, 
issuedAtRequired);
+JwtUtils.validateJwtIssuedAt(jwt.getClaims(), ttl, clockOffset, 
issuedAtRequired);
 }
 
 public int getClockOffset() {
@@ -82,4 +83,12 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 public void setClockOffset(int clockOffset) {
 this.clockOffset = clockOffset;
 }
+
+public int getTtl() {
+return ttl;
+}
+
+public void setTtl(int ttl) {
+this.ttl = ttl;
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/27feb091/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
index 983ada3..3f0a27e 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
@@ -77,7 +77,7 @@ public final class JwtUtils {
 }
 }
 
-public static void validateJwtIssuedAt(JwtClaims claims, int clockOffset, 
boolean claimRequired) {
+public static void validateJwtIssuedAt(JwtClaims claims, int timeToLive, 
int clockOffset, boolean claimRequired) {
 Long issuedAtInSecs = claims.getIssuedAt();
 if (issuedAtInSecs == null) {
 if (claimRequired) {
@@ -92,9 +92,14 @@ public final class JwtUtils {
 createdDate.setTime(createdDate.getTime() - (long)clockOffset * 
1000L);
 }
 
-Date rightNow = new Date();
-
-if (createdDate.after(rightNow)) {
+Date validCreation = new Date();
+if (timeToLive != 0) {
+long currentTime = validCreation.getTime();
+currentTime -= (long)timeToLive * 1000L;
+validCreation.setTime(currentTime);
+}
+
+if (createdDate.after(validCreation)) {
 throw new JwtException("Invalid issuedAt");
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/27feb091/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/r

cxf git commit: Some updates for JWT time claims validation code as discussed with Colm, nont final yet

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 12a73a948 -> db71abb3b


Some updates for JWT time claims validation code as discussed with Colm, nont 
final yet


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

Branch: refs/heads/3.0.x-fixes
Commit: db71abb3b9d5d6ecfdbe714214f2f4f616911ef6
Parents: 12a73a9
Author: Sergey Beryozkin 
Authored: Mon Oct 12 14:04:02 2015 +0100
Committer: Sergey Beryozkin 
Committed: Mon Oct 12 14:49:06 2015 +0100

--
 .../jose/jaxrs/JwtAuthenticationFilter.java | 27 ---
 .../cxf/rs/security/jose/jwt/JwtUtils.java  | 47 ---
 .../oidc/rp/AbstractTokenValidator.java | 49 +++-
 3 files changed, 56 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/db71abb3/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
index cc14a85..dfbbc57 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
@@ -44,8 +44,7 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 
 private static final String DEFAULT_AUTH_SCHEME = "JWT";
 private String expectedAuthScheme = DEFAULT_AUTH_SCHEME;
-private int ttl = 300;
-private int futureTTL;
+private int clockOffset;
 
 @Override
 public void filter(ContainerRequestContext requestContext) throws 
IOException {
@@ -67,30 +66,20 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 protected void validateToken(JwtToken jwt) {
 // If we have no issued time then we need to have an expiry
 boolean expiredRequired = jwt.getClaims().getIssuedAt() == null;
-JwtUtils.validateJwtExpiry(jwt.getClaims(), expiredRequired);
+JwtUtils.validateJwtExpiry(jwt.getClaims(), clockOffset, 
expiredRequired);
 
-JwtUtils.validateJwtNotBefore(jwt.getClaims(), futureTTL, false);
+JwtUtils.validateJwtNotBefore(jwt.getClaims(), clockOffset, false);
 
 // If we have no expiry then we must have an issued at
 boolean issuedAtRequired = jwt.getClaims().getExpiryTime() == null;
-if (issuedAtRequired) {
-JwtUtils.validateJwtTTL(jwt.getClaims(), ttl, issuedAtRequired);
-}
-}
-
-public int getTtl() {
-return ttl;
-}
-
-public void setTtl(int ttl) {
-this.ttl = ttl;
+JwtUtils.validateJwtIssuedAt(jwt.getClaims(), clockOffset, 
issuedAtRequired);
 }
 
-public int getFutureTTL() {
-return futureTTL;
+public int getClockOffset() {
+return clockOffset;
 }
 
-public void setFutureTTL(int futureTTL) {
-this.futureTTL = futureTTL;
+public void setClockOffset(int clockOffset) {
+this.clockOffset = clockOffset;
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/db71abb3/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
index 64c24e9..983ada3 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
@@ -37,7 +37,7 @@ public final class JwtUtils {
 return new JwtTokenReaderWriter().fromJsonClaims(json);
 }
 
-public static void validateJwtExpiry(JwtClaims claims, boolean 
claimRequired) {
+public static void validateJwtExpiry(JwtClaims claims, int clockOffset, 
boolean claimRequired) {
 Long expiryTime = claims.getExpiryTime();
 if (expiryTime == null) {
 if (claimRequired) {
@@ -45,40 +45,39 @@ public final class JwtUtils {
 }
 return;
 }
-
 Date rightNow = new Date();
 Date expiresDate = new Date(expiryTime * 1000L);
+if (clockOffset != 0) {
+expiresDate.setTime(expiresDate.getTime() + (long)clockOffset * 
1000L);
+}

cxf git commit: Reintroducing a ttl property for validation JWT issuedAt, more to come...

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 8654f83ed -> 168b10164


Reintroducing a ttl property for validation JWT issuedAt, more to come...


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

Branch: refs/heads/master
Commit: 168b101644bbe1eeebb12bee6dbde56146e56a26
Parents: 8654f83
Author: Sergey Beryozkin 
Authored: Mon Oct 12 14:46:11 2015 +0100
Committer: Sergey Beryozkin 
Committed: Mon Oct 12 14:46:11 2015 +0100

--
 .../security/jose/jaxrs/JwtAuthenticationFilter.java   | 11 ++-
 .../org/apache/cxf/rs/security/jose/jwt/JwtUtils.java  | 13 +
 .../rs/security/oidc/rp/AbstractTokenValidator.java| 11 ++-
 3 files changed, 29 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/168b1016/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
index dfbbc57..295879d 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
@@ -45,6 +45,7 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 private static final String DEFAULT_AUTH_SCHEME = "JWT";
 private String expectedAuthScheme = DEFAULT_AUTH_SCHEME;
 private int clockOffset;
+private int ttl;
 
 @Override
 public void filter(ContainerRequestContext requestContext) throws 
IOException {
@@ -72,7 +73,7 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 
 // If we have no expiry then we must have an issued at
 boolean issuedAtRequired = jwt.getClaims().getExpiryTime() == null;
-JwtUtils.validateJwtIssuedAt(jwt.getClaims(), clockOffset, 
issuedAtRequired);
+JwtUtils.validateJwtIssuedAt(jwt.getClaims(), ttl, clockOffset, 
issuedAtRequired);
 }
 
 public int getClockOffset() {
@@ -82,4 +83,12 @@ public class JwtAuthenticationFilter extends 
AbstractJoseJwtConsumer implements
 public void setClockOffset(int clockOffset) {
 this.clockOffset = clockOffset;
 }
+
+public int getTtl() {
+return ttl;
+}
+
+public void setTtl(int ttl) {
+this.ttl = ttl;
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/168b1016/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
index 983ada3..3f0a27e 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
@@ -77,7 +77,7 @@ public final class JwtUtils {
 }
 }
 
-public static void validateJwtIssuedAt(JwtClaims claims, int clockOffset, 
boolean claimRequired) {
+public static void validateJwtIssuedAt(JwtClaims claims, int timeToLive, 
int clockOffset, boolean claimRequired) {
 Long issuedAtInSecs = claims.getIssuedAt();
 if (issuedAtInSecs == null) {
 if (claimRequired) {
@@ -92,9 +92,14 @@ public final class JwtUtils {
 createdDate.setTime(createdDate.getTime() - (long)clockOffset * 
1000L);
 }
 
-Date rightNow = new Date();
-
-if (createdDate.after(rightNow)) {
+Date validCreation = new Date();
+if (timeToLive != 0) {
+long currentTime = validCreation.getTime();
+currentTime -= (long)timeToLive * 1000L;
+validCreation.setTime(currentTime);
+}
+
+if (createdDate.after(validCreation)) {
 throw new JwtException("Invalid issuedAt");
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/168b1016/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security

cxf git commit: Some updates for JWT time claims validation code as discussed with Colm, nont final yet

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 741a74e33 -> 8654f83ed


Some updates for JWT time claims validation code as discussed with Colm, nont 
final yet


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

Branch: refs/heads/master
Commit: 8654f83ed145f3be4dabd19205491b7ec5e31a64
Parents: 741a74e
Author: Sergey Beryozkin 
Authored: Mon Oct 12 14:04:02 2015 +0100
Committer: Sergey Beryozkin 
Committed: Mon Oct 12 14:04:02 2015 +0100

--
 .../main/webapp/WEB-INF/applicationContext.xml  |  2 +-
 .../main/webapp/WEB-INF/applicationContext.xml  |  2 +-
 .../jose/jaxrs/JwtAuthenticationFilter.java | 27 ---
 .../cxf/rs/security/jose/jwt/JwtUtils.java  | 47 ---
 .../oidc/rp/AbstractTokenValidator.java | 49 +++-
 5 files changed, 58 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8654f83e/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/applicationContext.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/applicationContext.xml
 
b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/applicationContext.xml
index 8398d45..3fa9454 100644
--- 
a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/applicationContext.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/applicationContext.xml
@@ -93,7 +93,7 @@
  
   
  
- 
+ 
  
  
  

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 234e6a5b9 -> 12a73a948


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

Branch: refs/heads/3.0.x-fixes
Commit: 12a73a9486961dce563f25b376626d9ae3453005
Parents: 234e6a5
Author: Colm O hEigeartaigh 
Authored: Mon Oct 12 10:48:25 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 12 10:48:25 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/12a73a94/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index df915d6..10abaca 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -216,6 +216,7 @@ B 71dfb1f0e9636b7685482cd9aafb9ef6283d28ba
 B 71e9ada9b119ad8d960b9be15bc5689d718273ef
 B 72ba5f34d674012e2f8ca8ef5add0b022235ee06
 B 731d7df1181d717e2dc867c9e00118f974de6179
+B 741a74e33bc29f7ada4f5f908ec4fcbee55dc011
 B 7456089088a21620ec75dc83fbb4b89ebdfd290e
 B 74a2e6f2b1d9787cc9b5cff4cc84e43cfccbfe94
 B 74aea1227832d3000f2f9fe61d7cc3bcb8a60a79

cxf git commit: Fixing demos

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 6a688edc9 -> 741a74e33


Fixing demos


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

Branch: refs/heads/master
Commit: 741a74e33bc29f7ada4f5f908ec4fcbee55dc011
Parents: 6a688ed
Author: Colm O hEigeartaigh 
Authored: Mon Oct 12 10:46:13 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 12 10:46:13 2015 +0100

--
 .../basic_oidc/src/main/webapp/WEB-INF/applicationContext.xml  | 2 +-
 .../big_query/src/main/webapp/WEB-INF/applicationContext.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/741a74e3/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/applicationContext.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/applicationContext.xml
 
b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/applicationContext.xml
index 3fa9454..8398d45 100644
--- 
a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/applicationContext.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/applicationContext.xml
@@ -93,7 +93,7 @@
  
   
  
- 
+ 
  
  
  

cxf git commit: Fixing build

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 42abee389 -> 234e6a5b9


Fixing build


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

Branch: refs/heads/3.0.x-fixes
Commit: 234e6a5b9761a3736ce57db5c102913f03f30e56
Parents: 42abee3
Author: Colm O hEigeartaigh 
Authored: Mon Oct 12 10:27:02 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 12 10:29:07 2015 +0100

--
 .../oidc/rp/AbstractTokenValidator.java | 40 ++--
 1 file changed, 28 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/234e6a5b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
index f56651f..02a7dc2 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
@@ -34,8 +34,8 @@ import 
org.apache.cxf.rs.security.oauth2.provider.AbstractOAuthJoseJwtConsumer;
 public abstract class AbstractTokenValidator extends 
AbstractOAuthJoseJwtConsumer {
 private static final String SELF_ISSUED_ISSUER = "https://self-issued.me";;
 private String issuerId;
-private int issuedAtRange;
-private int clockOffset;
+private int ttl = 300;
+private int futureTTL;
 private WebClient jwkSetClient;
 private boolean supportSelfIssuedProvider;
 private ConcurrentHashMap keyMap = new 
ConcurrentHashMap(); 
@@ -63,7 +63,17 @@ public abstract class AbstractTokenValidator extends 
AbstractOAuthJoseJwtConsume
 throw new SecurityException("Invalid audience");
 }
 
-JwtUtils.validateJwtTimeClaims(claims, clockOffset, issuedAtRange, 
validateClaimsAlways);
+// If we have no issued time then we need to have an expiry
+boolean expiredRequired = claims.getIssuedAt() == null;
+JwtUtils.validateJwtExpiry(claims, expiredRequired);
+
+JwtUtils.validateJwtNotBefore(claims, futureTTL, false);
+
+// If we have no expiry then we must have an issued at
+boolean issuedAtRequired = claims.getExpiryTime() == null;
+if (issuedAtRequired) {
+JwtUtils.validateJwtTTL(claims, ttl, issuedAtRequired);
+}
 }
 }
 
@@ -75,10 +85,6 @@ public abstract class AbstractTokenValidator extends 
AbstractOAuthJoseJwtConsume
 this.jwkSetClient = jwkSetClient;
 }
 
-public void setIssuedAtRange(int issuedAtRange) {
-this.issuedAtRange = issuedAtRange;
-}
-
 @Override
 protected JwsSignatureVerifier getInitializedSignatureVerifier(JwtToken 
jwt) {
 JsonWebKey key = null;
@@ -120,13 +126,23 @@ public abstract class AbstractTokenValidator extends 
AbstractOAuthJoseJwtConsume
 return theJwsVerifier;
 }
 
-public void setClockOffset(int clockOffset) {
-this.clockOffset = clockOffset;
-}
-
 public void setSupportSelfIssuedProvider(boolean 
supportSelfIssuedProvider) {
 this.supportSelfIssuedProvider = supportSelfIssuedProvider;
 }
 
-
+public int getTtl() {
+return ttl;
+}
+
+public void setTtl(int ttl) {
+this.ttl = ttl;
+}
+
+public int getFutureTTL() {
+return futureTTL;
+}
+
+public void setFutureTTL(int futureTTL) {
+this.futureTTL = futureTTL;
+}
 }

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 9e62069dc -> f3bdf12be


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

Branch: refs/heads/2.7.x-fixes
Commit: f3bdf12bed2ddf32fbab5ca9ae5556ff65bd4780
Parents: 9e62069
Author: Colm O hEigeartaigh 
Authored: Mon Oct 12 10:29:44 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 12 10:29:44 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/f3bdf12b/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7704ffb..0ae9203 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -346,6 +346,7 @@ B 22bc02ff306aba39fc89bbd205d73523a0c4b566
 B 22dbf10ed281f3ec94b159829e21333f4afc0bf9
 B 22e352f442b62be811b25fba200f2f3158d41132
 B 22f0802eb1755df93e7a992fa308d3d909e830f4
+B 234e6a5b9761a3736ce57db5c102913f03f30e56
 B 2382e8c9753b2ec41a4c870e92828420ab4cac48
 B 23f8e62836eec21a0dfcf911dc026c4b9240c7df
 B 242ffb176a1b2bea2be1762750f66af8d227ca2f

cxf git commit: Fixing build

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master b25170121 -> 6a688edc9


Fixing build


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

Branch: refs/heads/master
Commit: 6a688edc96515f73e8133a6e2b012f37c739da77
Parents: b251701
Author: Colm O hEigeartaigh 
Authored: Mon Oct 12 10:27:02 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 12 10:27:02 2015 +0100

--
 .../oidc/rp/AbstractTokenValidator.java | 40 ++--
 1 file changed, 28 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6a688edc/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
--
diff --git 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
index f56651f..02a7dc2 100644
--- 
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
+++ 
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/AbstractTokenValidator.java
@@ -34,8 +34,8 @@ import 
org.apache.cxf.rs.security.oauth2.provider.AbstractOAuthJoseJwtConsumer;
 public abstract class AbstractTokenValidator extends 
AbstractOAuthJoseJwtConsumer {
 private static final String SELF_ISSUED_ISSUER = "https://self-issued.me";;
 private String issuerId;
-private int issuedAtRange;
-private int clockOffset;
+private int ttl = 300;
+private int futureTTL;
 private WebClient jwkSetClient;
 private boolean supportSelfIssuedProvider;
 private ConcurrentHashMap keyMap = new 
ConcurrentHashMap(); 
@@ -63,7 +63,17 @@ public abstract class AbstractTokenValidator extends 
AbstractOAuthJoseJwtConsume
 throw new SecurityException("Invalid audience");
 }
 
-JwtUtils.validateJwtTimeClaims(claims, clockOffset, issuedAtRange, 
validateClaimsAlways);
+// If we have no issued time then we need to have an expiry
+boolean expiredRequired = claims.getIssuedAt() == null;
+JwtUtils.validateJwtExpiry(claims, expiredRequired);
+
+JwtUtils.validateJwtNotBefore(claims, futureTTL, false);
+
+// If we have no expiry then we must have an issued at
+boolean issuedAtRequired = claims.getExpiryTime() == null;
+if (issuedAtRequired) {
+JwtUtils.validateJwtTTL(claims, ttl, issuedAtRequired);
+}
 }
 }
 
@@ -75,10 +85,6 @@ public abstract class AbstractTokenValidator extends 
AbstractOAuthJoseJwtConsume
 this.jwkSetClient = jwkSetClient;
 }
 
-public void setIssuedAtRange(int issuedAtRange) {
-this.issuedAtRange = issuedAtRange;
-}
-
 @Override
 protected JwsSignatureVerifier getInitializedSignatureVerifier(JwtToken 
jwt) {
 JsonWebKey key = null;
@@ -120,13 +126,23 @@ public abstract class AbstractTokenValidator extends 
AbstractOAuthJoseJwtConsume
 return theJwsVerifier;
 }
 
-public void setClockOffset(int clockOffset) {
-this.clockOffset = clockOffset;
-}
-
 public void setSupportSelfIssuedProvider(boolean 
supportSelfIssuedProvider) {
 this.supportSelfIssuedProvider = supportSelfIssuedProvider;
 }
 
-
+public int getTtl() {
+return ttl;
+}
+
+public void setTtl(int ttl) {
+this.ttl = ttl;
+}
+
+public int getFutureTTL() {
+return futureTTL;
+}
+
+public void setFutureTTL(int futureTTL) {
+this.futureTTL = futureTTL;
+}
 }