[2/2] git commit: [CXF-6078] Checking service class interfaces if one of its non-interface super classes has no expected JAX-RS annotated method
[CXF-6078] Checking service class interfaces if one of its non-interface super
classes has no expected JAX-RS annotated method
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/de0524a8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/de0524a8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/de0524a8
Branch: refs/heads/master
Commit: de0524a874be14a6bd5d9fac98a513169d7a4a7a
Parents: 30390cc
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Nov 5 11:19:04 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Nov 5 11:19:04 2014 +
--
.../systest/jaxrs/AbstractNameServiceImpl.java | 30 ++
.../apache/cxf/systest/jaxrs/NameService.java | 43
.../cxf/systest/jaxrs/NameServiceImpl.java | 31 ++
3 files changed, 104 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/de0524a8/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractNameServiceImpl.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractNameServiceImpl.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractNameServiceImpl.java
new file mode 100644
index 000..a8d7c01
--- /dev/null
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractNameServiceImpl.java
@@ -0,0 +1,30 @@
+/**
+ * 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.core.Response;
+
+public abstract class AbstractNameServiceImpl {
+
+public Response set(String id) {
+return Response.ok(id).build();
+}
+
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/de0524a8/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameService.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameService.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameService.java
new file mode 100644
index 000..5302b90
--- /dev/null
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameService.java
@@ -0,0 +1,43 @@
+/**
+ * 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.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
+
+@Path(/v1/names/)
+@Produces({ application/xml, application/json })
+@Consumes({ application/xml, application/json })
+public interface NameService {
+
+@GET
+@Path(/{id})
+Response get(@PathParam(id) String id);
+
+@PUT
+@Path(/{id})
+Response set(@PathParam(id) String id);
+
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/de0524a8/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameServiceImpl.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameServiceImpl.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameServiceImpl.java
new file mode 100644
index 000..6f3f087
--- /dev/null
[1/2] git commit: [CXF-6078] Checking service class interfaces if one of its non-interface super classes has no expected JAX-RS annotated method
Repository: cxf
Updated Branches:
refs/heads/master b916b1b7a - de0524a87
[CXF-6078] Checking service class interfaces if one of its non-interface super
classes has no expected JAX-RS annotated method
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/30390cc7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/30390cc7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/30390cc7
Branch: refs/heads/master
Commit: 30390cc755f58eab3b346dc7b035e6286d6662b8
Parents: b916b1b
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Nov 5 11:18:11 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Nov 5 11:18:11 2014 +
--
.../apache/cxf/jaxrs/utils/AnnotationUtils.java | 83 +++-
.../apache/cxf/jaxrs/utils/ResourceUtils.java | 5 +-
.../jaxrs/utils/AnnotationTestUtilsTest.java| 4 +-
.../apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 2 +-
.../JAXRSClientServerProxySpringBookTest.java | 18 -
.../resources/jaxrs_proxy/WEB-INF/beans.xml | 1 +
6 files changed, 72 insertions(+), 41 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/30390cc7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
index 345fa7c..27f8caf 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
@@ -151,52 +151,65 @@ public final class AnnotationUtils {
return null;
}
-public static Method getAnnotatedMethod(Method m) {
-Method annotatedMethod = doGetAnnotatedMethod(m);
+public static Method getAnnotatedMethod(Class? serviceClass, Method m) {
+Method annotatedMethod = doGetAnnotatedMethod(serviceClass, m);
return annotatedMethod == null ? m : annotatedMethod;
}
-private static Method doGetAnnotatedMethod(Method m) {
+private static Method doGetAnnotatedMethod(Class? serviceClass, Method
m) {
-if (m == null) {
-return m;
-}
-
-for (Annotation a : m.getAnnotations()) {
-if (AnnotationUtils.isMethodAnnotation(a)) {
-return m;
+if (m != null) {
+for (Annotation a : m.getAnnotations()) {
+if (AnnotationUtils.isMethodAnnotation(a)) {
+return m;
+}
}
-}
-for (Annotation[] paramAnnotations : m.getParameterAnnotations()) {
-if (isValidParamAnnotations(paramAnnotations)) {
-LOG.warning(Method + m.getName() + in +
m.getDeclaringClass().getName()
- + has no JAX-RS Path or HTTP Method
annotations);
-return m;
+for (Annotation[] paramAnnotations : m.getParameterAnnotations()) {
+if (isValidParamAnnotations(paramAnnotations)) {
+LOG.warning(Method + m.getName() + in +
m.getDeclaringClass().getName()
+ + has no JAX-RS Path or HTTP Method
annotations);
+return m;
+}
}
-}
-
-Class? superC = m.getDeclaringClass().getSuperclass();
-if (superC != null Object.class != superC) {
-try {
-Method method =
doGetAnnotatedMethod(superC.getMethod(m.getName(), m.getParameterTypes()));
-if (method != null) {
-return method;
+
+Class? declaringClass = m.getDeclaringClass();
+Class? superC = declaringClass.getSuperclass();
+if (superC != null Object.class != superC) {
+try {
+Method method = doGetAnnotatedMethod(serviceClass,
+
superC.getMethod(m.getName(), m.getParameterTypes()));
+if (method != null) {
+return method;
+}
+} catch (NoSuchMethodException ex) {
+// ignore
}
-} catch (NoSuchMethodException ex) {
-// ignore
}
-}
-for (Class? i : m.getDeclaringClass().getInterfaces()) {
-try {
-Method method = doGetAnnotatedMethod(i.getMethod(m.getName(),
m.getParameterTypes()));
-if (method != null) {
-return method;
+for (Class? i : declaringClass.getInterfaces()) {
+try {
[1/2] git commit: [CXF-6078] Checking service class interfaces if one of its non-interface super classes has no expected JAX-RS annotated method
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes cfde47b86 - aca6e050f
[CXF-6078] Checking service class interfaces if one of its non-interface super
classes has no expected JAX-RS annotated method
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aca6e050
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aca6e050
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aca6e050
Branch: refs/heads/3.0.x-fixes
Commit: aca6e050f16e438884fffd40d3612c974cd8b1c2
Parents: 1382c55
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Nov 5 11:19:04 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Nov 5 11:20:33 2014 +
--
.../systest/jaxrs/AbstractNameServiceImpl.java | 30 ++
.../apache/cxf/systest/jaxrs/NameService.java | 43
.../cxf/systest/jaxrs/NameServiceImpl.java | 31 ++
3 files changed, 104 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/aca6e050/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractNameServiceImpl.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractNameServiceImpl.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractNameServiceImpl.java
new file mode 100644
index 000..a8d7c01
--- /dev/null
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractNameServiceImpl.java
@@ -0,0 +1,30 @@
+/**
+ * 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.core.Response;
+
+public abstract class AbstractNameServiceImpl {
+
+public Response set(String id) {
+return Response.ok(id).build();
+}
+
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aca6e050/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameService.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameService.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameService.java
new file mode 100644
index 000..5302b90
--- /dev/null
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameService.java
@@ -0,0 +1,43 @@
+/**
+ * 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.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
+
+@Path(/v1/names/)
+@Produces({ application/xml, application/json })
+@Consumes({ application/xml, application/json })
+public interface NameService {
+
+@GET
+@Path(/{id})
+Response get(@PathParam(id) String id);
+
+@PUT
+@Path(/{id})
+Response set(@PathParam(id) String id);
+
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aca6e050/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameServiceImpl.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameServiceImpl.java
[2/2] git commit: [CXF-6078] Checking service class interfaces if one of its non-interface super classes has no expected JAX-RS annotated method
[CXF-6078] Checking service class interfaces if one of its non-interface super
classes has no expected JAX-RS annotated method
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1382c55e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1382c55e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1382c55e
Branch: refs/heads/3.0.x-fixes
Commit: 1382c55e1129b8647c2e56c11c6f70e7603d267e
Parents: cfde47b
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Nov 5 11:18:11 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Nov 5 11:20:33 2014 +
--
.../apache/cxf/jaxrs/utils/AnnotationUtils.java | 83 +++-
.../apache/cxf/jaxrs/utils/ResourceUtils.java | 5 +-
.../jaxrs/utils/AnnotationTestUtilsTest.java| 4 +-
.../apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 2 +-
.../JAXRSClientServerProxySpringBookTest.java | 18 -
.../resources/jaxrs_proxy/WEB-INF/beans.xml | 1 +
6 files changed, 72 insertions(+), 41 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1382c55e/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
index 345fa7c..27f8caf 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
@@ -151,52 +151,65 @@ public final class AnnotationUtils {
return null;
}
-public static Method getAnnotatedMethod(Method m) {
-Method annotatedMethod = doGetAnnotatedMethod(m);
+public static Method getAnnotatedMethod(Class? serviceClass, Method m) {
+Method annotatedMethod = doGetAnnotatedMethod(serviceClass, m);
return annotatedMethod == null ? m : annotatedMethod;
}
-private static Method doGetAnnotatedMethod(Method m) {
+private static Method doGetAnnotatedMethod(Class? serviceClass, Method
m) {
-if (m == null) {
-return m;
-}
-
-for (Annotation a : m.getAnnotations()) {
-if (AnnotationUtils.isMethodAnnotation(a)) {
-return m;
+if (m != null) {
+for (Annotation a : m.getAnnotations()) {
+if (AnnotationUtils.isMethodAnnotation(a)) {
+return m;
+}
}
-}
-for (Annotation[] paramAnnotations : m.getParameterAnnotations()) {
-if (isValidParamAnnotations(paramAnnotations)) {
-LOG.warning(Method + m.getName() + in +
m.getDeclaringClass().getName()
- + has no JAX-RS Path or HTTP Method
annotations);
-return m;
+for (Annotation[] paramAnnotations : m.getParameterAnnotations()) {
+if (isValidParamAnnotations(paramAnnotations)) {
+LOG.warning(Method + m.getName() + in +
m.getDeclaringClass().getName()
+ + has no JAX-RS Path or HTTP Method
annotations);
+return m;
+}
}
-}
-
-Class? superC = m.getDeclaringClass().getSuperclass();
-if (superC != null Object.class != superC) {
-try {
-Method method =
doGetAnnotatedMethod(superC.getMethod(m.getName(), m.getParameterTypes()));
-if (method != null) {
-return method;
+
+Class? declaringClass = m.getDeclaringClass();
+Class? superC = declaringClass.getSuperclass();
+if (superC != null Object.class != superC) {
+try {
+Method method = doGetAnnotatedMethod(serviceClass,
+
superC.getMethod(m.getName(), m.getParameterTypes()));
+if (method != null) {
+return method;
+}
+} catch (NoSuchMethodException ex) {
+// ignore
}
-} catch (NoSuchMethodException ex) {
-// ignore
}
-}
-for (Class? i : m.getDeclaringClass().getInterfaces()) {
-try {
-Method method = doGetAnnotatedMethod(i.getMethod(m.getName(),
m.getParameterTypes()));
-if (method != null) {
-return method;
+for (Class? i : declaringClass.getInterfaces()) {
+try {
+Method method = doGetAnnotatedMethod(serviceClass,
git commit: [CXF-6078] Checking service class interfaces if one of its non-interface super classes has no expected JAX-RS annotated method
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 9c275b132 - ebe561f18
[CXF-6078] Checking service class interfaces if one of its non-interface super
classes has no expected JAX-RS annotated method
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ebe561f1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ebe561f1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ebe561f1
Branch: refs/heads/2.7.x-fixes
Commit: ebe561f18d72586a6536cf89fe446ea60f8d538a
Parents: 9c275b1
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Nov 5 11:19:04 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Nov 5 11:23:00 2014 +
--
.../systest/jaxrs/AbstractNameServiceImpl.java | 30 ++
.../apache/cxf/systest/jaxrs/NameService.java | 43
.../cxf/systest/jaxrs/NameServiceImpl.java | 31 ++
3 files changed, 104 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ebe561f1/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractNameServiceImpl.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractNameServiceImpl.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractNameServiceImpl.java
new file mode 100644
index 000..a8d7c01
--- /dev/null
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractNameServiceImpl.java
@@ -0,0 +1,30 @@
+/**
+ * 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.core.Response;
+
+public abstract class AbstractNameServiceImpl {
+
+public Response set(String id) {
+return Response.ok(id).build();
+}
+
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ebe561f1/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameService.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameService.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameService.java
new file mode 100644
index 000..5302b90
--- /dev/null
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameService.java
@@ -0,0 +1,43 @@
+/**
+ * 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.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
+
+@Path(/v1/names/)
+@Produces({ application/xml, application/json })
+@Consumes({ application/xml, application/json })
+public interface NameService {
+
+@GET
+@Path(/{id})
+Response get(@PathParam(id) String id);
+
+@PUT
+@Path(/{id})
+Response set(@PathParam(id) String id);
+
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ebe561f1/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameServiceImpl.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/NameServiceImpl.java
git commit: [CXF-6078] Checking service class interfaces if one of its non-interface super classes has no expected JAX-RS annotated method
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes ebe561f18 - 9d671444d
[CXF-6078] Checking service class interfaces if one of its non-interface super
classes has no expected JAX-RS annotated method
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9d671444
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9d671444
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9d671444
Branch: refs/heads/2.7.x-fixes
Commit: 9d671444d3e677e6e7f5b5e86f13fc3d46b535a0
Parents: ebe561f
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Nov 5 11:18:11 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Nov 5 11:25:55 2014 +
--
.../apache/cxf/jaxrs/utils/AnnotationUtils.java | 83 +++-
.../apache/cxf/jaxrs/utils/ResourceUtils.java | 5 +-
.../jaxrs/utils/AnnotationTestUtilsTest.java| 4 +-
.../apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 2 +-
.../JAXRSClientServerProxySpringBookTest.java | 16
.../resources/jaxrs_proxy/WEB-INF/beans.xml | 3 +-
6 files changed, 72 insertions(+), 41 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/9d671444/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
index e902512..5d3cbf3 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
@@ -203,52 +203,65 @@ public final class AnnotationUtils {
return null;
}
-public static Method getAnnotatedMethod(Method m) {
-Method annotatedMethod = doGetAnnotatedMethod(m);
+public static Method getAnnotatedMethod(Class? serviceClass, Method m) {
+Method annotatedMethod = doGetAnnotatedMethod(serviceClass, m);
return annotatedMethod == null ? m : annotatedMethod;
}
-private static Method doGetAnnotatedMethod(Method m) {
+private static Method doGetAnnotatedMethod(Class? serviceClass, Method
m) {
-if (m == null) {
-return m;
-}
-
-for (Annotation a : m.getAnnotations()) {
-if (AnnotationUtils.isMethodAnnotation(a)) {
-return m;
+if (m != null) {
+for (Annotation a : m.getAnnotations()) {
+if (AnnotationUtils.isMethodAnnotation(a)) {
+return m;
+}
}
-}
-for (Annotation[] paramAnnotations : m.getParameterAnnotations()) {
-if (isValidParamAnnotations(paramAnnotations)) {
-LOG.warning(Method + m.getName() + in +
m.getDeclaringClass().getName()
- + has no JAX-RS Path or HTTP Method
annotations);
-return m;
+for (Annotation[] paramAnnotations : m.getParameterAnnotations()) {
+if (isValidParamAnnotations(paramAnnotations)) {
+LOG.warning(Method + m.getName() + in +
m.getDeclaringClass().getName()
+ + has no JAX-RS Path or HTTP Method
annotations);
+return m;
+}
}
-}
-
-Class? superC = m.getDeclaringClass().getSuperclass();
-if (superC != null Object.class != superC) {
-try {
-Method method =
doGetAnnotatedMethod(superC.getMethod(m.getName(), m.getParameterTypes()));
-if (method != null) {
-return method;
+
+Class? declaringClass = m.getDeclaringClass();
+Class? superC = declaringClass.getSuperclass();
+if (superC != null Object.class != superC) {
+try {
+Method method = doGetAnnotatedMethod(serviceClass,
+
superC.getMethod(m.getName(), m.getParameterTypes()));
+if (method != null) {
+return method;
+}
+} catch (NoSuchMethodException ex) {
+// ignore
}
-} catch (NoSuchMethodException ex) {
-// ignore
}
-}
-for (Class? i : m.getDeclaringClass().getInterfaces()) {
-try {
-Method method = doGetAnnotatedMethod(i.getMethod(m.getName(),
m.getParameterTypes()));
-if (method != null) {
-return method;
+for (Class? i : declaringClass.getInterfaces()) {
+
git commit: [CXF-6084] Support for validating critical headers, applying a patch on behalf of Daniel Torkian
Repository: cxf
Updated Branches:
refs/heads/master de0524a87 - afa521931
[CXF-6084] Support for validating critical headers, applying a patch on behalf
of Daniel Torkian
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/afa52193
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/afa52193
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/afa52193
Branch: refs/heads/master
Commit: afa52193148d7b1a6b60266ff73a92c1005f4c38
Parents: de0524a
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Nov 5 12:55:12 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Nov 5 12:55:12 2014 +
--
.../apache/cxf/rs/security/jose/JoseUtils.java | 23 +
.../security/jose/jwe/JweCompactConsumer.java | 4 ++
.../cxf/rs/security/jose/jwe/JweUtils.java | 6 +++
.../security/jose/jws/JwsCompactConsumer.java | 4 +-
.../jose/jws/JwsJsonSignatureEntry.java | 7 +++
.../cxf/rs/security/jose/jws/JwsUtils.java | 6 +++
.../security/jose/jws/JwsCompactHeaderTest.java | 49
.../provider/ClientSecretHashVerifier.java | 39
8 files changed, 137 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/afa52193/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseUtils.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseUtils.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseUtils.java
index b0ba894..23f9936 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseUtils.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseUtils.java
@@ -19,6 +19,9 @@
package org.apache.cxf.rs.security.jose;
import java.io.UnsupportedEncodingException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
import org.apache.cxf.common.util.crypto.CryptoUtils;
@@ -59,4 +62,24 @@ public final class JoseUtils {
public static byte[] decode(String encoded) {
return CryptoUtils.decodeSequence(encoded);
}
+
+public static boolean validateCriticalHeaders(JoseHeaders headers) {
+ListString critical = headers.getCritical();
+if (critical == null) {
+return true;
+}
+// The crit value MUST NOT be empty [] or contain either duplicate
values or crit
+if (critical.isEmpty()
+|| detectDoubleEntry(critical)
+|| critical.contains(JoseConstants.HEADER_CRITICAL)) {
+return false;
+}
+
+// Check that the headers contain these critical headers
+return headers.asMap().keySet().containsAll(critical);
+}
+private static boolean detectDoubleEntry(List? list) {
+SetObject inputSet = new HashSetObject(list);
+return list.size() inputSet.size();
+}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/afa52193/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweCompactConsumer.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweCompactConsumer.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweCompactConsumer.java
index 8673d4d..ab4c9b5 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweCompactConsumer.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweCompactConsumer.java
@@ -26,6 +26,7 @@ import org.apache.cxf.common.util.Base64UrlUtility;
import org.apache.cxf.rs.security.jose.JoseHeaders;
import org.apache.cxf.rs.security.jose.JoseHeadersReader;
import org.apache.cxf.rs.security.jose.JoseHeadersReaderWriter;
+import org.apache.cxf.rs.security.jose.jws.JwsUtils;
public class JweCompactConsumer {
@@ -113,4 +114,7 @@ public class JweCompactConsumer {
throw new SecurityException(ex);
}
}
+public boolean validateCriticalHeaders() {
+return JwsUtils.validateCriticalHeaders(getJweHeaders());
+}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/afa52193/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
index 4158da6..836a284 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
+++
git commit: [CXF-6084] Support for validating critical headers, applying a patch on behalf of Daniel Torkian
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes aca6e050f - 360a89355
[CXF-6084] Support for validating critical headers, applying a patch on behalf
of Daniel Torkian
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/360a8935
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/360a8935
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/360a8935
Branch: refs/heads/3.0.x-fixes
Commit: 360a89355da3b90a6687833e314d751f10d6ef39
Parents: aca6e05
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Nov 5 12:55:12 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Nov 5 12:56:06 2014 +
--
.../apache/cxf/rs/security/jose/JoseUtils.java | 23 +
.../security/jose/jwe/JweCompactConsumer.java | 4 ++
.../cxf/rs/security/jose/jwe/JweUtils.java | 6 +++
.../security/jose/jws/JwsCompactConsumer.java | 4 +-
.../jose/jws/JwsJsonSignatureEntry.java | 7 +++
.../cxf/rs/security/jose/jws/JwsUtils.java | 6 +++
.../security/jose/jws/JwsCompactHeaderTest.java | 49
.../provider/ClientSecretHashVerifier.java | 39
8 files changed, 137 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/360a8935/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseUtils.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseUtils.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseUtils.java
index b0ba894..23f9936 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseUtils.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseUtils.java
@@ -19,6 +19,9 @@
package org.apache.cxf.rs.security.jose;
import java.io.UnsupportedEncodingException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
import org.apache.cxf.common.util.crypto.CryptoUtils;
@@ -59,4 +62,24 @@ public final class JoseUtils {
public static byte[] decode(String encoded) {
return CryptoUtils.decodeSequence(encoded);
}
+
+public static boolean validateCriticalHeaders(JoseHeaders headers) {
+ListString critical = headers.getCritical();
+if (critical == null) {
+return true;
+}
+// The crit value MUST NOT be empty [] or contain either duplicate
values or crit
+if (critical.isEmpty()
+|| detectDoubleEntry(critical)
+|| critical.contains(JoseConstants.HEADER_CRITICAL)) {
+return false;
+}
+
+// Check that the headers contain these critical headers
+return headers.asMap().keySet().containsAll(critical);
+}
+private static boolean detectDoubleEntry(List? list) {
+SetObject inputSet = new HashSetObject(list);
+return list.size() inputSet.size();
+}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/360a8935/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweCompactConsumer.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweCompactConsumer.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweCompactConsumer.java
index 8673d4d..ab4c9b5 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweCompactConsumer.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweCompactConsumer.java
@@ -26,6 +26,7 @@ import org.apache.cxf.common.util.Base64UrlUtility;
import org.apache.cxf.rs.security.jose.JoseHeaders;
import org.apache.cxf.rs.security.jose.JoseHeadersReader;
import org.apache.cxf.rs.security.jose.JoseHeadersReaderWriter;
+import org.apache.cxf.rs.security.jose.jws.JwsUtils;
public class JweCompactConsumer {
@@ -113,4 +114,7 @@ public class JweCompactConsumer {
throw new SecurityException(ex);
}
}
+public boolean validateCriticalHeaders() {
+return JwsUtils.validateCriticalHeaders(getJweHeaders());
+}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/360a8935/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
index 4158da6..836a284 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
+++
git commit: Fixing a back merge issue in 2.7.x
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 9d671444d - a446d92c2 Fixing a back merge issue in 2.7.x Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a446d92c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a446d92c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a446d92c Branch: refs/heads/2.7.x-fixes Commit: a446d92c2456960d8adccfd404a952154101d8fd Parents: 9d67144 Author: Sergey Beryozkin sberyoz...@talend.com Authored: Wed Nov 5 13:06:21 2014 + Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Wed Nov 5 13:06:21 2014 + -- systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/a446d92c/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml -- diff --git a/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml index d67c9b2..fac009e 100644 --- a/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml +++ b/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml @@ -24,7 +24,7 @@ xsi:schemaLocation= http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd-- - HEAD + beans xmlns=http://www.springframework.org/schema/beans; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:jaxrs=http://cxf.apache.org/jaxrs;
git commit: Adding a SecureConversation test for Kerberos
Repository: cxf
Updated Branches:
refs/heads/master afa521931 - eb746f58d
Adding a SecureConversation test for Kerberos
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/eb746f58
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eb746f58
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eb746f58
Branch: refs/heads/master
Commit: eb746f58d608fff25049e76e922b2bf2730ff5cb
Parents: afa5219
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Nov 5 14:49:01 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Nov 5 14:49:16 2014 +
--
.../systest/ws/kerberos/KerberosTokenTest.java | 37 +-
.../systest/ws/kerberos/DoubleItKerberos.wsdl | 114 +++
.../apache/cxf/systest/ws/kerberos/client.xml | 13 +++
.../apache/cxf/systest/ws/kerberos/server.xml | 8 ++
4 files changed, 171 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/eb746f58/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
--
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
index 29d112c..1d4c89e 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
@@ -100,7 +100,7 @@ public class KerberosTokenTest extends
AbstractBusClientServerTestBase {
SecurityTestUtil.cleanup();
stopAllServers();
}
-
+
@org.junit.Test
public void testKerberosOverTransport() throws Exception {
@@ -552,4 +552,39 @@ public class KerberosTokenTest extends
AbstractBusClientServerTestBase {
bus.shutdown(true);
}
+
+@org.junit.Test
+public void testKerberosOverSymmetricSecureConversation() throws Exception
{
+
+if (!unrestrictedPoliciesInstalled) {
+return;
+}
+
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile = KerberosTokenTest.class.getResource(client.xml);
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL wsdl =
KerberosTokenTest.class.getResource(DoubleItKerberos.wsdl);
+Service service = Service.create(wsdl, SERVICE_QNAME);
+QName portQName = new QName(NAMESPACE,
DoubleItKerberosSymmetricSecureConversationPort);
+DoubleItPortType kerberosPort =
+service.getPort(portQName, DoubleItPortType.class);
+
+updateAddressPort(kerberosPort, test.getPort());
+
+if (test.isStreaming()) {
+SecurityTestUtil.enableStreaming(kerberosPort);
+}
+
+// TODO Streaming
+if (!test.isStreaming() !STAX_PORT.equals(test.getPort())) {
+kerberosPort.doubleIt(25);
+}
+
+((java.io.Closeable)kerberosPort).close();
+bus.shutdown(true);
+}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/eb746f58/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl
--
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl
index 86f24b5..cd858e4 100644
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl
+++
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl
@@ -251,6 +251,24 @@
/wsdl:fault
/wsdl:operation
/wsdl:binding
+wsdl:binding name=DoubleItKerberosSymmetricSecureConversationBinding
type=tns:DoubleItPortType
+wsp:PolicyReference
URI=#DoubleItKerberosSymmetricSecureConversationPolicy/
+soap:binding style=document
transport=http://schemas.xmlsoap.org/soap/http/
+wsdl:operation name=DoubleIt
+soap:operation soapAction=/
+wsdl:input
+soap:body use=literal/
+wsp:PolicyReference
URI=#DoubleItBinding_DoubleIt_Input_Policy/
+/wsdl:input
+wsdl:output
+soap:body use=literal/
+wsp:PolicyReference
URI=#DoubleItBinding_DoubleIt_Output_Policy/
+/wsdl:output
+wsdl:fault name=DoubleItFault
+soap:body use=literal name=DoubleItFault/
+
git commit: Adding a SecureConversation test for Kerberos
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 360a89355 - 7a5d8184f
Adding a SecureConversation test for Kerberos
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7a5d8184
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7a5d8184
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7a5d8184
Branch: refs/heads/3.0.x-fixes
Commit: 7a5d8184f175e461a508270b5620a9702adda18f
Parents: 360a893
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Nov 5 14:49:01 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Nov 5 14:55:46 2014 +
--
.../systest/ws/kerberos/KerberosTokenTest.java | 37 +-
.../systest/ws/kerberos/DoubleItKerberos.wsdl | 114 +++
.../apache/cxf/systest/ws/kerberos/client.xml | 13 +++
.../apache/cxf/systest/ws/kerberos/server.xml | 8 ++
4 files changed, 171 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/7a5d8184/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
--
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
index 29d112c..1d4c89e 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
@@ -100,7 +100,7 @@ public class KerberosTokenTest extends
AbstractBusClientServerTestBase {
SecurityTestUtil.cleanup();
stopAllServers();
}
-
+
@org.junit.Test
public void testKerberosOverTransport() throws Exception {
@@ -552,4 +552,39 @@ public class KerberosTokenTest extends
AbstractBusClientServerTestBase {
bus.shutdown(true);
}
+
+@org.junit.Test
+public void testKerberosOverSymmetricSecureConversation() throws Exception
{
+
+if (!unrestrictedPoliciesInstalled) {
+return;
+}
+
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile = KerberosTokenTest.class.getResource(client.xml);
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL wsdl =
KerberosTokenTest.class.getResource(DoubleItKerberos.wsdl);
+Service service = Service.create(wsdl, SERVICE_QNAME);
+QName portQName = new QName(NAMESPACE,
DoubleItKerberosSymmetricSecureConversationPort);
+DoubleItPortType kerberosPort =
+service.getPort(portQName, DoubleItPortType.class);
+
+updateAddressPort(kerberosPort, test.getPort());
+
+if (test.isStreaming()) {
+SecurityTestUtil.enableStreaming(kerberosPort);
+}
+
+// TODO Streaming
+if (!test.isStreaming() !STAX_PORT.equals(test.getPort())) {
+kerberosPort.doubleIt(25);
+}
+
+((java.io.Closeable)kerberosPort).close();
+bus.shutdown(true);
+}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/7a5d8184/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl
--
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl
index 86f24b5..cd858e4 100644
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl
+++
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl
@@ -251,6 +251,24 @@
/wsdl:fault
/wsdl:operation
/wsdl:binding
+wsdl:binding name=DoubleItKerberosSymmetricSecureConversationBinding
type=tns:DoubleItPortType
+wsp:PolicyReference
URI=#DoubleItKerberosSymmetricSecureConversationPolicy/
+soap:binding style=document
transport=http://schemas.xmlsoap.org/soap/http/
+wsdl:operation name=DoubleIt
+soap:operation soapAction=/
+wsdl:input
+soap:body use=literal/
+wsp:PolicyReference
URI=#DoubleItBinding_DoubleIt_Input_Policy/
+/wsdl:input
+wsdl:output
+soap:body use=literal/
+wsp:PolicyReference
URI=#DoubleItBinding_DoubleIt_Output_Policy/
+/wsdl:output
+wsdl:fault name=DoubleItFault
+soap:body use=literal
git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes a446d92c2 - 41545eea4 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/41545eea Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/41545eea Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/41545eea Branch: refs/heads/2.7.x-fixes Commit: 41545eea47315901c18d3488c67ee284788cfad5 Parents: a446d92 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Nov 5 15:03:06 2014 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Nov 5 15:03:06 2014 + -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/41545eea/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 4f328e4..c248fab 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -724,6 +724,7 @@ B 78d67e6576a93dc197538796a07d2f3f4a491570 B 78f0c578afd693c577e0eb43150250bc726e5e6e B 79bd4f37f7fea32346195180566d1c2562d79871 B 79be65ac292c636427922f61e85de6737c7b4975 +B 7a5d8184f175e461a508270b5620a9702adda18f B 7a9039c7a6d001974b70cbd1df064991c8f291a1 B 7ae1708c781b497769de20dff8f65c94d21d0dae B 7b2020d6a9f1de574348ae979a5b8a80f5984a6d
git commit: Some modifications to Hawk token nonce verification code, more is needed
Repository: cxf
Updated Branches:
refs/heads/master eb746f58d - 79916d34d
Some modifications to Hawk token nonce verification code, more is needed
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/79916d34
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/79916d34
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/79916d34
Branch: refs/heads/master
Commit: 79916d34da80bd16321347a3eb188e20ca991456
Parents: eb746f5
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Nov 5 16:16:51 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Nov 5 16:16:51 2014 +
--
.../rs/security/oauth2/tokens/hawk/Nonce.java | 11 +++-
.../oauth2/tokens/hawk/NonceHistory.java| 28 +++-
.../security/oauth2/tokens/hawk/NonceStore.java | 2 +-
.../oauth2/tokens/hawk/NonceVerifierImpl.java | 23 +---
4 files changed, 28 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/79916d34/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/Nonce.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/Nonce.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/Nonce.java
index 1669001..b87d959 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/Nonce.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/Nonce.java
@@ -25,7 +25,7 @@ public class Nonce implements Serializable {
private static final long serialVersionUID = -6164115071533503490L;
private String nonceString;
-private long ts;
+private Long ts;
public Nonce(String nonce, long ts) {
this.nonceString = nonce;
@@ -39,4 +39,13 @@ public class Nonce implements Serializable {
public long getTs() {
return ts;
}
+
+public int hashCode() {
+return nonceString.hashCode() + 37 * ts.hashCode();
+}
+public boolean equals(Object o) {
+return o instanceof Nonce
+ this.nonceString.equals(((Nonce)o).nonceString)
+ this.ts.equals(((Nonce)o).ts);
+}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/79916d34/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceHistory.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceHistory.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceHistory.java
index cb95e9c..99b6137 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceHistory.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceHistory.java
@@ -19,42 +19,34 @@
package org.apache.cxf.rs.security.oauth2.tokens.hawk;
import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
public class NonceHistory implements Serializable {
private static final long serialVersionUID = -6404833046910698956L;
private final long requestTimeDelta;
-private final ListNonce nonceList = new ArrayListNonce();
+private final SetNonce nonceList = Collections.synchronizedSet(new
LinkedHashSetNonce());
public NonceHistory(long requestTimeDelta, Nonce nonce) {
this.requestTimeDelta = requestTimeDelta;
nonceList.add(nonce);
}
-public void addNonce(Nonce nonce) {
-nonceList.add(nonce);
+public boolean addNonce(Nonce nonce) {
+return nonceList.add(nonce);
}
public long getRequestTimeDelta() {
return requestTimeDelta;
}
-public ListNonce getNonceList() {
-return nonceList;
-}
-
-public CollectionNonce findMatchingNonces(String nonceString, long ts) {
-ListNonce nonceMatches = new ArrayListNonce();
-for (Nonce nonce : getNonceList()) {
-if (nonce.getNonceString().equals(nonceString) nonce.getTs() ==
ts) {
-nonceMatches.add(nonce);
-}
-}
-return nonceMatches;
+public SetNonce getNonces() {
+return Collections.unmodifiableSet(nonceList);
}
+
+
}
\ No newline at end of file
git commit: Some modifications to Hawk token nonce verification code, more is needed
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 7a5d8184f - d6b88f980
Some modifications to Hawk token nonce verification code, more is needed
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d6b88f98
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d6b88f98
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d6b88f98
Branch: refs/heads/3.0.x-fixes
Commit: d6b88f98091501fb8009b8394fe0e3e22d4db12a
Parents: 7a5d818
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Nov 5 16:16:51 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Nov 5 16:17:39 2014 +
--
.../rs/security/oauth2/tokens/hawk/Nonce.java | 11 +++-
.../oauth2/tokens/hawk/NonceHistory.java| 28 +++-
.../security/oauth2/tokens/hawk/NonceStore.java | 2 +-
.../oauth2/tokens/hawk/NonceVerifierImpl.java | 23 +---
4 files changed, 28 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/d6b88f98/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/Nonce.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/Nonce.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/Nonce.java
index 1669001..b87d959 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/Nonce.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/Nonce.java
@@ -25,7 +25,7 @@ public class Nonce implements Serializable {
private static final long serialVersionUID = -6164115071533503490L;
private String nonceString;
-private long ts;
+private Long ts;
public Nonce(String nonce, long ts) {
this.nonceString = nonce;
@@ -39,4 +39,13 @@ public class Nonce implements Serializable {
public long getTs() {
return ts;
}
+
+public int hashCode() {
+return nonceString.hashCode() + 37 * ts.hashCode();
+}
+public boolean equals(Object o) {
+return o instanceof Nonce
+ this.nonceString.equals(((Nonce)o).nonceString)
+ this.ts.equals(((Nonce)o).ts);
+}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/d6b88f98/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceHistory.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceHistory.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceHistory.java
index cb95e9c..99b6137 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceHistory.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceHistory.java
@@ -19,42 +19,34 @@
package org.apache.cxf.rs.security.oauth2.tokens.hawk;
import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
public class NonceHistory implements Serializable {
private static final long serialVersionUID = -6404833046910698956L;
private final long requestTimeDelta;
-private final ListNonce nonceList = new ArrayListNonce();
+private final SetNonce nonceList = Collections.synchronizedSet(new
LinkedHashSetNonce());
public NonceHistory(long requestTimeDelta, Nonce nonce) {
this.requestTimeDelta = requestTimeDelta;
nonceList.add(nonce);
}
-public void addNonce(Nonce nonce) {
-nonceList.add(nonce);
+public boolean addNonce(Nonce nonce) {
+return nonceList.add(nonce);
}
public long getRequestTimeDelta() {
return requestTimeDelta;
}
-public ListNonce getNonceList() {
-return nonceList;
-}
-
-public CollectionNonce findMatchingNonces(String nonceString, long ts) {
-ListNonce nonceMatches = new ArrayListNonce();
-for (Nonce nonce : getNonceList()) {
-if (nonce.getNonceString().equals(nonceString) nonce.getTs() ==
ts) {
-nonceMatches.add(nonce);
-}
-}
-return nonceMatches;
+public SetNonce getNonces() {
+return Collections.unmodifiableSet(nonceList);
}
+
+
}
\ No newline at end of file
git commit: [CXF-6087] - Add a way to exclude (multiple) SSL/TLS protocols in the HTTPJ namespace
Repository: cxf
Updated Branches:
refs/heads/master 79916d34d - 1701e6c8d
[CXF-6087] - Add a way to exclude (multiple) SSL/TLS protocols in the HTTPJ
namespace
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1701e6c8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1701e6c8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1701e6c8
Branch: refs/heads/master
Commit: 1701e6c8d4e794f25d69781e3f69357723ad7fcf
Parents: 79916d3
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Nov 5 17:12:31 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Nov 5 17:12:47 2014 +
--
.../configuration/jsse/TLSServerParameters.java | 22 +++
.../jsse/TLSServerParametersConfig.java | 3 +
.../schemas/configuration/security.xsd | 19 ++
.../http_jetty/JettyHTTPServerEngine.java | 7 +-
.../osgi/HTTPJettyTransportActivator.java | 5 ++
...ttyHTTPServerEngineBeanDefinitionParser.java | 5 +-
.../org/apache/cxf/systest/ws/ssl/SSLTest.java | 67
.../apache/cxf/systest/ws/ssl/DoubleItSSL.wsdl | 3 +
.../apache/cxf/systest/ws/ssl/client-ssl3.xml | 34 ++
.../org/apache/cxf/systest/ws/ssl/server.xml| 26
10 files changed, 189 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1701e6c8/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
--
diff --git
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
index ab94d38..52884c3 100644
---
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
+++
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
@@ -18,6 +18,9 @@
*/
package org.apache.cxf.configuration.jsse;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.cxf.configuration.security.ClientAuthentication;
/**
@@ -28,6 +31,7 @@ import
org.apache.cxf.configuration.security.ClientAuthentication;
public class TLSServerParameters extends TLSParameterBase {
ClientAuthentication clientAuthentication;
+ListString excludeProtocols = new ArrayListString();
/**
* This parameter configures the server side to request and/or
@@ -43,4 +47,22 @@ public class TLSServerParameters extends TLSParameterBase {
public ClientAuthentication getClientAuthentication() {
return clientAuthentication;
}
+
+/**
+ * This parameter sets the protocol list to exclude.
+ */
+public final void setExcludeProtocols(ListString protocols) {
+excludeProtocols = protocols;
+}
+
+/**
+ * Returns the protocols to exclude that are associated with this endpoint.
+ */
+public ListString getExcludeProtocols() {
+if (excludeProtocols == null) {
+excludeProtocols = new ArrayListString();
+}
+return excludeProtocols;
+}
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/1701e6c8/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
--
diff --git
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
index 13d84e8..a9c9cd6 100644
---
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
+++
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
@@ -54,6 +54,9 @@ public class TLSServerParametersConfig
if (params.isSetCipherSuites()) {
this.setCipherSuites(params.getCipherSuites().getCipherSuite());
}
+if (params.isSetExcludeProtocols()) {
+
this.setExcludeProtocols(params.getExcludeProtocols().getExcludeProtocol());
+}
if (params.isSetJsseProvider()) {
this.setJsseProvider(params.getJsseProvider());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/1701e6c8/core/src/main/resources/schemas/configuration/security.xsd
--
diff --git a/core/src/main/resources/schemas/configuration/security.xsd
b/core/src/main/resources/schemas/configuration/security.xsd
index 4cfa92a..d53d3e6 100644
--- a/core/src/main/resources/schemas/configuration/security.xsd
+++ b/core/src/main/resources/schemas/configuration/security.xsd
@@ -350,6 +350,18 @@
/xs:sequence
/xs:complexType
+xs:complexType name=ExcludeProtocols
+ xs:annotation
+
[1/3] git commit: [CXF-6087] - Add a way to exclude (multiple) SSL/TLS protocols in the HTTPJ namespace
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes d6b88f980 - 11725278a
[CXF-6087] - Add a way to exclude (multiple) SSL/TLS protocols in the HTTPJ
namespace
Conflicts:
rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4199a30e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4199a30e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4199a30e
Branch: refs/heads/3.0.x-fixes
Commit: 4199a30e43e7fa90801fb4aafcfa3dc397f0c262
Parents: d6b88f9
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Nov 5 17:12:31 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Nov 5 17:13:19 2014 +
--
.../configuration/jsse/TLSServerParameters.java | 22 ++
.../jsse/TLSServerParametersConfig.java | 3 +
.../schemas/configuration/security.xsd | 19 ++
.../http_jetty/JettyHTTPServerEngine.java | 242 +++
.../osgi/HTTPJettyTransportActivator.java | 5 +
...ttyHTTPServerEngineBeanDefinitionParser.java | 5 +-
.../org/apache/cxf/systest/ws/ssl/SSLTest.java | 67 +
.../apache/cxf/systest/ws/ssl/DoubleItSSL.wsdl | 3 +
.../apache/cxf/systest/ws/ssl/client-ssl3.xml | 34 +++
.../org/apache/cxf/systest/ws/ssl/server.xml| 26 ++
10 files changed, 425 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/4199a30e/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
--
diff --git
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
index ab94d38..52884c3 100644
---
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
+++
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
@@ -18,6 +18,9 @@
*/
package org.apache.cxf.configuration.jsse;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.cxf.configuration.security.ClientAuthentication;
/**
@@ -28,6 +31,7 @@ import
org.apache.cxf.configuration.security.ClientAuthentication;
public class TLSServerParameters extends TLSParameterBase {
ClientAuthentication clientAuthentication;
+ListString excludeProtocols = new ArrayListString();
/**
* This parameter configures the server side to request and/or
@@ -43,4 +47,22 @@ public class TLSServerParameters extends TLSParameterBase {
public ClientAuthentication getClientAuthentication() {
return clientAuthentication;
}
+
+/**
+ * This parameter sets the protocol list to exclude.
+ */
+public final void setExcludeProtocols(ListString protocols) {
+excludeProtocols = protocols;
+}
+
+/**
+ * Returns the protocols to exclude that are associated with this endpoint.
+ */
+public ListString getExcludeProtocols() {
+if (excludeProtocols == null) {
+excludeProtocols = new ArrayListString();
+}
+return excludeProtocols;
+}
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4199a30e/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
--
diff --git
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
index 13d84e8..a9c9cd6 100644
---
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
+++
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
@@ -54,6 +54,9 @@ public class TLSServerParametersConfig
if (params.isSetCipherSuites()) {
this.setCipherSuites(params.getCipherSuites().getCipherSuite());
}
+if (params.isSetExcludeProtocols()) {
+
this.setExcludeProtocols(params.getExcludeProtocols().getExcludeProtocol());
+}
if (params.isSetJsseProvider()) {
this.setJsseProvider(params.getJsseProvider());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4199a30e/core/src/main/resources/schemas/configuration/security.xsd
--
diff --git a/core/src/main/resources/schemas/configuration/security.xsd
b/core/src/main/resources/schemas/configuration/security.xsd
index e68e65a..56fe888 100644
--- a/core/src/main/resources/schemas/configuration/security.xsd
+++ b/core/src/main/resources/schemas/configuration/security.xsd
@@ -341,6 +341,18 @@
[3/3] git commit: Fixing last commit
Fixing last commit
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/11725278
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/11725278
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/11725278
Branch: refs/heads/3.0.x-fixes
Commit: 11725278aa954eccb94cc3f59fde43acc3076cef
Parents: 72df21e
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Nov 5 17:31:01 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Nov 5 17:31:01 2014 +
--
.../http_jetty/JettyHTTPServerEngine.java | 243 +--
.../osgi/HTTPJettyTransportActivator.java | 2 +-
.../https_jetty/CXFJettySslSocketConnector.java | 16 +-
.../https_jetty/JettySslConnectorFactory.java | 1 +
4 files changed, 18 insertions(+), 244 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/11725278/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
--
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index be55bff..47da1c0 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -477,248 +477,6 @@ public class JettyHTTPServerEngine
++servantCount;
}
- HEAD
-===
-private void addServerMBean() {
-if (mBeanContainer == null) {
-return;
-}
-
-try {
-Object o = getContainer(server);
-o.getClass().getMethod(addEventListener,
Container.Listener.class).invoke(o, mBeanContainer);
-if (Server.getVersion().startsWith(8)) {
-return;
-}
-mBeanContainer.getClass().getMethod(beanAdded, Container.class,
Object.class)
-.invoke(mBeanContainer, null, server);
-} catch (RuntimeException rex) {
-throw rex;
-} catch (Exception r) {
-throw new RuntimeException(r);
-}
-}
-private void removeServerMBean() {
-try {
-mBeanContainer.getClass().getMethod(beanRemoved,
Container.class, Object.class)
-.invoke(mBeanContainer, null, server);
-} catch (RuntimeException rex) {
-throw rex;
-} catch (Exception r) {
-throw new RuntimeException(r);
-}
-}
-
-private Connector createConnector(String hosto, int porto) {
-// now we just use the SelectChannelConnector as the default connector
-SslContextFactory sslcf = null;
-if (tlsServerParameters != null) {
-sslcf = new SslContextFactory() {
-protected void doStart() throws Exception {
-setSslContext(createSSLContext(this));
-super.doStart();
-}
-public void checkKeyStore() {
-//we'll handle this later
-}
-};
-decorateCXFJettySslSocketConnector(sslcf);
-}
-AbstractConnector result = null;
-if (!Server.getVersion().startsWith(8)) {
-result = createConnectorJetty9(sslcf, hosto, porto);
-} else {
-result = createConnectorJetty8(sslcf, hosto, porto);
-}
-
-try {
-result.getClass().getMethod(setPort,
Integer.TYPE).invoke(result, porto);
-if (hosto != null) {
-result.getClass().getMethod(setHost,
String.class).invoke(result, hosto);
-}
-result.getClass().getMethod(setReuseAddress,
Boolean.TYPE).invoke(result, isReuseAddress());
-} catch (RuntimeException rex) {
-throw rex;
-} catch (Exception ex) {
-throw new RuntimeException(ex);
-}
-
-return result;
-}
-
-AbstractConnector createConnectorJetty9(SslContextFactory sslcf, String
hosto, int porto) {
-//Jetty 9
-AbstractConnector result = null;
-try {
-Class? configClass =
ClassLoaderUtils.loadClass(org.eclipse.jetty.server.HttpConfiguration,
- Server.class);
-Object httpConfig = configClass.newInstance();
-httpConfig.getClass().getMethod(setSendServerVersion,
Boolean.TYPE)
-.invoke(httpConfig, getSendServerVersion());
-
-Object httpFactory =
[2/3] git commit: Recording .gitmergeinfo Changes
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/72df21e8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/72df21e8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/72df21e8 Branch: refs/heads/3.0.x-fixes Commit: 72df21e88a8bd08515f43ec0882abef9a7b6250b Parents: 4199a30 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Nov 5 17:13:20 2014 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Nov 5 17:13:20 2014 + -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/72df21e8/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index efd87a5..819d30e 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -92,6 +92,7 @@ B fd3471e58e63ee672babc015ed0929f6cd6862dd B ff742436a3e177dc61106edf08f2509e727362dd B ffd429be404953874e141c52a9c8ba46812d73ca M 0d63846798b590255c45463359e2cb1a28e4d3cb +M 1701e6c8d4e794f25d69781e3f69357723ad7fcf M 18a3d43cb0044fcb84d3cc89f138fd9e7110dd04 M 43c8d500b04a13f72077751fdbfaab7bbcfbbf8f M 4640cf1ea20eee09ae650b706bce765a16affc8b
[2/4] git commit: Fixing last commit
Fixing last commit
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/26815745
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/26815745
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/26815745
Branch: refs/heads/2.7.x-fixes
Commit: 26815745a13a8cd014f1266abc15dc022b741e2d
Parents: f121288
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Nov 5 17:31:01 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Nov 5 17:31:35 2014 +
--
.../http_jetty/JettyHTTPServerEngine.java | 243 +--
.../osgi/HTTPJettyTransportActivator.java | 2 +-
.../https_jetty/CXFJettySslSocketConnector.java | 16 +-
.../https_jetty/JettySslConnectorFactory.java | 1 +
4 files changed, 18 insertions(+), 244 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/26815745/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
--
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 5904007..d6c5376 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -468,248 +468,6 @@ public class JettyHTTPServerEngine
++servantCount;
}
- HEAD
-===
-private void addServerMBean() {
-if (mBeanContainer == null) {
-return;
-}
-
-try {
-Object o = getContainer(server);
-o.getClass().getMethod(addEventListener,
Container.Listener.class).invoke(o, mBeanContainer);
-if (Server.getVersion().startsWith(8)) {
-return;
-}
-mBeanContainer.getClass().getMethod(beanAdded, Container.class,
Object.class)
-.invoke(mBeanContainer, null, server);
-} catch (RuntimeException rex) {
-throw rex;
-} catch (Exception r) {
-throw new RuntimeException(r);
-}
-}
-private void removeServerMBean() {
-try {
-mBeanContainer.getClass().getMethod(beanRemoved,
Container.class, Object.class)
-.invoke(mBeanContainer, null, server);
-} catch (RuntimeException rex) {
-throw rex;
-} catch (Exception r) {
-throw new RuntimeException(r);
-}
-}
-
-private Connector createConnector(String hosto, int porto) {
-// now we just use the SelectChannelConnector as the default connector
-SslContextFactory sslcf = null;
-if (tlsServerParameters != null) {
-sslcf = new SslContextFactory() {
-protected void doStart() throws Exception {
-setSslContext(createSSLContext(this));
-super.doStart();
-}
-public void checkKeyStore() {
-//we'll handle this later
-}
-};
-decorateCXFJettySslSocketConnector(sslcf);
-}
-AbstractConnector result = null;
-if (!Server.getVersion().startsWith(8)) {
-result = createConnectorJetty9(sslcf, hosto, porto);
-} else {
-result = createConnectorJetty8(sslcf, hosto, porto);
-}
-
-try {
-result.getClass().getMethod(setPort,
Integer.TYPE).invoke(result, porto);
-if (hosto != null) {
-result.getClass().getMethod(setHost,
String.class).invoke(result, hosto);
-}
-result.getClass().getMethod(setReuseAddress,
Boolean.TYPE).invoke(result, isReuseAddress());
-} catch (RuntimeException rex) {
-throw rex;
-} catch (Exception ex) {
-throw new RuntimeException(ex);
-}
-
-return result;
-}
-
-AbstractConnector createConnectorJetty9(SslContextFactory sslcf, String
hosto, int porto) {
-//Jetty 9
-AbstractConnector result = null;
-try {
-Class? configClass =
ClassLoaderUtils.loadClass(org.eclipse.jetty.server.HttpConfiguration,
- Server.class);
-Object httpConfig = configClass.newInstance();
-httpConfig.getClass().getMethod(setSendServerVersion,
Boolean.TYPE)
-.invoke(httpConfig, getSendServerVersion());
-
-Object httpFactory =
[4/4] git commit: Fixing SSLTest
Fixing SSLTest
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5c2d36d2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5c2d36d2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5c2d36d2
Branch: refs/heads/2.7.x-fixes
Commit: 5c2d36d20916c35e99ae9efc5a995ccb16e29b4b
Parents: 1072792
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Nov 5 17:45:50 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Nov 5 17:45:50 2014 +
--
.../src/test/java/org/apache/cxf/systest/ws/ssl/SSLTest.java | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/ssl/server.xml| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/5c2d36d2/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ssl/SSLTest.java
--
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ssl/SSLTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ssl/SSLTest.java
index 6c3478e..5aeb8da 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ssl/SSLTest.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ssl/SSLTest.java
@@ -36,7 +36,7 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.configuration.jsse.SSLUtils;
import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.common.UTPasswordCallback;
+import org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.example.contract.doubleit.DoubleItPortType;
http://git-wip-us.apache.org/repos/asf/cxf/blob/5c2d36d2/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ssl/server.xml
--
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ssl/server.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ssl/server.xml
index 93adf5b..17642a1 100644
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ssl/server.xml
+++
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ssl/server.xml
@@ -88,7 +88,7 @@
jaxws:endpoint xmlns:s=http://www.example.org/contract/DoubleIt;
id=Plaintext3
address=https://localhost:${testutil.ports.Server.3}/DoubleItUTPlaintext3;
serviceName=s:DoubleItService endpointName=s:DoubleItPlaintextPort3
implementor=org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl
wsdlLocation=org/apache/cxf/systest/ws/ssl/DoubleItSSL.wsdl
depends-on=disallow-tls-via-configuration
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
+entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.wssec10.server.UTPasswordCallback/
/jaxws:properties
/jaxws:endpoint
[3/4] git commit: Recording .gitmergeinfo Changes
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/1072792b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1072792b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1072792b Branch: refs/heads/2.7.x-fixes Commit: 1072792b21405624d779af658832cb2bbd798c87 Parents: 2681574 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Nov 5 17:31:35 2014 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Nov 5 17:31:35 2014 + -- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/1072792b/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index c248fab..2a53bef 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -686,6 +686,7 @@ B 724458f5417b0fad261dc9db0a7dc32e749062ae B 728590b437c9decb1561b60fbe95c712fb3fadf6 B 728a647a21486b8dd5e2adf4b0242a9abc014e0c B 7294ff05b25d1388128b8a546d47a6ebe61ffd61 +B 72df21e88a8bd08515f43ec0882abef9a7b6250b B 732ad179ea9f9e320a8fea5f910c4170798e0874 B 7335999ee13253a0e954ff8bc03c6d09b4058392 B 7397e892c7a63d8959c7a24277fb1b28dfa538e8 @@ -1690,6 +1691,7 @@ M 412fcccef8cebaf94b8eebb827672add984ff47c M 4150c1dd1545fcc4f5d77cfb0d1a86dbea936ca7 M 415fc29334310285b25d2c9a59c2640ee56a5963 M 417d9384948f93adcc0ce1c9f2786e8dcafa434d +M 4199a30e43e7fa90801fb4aafcfa3dc397f0c262 M 4199bf1c6cafedca459603cdc136c7d805226fc5 M 41d039fbd483609bac8837337c6c1b105c251459 M 422c8814c715f99d5a663e29030e1f7e66b842c1
[1/4] git commit: [CXF-6087] - Add a way to exclude (multiple) SSL/TLS protocols in the HTTPJ namespace
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 41545eea4 - 5c2d36d20
[CXF-6087] - Add a way to exclude (multiple) SSL/TLS protocols in the HTTPJ
namespace
Conflicts:
rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f1212884
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f1212884
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f1212884
Branch: refs/heads/2.7.x-fixes
Commit: f12128845e7f69ad8b7f1718dab5319af41f2138
Parents: 41545ee
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Nov 5 17:12:31 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Nov 5 17:31:26 2014 +
--
.../configuration/jsse/TLSServerParameters.java | 22 ++
.../jsse/TLSServerParametersConfig.java | 3 +
.../schemas/configuration/security.xsd | 19 ++
.../http_jetty/JettyHTTPServerEngine.java | 242 +++
.../osgi/HTTPJettyTransportActivator.java | 5 +
...ttyHTTPServerEngineBeanDefinitionParser.java | 5 +-
.../org/apache/cxf/systest/ws/ssl/SSLTest.java | 67 +
.../apache/cxf/systest/ws/ssl/DoubleItSSL.wsdl | 3 +
.../apache/cxf/systest/ws/ssl/client-ssl3.xml | 34 +++
.../org/apache/cxf/systest/ws/ssl/server.xml| 26 ++
10 files changed, 425 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/f1212884/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
--
diff --git
a/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
b/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
index ab94d38..52884c3 100644
---
a/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
+++
b/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
@@ -18,6 +18,9 @@
*/
package org.apache.cxf.configuration.jsse;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.cxf.configuration.security.ClientAuthentication;
/**
@@ -28,6 +31,7 @@ import
org.apache.cxf.configuration.security.ClientAuthentication;
public class TLSServerParameters extends TLSParameterBase {
ClientAuthentication clientAuthentication;
+ListString excludeProtocols = new ArrayListString();
/**
* This parameter configures the server side to request and/or
@@ -43,4 +47,22 @@ public class TLSServerParameters extends TLSParameterBase {
public ClientAuthentication getClientAuthentication() {
return clientAuthentication;
}
+
+/**
+ * This parameter sets the protocol list to exclude.
+ */
+public final void setExcludeProtocols(ListString protocols) {
+excludeProtocols = protocols;
+}
+
+/**
+ * Returns the protocols to exclude that are associated with this endpoint.
+ */
+public ListString getExcludeProtocols() {
+if (excludeProtocols == null) {
+excludeProtocols = new ArrayListString();
+}
+return excludeProtocols;
+}
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/f1212884/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
--
diff --git
a/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
b/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
index 13d84e8..a9c9cd6 100644
---
a/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
+++
b/api/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
@@ -54,6 +54,9 @@ public class TLSServerParametersConfig
if (params.isSetCipherSuites()) {
this.setCipherSuites(params.getCipherSuites().getCipherSuite());
}
+if (params.isSetExcludeProtocols()) {
+
this.setExcludeProtocols(params.getExcludeProtocols().getExcludeProtocol());
+}
if (params.isSetJsseProvider()) {
this.setJsseProvider(params.getJsseProvider());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/f1212884/api/src/main/resources/schemas/configuration/security.xsd
--
diff --git a/api/src/main/resources/schemas/configuration/security.xsd
b/api/src/main/resources/schemas/configuration/security.xsd
index e68e65a..56fe888 100644
--- a/api/src/main/resources/schemas/configuration/security.xsd
+++ b/api/src/main/resources/schemas/configuration/security.xsd
@@ -341,6 +341,18 @@
/xs:sequence
svn commit: r928047 - in /websites/production/cxf/content: cache/docs.pageCache docs/tls-configuration.html
Author: buildbot
Date: Wed Nov 5 17:47:14 2014
New Revision: 928047
Log:
Production update by buildbot for cxf
Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/tls-configuration.html
Modified: websites/production/cxf/content/cache/docs.pageCache
==
Binary files - no diff available.
Modified: websites/production/cxf/content/docs/tls-configuration.html
==
--- websites/production/cxf/content/docs/tls-configuration.html (original)
+++ websites/production/cxf/content/docs/tls-configuration.html Wed Nov 5
17:47:14 2014
@@ -117,11 +117,11 @@ Apache CXF -- TLS Configuration
!-- Content --
div class=wiki-content
div id=ConfluenceContentpstyle type=text/css/*![CDATA[*/
-div.rbtoc1413819986046 {padding: 0px;}
-div.rbtoc1413819986046 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1413819986046 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1415209606058 {padding: 0px;}
+div.rbtoc1415209606058 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1415209606058 li {margin-left: 0px;padding-left: 0px;}
-/*]]*//style/pdiv class=toc-macro rbtoc1413819986046
+/*]]*//style/pdiv class=toc-macro rbtoc1415209606058
ul class=toc-indentationlia shape=rect
href=#TLSConfiguration-TLSParameterscommontobothClientsandServersTLS
Parameters common to both Clients and Servers/a
ul class=toc-indentationlia shape=rect
href=#TLSConfiguration-KeyManagersKey Managers/a/lilia shape=rect
href=#TLSConfiguration-TrustManagersTrust Managers/a/lilia
shape=rect href=#TLSConfiguration-CipherSuitesFilterCipherSuites
Filter/a/lilia shape=rect
href=#TLSConfiguration-CertConstraintsCert Constraints/a/li/ul
/lilia shape=rect href=#TLSConfiguration-ClientTLSParametersClient
TLS Parameters/a
@@ -129,7 +129,7 @@ div.rbtoc1413819986046 li {margin-left:
/lilia shape=rect href=#TLSConfiguration-ServerTLSParametersServer
TLS Parameters/a
ul class=toc-indentationlia shape=rect
href=#TLSConfiguration-ClientAuthenticationClient
Authentication/a/li/ul
/li/ul
-/divh1 id=TLSConfiguration-TLSParameterscommontobothClientsandServersTLS
Parameters common to both Clients and Servers/h1pThe TLS Parameters common
to both Clients and Servers are given a shape=rect class=external-link
href=https://svn.apache.org/repos/asf/cxf/trunk/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java;here/a:/pdiv
class=table-wraptable class=confluenceTabletbodytrth colspan=1
rowspan=1 class=confluenceThpAttribute/p/thth colspan=1
rowspan=1 class=confluenceThpDefault/p/thth colspan=1 rowspan=1
class=confluenceThpDescription/p/th/trtrtd colspan=1
rowspan=1 class=confluenceTdpcodekeyManagers/code/p/tdtd
colspan=1 rowspan=1 class=confluenceTdpJVM default Key
Managers/p/tdtd colspan=1 rowspan=1 class=confluenceTdpKey
Managers to hold X509 certificates./p/td/trtrtd colspan=1
rowspan=1 class=confluenceTdpcodetru
stManagers/code/p/tdtd colspan=1 rowspan=1
class=confluenceTdpJVM default Trust Managers/p/tdtd colspan=1
rowspan=1 class=confluenceTdpTrustManagers to validate peer X509
certificates./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodejsseProvider/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdpJVM default provider associated with
protocol/p/tdtd colspan=1 rowspan=1 class=confluenceTdpJSSE
provider name./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodecipherSuites/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdpJVM default cipher suites/p/tdtd
colspan=1 rowspan=1 class=confluenceTdpCipherSuites that will be
supported./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodecipherSuitesFilter/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdp#160;/p/tdtd colspan=1 rowspan=1
class=confluenceTd
pfilters of the supported CipherSuites that will be supported and used if
available./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodecertConstraints/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdp#160;/p/tdtd colspan=1 rowspan=1
class=confluenceTdpCertificate Constraints
specification./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodesecureRandomParameters/code/p/tdtd
colspan=1 rowspan=1 class=confluenceTdpJVM default Secure
Random/p/tdtd colspan=1 rowspan=1 class=confluenceTdpSecureRandom
specification./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodesecureSocketProtocol/code/p/tdtd
colspan=1 rowspan=1 class=confluenceTdpTLS/p/tdtd colspan=1
rowspan=1 class=confluenceTdpProtocol Name. Most common example are
SSL, TLS or TLSv1./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpco
decertAlias/code/p/tdtd colspan=1 rowspan=1
class=confluenceTdp#160;/p/tdtd colspan=1 rowspan=1
class=confluenceTdpCert alias to use. Useful when keystore has multiple
certs./p/td/tr/tbody/table/divp#160;/ppNote that from CXF
3.0.3 and 2.7.14, the SSLv3
svn commit: r928113 - in /websites/production/cxf/content: cache/main.pageCache project-status.html
Author: buildbot Date: Thu Nov 6 06:47:19 2014 New Revision: 928113 Log: Production update by buildbot for cxf Modified: websites/production/cxf/content/cache/main.pageCache websites/production/cxf/content/project-status.html Modified: websites/production/cxf/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/cxf/content/project-status.html == --- websites/production/cxf/content/project-status.html (original) +++ websites/production/cxf/content/project-status.html Thu Nov 6 06:47:19 2014 @@ -99,7 +99,7 @@ Apache CXF -- Project Status td height=100% !-- Content -- div class=wiki-content -div id=ConfluenceContenth1 id=ProjectStatus-ProjectStatusProject Status/h1pThis page is meant to help keep track of the status of various portions of Apache CXF./ph2 id=ProjectStatus-WebServicesStandardsSupportModulesWeb Services Standards Support Modules/h2pCXF supports a variety of web service standards including SOAP, the WS-I Basic Profile, WSDL, WS-Addressing, WS-Policy, WS-ReliableMessaging, WS-Security, WS-SecurityPolicy, WS-SecureConversation, and WS-Trust./pdiv class=table-wraptable class=confluenceTabletbodytrth colspan=1 rowspan=1 class=confluenceThpModule/p/thth colspan=1 rowspan=1 class=confluenceThpFilename/p/th/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect href=http://cxf.apache.org/docs/ws-addressing.html;WS-Addressing/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcodecxf-rt-ws-addr-[version].jar/code/p/td/trtrtd colspan=1 rowspan=1 class =confluenceTdpa shape=rect href=http://cxf.apache.org/docs/ws-policy.html;WS-Policy/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcodecxf-rt-ws-policy-[version].jar/code/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect href=http://cxf.apache.org/docs/ws-reliablemessaging.html;WS-ReliableMessaging (1.0 complete, 1.1 ongoing)/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcodecxf-rt-ws-rm-[version].jar/code/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect href=http://cxf.apache.org/docs/ws-security.html;WS-Security/a, a shape=rect href=http://cxf.apache.org/docs/ws-securitypolicy.html;WS-SecurityPolicy/a, a shape=rect href=http://cxf.apache.org/docs/ws-secureconversation.html;WS-SecureConversation/a, a shape=rect href=http://cxf.apache.org/docs/ws-trust.html;WS-Trust (client-side)/a/p/tdtd colspan=1 rowspan=1 class=confluence Tdpcodecxf-rt-ws-security-[version].jar/code/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect href=http://cxf.apache.org/docs/ws-metadataexchange.html;WS-MetadataExchange/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdcodecxf-rt-ws-mex-[version].jar/code/td/tr/tbody/table/divh2 id=ProjectStatus-FrontendProgrammingModulesFrontend Programming Modules/h2pCXF supports a variety of frontend programming models./pdiv class=table-wraptable class=confluenceTabletbodytrth colspan=1 rowspan=1 class=confluenceThpModule/p/thth colspan=1 rowspan=1 class=confluenceThpFilename/p/th/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect href=http://cxf.apache.org/docs/dynamic-languages.html;Javascript frontend/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcodecxf-rt-frontend-js-[version].jar/code/p/td/trtrtd colspan=1 ro wspan=1 class=confluenceTdpa shape=rect href=http://cxf.apache.org/docs/jax-rs.html;JAX-RS frontend/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcodecxf-rt-frontend-jaxrs-[version].jar/code/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect href=http://cxf.apache.org/docs/jax-ws.html;JAX-WS frontend/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcodecxf-rt-frontend-jaxws-[version].jar/code/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect href=http://cxf.apache.org/docs/simple.html;Simple frontend/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcodecxf-rt-frontend-simple-[version].jar/code/p/td/tr/tbody/table/divh2 id=ProjectStatus-TransportModulesTransport Modules/h2pCXF includes its own transport abstraction layer to hide transport specific details from the binding and front end layers. Currently supported transpor ts include: HTTP, HTTPs, HTTP-Jetty, HTTP-OSGI, Servlet, local, JMS, In-VM and many others via the Camel transport for CXF such as SMTP/POP3, TCP and Jabber./pdiv class=table-wraptable class=confluenceTabletbodytrth colspan=1 rowspan=1 class=confluenceThpModule/p/thth colspan=1 rowspan=1 class=confluenceThpFilename/p/th/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect href=http://cxf.apache.org/docs/http-transport.html;HTTP, Servlet/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcodecxf-rt-transports-http-[version].jar/code/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect
