cxf git commit: [CXF-6089] Reworking the fix to avoid regressions and adding an additional testcase from Rebecca
Repository: cxf
Updated Branches:
refs/heads/master cc27d5ba1 - e2ad037fb
[CXF-6089] Reworking the fix to avoid regressions and adding an additional
testcase from Rebecca
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e2ad037f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e2ad037f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e2ad037f
Branch: refs/heads/master
Commit: e2ad037fbc74f42655ac968415fcb4bded87bb38
Parents: cc27d5b
Author: Alessio Soldano asold...@redhat.com
Authored: Wed Nov 12 10:57:00 2014 +0100
Committer: Alessio Soldano asold...@redhat.com
Committed: Wed Nov 12 10:59:23 2014 +0100
--
.../apache/cxf/jaxb/JAXBSchemaInitializer.java | 24 -
.../cxf/tools/fortest/exception/Echo5.java | 26 ++
.../cxf/tools/fortest/exception/Echo5Impl.java | 33 +
.../tools/fortest/exception/MyException2.java | 52
.../exception/NonTransientMessageException.java | 44 +
.../processor/JavaToProcessorTest.java | 45 +
6 files changed, 223 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/e2ad037f/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
--
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
index 0e344d2..dbaefcf 100644
---
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
+++
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
@@ -42,6 +42,7 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorOrder;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlList;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -581,7 +582,11 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
}
}
}
-
+// Create element in xsd:sequence for Exception.class
+if (Exception.class.isAssignableFrom(cls)) {
+addExceptionMessage(cls, schema, seq);
+}
+
if (propertyOrder != null) {
if (propertyOrder.length == seq.getItems().size()) {
sortItems(seq, propertyOrder);
@@ -600,6 +605,23 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
schemas.addCrossImports();
part.setProperty(JAXBDataBinding.class.getName() +
.CUSTOM_EXCEPTION, Boolean.TRUE);
}
+private void addExceptionMessage(Class? cls, XmlSchema schema,
XmlSchemaSequence seq) {
+try {
+//a subclass could mark the message method as transient
+Method m = cls.getMethod(getMessage);
+if (!m.isAnnotationPresent(XmlTransient.class)
+ m.getDeclaringClass().equals(Throwable.class)) {
+JAXBBeanInfo beanInfo = getBeanInfo(java.lang.String.class);
+XmlSchemaElement exEle = new XmlSchemaElement(schema, false);
+exEle.setName(message);
+exEle.setSchemaTypeName(getTypeName(beanInfo));
+exEle.setMinOccurs(0);
+seq.getItems().add(exEle);
+}
+} catch (Exception e) {
+//ignore, just won't have the message element
+}
+}
private boolean generateGenericType(Type type) {
if (type instanceof ParameterizedType) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/e2ad037f/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo5.java
--
diff --git
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo5.java
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo5.java
new file mode 100644
index 000..424d043
--- /dev/null
+++
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo5.java
@@ -0,0 +1,26 @@
+/**
+ * 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
[2/2] cxf 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/ea6778c3 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ea6778c3 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ea6778c3 Branch: refs/heads/3.0.x-fixes Commit: ea6778c36b1dc6d821b7cd19b5350c1b033b62ca Parents: 17b3db5 Author: Alessio Soldano asold...@redhat.com Authored: Wed Nov 12 11:53:13 2014 +0100 Committer: Alessio Soldano asold...@redhat.com Committed: Wed Nov 12 11:53:13 2014 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/ea6778c3/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 75c6bf2..c28d722 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -134,5 +134,6 @@ M c1c75b039df7bd1ca9f11ff21f16593fed0c8c16 M c34bf7ad6bc55b6584dfd009f49a3f4eb8ececc9 M c55664128b1223667dedacc2011ccd5945d9c8b9 M d2dec5b87788b8cb5059d3719cf3dfd7135a1280 +M e2ad037fbc74f42655ac968415fcb4bded87bb38 M f02b02934bf78504ffc462c364dc43e386e727b2 M fb0520525f07041f42bc0562b4a15240bb757373
[1/2] cxf git commit: [CXF-6089] Reworking the fix to avoid regressions and adding an additional testcase from Rebecca
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 467a9d933 - ea6778c36
[CXF-6089] Reworking the fix to avoid regressions and adding an additional
testcase from Rebecca
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/17b3db58
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/17b3db58
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/17b3db58
Branch: refs/heads/3.0.x-fixes
Commit: 17b3db58966d22f46696c8b852ae510822639550
Parents: 467a9d9
Author: Alessio Soldano asold...@redhat.com
Authored: Wed Nov 12 10:57:00 2014 +0100
Committer: Alessio Soldano asold...@redhat.com
Committed: Wed Nov 12 11:24:35 2014 +0100
--
.../apache/cxf/jaxb/JAXBSchemaInitializer.java | 24 -
.../cxf/tools/fortest/exception/Echo5.java | 26 ++
.../cxf/tools/fortest/exception/Echo5Impl.java | 33 +
.../tools/fortest/exception/MyException2.java | 52
.../exception/NonTransientMessageException.java | 44 +
.../processor/JavaToProcessorTest.java | 45 +
6 files changed, 223 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/17b3db58/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
--
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
index 0e344d2..dbaefcf 100644
---
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
+++
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
@@ -42,6 +42,7 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorOrder;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlList;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -581,7 +582,11 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
}
}
}
-
+// Create element in xsd:sequence for Exception.class
+if (Exception.class.isAssignableFrom(cls)) {
+addExceptionMessage(cls, schema, seq);
+}
+
if (propertyOrder != null) {
if (propertyOrder.length == seq.getItems().size()) {
sortItems(seq, propertyOrder);
@@ -600,6 +605,23 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
schemas.addCrossImports();
part.setProperty(JAXBDataBinding.class.getName() +
.CUSTOM_EXCEPTION, Boolean.TRUE);
}
+private void addExceptionMessage(Class? cls, XmlSchema schema,
XmlSchemaSequence seq) {
+try {
+//a subclass could mark the message method as transient
+Method m = cls.getMethod(getMessage);
+if (!m.isAnnotationPresent(XmlTransient.class)
+ m.getDeclaringClass().equals(Throwable.class)) {
+JAXBBeanInfo beanInfo = getBeanInfo(java.lang.String.class);
+XmlSchemaElement exEle = new XmlSchemaElement(schema, false);
+exEle.setName(message);
+exEle.setSchemaTypeName(getTypeName(beanInfo));
+exEle.setMinOccurs(0);
+seq.getItems().add(exEle);
+}
+} catch (Exception e) {
+//ignore, just won't have the message element
+}
+}
private boolean generateGenericType(Type type) {
if (type instanceof ParameterizedType) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/17b3db58/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo5.java
--
diff --git
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo5.java
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo5.java
new file mode 100644
index 000..424d043
--- /dev/null
+++
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo5.java
@@ -0,0 +1,26 @@
+/**
+ * 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
[2/2] cxf 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/96ba1a16 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/96ba1a16 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/96ba1a16 Branch: refs/heads/2.7.x-fixes Commit: 96ba1a16ec19caabbbf13c58382f60d015ca3e24 Parents: a931d1c Author: Alessio Soldano asold...@redhat.com Authored: Wed Nov 12 12:14:04 2014 +0100 Committer: Alessio Soldano asold...@redhat.com Committed: Wed Nov 12 12:14:04 2014 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/96ba1a16/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 71870c2..536f887 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1593,6 +1593,7 @@ M 1638e3ebdf6ccb51ed01ef98745c3f888e65ffcd M 174e54b922bbe3a27405bd71933ba18e1145dd7a M 1764cb7d4180169f647cb728fd36603d265e5a9c M 177b53ee279392baa0b98bfa4e55391343f02428 +M 17b3db58966d22f46696c8b852ae510822639550 M 17d844c86568030e0ac746f0a3a9318d3ba67a9c M 18caf87e1302aac473c8cc1cc11853fb1ad401ef M 19322e37932772ebc4ff988db49089d15e3aa1a7
[1/2] cxf git commit: [CXF-6089] Reworking the fix to avoid regressions and adding an additional testcase from Rebecca
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes bb5df0b76 - 96ba1a16e
[CXF-6089] Reworking the fix to avoid regressions and adding an additional
testcase from Rebecca
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a931d1ce
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a931d1ce
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a931d1ce
Branch: refs/heads/2.7.x-fixes
Commit: a931d1ce27f041ddeb84e94ddd36d50968fc904b
Parents: bb5df0b
Author: Alessio Soldano asold...@redhat.com
Authored: Wed Nov 12 10:57:00 2014 +0100
Committer: Alessio Soldano asold...@redhat.com
Committed: Wed Nov 12 11:59:01 2014 +0100
--
.../apache/cxf/jaxb/JAXBSchemaInitializer.java | 24 -
.../cxf/tools/fortest/exception/Echo5.java | 26 ++
.../cxf/tools/fortest/exception/Echo5Impl.java | 33 +
.../tools/fortest/exception/MyException2.java | 52
.../exception/NonTransientMessageException.java | 44 +
.../processor/JavaToProcessorTest.java | 45 +
6 files changed, 223 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/a931d1ce/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
--
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
index c5d7df5..328f03d 100644
---
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
+++
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
@@ -42,6 +42,7 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorOrder;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlList;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -581,7 +582,11 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
}
}
}
-
+// Create element in xsd:sequence for Exception.class
+if (Exception.class.isAssignableFrom(cls)) {
+addExceptionMessage(cls, schema, seq);
+}
+
if (propertyOrder != null) {
if (propertyOrder.length == seq.getItems().size()) {
sortItems(seq, propertyOrder);
@@ -600,6 +605,23 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
schemas.addCrossImports();
part.setProperty(JAXBDataBinding.class.getName() +
.CUSTOM_EXCEPTION, Boolean.TRUE);
}
+private void addExceptionMessage(Class? cls, XmlSchema schema,
XmlSchemaSequence seq) {
+try {
+//a subclass could mark the message method as transient
+Method m = cls.getMethod(getMessage);
+if (!m.isAnnotationPresent(XmlTransient.class)
+ m.getDeclaringClass().equals(Throwable.class)) {
+JAXBBeanInfo beanInfo = getBeanInfo(java.lang.String.class);
+XmlSchemaElement exEle = new XmlSchemaElement(schema, false);
+exEle.setName(message);
+exEle.setSchemaTypeName(getTypeName(beanInfo));
+exEle.setMinOccurs(0);
+seq.getItems().add(exEle);
+}
+} catch (Exception e) {
+//ignore, just won't have the message element
+}
+}
private boolean generateGenericType(Type type) {
if (type instanceof ParameterizedType) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/a931d1ce/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo5.java
--
diff --git
a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo5.java
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo5.java
new file mode 100644
index 000..424d043
--- /dev/null
+++
b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo5.java
@@ -0,0 +1,26 @@
+/**
+ * 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
cxf git commit: [CXF-6062] Fix adding interceptors to bus via spring
Repository: cxf
Updated Branches:
refs/heads/master e2ad037fb - 36b72974e
[CXF-6062] Fix adding interceptors to bus via spring
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/36b72974
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/36b72974
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/36b72974
Branch: refs/heads/master
Commit: 36b72974e16fe04dd1d23c91e2f149de8f184386
Parents: e2ad037
Author: Daniel Kulp dk...@apache.org
Authored: Wed Nov 12 07:07:55 2014 -0500
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Nov 12 07:08:19 2014 -0500
--
.../apache/cxf/bus/spring/BusDefinitionParser.java | 16
1 file changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/36b72974/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
--
diff --git
a/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
b/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
index d3f200d..847ce28 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
@@ -168,30 +168,30 @@ public class BusDefinitionParser extends
AbstractBeanDefinitionParser {
if (bus == bb) {
return;
}
-bus = bb;
if (properties != null) {
-bus.setProperties(properties);
+bb.setProperties(properties);
properties = null;
}
if (!getInInterceptors().isEmpty()) {
-bus.getInInterceptors().addAll(getInInterceptors());
+bb.getInInterceptors().addAll(getInInterceptors());
}
if (!getOutInterceptors().isEmpty()) {
-bus.getOutInterceptors().addAll(getOutInterceptors());
+bb.getOutInterceptors().addAll(getOutInterceptors());
}
if (!getInFaultInterceptors().isEmpty()) {
-bus.getInFaultInterceptors().addAll(getInFaultInterceptors());
+bb.getInFaultInterceptors().addAll(getInFaultInterceptors());
}
if (!getOutFaultInterceptors().isEmpty()) {
-
bus.getOutFaultInterceptors().addAll(getOutFaultInterceptors());
+bb.getOutFaultInterceptors().addAll(getOutFaultInterceptors());
}
if (!StringUtils.isEmpty(id)) {
-bus.setId(id);
+bb.setId(id);
}
if (features != null) {
-bus.setFeatures(features);
+bb.setFeatures(features);
features = null;
}
+bus = bb;
}
public void setApplicationContext(ApplicationContext
applicationContext) throws BeansException {
cxf git commit: EhCache upgrade
Repository: cxf Updated Branches: refs/heads/master 36b72974e - f675e3158 EhCache upgrade Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f675e315 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f675e315 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f675e315 Branch: refs/heads/master Commit: f675e3158f275b6d0f1fd20bf71b0d9281803cee Parents: 36b7297 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Nov 12 14:02:01 2014 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Nov 12 14:02:01 2014 + -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/f675e315/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 2c7f787..d798b60 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -79,7 +79,7 @@ cxf.commons-collections.version3.2.1/cxf.commons-collections.version cxf.commons-lang.version2.6/cxf.commons-lang.version cxf.derby.version10.2.2.0/cxf.derby.version -cxf.ehcache.version2.8.3/cxf.ehcache.version +cxf.ehcache.version2.8.5/cxf.ehcache.version cxf.fastinfoset.bundle.version1.2.13_1/cxf.fastinfoset.bundle.version cxf.hazelcast.version1.9.4/cxf.hazelcast.version cxf.httpcomponents.asyncclient.version4.0.2/cxf.httpcomponents.asyncclient.version
[2/2] cxf git commit: EhCache upgrade
EhCache upgrade Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cefd33b8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cefd33b8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cefd33b8 Branch: refs/heads/3.0.x-fixes Commit: cefd33b8ec036be6c3b5e2d3052b2daf462e9c77 Parents: ea6778c Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Nov 12 14:02:01 2014 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Nov 12 14:05:34 2014 + -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/cefd33b8/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 5aa042e..cbaac72 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -85,7 +85,7 @@ cxf.commons-collections.version3.2.1/cxf.commons-collections.version cxf.commons-lang.version2.6/cxf.commons-lang.version cxf.derby.version10.2.2.0/cxf.derby.version -cxf.ehcache.version2.8.3/cxf.ehcache.version +cxf.ehcache.version2.8.5/cxf.ehcache.version cxf.fastinfoset.bundle.version1.2.13_1/cxf.fastinfoset.bundle.version cxf.hazelcast.version1.9.4/cxf.hazelcast.version cxf.httpcomponents.asyncclient.version4.0.2/cxf.httpcomponents.asyncclient.version
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes ea6778c36 - 8313a8531 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/8313a853 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8313a853 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8313a853 Branch: refs/heads/3.0.x-fixes Commit: 8313a8531569559a3edc53344197d0136a35c9c2 Parents: cefd33b Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Nov 12 14:05:34 2014 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Nov 12 14:05:34 2014 + -- .gitmergeinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/8313a853/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index c28d722..94ca65b 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -110,10 +110,10 @@ B ffd429be404953874e141c52a9c8ba46812d73ca M 0d63846798b590255c45463359e2cb1a28e4d3cb M 1701e6c8d4e794f25d69781e3f69357723ad7fcf M 18a3d43cb0044fcb84d3cc89f138fd9e7110dd04 -M 4a292c0cc49c0c4eef5d50efc78a499c7a5e1783 M 43c8d500b04a13f72077751fdbfaab7bbcfbbf8f M 4640cf1ea20eee09ae650b706bce765a16affc8b M 47b57d723f1468e9d9650617a6013edf4f965900 +M 4a292c0cc49c0c4eef5d50efc78a499c7a5e1783 M 51db79ca7bd2c703a4dbbd42d7761c97af3bad84 M 58e6563da54fd3237a9a1d21a2cf7115740795a2 M 6129ec5f6735a986660a2d05c6b3b0c9230610d9
[2/2] cxf 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/1ea3fc16 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1ea3fc16 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1ea3fc16 Branch: refs/heads/2.7.x-fixes Commit: 1ea3fc1666878e16e8080df14f429cf0f7ac9394 Parents: 691a57e Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Nov 12 14:11:38 2014 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Nov 12 14:11:38 2014 + -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/1ea3fc16/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 91c50c4..dee51d8 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1224,6 +1224,7 @@ B cdb21645e189c3b31f7a407e0d37db6464df4a91 B cde7fd3075e66a693fdcc0f75efd0e81ec0c23ea B ce7692af60cf4e270c62d9bdda935adf547add73 B ce8b13fa4ed9784bb9fff443e182edf166b466d1 +B cefd33b8ec036be6c3b5e2d3052b2daf462e9c77 B cf10da7507a917b80130152eb382e5855fb07b4b B cf26ae9a13bdec8aa8f49531161e98dc95629231 B cf2db1f2cd77c7e0136718b17257709e4229cc0b
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 96ba1a16e - 1ea3fc166 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/691a57e6 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/691a57e6 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/691a57e6 Branch: refs/heads/2.7.x-fixes Commit: 691a57e6d37bc8cc2924c492ec4a60c51960e82c Parents: 96ba1a1 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Nov 12 14:11:18 2014 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Nov 12 14:11:18 2014 + -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/691a57e6/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 536f887..91c50c4 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -795,6 +795,7 @@ B 82b3dbac1454207399520935759560ed51639091 B 82b48aa2209d58a3a9fc33cf3a30421ac480 B 82de186da4dd23fa95c39151d4980ed99c65166d B 83052fac88126b39f1f32bd11b308613fa1af09c +B 8313a8531569559a3edc53344197d0136a35c9c2 B 8364fbf7208e7df11db6be71ffed9de70c09d0de B 836b08e6ca23b7f627b2a6c8e5b9340a9687bdd7 B 83841421a6e896da60acba0cd52235a87decd7f5
cxf-fediz git commit: EhCache upgrade
Repository: cxf-fediz Updated Branches: refs/heads/master f233488c3 - 0630d4e09 EhCache upgrade Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/0630d4e0 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/0630d4e0 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/0630d4e0 Branch: refs/heads/master Commit: 0630d4e09983fc02a449d4a62e1dacab8bfd39f2 Parents: f233488 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Nov 12 14:11:52 2014 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Nov 12 14:11:52 2014 + -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/0630d4e0/pom.xml -- diff --git a/pom.xml b/pom.xml index 4c3e60d..e55f676 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ cxf.version3.0.2/cxf.version cxf.build-utils.version2.6.0/cxf.build-utils.version easymock.version3.1/easymock.version -ehcache.version2.8.3/ehcache.version +ehcache.version2.8.5/ehcache.version httpclient.version4.3.3/httpclient.version hsqldb.version1.8.0.10/hsqldb.version htmlunit.version2.15/htmlunit.version
cxf-xjc-utils git commit: Fix tests on windows in non-forked mode.
Repository: cxf-xjc-utils
Updated Branches:
refs/heads/master 8d5b44460 - 1747a9cbc
Fix tests on windows in non-forked mode.
Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/1747a9cb
Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/1747a9cb
Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/1747a9cb
Branch: refs/heads/master
Commit: 1747a9cbc21f85b65da08b78b6bfbc08fd80420d
Parents: 8d5b444
Author: Daniel Kulp dk...@apache.org
Authored: Wed Nov 12 10:05:53 2014 -0500
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Nov 12 10:05:53 2014 -0500
--
.../cxf/maven_plugin/XSDToJavaRunner.java | 25 +++-
1 file changed, 14 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/1747a9cb/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
--
diff --git
a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
index 69fab41..f0c8838 100644
---
a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
+++
b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
@@ -104,6 +104,17 @@ public class XSDToJavaRunner {
urls.add(file.toURI().toURL());
}
}
+for (int x = 0; x args.length; x++) {
+if (-classpath.equals(args[x])) {
+File file = getFile(args[x + 1], listener);
+if (file != null file.exists()) {
+cpList.add(file.getAbsolutePath());
+urls.add(file.getAbsoluteFile().toURI().toURL());
+}
+x++;
+}
+}
+
final ClassLoader loader = new URLClassLoader(urls.toArray(new
URL[urls.size()]),
this.getClass().getClassLoader());
@@ -147,6 +158,9 @@ public class XSDToJavaRunner {
catResolver.getCatalog().parseCatalog(catalogFile.getPath());
}
};
+for (URL url : urls) {
+opt.classpaths.add(url);
+}
if (checkXmlElementRef()) {
opt.target = SpecVersion.V2_1;
}
@@ -345,17 +359,6 @@ public class XSDToJavaRunner {
XJCErrorListener listener = new XJCErrorListener(context);
ListString cplist = new ArrayListString();
-for (int x = 0; x args.length; x++) {
-if (-classpath.equals(args[x])) {
-cplist.add(args[x + 1]);
-File file = getFile(args[x + 1], listener);
-if (file != null file.exists()) {
-args[x + 1] = file.getAbsolutePath();
-}
-x++;
-}
-}
-
File outputFile = getFile(args[args.length - 1], listener);
if (outputFile == null) {
cxf-xjc-utils git commit: Add a fork mode test to help catch issues
Repository: cxf-xjc-utils Updated Branches: refs/heads/master 1747a9cbc - fd9a1b9f2 Add a fork mode test to help catch issues Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/fd9a1b9f Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/fd9a1b9f Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/fd9a1b9f Branch: refs/heads/master Commit: fd9a1b9f297aa5780567814c63deb66b72b09f2e Parents: 1747a9c Author: Daniel Kulp dk...@apache.org Authored: Wed Nov 12 10:41:33 2014 -0500 Committer: Daniel Kulp dk...@apache.org Committed: Wed Nov 12 10:41:33 2014 -0500 -- ts-test/pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/fd9a1b9f/ts-test/pom.xml -- diff --git a/ts-test/pom.xml b/ts-test/pom.xml index 790f09e..c6bf644 100644 --- a/ts-test/pom.xml +++ b/ts-test/pom.xml @@ -73,6 +73,7 @@ /execution /executions configuration +forktrue/fork xsdOptions xsdOption extensiontrue/extension
[3/3] cxf 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/c934af8a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c934af8a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c934af8a Branch: refs/heads/3.0.x-fixes Commit: c934af8a6abc7396950b266cfe043e366b41cd13 Parents: c437996 Author: Daniel Kulp dk...@apache.org Authored: Wed Nov 12 09:40:06 2014 -0500 Committer: Daniel Kulp dk...@apache.org Committed: Wed Nov 12 09:40:06 2014 -0500 -- .gitmergeinfo | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/c934af8a/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 94ca65b..0ccb296 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -110,11 +110,15 @@ B ffd429be404953874e141c52a9c8ba46812d73ca M 0d63846798b590255c45463359e2cb1a28e4d3cb M 1701e6c8d4e794f25d69781e3f69357723ad7fcf M 18a3d43cb0044fcb84d3cc89f138fd9e7110dd04 +M 2b4fe9966c46457177f6412525c57c64d07dbe69 M 43c8d500b04a13f72077751fdbfaab7bbcfbbf8f M 4640cf1ea20eee09ae650b706bce765a16affc8b M 47b57d723f1468e9d9650617a6013edf4f965900 +M 4915ce370e5f1905f77ebecc8883cc86fcc3e4f4 M 4a292c0cc49c0c4eef5d50efc78a499c7a5e1783 +M 4e9b960f4eab531e6086fbe9f3373bf69efca7cd M 51db79ca7bd2c703a4dbbd42d7761c97af3bad84 +M 56c0db05126292a61a782f05848321b9b8b8b80c M 58e6563da54fd3237a9a1d21a2cf7115740795a2 M 6129ec5f6735a986660a2d05c6b3b0c9230610d9 M 6292346fb110f0517b791f91d03fd2515d575388
[1/3] cxf git commit: Excluding org.eclipse:org.eclipse.osgi transitive dependency which seems to be not needed and is causing issues as the required version is not in Maven Central
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 8313a8531 - c934af8a6 Excluding org.eclipse:org.eclipse.osgi transitive dependency which seems to be not needed and is causing issues as the required version is not in Maven Central Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6552a56b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6552a56b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6552a56b Branch: refs/heads/3.0.x-fixes Commit: 6552a56babd287ddffb903451458b9d4fdf32d48 Parents: 8313a85 Author: Alessio Soldano asold...@redhat.com Authored: Tue Nov 11 17:07:45 2014 +0100 Committer: Daniel Kulp dk...@apache.org Committed: Wed Nov 12 09:40:01 2014 -0500 -- osgi/itests/pom.xml | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/6552a56b/osgi/itests/pom.xml -- diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml index 92f2ecf..731cabd 100644 --- a/osgi/itests/pom.xml +++ b/osgi/itests/pom.xml @@ -150,6 +150,10 @@ artifactIdosgi/artifactId /exclusion exclusion +groupIdorg.eclipse/groupId +artifactIdorg.eclipse.osgi/artifactId +/exclusion +exclusion groupIdorg.apache.karaf/groupId artifactIdorg.apache.karaf.client/artifactId /exclusion
[2/3] cxf git commit: [CXF-6062] Fix adding interceptors to bus via spring
[CXF-6062] Fix adding interceptors to bus via spring
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c4379960
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c4379960
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c4379960
Branch: refs/heads/3.0.x-fixes
Commit: c43799609c4d18c6ff852cf5174d80e1aa6dc694
Parents: 6552a56
Author: Daniel Kulp dk...@apache.org
Authored: Wed Nov 12 07:07:55 2014 -0500
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Nov 12 09:40:05 2014 -0500
--
.../apache/cxf/bus/spring/BusDefinitionParser.java | 16
1 file changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/c4379960/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
--
diff --git
a/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
b/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
index d3f200d..847ce28 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
@@ -168,30 +168,30 @@ public class BusDefinitionParser extends
AbstractBeanDefinitionParser {
if (bus == bb) {
return;
}
-bus = bb;
if (properties != null) {
-bus.setProperties(properties);
+bb.setProperties(properties);
properties = null;
}
if (!getInInterceptors().isEmpty()) {
-bus.getInInterceptors().addAll(getInInterceptors());
+bb.getInInterceptors().addAll(getInInterceptors());
}
if (!getOutInterceptors().isEmpty()) {
-bus.getOutInterceptors().addAll(getOutInterceptors());
+bb.getOutInterceptors().addAll(getOutInterceptors());
}
if (!getInFaultInterceptors().isEmpty()) {
-bus.getInFaultInterceptors().addAll(getInFaultInterceptors());
+bb.getInFaultInterceptors().addAll(getInFaultInterceptors());
}
if (!getOutFaultInterceptors().isEmpty()) {
-
bus.getOutFaultInterceptors().addAll(getOutFaultInterceptors());
+bb.getOutFaultInterceptors().addAll(getOutFaultInterceptors());
}
if (!StringUtils.isEmpty(id)) {
-bus.setId(id);
+bb.setId(id);
}
if (features != null) {
-bus.setFeatures(features);
+bb.setFeatures(features);
features = null;
}
+bus = bb;
}
public void setApplicationContext(ApplicationContext
applicationContext) throws BeansException {
cxf git commit: [CXF-5607] Adding some more OIDC utility code
Repository: cxf
Updated Branches:
refs/heads/master f675e3158 - 4ff4d39b0
[CXF-5607] Adding some more OIDC utility code
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4ff4d39b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4ff4d39b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4ff4d39b
Branch: refs/heads/master
Commit: 4ff4d39b076281ac5ef193b72a77db9d5d7755f3
Parents: f675e31
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Nov 12 17:29:13 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Nov 12 17:29:13 2014 +
--
.../cxf/jaxrs/provider/json/JsonMapObject.java | 8 +
.../cxf/rs/security/jose/jwt/JwtToken.java | 6 +
.../oauth2/filters/OAuthRequestFilter.java | 26 ++-
.../rs/security/oidc/common/UserAddress.java| 55 ++
.../rs/security/oidc/common/UserIdToken.java| 61 ++
.../rs/security/oidc/common/UserProfile.java| 71 ++-
.../rs/security/oidc/rp/IdTokenValidator.java | 121
.../cxf/rs/security/oidc/rp/OidcUtils.java | 15 +-
.../cxf/rs/security/oidc/rp/TokenValidator.java | 190 +++
9 files changed, 423 insertions(+), 130 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/4ff4d39b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
--
diff --git
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
index 3001833..cfc98f2 100644
---
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
+++
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
@@ -69,6 +69,14 @@ public class JsonMapObject {
return null;
}
}
+public Boolean getBooleanProperty(String name) {
+Object value = getProperty(name);
+if (value != null) {
+return value instanceof Boolean ? (Boolean)value :
Boolean.parseBoolean(value.toString());
+} else {
+return null;
+}
+}
public int hashCode() {
return values.hashCode();
http://git-wip-us.apache.org/repos/asf/cxf/blob/4ff4d39b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java
index e22e0ef..6a55854 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java
@@ -35,6 +35,12 @@ public class JwtToken {
public JwtClaims getClaims() {
return claims;
}
+public Object getHeader(String name) {
+return headers.getHeader(name);
+}
+public Object getClaim(String name) {
+return claims.getClaim(name);
+}
public int hashCode() {
return headers.hashCode() + 37 * claims.hashCode();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4ff4d39b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
index 8f3f5d8..fb63639 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
@@ -20,6 +20,7 @@ package org.apache.cxf.rs.security.oauth2.filters;
import java.security.Principal;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.logging.Logger;
@@ -64,6 +65,8 @@ public class OAuthRequestFilter extends
AbstractAccessTokenValidator
private boolean useUserSubject;
private boolean audienceIsEndpointAddress;
private boolean checkFormData;
+private ListString requiredScopes = Collections.emptyList();
+private boolean allPermissionsMatch;
public void filter(ContainerRequestContext context) {
validateRequest(JAXRSUtils.getCurrentMessage());
@@ -93,12 +96,15 @@ public class
cxf git commit: [CXF-5607] Adding some more OIDC utility code
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes c934af8a6 - 900c5f46b
[CXF-5607] Adding some more OIDC utility code
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/900c5f46
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/900c5f46
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/900c5f46
Branch: refs/heads/3.0.x-fixes
Commit: 900c5f46bee29ba83e61b16fb54d1c8a8af00ae0
Parents: c934af8
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Nov 12 17:29:13 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Nov 12 17:31:59 2014 +
--
.../cxf/jaxrs/provider/json/JsonMapObject.java | 8 +
.../cxf/rs/security/jose/jwt/JwtToken.java | 6 +
.../oauth2/filters/OAuthRequestFilter.java | 26 ++-
.../rs/security/oidc/common/UserAddress.java| 55 ++
.../rs/security/oidc/common/UserIdToken.java| 61 ++
.../rs/security/oidc/common/UserProfile.java| 71 ++-
.../rs/security/oidc/rp/IdTokenValidator.java | 121
.../cxf/rs/security/oidc/rp/OidcUtils.java | 15 +-
.../cxf/rs/security/oidc/rp/TokenValidator.java | 190 +++
9 files changed, 423 insertions(+), 130 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/900c5f46/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
--
diff --git
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
index 3001833..cfc98f2 100644
---
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
+++
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
@@ -69,6 +69,14 @@ public class JsonMapObject {
return null;
}
}
+public Boolean getBooleanProperty(String name) {
+Object value = getProperty(name);
+if (value != null) {
+return value instanceof Boolean ? (Boolean)value :
Boolean.parseBoolean(value.toString());
+} else {
+return null;
+}
+}
public int hashCode() {
return values.hashCode();
http://git-wip-us.apache.org/repos/asf/cxf/blob/900c5f46/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java
index e22e0ef..6a55854 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtToken.java
@@ -35,6 +35,12 @@ public class JwtToken {
public JwtClaims getClaims() {
return claims;
}
+public Object getHeader(String name) {
+return headers.getHeader(name);
+}
+public Object getClaim(String name) {
+return claims.getClaim(name);
+}
public int hashCode() {
return headers.hashCode() + 37 * claims.hashCode();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/900c5f46/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
index 8f3f5d8..fb63639 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
@@ -20,6 +20,7 @@ package org.apache.cxf.rs.security.oauth2.filters;
import java.security.Principal;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.logging.Logger;
@@ -64,6 +65,8 @@ public class OAuthRequestFilter extends
AbstractAccessTokenValidator
private boolean useUserSubject;
private boolean audienceIsEndpointAddress;
private boolean checkFormData;
+private ListString requiredScopes = Collections.emptyList();
+private boolean allPermissionsMatch;
public void filter(ContainerRequestContext context) {
validateRequest(JAXRSUtils.getCurrentMessage());
@@ -93,12 +96,15 @@ public
[1/2] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added customized Swagger UI.
Repository: cxf
Updated Branches:
refs/heads/master 4ff4d39b0 - e31cf1c5d
CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added
customized Swagger UI.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/49c35937
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/49c35937
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/49c35937
Branch: refs/heads/master
Commit: 49c35937c3a0813ed4ccf34dd03fd5fa2f41b86c
Parents: e2ad037
Author: reta drr...@gmail.com
Authored: Wed Nov 12 13:37:12 2014 -0500
Committer: reta drr...@gmail.com
Committed: Wed Nov 12 13:37:12 2014 -0500
--
.../samples/jax_rs/description_swagger/pom.xml | 117 ---
.../webjars/swagger-ui/2.0.24/index.html| 60 ++
.../cxf/jaxrs/swagger/SwaggerFeature.java | 6 +-
3 files changed, 137 insertions(+), 46 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/49c35937/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
index fa49ef0..0faab16 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
@@ -39,42 +39,73 @@
idserver/id
build
defaultGoaltest/defaultGoal
- plugins
- plugin
- groupIdorg.codehaus.mojo/groupId
- artifactIdexec-maven-plugin/artifactId
- executions
- execution
- phasetest/phase
- goals
- goaljava/goal
- /goals
- configuration
-
mainClassdemo.jaxrs.swagger.server.Server/mainClass
- /configuration
- /execution
- /executions
- /plugin
- /plugins
- /build
- /profile
- /profiles
-
+plugins
+plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdexec-maven-plugin/artifactId
+executions
+execution
+phasetest/phase
+goals
+goaljava/goal
+/goals
+configuration
+
mainClassdemo.jaxrs.swagger.server.Server/mainClass
+/configuration
+/execution
+/executions
+/plugin
+/plugins
+/build
+/profile
+/profiles
+
+build
+plugins
+plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-dependency-plugin/artifactId
+version2.9/version
+executions
+execution
+phasegenerate-resources/phase
+goals
+goalunpack/goal
+/goals
+configuration
+artifactItems
+artifactItem
+groupIdorg.webjars/groupId
+artifactIdswagger-ui/artifactId
+version2.0.24/version
+overWritetrue/overWrite
+
outputDirectory${project.build.directory}/classes/outputDirectory
+excludes**/index.html/excludes
+/artifactItem
+/artifactItems
+/configuration
+/execution
+/executions
+/plugin
+/plugins
+/build
+
dependencies
- dependency
+dependency
groupIdcom.wordnik/groupId
- artifactIdswagger-jaxrs_2.10/artifactId
- exclusions
- exclusion
-
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e31cf1c5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e31cf1c5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e31cf1c5 Branch: refs/heads/master Commit: e31cf1c5dc29f5d11dc29e3c4a63b56ed8f960a0 Parents: 49c3593 4ff4d39 Author: reta drr...@gmail.com Authored: Wed Nov 12 13:37:18 2014 -0500 Committer: reta drr...@gmail.com Committed: Wed Nov 12 13:37:18 2014 -0500 -- .../cxf/bus/spring/BusDefinitionParser.java | 16 +- parent/pom.xml | 2 +- .../cxf/jaxrs/provider/json/JsonMapObject.java | 8 + .../cxf/rs/security/jose/jwt/JwtToken.java | 6 + .../oauth2/filters/OAuthRequestFilter.java | 26 ++- .../rs/security/oidc/common/UserAddress.java| 55 ++ .../rs/security/oidc/common/UserIdToken.java| 61 ++ .../rs/security/oidc/common/UserProfile.java| 71 ++- .../rs/security/oidc/rp/IdTokenValidator.java | 121 .../cxf/rs/security/oidc/rp/OidcUtils.java | 15 +- .../cxf/rs/security/oidc/rp/TokenValidator.java | 190 +++ 11 files changed, 432 insertions(+), 139 deletions(-) --
cxf git commit: The extensions are put into a Map using the same key, thus there is no point in putting all of them in. Just grab the first one.
Repository: cxf
Updated Branches:
refs/heads/master e31cf1c5d - 0158b0194
The extensions are put into a Map using the same key, thus there is no point
in putting all of them in. Just grab the first one.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0158b019
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0158b019
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0158b019
Branch: refs/heads/master
Commit: 0158b0194d9e5711bf3c3275f2d568accca62280
Parents: e31cf1c
Author: Daniel Kulp dk...@apache.org
Authored: Wed Nov 12 14:08:40 2014 -0500
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Nov 12 14:11:01 2014 -0500
--
.../java/org/apache/cxf/bus/extension/ExtensionManagerBus.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/0158b019/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
--
diff --git
a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
index bb5f1b9..0478279 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
@@ -208,10 +208,8 @@ public class ExtensionManagerBus extends
AbstractBasicInterceptorProvider implem
} else {
//force loading
Collection? objs = loc.getBeansOfType(extensionType);
-if (objs != null) {
-for (Object o : objs) {
-extensions.put(extensionType, o);
-}
+if (objs != null objs.size() != 0) {
+extensions.put(extensionType, objs.iterator().next());
}
obj = extensions.get(extensionType);
}
cxf git commit: The extensions are put into a Map using the same key, thus there is no point in putting all of them in. Just grab the first one.
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 900c5f46b - 38962dab9
The extensions are put into a Map using the same key, thus there is no point
in putting all of them in. Just grab the first one.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/38962dab
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/38962dab
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/38962dab
Branch: refs/heads/3.0.x-fixes
Commit: 38962dab94efd1cfafd562dec34819719367a81a
Parents: 900c5f4
Author: Daniel Kulp dk...@apache.org
Authored: Wed Nov 12 14:08:40 2014 -0500
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Nov 12 14:11:33 2014 -0500
--
.../java/org/apache/cxf/bus/extension/ExtensionManagerBus.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/38962dab/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
--
diff --git
a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
index bb5f1b9..0478279 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
@@ -208,10 +208,8 @@ public class ExtensionManagerBus extends
AbstractBasicInterceptorProvider implem
} else {
//force loading
Collection? objs = loc.getBeansOfType(extensionType);
-if (objs != null) {
-for (Object o : objs) {
-extensions.put(extensionType, o);
-}
+if (objs != null objs.size() != 0) {
+extensions.put(extensionType, objs.iterator().next());
}
obj = extensions.get(extensionType);
}
cxf git commit: add logbrowser-blueprint in its parent pom's module list
Repository: cxf Updated Branches: refs/heads/master 0158b0194 - 7d1f30f76 add logbrowser-blueprint in its parent pom's module list Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7d1f30f7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7d1f30f7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7d1f30f7 Branch: refs/heads/master Commit: 7d1f30f76d95f9eddf0bed995120c71bf1a393b3 Parents: 0158b01 Author: Akitoshi Yoshida a...@apache.org Authored: Thu Nov 13 00:17:10 2014 +0100 Committer: Akitoshi Yoshida a...@apache.org Committed: Thu Nov 13 00:17:10 2014 +0100 -- distribution/src/main/release/samples/pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/7d1f30f7/distribution/src/main/release/samples/pom.xml -- diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 19a3e5f..82d6bf4 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -91,6 +91,7 @@ modulejms_pubsub/module modulejax_rs/spring_security/module modulelogbrowser/module +modulelogbrowser-blueprint/module modulews_notification/module modulests/module modulecorba/bank/module
