cxf git commit: [CXF-7316] Fixing the ApiListingResource injection issue

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 7d8664155 -> df56ca9fa


[CXF-7316] Fixing the ApiListingResource injection issue


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

Branch: refs/heads/3.1.x-fixes
Commit: df56ca9fafe1496861f702ed345548150002a0a2
Parents: 7d86641
Author: Sergey Beryozkin 
Authored: Thu May 11 15:47:34 2017 +0100
Committer: Sergey Beryozkin 
Committed: Thu May 11 15:48:46 2017 +0100

--
 .../main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/df56ca9f/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index 7fc087d..d5813b0 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -159,7 +159,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 List cris = sfb.getClassResourceInfo();
 if (!runAsFilter) {
 for (ClassResourceInfo cri : cris) {
-if (ApiListingResource.class == cri.getResourceClass()) {
+if 
(ApiListingResource.class.isAssignableFrom(cri.getResourceClass())) {
 InjectionUtils.injectContextProxies(cri, 
apiListingResource);
 }
 }

cxf git commit: [CXF-7316] Fixing the ApiListingResource injection issue

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 686fabd80 -> f5b26b191


[CXF-7316] Fixing the ApiListingResource injection issue


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

Branch: refs/heads/master
Commit: f5b26b19179917141abc0b7834218b0100dbf6c7
Parents: 686fabd
Author: Sergey Beryozkin 
Authored: Thu May 11 15:47:34 2017 +0100
Committer: Sergey Beryozkin 
Committed: Thu May 11 15:47:34 2017 +0100

--
 .../main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f5b26b19/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index 950a1b8..36dfd3d 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -159,7 +159,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 List cris = sfb.getClassResourceInfo();
 if (!runAsFilter) {
 for (ClassResourceInfo cri : cris) {
-if (ApiListingResource.class == cri.getResourceClass()) {
+if 
(ApiListingResource.class.isAssignableFrom(cri.getResourceClass())) {
 InjectionUtils.injectContextProxies(cri, 
apiListingResource);
 }
 }

cxf git commit: [CXF-7367] Adding a test

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 751183b2e -> 82bb06eec


[CXF-7367] Adding a test


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

Branch: refs/heads/3.0.x-fixes
Commit: 82bb06eec7cab58dd9ee5bdd98d8acba711515c1
Parents: 751183b
Author: Sergey Beryozkin 
Authored: Thu May 11 14:01:02 2017 +0100
Committer: Sergey Beryozkin 
Committed: Thu May 11 14:03:06 2017 +0100

--
 .../systest/jaxrs/ApplicationController.java| 46 
 .../jaxrs/ApplicationInfoJaxrsFilter.java   | 44 +++
 .../cxf/systest/jaxrs/JAXRSFiltersTest.java | 78 
 3 files changed, 168 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/82bb06ee/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationController.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationController.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationController.java
new file mode 100644
index 000..3ac0bb2
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationController.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.jaxrs;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.container.ResourceContext;
+import javax.ws.rs.core.Context;
+
+@Path("app")
+public class ApplicationController {
+
+@Context
+private ResourceContext resourceContext;
+
+@Path("nav")
+public ApplicationControllerSub getNavigationDrawer() {
+return resourceContext.initResource(new ApplicationControllerSub());
+}
+
+public static class ApplicationControllerSub {
+@GET
+@Produces("text/plain")
+public String getApplicationInfo(@HeaderParam("ApplicationInfo") 
String appInfo) {
+return appInfo == null ? "DefaultAppInfo" : appInfo;
+}
+}
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/82bb06ee/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationInfoJaxrsFilter.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationInfoJaxrsFilter.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationInfoJaxrsFilter.java
new file mode 100644
index 000..9ca6690
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationInfoJaxrsFilter.java
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.jaxrs;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.annotation.Priority;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Priority(Priorities.AUTHENTICATION + 1)

cxf git commit: [CXF-7367] Adding a test

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 6c5d3341c -> 7d8664155


[CXF-7367] Adding a test


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

Branch: refs/heads/3.1.x-fixes
Commit: 7d8664155933bbcc937115b3d73f1120ea2ca486
Parents: 6c5d334
Author: Sergey Beryozkin 
Authored: Thu May 11 14:01:02 2017 +0100
Committer: Sergey Beryozkin 
Committed: Thu May 11 14:02:06 2017 +0100

--
 .../systest/jaxrs/ApplicationController.java| 46 
 .../jaxrs/ApplicationInfoJaxrsFilter.java   | 44 +++
 .../cxf/systest/jaxrs/JAXRSFiltersTest.java | 78 
 3 files changed, 168 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7d866415/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationController.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationController.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationController.java
new file mode 100644
index 000..3ac0bb2
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationController.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.jaxrs;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.container.ResourceContext;
+import javax.ws.rs.core.Context;
+
+@Path("app")
+public class ApplicationController {
+
+@Context
+private ResourceContext resourceContext;
+
+@Path("nav")
+public ApplicationControllerSub getNavigationDrawer() {
+return resourceContext.initResource(new ApplicationControllerSub());
+}
+
+public static class ApplicationControllerSub {
+@GET
+@Produces("text/plain")
+public String getApplicationInfo(@HeaderParam("ApplicationInfo") 
String appInfo) {
+return appInfo == null ? "DefaultAppInfo" : appInfo;
+}
+}
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/7d866415/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationInfoJaxrsFilter.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationInfoJaxrsFilter.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationInfoJaxrsFilter.java
new file mode 100644
index 000..9ca6690
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationInfoJaxrsFilter.java
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.jaxrs;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.annotation.Priority;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Priority(Priorities.AUTHENTICATION + 1)

cxf git commit: [CXF-7367] Adding a test

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 85c390abd -> 686fabd80


[CXF-7367] Adding a test


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

Branch: refs/heads/master
Commit: 686fabd808398ee7a16aa3c6aaf4f50388327fa5
Parents: 85c390a
Author: Sergey Beryozkin 
Authored: Thu May 11 14:01:02 2017 +0100
Committer: Sergey Beryozkin 
Committed: Thu May 11 14:01:02 2017 +0100

--
 .../systest/jaxrs/ApplicationController.java| 46 
 .../jaxrs/ApplicationInfoJaxrsFilter.java   | 44 +++
 .../cxf/systest/jaxrs/JAXRSFiltersTest.java | 78 
 3 files changed, 168 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/686fabd8/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationController.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationController.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationController.java
new file mode 100644
index 000..3ac0bb2
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationController.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.jaxrs;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.container.ResourceContext;
+import javax.ws.rs.core.Context;
+
+@Path("app")
+public class ApplicationController {
+
+@Context
+private ResourceContext resourceContext;
+
+@Path("nav")
+public ApplicationControllerSub getNavigationDrawer() {
+return resourceContext.initResource(new ApplicationControllerSub());
+}
+
+public static class ApplicationControllerSub {
+@GET
+@Produces("text/plain")
+public String getApplicationInfo(@HeaderParam("ApplicationInfo") 
String appInfo) {
+return appInfo == null ? "DefaultAppInfo" : appInfo;
+}
+}
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/686fabd8/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationInfoJaxrsFilter.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationInfoJaxrsFilter.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationInfoJaxrsFilter.java
new file mode 100644
index 000..9ca6690
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ApplicationInfoJaxrsFilter.java
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.jaxrs;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.annotation.Priority;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Priority(Priorities.AUTHENTICATION + 1)
+public class 

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

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 2f735ea94 -> 6c5d3341c


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

Branch: refs/heads/3.1.x-fixes
Commit: 6c5d3341c2b6fa696d6564dc7822c607baae2ded
Parents: 4320382
Author: Colm O hEigeartaigh 
Authored: Thu May 11 12:57:14 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu May 11 12:57:14 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/6c5d3341/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 230802d..1d12f5b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -472,6 +472,7 @@ M 81f8c3b6c0c283ec2370e4987d21f600a80b19d0
 M 847216a39ba3639f3170b8ad939548788fff4eb6
 M 855d033766dc31a76e8cf1a38b6ef8eb7490a23e
 M 8583a24ac541dc373503d7a6c59cd90890acdae3
+M 85c390abd81c0a5590e83b2d5bd9c6cfc2f3bddc
 M 86667619dc61c8a84672fc5a583b4517f48176c5
 M 896f1abec915897967905762d6e850cfb6bac3bc
 M 8aebfa30047f32e3a6b4feb7ffdd89208ec4f435

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 29ab0f6da -> 751183b2e


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

Branch: refs/heads/3.0.x-fixes
Commit: 751183b2e23eca0f195389e20409c442c6320cfa
Parents: 29ab0f6
Author: Colm O hEigeartaigh 
Authored: Thu May 11 12:57:29 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu May 11 12:57:29 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/751183b2/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3fcbc4d..c12e59f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -454,6 +454,7 @@ B 42eba2f948a967d62dc0257a920715ae47ae4310
 B 42f6750b3690a19d906c2d9fb146d8fafbcb7620
 B 4306144c1704d2cf085d387cf0be8d9cbdd5f5b8
 B 431db5275e3a056d6cedf4608533197580cb6073
+B 432038214b8aba9afadb1d326ab057f867022ee2
 B 432d9517952f9d14478bff8fb8e421266f82014d
 B 434dd09df50479fea2408826bc04603cb8b8eb58
 B 438919fe6972d7f1fa086e201a701ef9bcf7ea47
@@ -745,6 +746,7 @@ B 6bdc9257b691e140f435a567e0b4f566c71be6cf
 B 6c14b437f2fadd1ab273455c0d6779e45180f642
 B 6c5225f0b84517f869808e8f6a9665f3ebdfe0bc
 B 6c58f0c8861c9e9a922d337da4ea8282c75255c1
+B 6c5d3341c2b6fa696d6564dc7822c607baae2ded
 B 6c67f878e2c210e7f03c4aea52b2ba2eec7d611a
 B 6c77d135c835946eacda132e46c4b2207a2f0355
 B 6c8d2ba818713be47a26541a22a67470235daf96

[2/2] cxf git commit: Adding a test for CXF-7314

[coheigea]

Adding a test for CXF-7314


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

Branch: refs/heads/3.1.x-fixes
Commit: 432038214b8aba9afadb1d326ab057f867022ee2
Parents: 2f735ea
Author: Colm O hEigeartaigh 
Authored: Thu May 11 12:56:27 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu May 11 12:57:14 2017 +0100

--
 .../custom_onbehalfof/CustomOnBehalfOfTest.java | 38 +--
 .../LocalBSTTokenValidator.java | 38 +++
 .../LocalDoubleItPortTypeImpl.java  | 51 
 .../SAMLDoubleItPortTypeImpl.java   | 51 
 .../systest/sts/custom_onbehalfof/DoubleIt.wsdl |  4 +-
 .../sts/custom_onbehalfof/cxf-client.xml| 42 +---
 .../sts/custom_onbehalfof/cxf-service.xml   | 15 +-
 7 files changed, 213 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/43203821/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
--
diff --git 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
index 7844e83..3fccdae 100644
--- 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
+++ 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
@@ -34,12 +34,14 @@ import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;
 
 /**
- * In this test case, a CXF client requests a Security Token from an STS, 
passing a username that
+ * In these test cases, a CXF client requests a Security Token from an STS, 
passing a username that
  * it has obtained from an unknown client as an "OnBehalfOf" element. This 
username is obtained
  * by parsing the SecurityConstants.USERNAME property. The client then invokes 
on the service
- * provider using the returned (custom BinarySecurityToken) token from the 
STS. The service
- * provider dispatches the received BinarySecurityToken to the STS for 
validation, and receives
- * a transformed SAML Token in response.
+ * provider using the returned (custom BinarySecurityToken) token from the STS.
+ *
+ * In the first test-case, the service provider dispatches the received 
BinarySecurityToken to the STS
+ * for validation, and receives a transformed SAML Token in response. In the 
second test-case, the
+ * service just validates the Token locally.
  */
 public class CustomOnBehalfOfTest extends AbstractBusClientServerTestBase {
 
@@ -73,7 +75,7 @@ public class CustomOnBehalfOfTest extends 
AbstractBusClientServerTestBase {
 }
 
 @org.junit.Test
-public void testUsernameOnBehalfOf() throws Exception {
+public void testUsernameOnBehalfOfSTS() throws Exception {
 SpringBusFactory bf = new SpringBusFactory();
 URL busFile = CustomOnBehalfOfTest.class.getResource("cxf-client.xml");
 
@@ -98,6 +100,32 @@ public class CustomOnBehalfOfTest extends 
AbstractBusClientServerTestBase {
 bus.shutdown(true);
 }
 
+@org.junit.Test
+public void testUsernameOnBehalfOfLocal() throws Exception {
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile = CustomOnBehalfOfTest.class.getResource("cxf-client.xml");
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL wsdl = CustomOnBehalfOfTest.class.getResource("DoubleIt.wsdl");
+Service service = Service.create(wsdl, SERVICE_QNAME);
+QName portQName = new QName(NAMESPACE, 
"DoubleItTransportCustomBSTLocalPort");
+DoubleItPortType transportPort =
+service.getPort(portQName, DoubleItPortType.class);
+updateAddressPort(transportPort, PORT);
+
+// Transport port
+((BindingProvider)transportPort).getRequestContext().put(
+SecurityConstants.USERNAME, "alice"
+);
+doubleIt(transportPort, 25);
+
+((java.io.Closeable)transportPort).close();
+bus.shutdown(true);
+}
+
 private static void doubleIt(DoubleItPortType port, int numToDouble) {
 int resp = port.doubleIt(numToDouble);
 assertEquals(numToDouble * 2, resp);

cxf git commit: Adding a test for CXF-7314

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master bbcbe17e5 -> 85c390abd


Adding a test for CXF-7314


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

Branch: refs/heads/master
Commit: 85c390abd81c0a5590e83b2d5bd9c6cfc2f3bddc
Parents: bbcbe17
Author: Colm O hEigeartaigh 
Authored: Thu May 11 12:56:27 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu May 11 12:56:50 2017 +0100

--
 .../custom_onbehalfof/CustomOnBehalfOfTest.java | 38 +--
 .../LocalBSTTokenValidator.java | 38 +++
 .../LocalDoubleItPortTypeImpl.java  | 51 
 .../SAMLDoubleItPortTypeImpl.java   | 51 
 .../systest/sts/custom_onbehalfof/DoubleIt.wsdl |  4 +-
 .../sts/custom_onbehalfof/cxf-client.xml| 42 +---
 .../sts/custom_onbehalfof/cxf-service.xml   | 15 +-
 7 files changed, 213 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/85c390ab/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
--
diff --git 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
index f4e6902..d1c43d4 100644
--- 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
+++ 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
@@ -34,12 +34,14 @@ import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;
 
 /**
- * In this test case, a CXF client requests a Security Token from an STS, 
passing a username that
+ * In these test cases, a CXF client requests a Security Token from an STS, 
passing a username that
  * it has obtained from an unknown client as an "OnBehalfOf" element. This 
username is obtained
  * by parsing the SecurityConstants.USERNAME property. The client then invokes 
on the service
- * provider using the returned (custom BinarySecurityToken) token from the 
STS. The service
- * provider dispatches the received BinarySecurityToken to the STS for 
validation, and receives
- * a transformed SAML Token in response.
+ * provider using the returned (custom BinarySecurityToken) token from the STS.
+ *
+ * In the first test-case, the service provider dispatches the received 
BinarySecurityToken to the STS
+ * for validation, and receives a transformed SAML Token in response. In the 
second test-case, the
+ * service just validates the Token locally.
  */
 public class CustomOnBehalfOfTest extends AbstractBusClientServerTestBase {
 
@@ -73,7 +75,7 @@ public class CustomOnBehalfOfTest extends 
AbstractBusClientServerTestBase {
 }
 
 @org.junit.Test
-public void testUsernameOnBehalfOf() throws Exception {
+public void testUsernameOnBehalfOfSTS() throws Exception {
 SpringBusFactory bf = new SpringBusFactory();
 URL busFile = CustomOnBehalfOfTest.class.getResource("cxf-client.xml");
 
@@ -98,6 +100,32 @@ public class CustomOnBehalfOfTest extends 
AbstractBusClientServerTestBase {
 bus.shutdown(true);
 }
 
+@org.junit.Test
+public void testUsernameOnBehalfOfLocal() throws Exception {
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile = CustomOnBehalfOfTest.class.getResource("cxf-client.xml");
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL wsdl = CustomOnBehalfOfTest.class.getResource("DoubleIt.wsdl");
+Service service = Service.create(wsdl, SERVICE_QNAME);
+QName portQName = new QName(NAMESPACE, 
"DoubleItTransportCustomBSTLocalPort");
+DoubleItPortType transportPort =
+service.getPort(portQName, DoubleItPortType.class);
+updateAddressPort(transportPort, PORT);
+
+// Transport port
+((BindingProvider)transportPort).getRequestContext().put(
+SecurityConstants.USERNAME, "alice"
+);
+doubleIt(transportPort, 25);
+
+((java.io.Closeable)transportPort).close();
+bus.shutdown(true);
+}
+
 private static void doubleIt(DoubleItPortType port, int numToDouble) {
 int resp = port.doubleIt(numToDouble);
 assertEquals(numToDouble * 2, resp);

cxf git commit: [CXF-7316] Minor tweak to DefaultSwagger2Serializers

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 45ca76a25 -> 2f735ea94


[CXF-7316] Minor tweak to DefaultSwagger2Serializers


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

Branch: refs/heads/3.1.x-fixes
Commit: 2f735ea94006454e42c859d44e2efac1051c2f0f
Parents: 45ca76a
Author: Sergey Beryozkin 
Authored: Thu May 11 12:26:52 2017 +0100
Committer: Sergey Beryozkin 
Committed: Thu May 11 12:28:07 2017 +0100

--
 .../apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2f735ea9/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
index 5645a8c..fe5aff2 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
@@ -41,15 +41,15 @@ public class DefaultSwagger2Serializers extends 
SwaggerSerializers implements Sw
 
 @Override
 public void writeTo(
-Swagger data,
+final Swagger data,
 final Class type,
 final Type genericType,
 final Annotation[] annotations,
 final MediaType mediaType,
 final MultivaluedMap headers,
 final OutputStream out) throws IOException {
-data = customizer.customize(data);
-super.writeTo(data, type, genericType, annotations, mediaType, 
headers, out);
+Swagger customizedData = customizer.customize(data);
+super.writeTo(customizedData, type, genericType, annotations, 
mediaType, headers, out);
 }
 
 @Override

cxf git commit: [CXF-7366] Adding a negative test, updating JWE filters too

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 6e89af732 -> 45ca76a25


[CXF-7366] Adding a negative test, updating JWE filters too


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

Branch: refs/heads/3.1.x-fixes
Commit: 45ca76a2502fe1a4f05e49c870035be0297d9142
Parents: 6e89af7
Author: Sergey Beryozkin 
Authored: Thu May 11 11:38:18 2017 +0100
Committer: Sergey Beryozkin 
Committed: Thu May 11 12:18:13 2017 +0100

--
 .../jose/jaxrs/AbstractJweDecryptingFilter.java | 20 +
 .../jaxrs/AbstractJweJsonDecryptingFilter.java  | 22 -
 .../jaxrs/AbstractJwsJsonReaderProvider.java| 32 +--
 .../jose/jaxrs/AbstractJwsReaderProvider.java   | 35 +---
 .../rs/security/jose/jaxrs/JoseJaxrsUtils.java  | 95 
 .../jose/jaxrs/JweClientResponseFilter.java |  5 +-
 .../jose/jaxrs/JweContainerRequestFilter.java   |  3 +
 .../jose/jaxrs/JweJsonClientResponseFilter.java |  3 +
 .../jaxrs/JweJsonContainerRequestFilter.java|  3 +
 .../jose/jaxrs/JweJsonWriterInterceptor.java| 23 -
 .../jose/jaxrs/JweWriterInterceptor.java| 23 -
 .../jose/jaxrs/JwsJsonWriterInterceptor.java| 22 +
 .../jose/jaxrs/JwsWriterInterceptor.java| 16 +---
 .../systest/jaxrs/security/jose/BookStore.java  |  2 +-
 .../jose/jwejws/HttpHeaderModifyingFilter.java  | 42 +
 .../security/jose/jwejws/JAXRSJweJwsTest.java   |  9 ++
 .../jaxrs/security/jose/jwejws/server.xml   |  2 +
 17 files changed, 260 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/45ca76a2/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
--
diff --git 
a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
 
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
index d28b1b7..7e2f066 100644
--- 
a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
+++ 
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
@@ -21,6 +21,9 @@ package org.apache.cxf.rs.security.jose.jaxrs;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.Set;
+
+import javax.ws.rs.core.MultivaluedMap;
 
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.rs.security.jose.common.JoseUtils;
@@ -31,6 +34,8 @@ import org.apache.cxf.rs.security.jose.jwe.JweHeaders;
 import org.apache.cxf.rs.security.jose.jwe.JweUtils;
 
 public class AbstractJweDecryptingFilter {
+private Set protectedHttpHeaders;
+private boolean validateHttpHeaders;
 private JweDecryptionProvider decryption;
 private String defaultMediaType;
 protected JweDecryptionOutput decrypt(InputStream is) throws IOException {
@@ -63,4 +68,19 @@ public class AbstractJweDecryptingFilter {
 this.defaultMediaType = defaultMediaType;
 }
 
+public void setValidateHttpHeaders(boolean validateHttpHeaders) {
+this.validateHttpHeaders = validateHttpHeaders;
+}
+public boolean isValidateHttpHeaders() {
+return validateHttpHeaders;
+}
+
+protected void validateHttpHeadersIfNeeded(MultivaluedMap 
httpHeaders, JweHeaders jweHeaders) {
+JoseJaxrsUtils.validateHttpHeaders(httpHeaders, 
+   jweHeaders, 
+   protectedHttpHeaders);
+}
+public void setProtectedHttpHeaders(Set protectedHttpHeaders) {
+this.protectedHttpHeaders = protectedHttpHeaders;
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/45ca76a2/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonDecryptingFilter.java
--
diff --git 
a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonDecryptingFilter.java
 
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonDecryptingFilter.java
index 8bfc807..9180ad9 100644
--- 
a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonDecryptingFilter.java
+++ 

cxf git commit: [CXF-7366] Adding a negative test, updating JWE filters too

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master ad7c861a8 -> eb14ce920


[CXF-7366] Adding a negative test, updating JWE filters too


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

Branch: refs/heads/master
Commit: eb14ce9206bc43371f149f9d0b1c6e8e2682e5c0
Parents: ad7c861
Author: Sergey Beryozkin 
Authored: Thu May 11 11:38:18 2017 +0100
Committer: Sergey Beryozkin 
Committed: Thu May 11 11:38:18 2017 +0100

--
 .../jose/jaxrs/AbstractJweDecryptingFilter.java | 20 +
 .../jaxrs/AbstractJweJsonDecryptingFilter.java  | 20 +
 .../jaxrs/AbstractJwsJsonReaderProvider.java| 32 +--
 .../jose/jaxrs/AbstractJwsReaderProvider.java   | 35 +---
 .../rs/security/jose/jaxrs/JoseJaxrsUtils.java  | 95 
 .../jose/jaxrs/JweClientResponseFilter.java |  5 +-
 .../jose/jaxrs/JweContainerRequestFilter.java   |  3 +
 .../jose/jaxrs/JweJsonClientResponseFilter.java |  3 +
 .../jaxrs/JweJsonContainerRequestFilter.java|  3 +
 .../jose/jaxrs/JweJsonWriterInterceptor.java| 19 
 .../jose/jaxrs/JweWriterInterceptor.java| 21 -
 .../jose/jaxrs/JwsJsonWriterInterceptor.java| 22 +
 .../jose/jaxrs/JwsWriterInterceptor.java| 16 +---
 .../systest/jaxrs/security/jose/BookStore.java  |  2 +-
 .../jose/jwejws/HttpHeaderModifyingFilter.java  | 42 +
 .../security/jose/jwejws/JAXRSJweJwsTest.java   |  9 ++
 .../jaxrs/security/jose/jwejws/server.xml   |  2 +
 17 files changed, 256 insertions(+), 93 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/eb14ce92/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
--
diff --git 
a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
 
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
index 2ee9d2d..c6d704a 100644
--- 
a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
+++ 
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java
@@ -21,6 +21,9 @@ package org.apache.cxf.rs.security.jose.jaxrs;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.Set;
+
+import javax.ws.rs.core.MultivaluedMap;
 
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.rs.security.jose.common.JoseUtils;
@@ -31,6 +34,8 @@ import org.apache.cxf.rs.security.jose.jwe.JweHeaders;
 import org.apache.cxf.rs.security.jose.jwe.JweUtils;
 
 public class AbstractJweDecryptingFilter {
+private Set protectedHttpHeaders;
+private boolean validateHttpHeaders;
 private JweDecryptionProvider decryption;
 private String defaultMediaType;
 protected JweDecryptionOutput decrypt(InputStream is) throws IOException {
@@ -63,4 +68,19 @@ public class AbstractJweDecryptingFilter {
 this.defaultMediaType = defaultMediaType;
 }
 
+public void setValidateHttpHeaders(boolean validateHttpHeaders) {
+this.validateHttpHeaders = validateHttpHeaders;
+}
+public boolean isValidateHttpHeaders() {
+return validateHttpHeaders;
+}
+
+protected void validateHttpHeadersIfNeeded(MultivaluedMap 
httpHeaders, JweHeaders jweHeaders) {
+JoseJaxrsUtils.validateHttpHeaders(httpHeaders, 
+   jweHeaders, 
+   protectedHttpHeaders);
+}
+public void setProtectedHttpHeaders(Set protectedHttpHeaders) {
+this.protectedHttpHeaders = protectedHttpHeaders;
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/eb14ce92/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonDecryptingFilter.java
--
diff --git 
a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonDecryptingFilter.java
 
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonDecryptingFilter.java
index 97ee5d9..bddbf65 100644
--- 
a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonDecryptingFilter.java
+++ 

cxf git commit: Removing MTOSI stuff from the rat.unknows.txt

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 88db31a17 -> 29ab0f6da


Removing MTOSI stuff from the rat.unknows.txt


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

Branch: refs/heads/3.0.x-fixes
Commit: 29ab0f6daa96ad848bfe55197df41d5612e57823
Parents: 88db31a
Author: Colm O hEigeartaigh 
Authored: Thu May 11 11:27:27 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu May 11 11:28:47 2017 +0100

--
 etc/rat.unknowns.txt | 91 ---
 1 file changed, 91 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/29ab0f6d/etc/rat.unknowns.txt
--
diff --git a/etc/rat.unknowns.txt b/etc/rat.unknowns.txt
index 47fc3d1..ec655ce 100644
--- a/etc/rat.unknowns.txt
+++ b/etc/rat.unknowns.txt
@@ -227,94 +227,3 @@ part of the work around CXF-1000:
  !? ./distribution/src/main/release/samples/restful_http_binding/index.html
  !? ./distribution/src/main/release/samples/restful_http_binding/update.xml
 
-MTOSI stuff:  (see NOTICE file)
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/DiscoveryServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/EquipmentInventoryMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/FaultServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/InventoryRetrievalSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/ManagedElementMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/MultiLayerSubnetworkMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/NotificationServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/OperationsSystemMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/ProtectionMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/TransmissionDescriptorMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/DiscoveryServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/EquipmentInventoryMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/FaultServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/InventoryRetrievalSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/ManagedElementMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/MultiLayerSubnetworkMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/NotificationServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/OperationsSystemMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/ProtectionMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/TransmissionDescriptorMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/ConfigurationService.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/DiscoveryService.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/EquipmentInventoryMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/Exceptions.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/FaultService.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/InventoryRetrieval.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/ManagedElementMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/MultiLayerSubnetworkMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/NotificationService.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/OperationsSystemMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/ProtectionMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/TransmissionDescriptorMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/transport/http/async_binding.xml
- !? 

cxf git commit: Removing MTOSI stuff from the rat.unknows.txt

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 18a0ee643 -> ad7c861a8


Removing MTOSI stuff from the rat.unknows.txt


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

Branch: refs/heads/master
Commit: ad7c861a846815474b0e69b73d2d604cf13f6c4d
Parents: 18a0ee6
Author: Colm O hEigeartaigh 
Authored: Thu May 11 11:27:27 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu May 11 11:27:27 2017 +0100

--
 etc/rat.unknowns.txt | 91 ---
 1 file changed, 91 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ad7c861a/etc/rat.unknowns.txt
--
diff --git a/etc/rat.unknowns.txt b/etc/rat.unknowns.txt
index 47fc3d1..ec655ce 100644
--- a/etc/rat.unknowns.txt
+++ b/etc/rat.unknowns.txt
@@ -227,94 +227,3 @@ part of the work around CXF-1000:
  !? ./distribution/src/main/release/samples/restful_http_binding/index.html
  !? ./distribution/src/main/release/samples/restful_http_binding/update.xml
 
-MTOSI stuff:  (see NOTICE file)
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/DiscoveryServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/EquipmentInventoryMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/FaultServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/InventoryRetrievalSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/ManagedElementMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/MultiLayerSubnetworkMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/NotificationServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/OperationsSystemMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/ProtectionMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/TransmissionDescriptorMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/DiscoveryServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/EquipmentInventoryMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/FaultServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/InventoryRetrievalSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/ManagedElementMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/MultiLayerSubnetworkMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/NotificationServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/OperationsSystemMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/ProtectionMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/TransmissionDescriptorMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/ConfigurationService.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/DiscoveryService.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/EquipmentInventoryMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/Exceptions.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/FaultService.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/InventoryRetrieval.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/ManagedElementMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/MultiLayerSubnetworkMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/NotificationService.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/OperationsSystemMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/ProtectionMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/TransmissionDescriptorMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/transport/http/async_binding.xml
- !? 

cxf git commit: Removing MTOSI stuff from the rat.unknows.txt

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 55e94d15e -> 6e89af732


Removing MTOSI stuff from the rat.unknows.txt


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

Branch: refs/heads/3.1.x-fixes
Commit: 6e89af7326eb15567278878716d5a758542fd058
Parents: 55e94d1
Author: Colm O hEigeartaigh 
Authored: Thu May 11 11:27:27 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu May 11 11:28:35 2017 +0100

--
 etc/rat.unknowns.txt | 91 ---
 1 file changed, 91 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6e89af73/etc/rat.unknowns.txt
--
diff --git a/etc/rat.unknowns.txt b/etc/rat.unknowns.txt
index 47fc3d1..ec655ce 100644
--- a/etc/rat.unknowns.txt
+++ b/etc/rat.unknowns.txt
@@ -227,94 +227,3 @@ part of the work around CXF-1000:
  !? ./distribution/src/main/release/samples/restful_http_binding/index.html
  !? ./distribution/src/main/release/samples/restful_http_binding/update.xml
 
-MTOSI stuff:  (see NOTICE file)
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/DiscoveryServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/EquipmentInventoryMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/FaultServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/InventoryRetrievalSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/ManagedElementMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/MultiLayerSubnetworkMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/NotificationServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/OperationsSystemMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/ProtectionMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_http/TransmissionDescriptorMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/DiscoveryServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/EquipmentInventoryMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/FaultServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/InventoryRetrievalSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/ManagedElementMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/MultiLayerSubnetworkMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/NotificationServiceSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/OperationsSystemMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/ProtectionMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/soap_jms/TransmissionDescriptorMgrSOAP.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/ConfigurationService.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/DiscoveryService.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/EquipmentInventoryMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/Exceptions.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/FaultService.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/InventoryRetrieval.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/ManagedElementMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/MultiLayerSubnetworkMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/NotificationService.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/OperationsSystemMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/ProtectionMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/common/TransmissionDescriptorMgr.wsdl
- !? 
./distribution/src/main/release/samples/mtosi_1.1/wsdl/transport/http/async_binding.xml
- !? 

cxf git commit: Renaming slf4j license file + updating copyright year

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 148708b2c -> 88db31a17


Renaming slf4j license file + updating copyright year


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

Branch: refs/heads/3.0.x-fixes
Commit: 88db31a177cff3d0b288bceced1907ad66f447e4
Parents: 148708b
Author: Colm O hEigeartaigh 
Authored: Thu May 11 11:23:03 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu May 11 11:24:07 2017 +0100

--
 distribution/src/main/release/licenses/sl4j.txt | 22 
 .../src/main/release/licenses/slf4j.txt | 22 
 2 files changed, 22 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/88db31a1/distribution/src/main/release/licenses/sl4j.txt
--
diff --git a/distribution/src/main/release/licenses/sl4j.txt 
b/distribution/src/main/release/licenses/sl4j.txt
deleted file mode 100644
index 46ba802..000
--- a/distribution/src/main/release/licenses/sl4j.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2004-2007 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free  of charge, to any person obtaining
-a  copy  of this  software  and  associated  documentation files  (the
-"Software"), to  deal in  the Software without  restriction, including
-without limitation  the rights to  use, copy, modify,  merge, publish,
-distribute,  sublicense, and/or sell  copies of  the Software,  and to
-permit persons to whom the Software  is furnished to do so, subject to
-the following conditions:
-
-The  above  copyright  notice  and  this permission  notice  shall  be
-included in all copies or substantial portions of the Software.
-
-THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
-EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
-MERCHANTABILITY,FITNESSFORA   PARTICULARPURPOSEAND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

http://git-wip-us.apache.org/repos/asf/cxf/blob/88db31a1/distribution/src/main/release/licenses/slf4j.txt
--
diff --git a/distribution/src/main/release/licenses/slf4j.txt 
b/distribution/src/main/release/licenses/slf4j.txt
new file mode 100644
index 000..a502dd9
--- /dev/null
+++ b/distribution/src/main/release/licenses/slf4j.txt
@@ -0,0 +1,22 @@
+Copyright (c) 2004-2017 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free  of charge, to any person obtaining
+a  copy  of this  software  and  associated  documentation files  (the
+"Software"), to  deal in  the Software without  restriction, including
+without limitation  the rights to  use, copy, modify,  merge, publish,
+distribute,  sublicense, and/or sell  copies of  the Software,  and to
+permit persons to whom the Software  is furnished to do so, subject to
+the following conditions:
+
+The  above  copyright  notice  and  this permission  notice  shall  be
+included in all copies or substantial portions of the Software.
+
+THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+MERCHANTABILITY,FITNESSFORA   PARTICULARPURPOSEAND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

cxf git commit: Renaming slf4j license file + updating copyright year

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 3b8e7c156 -> 55e94d15e


Renaming slf4j license file + updating copyright year


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

Branch: refs/heads/3.1.x-fixes
Commit: 55e94d15ef478c9e051dc8068377b5421449c5f2
Parents: 3b8e7c1
Author: Colm O hEigeartaigh 
Authored: Thu May 11 11:23:03 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu May 11 11:23:50 2017 +0100

--
 distribution/src/main/release/licenses/sl4j.txt | 22 
 .../src/main/release/licenses/slf4j.txt | 22 
 2 files changed, 22 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/55e94d15/distribution/src/main/release/licenses/sl4j.txt
--
diff --git a/distribution/src/main/release/licenses/sl4j.txt 
b/distribution/src/main/release/licenses/sl4j.txt
deleted file mode 100644
index 46ba802..000
--- a/distribution/src/main/release/licenses/sl4j.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2004-2007 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free  of charge, to any person obtaining
-a  copy  of this  software  and  associated  documentation files  (the
-"Software"), to  deal in  the Software without  restriction, including
-without limitation  the rights to  use, copy, modify,  merge, publish,
-distribute,  sublicense, and/or sell  copies of  the Software,  and to
-permit persons to whom the Software  is furnished to do so, subject to
-the following conditions:
-
-The  above  copyright  notice  and  this permission  notice  shall  be
-included in all copies or substantial portions of the Software.
-
-THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
-EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
-MERCHANTABILITY,FITNESSFORA   PARTICULARPURPOSEAND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

http://git-wip-us.apache.org/repos/asf/cxf/blob/55e94d15/distribution/src/main/release/licenses/slf4j.txt
--
diff --git a/distribution/src/main/release/licenses/slf4j.txt 
b/distribution/src/main/release/licenses/slf4j.txt
new file mode 100644
index 000..a502dd9
--- /dev/null
+++ b/distribution/src/main/release/licenses/slf4j.txt
@@ -0,0 +1,22 @@
+Copyright (c) 2004-2017 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free  of charge, to any person obtaining
+a  copy  of this  software  and  associated  documentation files  (the
+"Software"), to  deal in  the Software without  restriction, including
+without limitation  the rights to  use, copy, modify,  merge, publish,
+distribute,  sublicense, and/or sell  copies of  the Software,  and to
+permit persons to whom the Software  is furnished to do so, subject to
+the following conditions:
+
+The  above  copyright  notice  and  this permission  notice  shall  be
+included in all copies or substantial portions of the Software.
+
+THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+MERCHANTABILITY,FITNESSFORA   PARTICULARPURPOSEAND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

cxf git commit: Renaming slf4j license file + updating copyright year

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master f40e11663 -> 18a0ee643


Renaming slf4j license file + updating copyright year


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

Branch: refs/heads/master
Commit: 18a0ee64373251efe51a94d6634682534e43facc
Parents: f40e116
Author: Colm O hEigeartaigh 
Authored: Thu May 11 11:23:03 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu May 11 11:23:03 2017 +0100

--
 distribution/src/main/release/licenses/sl4j.txt | 22 
 .../src/main/release/licenses/slf4j.txt | 22 
 2 files changed, 22 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/18a0ee64/distribution/src/main/release/licenses/sl4j.txt
--
diff --git a/distribution/src/main/release/licenses/sl4j.txt 
b/distribution/src/main/release/licenses/sl4j.txt
deleted file mode 100644
index 46ba802..000
--- a/distribution/src/main/release/licenses/sl4j.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2004-2007 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free  of charge, to any person obtaining
-a  copy  of this  software  and  associated  documentation files  (the
-"Software"), to  deal in  the Software without  restriction, including
-without limitation  the rights to  use, copy, modify,  merge, publish,
-distribute,  sublicense, and/or sell  copies of  the Software,  and to
-permit persons to whom the Software  is furnished to do so, subject to
-the following conditions:
-
-The  above  copyright  notice  and  this permission  notice  shall  be
-included in all copies or substantial portions of the Software.
-
-THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
-EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
-MERCHANTABILITY,FITNESSFORA   PARTICULARPURPOSEAND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

http://git-wip-us.apache.org/repos/asf/cxf/blob/18a0ee64/distribution/src/main/release/licenses/slf4j.txt
--
diff --git a/distribution/src/main/release/licenses/slf4j.txt 
b/distribution/src/main/release/licenses/slf4j.txt
new file mode 100644
index 000..a502dd9
--- /dev/null
+++ b/distribution/src/main/release/licenses/slf4j.txt
@@ -0,0 +1,22 @@
+Copyright (c) 2004-2017 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free  of charge, to any person obtaining
+a  copy  of this  software  and  associated  documentation files  (the
+"Software"), to  deal in  the Software without  restriction, including
+without limitation  the rights to  use, copy, modify,  merge, publish,
+distribute,  sublicense, and/or sell  copies of  the Software,  and to
+permit persons to whom the Software  is furnished to do so, subject to
+the following conditions:
+
+The  above  copyright  notice  and  this permission  notice  shall  be
+included in all copies or substantial portions of the Software.
+
+THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+MERCHANTABILITY,FITNESSFORA   PARTICULARPURPOSEAND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

cxf-fediz git commit: Adding LDAP notice

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.2.x-fixes 4cdc6f4e3 -> 25e29260c


Adding LDAP notice


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

Branch: refs/heads/1.2.x-fixes
Commit: 25e29260cee8a2f8a45f4895e0bc104950135b28
Parents: 4cdc6f4
Author: Colm O hEigeartaigh 
Authored: Thu May 11 11:08:03 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu May 11 11:09:02 2017 +0100

--
 apache-fediz/src/main/release/NOTICE | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/25e29260/apache-fediz/src/main/release/NOTICE
--
diff --git a/apache-fediz/src/main/release/NOTICE 
b/apache-fediz/src/main/release/NOTICE
index 939ea2e..bf3e438 100644
--- a/apache-fediz/src/main/release/NOTICE
+++ b/apache-fediz/src/main/release/NOTICE
@@ -8,6 +8,9 @@ The Apache Software Foundation (http://www.apache.org/).
 This product includes software developed by Spring Security
 Project (http://www.springframework.org/security).
 
+This product includes software developed by the Spring LDAP
+Project (http://www.springframework.org/ldap).
+
 Portions of the included XmlSchema library are Copyright 2006 International 
Business Machines Corp.
 
 Portions of the included XmlSchema library are Copyright (C) World Wide Web

cxf-fediz git commit: Adding LDAP notice

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.3.x-fixes f2016e840 -> e66340ea5


Adding LDAP notice


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

Branch: refs/heads/1.3.x-fixes
Commit: e66340ea5b3bb81455ee87c08cbec429ea64fbe7
Parents: f2016e8
Author: Colm O hEigeartaigh 
Authored: Thu May 11 11:08:03 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu May 11 11:08:49 2017 +0100

--
 apache-fediz/src/main/release/NOTICE | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e66340ea/apache-fediz/src/main/release/NOTICE
--
diff --git a/apache-fediz/src/main/release/NOTICE 
b/apache-fediz/src/main/release/NOTICE
index 939ea2e..bf3e438 100644
--- a/apache-fediz/src/main/release/NOTICE
+++ b/apache-fediz/src/main/release/NOTICE
@@ -8,6 +8,9 @@ The Apache Software Foundation (http://www.apache.org/).
 This product includes software developed by Spring Security
 Project (http://www.springframework.org/security).
 
+This product includes software developed by the Spring LDAP
+Project (http://www.springframework.org/ldap).
+
 Portions of the included XmlSchema library are Copyright 2006 International 
Business Machines Corp.
 
 Portions of the included XmlSchema library are Copyright (C) World Wide Web

cxf-fediz git commit: Adding LDAP notice

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 0fdadd479 -> 83699efd4


Adding LDAP notice


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

Branch: refs/heads/master
Commit: 83699efd40cfcb4e1de35b7e52e5d9356a5b7654
Parents: 0fdadd4
Author: Colm O hEigeartaigh 
Authored: Thu May 11 11:08:03 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu May 11 11:08:03 2017 +0100

--
 apache-fediz/src/main/release/NOTICE | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/83699efd/apache-fediz/src/main/release/NOTICE
--
diff --git a/apache-fediz/src/main/release/NOTICE 
b/apache-fediz/src/main/release/NOTICE
index 939ea2e..bf3e438 100644
--- a/apache-fediz/src/main/release/NOTICE
+++ b/apache-fediz/src/main/release/NOTICE
@@ -8,6 +8,9 @@ The Apache Software Foundation (http://www.apache.org/).
 This product includes software developed by Spring Security
 Project (http://www.springframework.org/security).
 
+This product includes software developed by the Spring LDAP
+Project (http://www.springframework.org/ldap).
+
 Portions of the included XmlSchema library are Copyright 2006 International 
Business Machines Corp.
 
 Portions of the included XmlSchema library are Copyright (C) World Wide Web

cxf-fediz git commit: Adding more licenses

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.2.x-fixes 5fa238fbc -> 4cdc6f4e3


Adding more licenses


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

Branch: refs/heads/1.2.x-fixes
Commit: 4cdc6f4e3c91eaea38a172aae0b4c78b7f9033ec
Parents: 5fa238f
Author: Colm O hEigeartaigh 
Authored: Thu May 11 10:45:59 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu May 11 10:49:24 2017 +0100

--
 apache-fediz/src/main/release/LICENSE   |  12 +
 apache-fediz/src/main/release/NOTICE|   7 +
 .../src/main/release/licenses/LICENSE-bsd.txt   |  12 +
 .../release/licenses/LICENSE-cddl-gpl-10.txt| 269 ++
 .../release/licenses/LICENSE-cddl-gpl-11.txt| 277 +++
 5 files changed, 577 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4cdc6f4e/apache-fediz/src/main/release/LICENSE
--
diff --git a/apache-fediz/src/main/release/LICENSE 
b/apache-fediz/src/main/release/LICENSE
index ad516d4..71ad807 100644
--- a/apache-fediz/src/main/release/LICENSE
+++ b/apache-fediz/src/main/release/LICENSE
@@ -210,3 +210,15 @@ This project bundles SLF4J (MIT license):
 
 This project bundles BouncyCastle (MIT license):
  - See licenses/LICENSE-bouncycastle.txt 
+
+This project bundles AOP alliance (public domain license)
+
+This project bundles the Stax2 API (BSD license):
+ - See licenses/LICENSE-bsd.txt
+
+This project bundles the javax.annotation API (CDDL 1.0 + GPLv2 with classpath 
exception license)
+ - See licenses/LICENSE-cddl-gpl-10.txt
+
+This project bundles the javax.ws.rs-api (CDDL 1.1 + GPLv2 with classpath 
exception license)
+ - See licenses/LICENSE-cddl-gpl-11.txt
+

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4cdc6f4e/apache-fediz/src/main/release/NOTICE
--
diff --git a/apache-fediz/src/main/release/NOTICE 
b/apache-fediz/src/main/release/NOTICE
index b9ea4c5..939ea2e 100644
--- a/apache-fediz/src/main/release/NOTICE
+++ b/apache-fediz/src/main/release/NOTICE
@@ -5,4 +5,11 @@ Copyright 2011-2017 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+This product includes software developed by Spring Security
+Project (http://www.springframework.org/security).
+
+Portions of the included XmlSchema library are Copyright 2006 International 
Business Machines Corp.
+
+Portions of the included XmlSchema library are Copyright (C) World Wide Web
+Consortium 2006, 2007 and licensed under the three-part BSD license.
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4cdc6f4e/apache-fediz/src/main/release/licenses/LICENSE-bsd.txt
--
diff --git a/apache-fediz/src/main/release/licenses/LICENSE-bsd.txt 
b/apache-fediz/src/main/release/licenses/LICENSE-bsd.txt
new file mode 100644
index 000..1568be2
--- /dev/null
+++ b/apache-fediz/src/main/release/licenses/LICENSE-bsd.txt
@@ -0,0 +1,12 @@
+The BSD License
+
+   Copyright (c) , 
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, 
this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright 
notice, this list of conditions and the following disclaimer in the 
documentation and/or other materials provided with the distribution.
+* Neither the name of the  nor the names of its contributors 
may be used to endorse or promote products derived from this software without 
specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
SOFTWARE, EVEN IF ADVISED OF THE 

cxf-fediz git commit: Adding more licenses

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.3.x-fixes f2907fb4a -> f2016e840


Adding more licenses


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

Branch: refs/heads/1.3.x-fixes
Commit: f2016e840a1c7b7c601245f1d4c456ba1fa86166
Parents: f2907fb
Author: Colm O hEigeartaigh 
Authored: Thu May 11 10:45:59 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu May 11 10:46:30 2017 +0100

--
 apache-fediz/src/main/release/LICENSE   |  12 +
 apache-fediz/src/main/release/NOTICE|   7 +
 .../src/main/release/licenses/LICENSE-bsd.txt   |  12 +
 .../release/licenses/LICENSE-cddl-gpl-10.txt| 269 ++
 .../release/licenses/LICENSE-cddl-gpl-11.txt| 277 +++
 5 files changed, 577 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/f2016e84/apache-fediz/src/main/release/LICENSE
--
diff --git a/apache-fediz/src/main/release/LICENSE 
b/apache-fediz/src/main/release/LICENSE
index ad516d4..71ad807 100644
--- a/apache-fediz/src/main/release/LICENSE
+++ b/apache-fediz/src/main/release/LICENSE
@@ -210,3 +210,15 @@ This project bundles SLF4J (MIT license):
 
 This project bundles BouncyCastle (MIT license):
  - See licenses/LICENSE-bouncycastle.txt 
+
+This project bundles AOP alliance (public domain license)
+
+This project bundles the Stax2 API (BSD license):
+ - See licenses/LICENSE-bsd.txt
+
+This project bundles the javax.annotation API (CDDL 1.0 + GPLv2 with classpath 
exception license)
+ - See licenses/LICENSE-cddl-gpl-10.txt
+
+This project bundles the javax.ws.rs-api (CDDL 1.1 + GPLv2 with classpath 
exception license)
+ - See licenses/LICENSE-cddl-gpl-11.txt
+

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/f2016e84/apache-fediz/src/main/release/NOTICE
--
diff --git a/apache-fediz/src/main/release/NOTICE 
b/apache-fediz/src/main/release/NOTICE
index b9ea4c5..939ea2e 100644
--- a/apache-fediz/src/main/release/NOTICE
+++ b/apache-fediz/src/main/release/NOTICE
@@ -5,4 +5,11 @@ Copyright 2011-2017 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+This product includes software developed by Spring Security
+Project (http://www.springframework.org/security).
+
+Portions of the included XmlSchema library are Copyright 2006 International 
Business Machines Corp.
+
+Portions of the included XmlSchema library are Copyright (C) World Wide Web
+Consortium 2006, 2007 and licensed under the three-part BSD license.
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/f2016e84/apache-fediz/src/main/release/licenses/LICENSE-bsd.txt
--
diff --git a/apache-fediz/src/main/release/licenses/LICENSE-bsd.txt 
b/apache-fediz/src/main/release/licenses/LICENSE-bsd.txt
new file mode 100644
index 000..1568be2
--- /dev/null
+++ b/apache-fediz/src/main/release/licenses/LICENSE-bsd.txt
@@ -0,0 +1,12 @@
+The BSD License
+
+   Copyright (c) , 
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, 
this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright 
notice, this list of conditions and the following disclaimer in the 
documentation and/or other materials provided with the distribution.
+* Neither the name of the  nor the names of its contributors 
may be used to endorse or promote products derived from this software without 
specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
SOFTWARE, EVEN IF ADVISED OF THE 

cxf-fediz git commit: Adding more licenses

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 172addfc5 -> 0fdadd479


Adding more licenses


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

Branch: refs/heads/master
Commit: 0fdadd47926c1d410133979a0f3d978e2cb7ad84
Parents: 172addf
Author: Colm O hEigeartaigh 
Authored: Thu May 11 10:45:59 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu May 11 10:45:59 2017 +0100

--
 apache-fediz/src/main/release/LICENSE   |  12 +
 apache-fediz/src/main/release/NOTICE|   7 +
 .../src/main/release/licenses/LICENSE-bsd.txt   |  12 +
 .../release/licenses/LICENSE-cddl-gpl-10.txt| 269 ++
 .../release/licenses/LICENSE-cddl-gpl-11.txt| 277 +++
 5 files changed, 577 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/0fdadd47/apache-fediz/src/main/release/LICENSE
--
diff --git a/apache-fediz/src/main/release/LICENSE 
b/apache-fediz/src/main/release/LICENSE
index ad516d4..71ad807 100644
--- a/apache-fediz/src/main/release/LICENSE
+++ b/apache-fediz/src/main/release/LICENSE
@@ -210,3 +210,15 @@ This project bundles SLF4J (MIT license):
 
 This project bundles BouncyCastle (MIT license):
  - See licenses/LICENSE-bouncycastle.txt 
+
+This project bundles AOP alliance (public domain license)
+
+This project bundles the Stax2 API (BSD license):
+ - See licenses/LICENSE-bsd.txt
+
+This project bundles the javax.annotation API (CDDL 1.0 + GPLv2 with classpath 
exception license)
+ - See licenses/LICENSE-cddl-gpl-10.txt
+
+This project bundles the javax.ws.rs-api (CDDL 1.1 + GPLv2 with classpath 
exception license)
+ - See licenses/LICENSE-cddl-gpl-11.txt
+

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/0fdadd47/apache-fediz/src/main/release/NOTICE
--
diff --git a/apache-fediz/src/main/release/NOTICE 
b/apache-fediz/src/main/release/NOTICE
index b9ea4c5..939ea2e 100644
--- a/apache-fediz/src/main/release/NOTICE
+++ b/apache-fediz/src/main/release/NOTICE
@@ -5,4 +5,11 @@ Copyright 2011-2017 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+This product includes software developed by Spring Security
+Project (http://www.springframework.org/security).
+
+Portions of the included XmlSchema library are Copyright 2006 International 
Business Machines Corp.
+
+Portions of the included XmlSchema library are Copyright (C) World Wide Web
+Consortium 2006, 2007 and licensed under the three-part BSD license.
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/0fdadd47/apache-fediz/src/main/release/licenses/LICENSE-bsd.txt
--
diff --git a/apache-fediz/src/main/release/licenses/LICENSE-bsd.txt 
b/apache-fediz/src/main/release/licenses/LICENSE-bsd.txt
new file mode 100644
index 000..1568be2
--- /dev/null
+++ b/apache-fediz/src/main/release/licenses/LICENSE-bsd.txt
@@ -0,0 +1,12 @@
+The BSD License
+
+   Copyright (c) , 
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, 
this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright 
notice, this list of conditions and the following disclaimer in the 
documentation and/or other materials provided with the distribution.
+* Neither the name of the  nor the names of its contributors 
may be used to endorse or promote products derived from this software without 
specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
SOFTWARE, EVEN IF ADVISED OF THE