buildbot success in ASF Buildbot on cxf-site-production
The Buildbot has detected a restored build on builder cxf-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/cxf-site-production/builds/1883 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
git commit: Minor updates to the search parser to beter control the encoding/decoding process
Repository: cxf Updated Branches: refs/heads/master f55a02f15 -> 9fc73f516 Minor updates to the search parser to beter control the encoding/decoding process Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9fc73f51 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9fc73f51 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9fc73f51 Branch: refs/heads/master Commit: 9fc73f516f215d640b144f13088bb8c73cce8406 Parents: f55a02f Author: Sergey Beryozkin Authored: Wed Jul 9 11:00:26 2014 +0100 Committer: Sergey Beryozkin Committed: Wed Jul 9 11:00:26 2014 +0100 -- .../cxf/jaxrs/ext/search/AbstractSearchConditionParser.java | 5 + .../org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java | 9 - .../java/org/apache/cxf/jaxrs/ext/search/SearchUtils.java | 2 +- .../org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java| 4 .../org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java | 7 ++- 5 files changed, 24 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/9fc73f51/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractSearchConditionParser.java -- diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractSearchConditionParser.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractSearchConditionParser.java index 0278d53..94eb45f 100644 --- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractSearchConditionParser.java +++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractSearchConditionParser.java @@ -32,6 +32,7 @@ import java.util.Set; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; +import org.apache.cxf.common.util.PropertyUtils; import org.apache.cxf.jaxrs.ext.search.Beanspector.TypeInfo; import org.apache.cxf.jaxrs.ext.search.collections.CollectionCheck; import org.apache.cxf.jaxrs.ext.search.collections.CollectionCheckInfo; @@ -68,6 +69,10 @@ public abstract class AbstractSearchConditionParser implements SearchConditio return beanPropertyName != null ? beanPropertyName : setter; } +protected Boolean isDecodeQueryValues() { +return PropertyUtils.isTrue(contextProperties.get(SearchUtils.DECODE_QUERY_VALUES)); +} + protected TypeInfo getTypeInfo(String setter, String value) throws SearchParseException, PropertyNotFoundException { http://git-wip-us.apache.org/repos/asf/cxf/blob/9fc73f51/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java -- diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java index d783d50..be1e4d9 100644 --- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java +++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java @@ -47,6 +47,7 @@ public class SearchContextImpl implements SearchContext { private static final String USE_PLAIN_QUERY_PARAMETERS = "search.use.plain.queries"; private static final String USE_ALL_QUERY_COMPONENT = "search.use.all.query.component"; private static final String BLOCK_SEARCH_EXCEPTION = "search.block.search.exception"; +private static final String KEEP_QUERY_ENCODED = "search.keep.query.encoded"; private static final Logger LOG = LogUtils.getL7dLogger(SearchContextImpl.class); private Message message; @@ -115,8 +116,10 @@ public class SearchContextImpl implements SearchContext { if (MessageUtils.isTrue(message.getContextualProperty(USE_ALL_QUERY_COMPONENT))) { return queryStr; } +boolean encoded = PropertyUtils.isTrue(getKeepEncodedProperty()); + MultivaluedMap params = -JAXRSUtils.getStructuredParams(queryStr, "&", true, false); +JAXRSUtils.getStructuredParams(queryStr, "&", !encoded, false); String customQueryParamName = (String)message.getContextualProperty(CUSTOM_SEARCH_QUERY_PARAM_NAME); if (customQueryParamName != null) { return params.getFirst(customQueryParamName); @@ -145,6 +148,10 @@ public class SearchContextImpl implements SearchContext { return builder.and(list).query(); } +private String getKeepEncodedProperty() { +return (String)message.getContextualProperty(KEEP_QUERY_ENCODE
git commit: Minor updates to the search parser to beter control the encoding/decoding process
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 51546af28 -> 5f76a5316 Minor updates to the search parser to beter control the encoding/decoding process Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5f76a531 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5f76a531 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5f76a531 Branch: refs/heads/2.7.x-fixes Commit: 5f76a53165b4136e70a72065105b872ea5719177 Parents: 51546af Author: Sergey Beryozkin Authored: Wed Jul 9 11:00:26 2014 +0100 Committer: Sergey Beryozkin Committed: Wed Jul 9 11:09:48 2014 +0100 -- .../apache/cxf/jaxrs/ext/search/SearchContextImpl.java | 9 - .../org/apache/cxf/jaxrs/ext/search/SearchUtils.java| 1 + .../apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java| 12 ++-- 3 files changed, 19 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/5f76a531/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java -- diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java index bacd4cf..9130577 100644 --- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java +++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java @@ -46,6 +46,7 @@ public class SearchContextImpl implements SearchContext { private static final String USE_PLAIN_QUERY_PARAMETERS = "search.use.plain.queries"; private static final String USE_ALL_QUERY_COMPONENT = "search.use.all.query.component"; private static final String BLOCK_SEARCH_EXCEPTION = "search.block.search.exception"; +private static final String KEEP_QUERY_ENCODED = "search.keep.query.encoded"; private static final Logger LOG = LogUtils.getL7dLogger(SearchContextImpl.class); private Message message; @@ -115,8 +116,10 @@ public class SearchContextImpl implements SearchContext { if (MessageUtils.isTrue(message.getContextualProperty(USE_ALL_QUERY_COMPONENT))) { return queryStr; } +boolean encoded = PropertyUtils.isTrue(getKeepEncodedProperty()); + MultivaluedMap params = -JAXRSUtils.getStructuredParams(queryStr, "&", true, false); +JAXRSUtils.getStructuredParams(queryStr, "&", !encoded, false); String customQueryParamName = (String)message.getContextualProperty(CUSTOM_SEARCH_QUERY_PARAM_NAME); if (customQueryParamName != null) { return params.getFirst(customQueryParamName); @@ -145,6 +148,10 @@ public class SearchContextImpl implements SearchContext { return builder.and(list).query(); } +private String getKeepEncodedProperty() { +return (String)message.getContextualProperty(KEEP_QUERY_ENCODED); +} + private CompleteCondition getOrCondition(SearchConditionBuilder builder, Map.Entry> entry) { String key = entry.getKey(); http://git-wip-us.apache.org/repos/asf/cxf/blob/5f76a531/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchUtils.java -- diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchUtils.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchUtils.java index 773395e..d4dbc59 100644 --- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchUtils.java +++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchUtils.java @@ -31,6 +31,7 @@ public final class SearchUtils { public static final String LAX_PROPERTY_MATCH = "search.lax.property.match"; public static final String BEAN_PROPERTY_MAP = "search.bean.property.map"; public static final String SEARCH_VISITOR_PROPERTY = "search.visitor"; +public static final String DECODE_QUERY_VALUES = "search.decode.values"; private SearchUtils() { http://git-wip-us.apache.org/repos/asf/cxf/blob/5f76a531/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java -- diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java index 937aba5..39ad123 100644 --- a/rt/rs/extensions/search/src/main/
git commit: [CXF-5865] Do not close Response if WebClient.close is called as a code may be holding a reference to a non consumed Response
Repository: cxf Updated Branches: refs/heads/master 9fc73f516 -> 669e2f061 [CXF-5865] Do not close Response if WebClient.close is called as a code may be holding a reference to a non consumed Response Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/669e2f06 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/669e2f06 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/669e2f06 Branch: refs/heads/master Commit: 669e2f061fc0877bb9d5fad981850538f6de421f Parents: 9fc73f5 Author: Sergey Beryozkin Authored: Wed Jul 9 12:01:00 2014 +0100 Committer: Sergey Beryozkin Committed: Wed Jul 9 12:01:00 2014 +0100 -- .../main/java/org/apache/cxf/jaxrs/client/LocalClientState.java | 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/669e2f06/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java -- diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java index c764c63..217244f 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java @@ -122,9 +122,6 @@ public class LocalClientState implements ClientState { public void reset() { requestHeaders.clear(); -if (response != null) { -response.close(); -} response = null; currentBuilder = new UriBuilderImpl().uri(baseURI); templates = null;
git commit: [CXF-5838] Setting a correct default char value
Repository: cxf Updated Branches: refs/heads/master 669e2f061 -> badfac577 [CXF-5838] Setting a correct default char value Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/badfac57 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/badfac57 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/badfac57 Branch: refs/heads/master Commit: badfac57768fdf8fdd2ec5179d3420fc8cd21c4b Parents: 669e2f0 Author: Sergey Beryozkin Authored: Wed Jul 9 12:36:28 2014 +0100 Committer: Sergey Beryozkin Committed: Wed Jul 9 12:36:28 2014 +0100 -- .../java/org/apache/cxf/jaxrs/utils/InjectionUtils.java | 3 ++- .../src/test/java/org/apache/cxf/jaxrs/Customer.java | 3 ++- .../java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 10 ++ 3 files changed, 10 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/badfac57/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java -- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java index 8043da9..7cbfea9 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java @@ -917,7 +917,8 @@ public final class InjectionUtils { } else { if (paramType.isPrimitive()) { paramValues = Collections.singletonList( -boolean.class == paramType ? "false" : "0"); +boolean.class == paramType ? "false" +: char.class == paramType ? Character.toString('\u') : "0"); } else if (InjectionUtils.isSupportedCollectionOrArray(paramType)) { paramValues = Collections.emptyList(); } else { http://git-wip-us.apache.org/repos/asf/cxf/blob/badfac57/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java -- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java index 9bc29bb..f64ae66 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java @@ -394,7 +394,8 @@ public class Customer extends AbstractCustomer implements CustomerInfo { @QueryParam("query2") String queryString2, @QueryParam("query3") Long queryString3, @QueryParam("query4") boolean queryBoolean4, - @QueryParam("query5") String queryString4) { + @QueryParam("query5") char queryChar5, + @QueryParam("query6") String queryString6) { // complete } http://git-wip-us.apache.org/repos/asf/cxf/blob/badfac57/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java -- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java index cd0fb53..1e740a9 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java @@ -1428,12 +1428,12 @@ public class JAXRSUtilsTest extends Assert { @Test public void testMultipleQueryParameters() throws Exception { Class[] argType = {String.class, String.class, Long.class, - Boolean.TYPE, String.class}; + Boolean.TYPE, char.class, String.class}; Method m = Customer.class.getMethod("testMultipleQuery", argType); Message messageImpl = createMessage(); messageImpl.put(Message.QUERY_STRING, - "query=first&query2=second&query3=3&query4=true&query5"); + "query=first&query2=second&query3=3&query4=true&query6"); List params = JAXRSUtils.processParameters(new OperationResourceInfo(m, new ClassResourceInfo(Customer.class)), null, messageImpl); @@ -1445,8 +1445,10 @@ public class JAXRSUtilsTest extends Assert { new Long(3), params.get(2)); assertEquals
git commit: [CXF-5838] Setting a correct default char value
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 5f76a5316 -> 18f7085cb [CXF-5838] Setting a correct default char value Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/18f7085c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/18f7085c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/18f7085c Branch: refs/heads/2.7.x-fixes Commit: 18f7085cbbb06167543aec42a82036e74cf0541d Parents: 5f76a53 Author: Sergey Beryozkin Authored: Wed Jul 9 12:36:28 2014 +0100 Committer: Sergey Beryozkin Committed: Wed Jul 9 12:39:15 2014 +0100 -- .../java/org/apache/cxf/jaxrs/utils/InjectionUtils.java | 3 ++- .../src/test/java/org/apache/cxf/jaxrs/Customer.java | 3 ++- .../java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 10 ++ 3 files changed, 10 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/18f7085c/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java -- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java index cc11ddc..fdf4dd6 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java @@ -907,7 +907,8 @@ public final class InjectionUtils { } else { if (paramType.isPrimitive()) { paramValues = Collections.singletonList( -boolean.class == paramType ? "false" : "0"); +boolean.class == paramType ? "false" +: char.class == paramType ? Character.toString('\u') : "0"); } else if (InjectionUtils.isSupportedCollectionOrArray(paramType)) { paramValues = Collections.emptyList(); } else { http://git-wip-us.apache.org/repos/asf/cxf/blob/18f7085c/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java -- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java index 2155e23..c30513f 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java @@ -393,7 +393,8 @@ public class Customer extends AbstractCustomer implements CustomerInfo { @QueryParam("query2") String queryString2, @QueryParam("query3") Long queryString3, @QueryParam("query4") boolean queryBoolean4, - @QueryParam("query5") String queryString4) { + @QueryParam("query5") char queryChar5, + @QueryParam("query6") String queryString6) { // complete } http://git-wip-us.apache.org/repos/asf/cxf/blob/18f7085c/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java -- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java index c4c58e9..b707952 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java @@ -1431,12 +1431,12 @@ public class JAXRSUtilsTest extends Assert { @Test public void testMultipleQueryParameters() throws Exception { Class[] argType = {String.class, String.class, Long.class, - Boolean.TYPE, String.class}; + Boolean.TYPE, char.class, String.class}; Method m = Customer.class.getMethod("testMultipleQuery", argType); MessageImpl messageImpl = new MessageImpl(); messageImpl.put(Message.QUERY_STRING, - "query=first&query2=second&query3=3&query4=true&query5"); + "query=first&query2=second&query3=3&query4=true&query6"); List params = JAXRSUtils.processParameters(new OperationResourceInfo(m, new ClassResourceInfo(Customer.class)), null, messageImpl); @@ -1448,8 +1448,10 @@ public class JAXRSUtilsTest extends Assert { new Long(3), params.get(2));
git commit: [CXF-5838] Setting a correct default char value
Repository: cxf Updated Branches: refs/heads/2.6.x-fixes f5ac8ade5 -> 05239840b [CXF-5838] Setting a correct default char value Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/05239840 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/05239840 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/05239840 Branch: refs/heads/2.6.x-fixes Commit: 05239840b7a6a4cec5112bbb6c7a4768b4aaf170 Parents: f5ac8ad Author: Sergey Beryozkin Authored: Wed Jul 9 12:36:28 2014 +0100 Committer: Sergey Beryozkin Committed: Wed Jul 9 12:40:38 2014 +0100 -- .../java/org/apache/cxf/jaxrs/utils/InjectionUtils.java | 3 ++- .../src/test/java/org/apache/cxf/jaxrs/Customer.java | 3 ++- .../java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 10 ++ 3 files changed, 10 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/05239840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java -- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java index 4f297fe..858bf74 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java @@ -846,7 +846,8 @@ public final class InjectionUtils { } else { if (paramType.isPrimitive()) { paramValues = Collections.singletonList( -boolean.class == paramType ? "false" : "0"); +boolean.class == paramType ? "false" +: char.class == paramType ? Character.toString('\u') : "0"); } else if (InjectionUtils.isSupportedCollectionOrArray(paramType)) { paramValues = Collections.emptyList(); } else { http://git-wip-us.apache.org/repos/asf/cxf/blob/05239840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java -- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java index c76dea1..c394769 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java @@ -382,7 +382,8 @@ public class Customer extends AbstractCustomer implements CustomerInfo { @QueryParam("query2") String queryString2, @QueryParam("query3") Long queryString3, @QueryParam("query4") boolean queryBoolean4, - @QueryParam("query5") String queryString4) { + @QueryParam("query5") char queryChar5, + @QueryParam("query6") String queryString6) { // complete } http://git-wip-us.apache.org/repos/asf/cxf/blob/05239840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java -- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java index d68801c..21b96df 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java @@ -1312,12 +1312,12 @@ public class JAXRSUtilsTest extends Assert { @Test public void testMultipleQueryParameters() throws Exception { Class[] argType = {String.class, String.class, Long.class, - Boolean.TYPE, String.class}; + Boolean.TYPE, char.class, String.class}; Method m = Customer.class.getMethod("testMultipleQuery", argType); MessageImpl messageImpl = new MessageImpl(); messageImpl.put(Message.QUERY_STRING, - "query=first&query2=second&query3=3&query4=true&query5"); + "query=first&query2=second&query3=3&query4=true&query6"); List params = JAXRSUtils.processParameters(new OperationResourceInfo(m, new ClassResourceInfo(Customer.class)), null, messageImpl); @@ -1329,8 +1329,10 @@ public class JAXRSUtilsTest extends Assert { new Long(3), params.get(2));
git commit: [CXF-5864] Optional support for anonymous users
Repository: cxf Updated Branches: refs/heads/master badfac577 -> 38a9b6614 [CXF-5864] Optional support for anonymous users Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/38a9b661 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/38a9b661 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/38a9b661 Branch: refs/heads/master Commit: 38a9b6614c4c28014710eb47c40d77c8adf54071 Parents: badfac5 Author: Sergey Beryozkin Authored: Wed Jul 9 14:24:18 2014 +0100 Committer: Sergey Beryozkin Committed: Wed Jul 9 14:24:18 2014 +0100 -- .../AbstractAuthorizingInInterceptor.java | 18 ++-- .../OperationInfoAuthorizingInterceptor.java| 15 ++--- .../SimpleAuthorizingInterceptorTest.java | 22 ++-- 3 files changed, 48 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/38a9b661/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java -- diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java index 11f6b31..d4f22f1 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java @@ -38,21 +38,24 @@ public abstract class AbstractAuthorizingInInterceptor extends AbstractPhaseInte private static final Logger LOG = LogUtils.getL7dLogger(AbstractAuthorizingInInterceptor.class); private static final String ALL_ROLES = "*"; - +private boolean allowAnonymousUsers = true; public AbstractAuthorizingInInterceptor() { super(Phase.PRE_INVOKE); } public void handleMessage(Message message) throws Fault { +Method method = getTargetMethod(message); SecurityContext sc = message.get(SecurityContext.class); if (sc != null && sc.getUserPrincipal() != null) { -Method method = getTargetMethod(message); if (authorize(sc, method)) { return; } +} else if (!isMethodProtected(method) && isAllowAnonymousUsers()) { +return; } + throw new AccessDeniedException("Unauthorized"); } @@ -87,6 +90,9 @@ public abstract class AbstractAuthorizingInInterceptor extends AbstractPhaseInte } return false; } +protected boolean isMethodProtected(Method method) { +return !getExpectedRoles(method).isEmpty() || !getDenyRoles(method).isEmpty(); +} protected boolean isUserInRole(SecurityContext sc, List roles, boolean deny) { @@ -118,5 +124,13 @@ public abstract class AbstractAuthorizingInInterceptor extends AbstractPhaseInte protected List getDenyRoles(Method method) { return Collections.emptyList(); } + +public boolean isAllowAnonymousUsers() { +return allowAnonymousUsers; +} + +public void setAllowAnonymousUsers(boolean allowAnonymousUsers) { +this.allowAnonymousUsers = allowAnonymousUsers; +} } http://git-wip-us.apache.org/repos/asf/cxf/blob/38a9b661/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java -- diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java index b7e496c..f0dbaa0 100755 --- a/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java @@ -39,13 +39,15 @@ public class OperationInfoAuthorizingInterceptor extends SimpleAuthorizingInterc @Override public void handleMessage(Message message) throws Fault { +OperationInfo opinfo = getTargetOperationInfo(message); SecurityContext sc = message.get(SecurityContext.class); if (sc != null && sc.getUserPrincipal() != null) { -OperationInfo opinfo = getTargetOperationInfo(message); -if (opinfo != null && opinfo.getName() != null +if (opinfo.getName() != null && authorize(sc, opinfo.getName().getLocalPart())) { return; } +} else if (!isMethodProtected(opinfo.getName().getLocalPart()) && isAllowAnonymousUsers()) { +return; } throw new AccessDenie
git commit: [CXF-5864] Optional support for anonymous users
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 18f7085cb -> beb6b97ae [CXF-5864] Optional support for anonymous users Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/beb6b97a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/beb6b97a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/beb6b97a Branch: refs/heads/2.7.x-fixes Commit: beb6b97aecc306b60225256f6c053fa2c5181c3d Parents: 18f7085 Author: Sergey Beryozkin Authored: Wed Jul 9 14:24:18 2014 +0100 Committer: Sergey Beryozkin Committed: Wed Jul 9 14:34:17 2014 +0100 -- .../AbstractAuthorizingInInterceptor.java | 18 ++-- .../OperationInfoAuthorizingInterceptor.java| 15 ++--- .../SimpleAuthorizingInterceptorTest.java | 22 ++-- 3 files changed, 48 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/beb6b97a/rt/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java -- diff --git a/rt/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java b/rt/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java index 11f6b31..d4f22f1 100644 --- a/rt/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java +++ b/rt/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java @@ -38,21 +38,24 @@ public abstract class AbstractAuthorizingInInterceptor extends AbstractPhaseInte private static final Logger LOG = LogUtils.getL7dLogger(AbstractAuthorizingInInterceptor.class); private static final String ALL_ROLES = "*"; - +private boolean allowAnonymousUsers = true; public AbstractAuthorizingInInterceptor() { super(Phase.PRE_INVOKE); } public void handleMessage(Message message) throws Fault { +Method method = getTargetMethod(message); SecurityContext sc = message.get(SecurityContext.class); if (sc != null && sc.getUserPrincipal() != null) { -Method method = getTargetMethod(message); if (authorize(sc, method)) { return; } +} else if (!isMethodProtected(method) && isAllowAnonymousUsers()) { +return; } + throw new AccessDeniedException("Unauthorized"); } @@ -87,6 +90,9 @@ public abstract class AbstractAuthorizingInInterceptor extends AbstractPhaseInte } return false; } +protected boolean isMethodProtected(Method method) { +return !getExpectedRoles(method).isEmpty() || !getDenyRoles(method).isEmpty(); +} protected boolean isUserInRole(SecurityContext sc, List roles, boolean deny) { @@ -118,5 +124,13 @@ public abstract class AbstractAuthorizingInInterceptor extends AbstractPhaseInte protected List getDenyRoles(Method method) { return Collections.emptyList(); } + +public boolean isAllowAnonymousUsers() { +return allowAnonymousUsers; +} + +public void setAllowAnonymousUsers(boolean allowAnonymousUsers) { +this.allowAnonymousUsers = allowAnonymousUsers; +} } http://git-wip-us.apache.org/repos/asf/cxf/blob/beb6b97a/rt/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java -- diff --git a/rt/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java b/rt/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java index b7e496c..f0dbaa0 100755 --- a/rt/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java +++ b/rt/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java @@ -39,13 +39,15 @@ public class OperationInfoAuthorizingInterceptor extends SimpleAuthorizingInterc @Override public void handleMessage(Message message) throws Fault { +OperationInfo opinfo = getTargetOperationInfo(message); SecurityContext sc = message.get(SecurityContext.class); if (sc != null && sc.getUserPrincipal() != null) { -OperationInfo opinfo = getTargetOperationInfo(message); -if (opinfo != null && opinfo.getName() != null +if (opinfo.getName() != null && authorize(sc, opinfo.getName().getLocalPart())) { return; } +} else if (!isMethodProtected(opinfo.getName().getLocalPart()) && isAllowAnonymousUsers()) { +return; }
git commit: [CXF-5864] Optional support for anonymous users
Repository: cxf Updated Branches: refs/heads/2.6.x-fixes 05239840b -> 915cabf8b [CXF-5864] Optional support for anonymous users Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/915cabf8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/915cabf8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/915cabf8 Branch: refs/heads/2.6.x-fixes Commit: 915cabf8b784cd7a363d765c7a3f70cdef85d449 Parents: 0523984 Author: Sergey Beryozkin Authored: Wed Jul 9 14:24:18 2014 +0100 Committer: Sergey Beryozkin Committed: Wed Jul 9 14:37:16 2014 +0100 -- .../AbstractAuthorizingInInterceptor.java | 18 ++-- .../OperationInfoAuthorizingInterceptor.java| 15 ++--- .../SimpleAuthorizingInterceptorTest.java | 22 ++-- 3 files changed, 48 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/915cabf8/rt/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java -- diff --git a/rt/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java b/rt/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java index 11f6b31..d4f22f1 100644 --- a/rt/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java +++ b/rt/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java @@ -38,21 +38,24 @@ public abstract class AbstractAuthorizingInInterceptor extends AbstractPhaseInte private static final Logger LOG = LogUtils.getL7dLogger(AbstractAuthorizingInInterceptor.class); private static final String ALL_ROLES = "*"; - +private boolean allowAnonymousUsers = true; public AbstractAuthorizingInInterceptor() { super(Phase.PRE_INVOKE); } public void handleMessage(Message message) throws Fault { +Method method = getTargetMethod(message); SecurityContext sc = message.get(SecurityContext.class); if (sc != null && sc.getUserPrincipal() != null) { -Method method = getTargetMethod(message); if (authorize(sc, method)) { return; } +} else if (!isMethodProtected(method) && isAllowAnonymousUsers()) { +return; } + throw new AccessDeniedException("Unauthorized"); } @@ -87,6 +90,9 @@ public abstract class AbstractAuthorizingInInterceptor extends AbstractPhaseInte } return false; } +protected boolean isMethodProtected(Method method) { +return !getExpectedRoles(method).isEmpty() || !getDenyRoles(method).isEmpty(); +} protected boolean isUserInRole(SecurityContext sc, List roles, boolean deny) { @@ -118,5 +124,13 @@ public abstract class AbstractAuthorizingInInterceptor extends AbstractPhaseInte protected List getDenyRoles(Method method) { return Collections.emptyList(); } + +public boolean isAllowAnonymousUsers() { +return allowAnonymousUsers; +} + +public void setAllowAnonymousUsers(boolean allowAnonymousUsers) { +this.allowAnonymousUsers = allowAnonymousUsers; +} } http://git-wip-us.apache.org/repos/asf/cxf/blob/915cabf8/rt/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java -- diff --git a/rt/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java b/rt/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java index b7e496c..f0dbaa0 100755 --- a/rt/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java +++ b/rt/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java @@ -39,13 +39,15 @@ public class OperationInfoAuthorizingInterceptor extends SimpleAuthorizingInterc @Override public void handleMessage(Message message) throws Fault { +OperationInfo opinfo = getTargetOperationInfo(message); SecurityContext sc = message.get(SecurityContext.class); if (sc != null && sc.getUserPrincipal() != null) { -OperationInfo opinfo = getTargetOperationInfo(message); -if (opinfo != null && opinfo.getName() != null +if (opinfo.getName() != null && authorize(sc, opinfo.getName().getLocalPart())) { return; } +} else if (!isMethodProtected(opinfo.getName().getLocalPart()) && isAllowAnonymousUsers()) { +return; }
git commit: CXF-5863 Fixed the issue that JettyHTTPServerEngineFactoryHolder does not support Handlers
Repository: cxf Updated Branches: refs/heads/master 38a9b6614 -> 3812fe232 CXF-5863 Fixed the issue that JettyHTTPServerEngineFactoryHolder does not support Handlers Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3812fe23 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3812fe23 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3812fe23 Branch: refs/heads/master Commit: 3812fe2327b06d06ba60fe80fc466e4b39c915d6 Parents: 38a9b66 Author: Willem Jiang Authored: Wed Jul 9 22:47:48 2014 +0800 Committer: Willem Jiang Committed: Wed Jul 9 22:58:02 2014 +0800 -- .../JettyHTTPServerEngineFactoryHolder.java | 39 -- .../JettyServerEngineFactoryParser.java | 54 +++- 2 files changed, 89 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/3812fe23/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java -- diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java index c56083f..a4dd160 100644 --- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java +++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java @@ -26,11 +26,13 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.logging.Logger; + import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; import javax.xml.parsers.DocumentBuilderFactory; + import org.w3c.dom.Element; import org.apache.cxf.common.jaxb.JAXBContextCache; @@ -47,6 +49,8 @@ import org.apache.cxf.transports.http_jetty.configuration.JettyHTTPServerEngineF import org.apache.cxf.transports.http_jetty.configuration.TLSServerParametersIdentifiedType; import org.apache.cxf.transports.http_jetty.configuration.ThreadingParametersIdentifiedType; import org.apache.cxf.transports.http_jetty.configuration.ThreadingParametersType; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; public class JettyHTTPServerEngineFactoryHolder { @@ -54,6 +58,10 @@ public class JettyHTTPServerEngineFactoryHolder { private String parsedElement; private JettyHTTPServerEngineFactory factory; + +private Map connectorMap; + +private Map> handlersMap; private JAXBContext jaxbContext; private Set> jaxbClasses; @@ -111,13 +119,30 @@ public class JettyHTTPServerEngineFactoryHolder { List engineList = new ArrayList(); for (JettyHTTPServerEngineConfigType engine : config.getEngine()) { JettyHTTPServerEngine eng = new JettyHTTPServerEngine(); -//eng.setConnector(engine.getConnector()); +if (engine.getConnector() != null && connectorMap != null) { +// we need to setup the Connector from the connectorMap +Connector connector = connectorMap.get(engine.getPort().toString()); +if (connector != null) { +eng.setConnector(connector); +} else { +throw new RuntimeException("Could not find the connector instance for engine with port" ++ engine.getPort().toString()); +} +} +if (engine.getHandlers() != null && handlersMap != null) { +List handlers = handlersMap.get(engine.getPort().toString()); +if (handlers != null) { +eng.setHandlers(handlers); +} else { +throw new RuntimeException("Could not find the handlers instance for engine with port" ++ engine.getPort().toString()); +} +} if (engine.isContinuationsEnabled() != null) { eng.setContinuationsEnabled(engine.isContinuationsEnabled()); } -// eng.setHandlers(engine.getHandlers()); - + if (engine.getHost() != null && !StringUtils.isEmpty(engine.getHost())) { eng.setHost(engine.getHost()); } @@ -180,6 +205,14 @@ public class JettyHTTPServerEngineFactoryHolder { public void setParsedElement(String parsedElement) { this.
git commit: [CXF-5842] Make sure the cache gets cleaned up if it fails to cache the input
Repository: cxf Updated Branches: refs/heads/master 3812fe232 -> ebf24b72c [CXF-5842] Make sure the cache gets cleaned up if it fails to cache the input Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ebf24b72 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ebf24b72 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ebf24b72 Branch: refs/heads/master Commit: ebf24b72c0468195f129aa6fd3b10c571592d216 Parents: 3812fe2 Author: Daniel Kulp Authored: Wed Jul 9 10:58:33 2014 -0400 Committer: Daniel Kulp Committed: Wed Jul 9 11:28:27 2014 -0400 -- .../cxf/attachment/AttachmentDataSource.java| 28 ++-- .../cxf/jaxrs/ext/MessageContextImpl.java | 2 +- .../cxf/systest/jaxrs/JAXRSMultipartTest.java | 67 +++- .../cxf/systest/jaxrs/MultipartServer.java | 1 + .../cxf/systest/jaxrs/resources/attachmentData | 2 +- 5 files changed, 90 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/ebf24b72/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java -- diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java index 42194f5..d1b64b8 100644 --- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java +++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java @@ -26,6 +26,7 @@ import java.io.OutputStream; import javax.activation.DataSource; import org.apache.cxf.helpers.IOUtils; +import org.apache.cxf.io.CacheSizeExceededException; import org.apache.cxf.io.CachedOutputStream; import org.apache.cxf.message.Message; @@ -49,12 +50,27 @@ public class AttachmentDataSource implements DataSource { if (cache == null) { cache = new CachedOutputStream(); AttachmentUtil.setStreamedAttachmentProperties(message, cache); -IOUtils.copy(ins, cache); -cache.lockOutputStream(); -ins.close(); -ins = null; -if (delegate != null) { -delegate.setInputStream(cache.getInputStream()); +try { +IOUtils.copy(ins, cache); +cache.lockOutputStream(); +if (delegate != null) { +delegate.setInputStream(cache.getInputStream()); +} +} catch (CacheSizeExceededException cee) { +cache.close(); +cache = null; +throw cee; +} catch (IOException cee) { +cache.close(); +cache = null; +throw cee; +} finally { +try { +ins.close(); +} catch (Exception ex) { +//ignore +} +ins = null; } } } http://git-wip-us.apache.org/repos/asf/cxf/blob/ebf24b72/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java -- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java index acd96d8..b1fec9b 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java @@ -76,7 +76,7 @@ public class MessageContextImpl implements MessageContext { return createAttachments(key.toString()); } catch (CacheSizeExceededException e) { m.getExchange().put("cxf.io.cacheinput", Boolean.FALSE); -throw new WebApplicationException(413); +throw new WebApplicationException(e, 413); } } if (keyValue.equals("WRITE-" + Message.ATTACHMENTS)) { http://git-wip-us.apache.org/repos/asf/cxf/blob/ebf24b72/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java -- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java index 9832202..e89a3ea 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java @@ -22,7 +22,9 @@ package org.apache.cxf.systest.jaxrs; import java.awt.Image; import java.io.ByteArrayInputStream; import java.io.File; +import java.io.
[2/2] git commit: CXF-5863 Fixed the issue that JettyHTTPServerEngineFactoryHolder does not support Handlers
CXF-5863 Fixed the issue that JettyHTTPServerEngineFactoryHolder does not support Handlers Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b6d8e0fb Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b6d8e0fb Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b6d8e0fb Branch: refs/heads/2.6.x-fixes Commit: b6d8e0fbfd356eac4cc27e809ad9c034ca027d49 Parents: 915cabf Author: Willem Jiang Authored: Wed Jul 9 22:47:48 2014 +0800 Committer: Willem Jiang Committed: Wed Jul 9 23:24:18 2014 +0800 -- .../JettyHTTPServerEngineFactoryHolder.java | 39 ++- .../JettyServerEngineFactoryParser.java | 72 +++- 2 files changed, 91 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/b6d8e0fb/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java -- diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java index c56083f..a4dd160 100644 --- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java +++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java @@ -26,11 +26,13 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.logging.Logger; + import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; import javax.xml.parsers.DocumentBuilderFactory; + import org.w3c.dom.Element; import org.apache.cxf.common.jaxb.JAXBContextCache; @@ -47,6 +49,8 @@ import org.apache.cxf.transports.http_jetty.configuration.JettyHTTPServerEngineF import org.apache.cxf.transports.http_jetty.configuration.TLSServerParametersIdentifiedType; import org.apache.cxf.transports.http_jetty.configuration.ThreadingParametersIdentifiedType; import org.apache.cxf.transports.http_jetty.configuration.ThreadingParametersType; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; public class JettyHTTPServerEngineFactoryHolder { @@ -54,6 +58,10 @@ public class JettyHTTPServerEngineFactoryHolder { private String parsedElement; private JettyHTTPServerEngineFactory factory; + +private Map connectorMap; + +private Map> handlersMap; private JAXBContext jaxbContext; private Set> jaxbClasses; @@ -111,13 +119,30 @@ public class JettyHTTPServerEngineFactoryHolder { List engineList = new ArrayList(); for (JettyHTTPServerEngineConfigType engine : config.getEngine()) { JettyHTTPServerEngine eng = new JettyHTTPServerEngine(); -//eng.setConnector(engine.getConnector()); +if (engine.getConnector() != null && connectorMap != null) { +// we need to setup the Connector from the connectorMap +Connector connector = connectorMap.get(engine.getPort().toString()); +if (connector != null) { +eng.setConnector(connector); +} else { +throw new RuntimeException("Could not find the connector instance for engine with port" ++ engine.getPort().toString()); +} +} +if (engine.getHandlers() != null && handlersMap != null) { +List handlers = handlersMap.get(engine.getPort().toString()); +if (handlers != null) { +eng.setHandlers(handlers); +} else { +throw new RuntimeException("Could not find the handlers instance for engine with port" ++ engine.getPort().toString()); +} +} if (engine.isContinuationsEnabled() != null) { eng.setContinuationsEnabled(engine.isContinuationsEnabled()); } -// eng.setHandlers(engine.getHandlers()); - + if (engine.getHost() != null && !StringUtils.isEmpty(engine.getHost())) { eng.setHost(engine.getHost()); } @@ -180,6 +205,14 @@ public class JettyHTTPServerEngineFactoryHolder { public void setParsedElement(String parsedElement) { this.parsedElement = parsedElement; } + +public void setConnectorMap
[1/2] git commit: CXF-5863 Fixed the issue that JettyHTTPServerEngineFactoryHolder does not support Handlers
Repository: cxf Updated Branches: refs/heads/2.6.x-fixes 915cabf8b -> b6d8e0fbf refs/heads/2.7.x-fixes beb6b97ae -> 22b612ffc CXF-5863 Fixed the issue that JettyHTTPServerEngineFactoryHolder does not support Handlers Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/22b612ff Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/22b612ff Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/22b612ff Branch: refs/heads/2.7.x-fixes Commit: 22b612ffcb2540dc59f9b48e947ed86ac2489686 Parents: beb6b97 Author: Willem Jiang Authored: Wed Jul 9 22:47:48 2014 +0800 Committer: Willem Jiang Committed: Wed Jul 9 23:23:03 2014 +0800 -- .../JettyHTTPServerEngineFactoryHolder.java | 39 ++- .../JettyServerEngineFactoryParser.java | 72 +++- 2 files changed, 91 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/22b612ff/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java -- diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java index c56083f..a4dd160 100644 --- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java +++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java @@ -26,11 +26,13 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.logging.Logger; + import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; import javax.xml.parsers.DocumentBuilderFactory; + import org.w3c.dom.Element; import org.apache.cxf.common.jaxb.JAXBContextCache; @@ -47,6 +49,8 @@ import org.apache.cxf.transports.http_jetty.configuration.JettyHTTPServerEngineF import org.apache.cxf.transports.http_jetty.configuration.TLSServerParametersIdentifiedType; import org.apache.cxf.transports.http_jetty.configuration.ThreadingParametersIdentifiedType; import org.apache.cxf.transports.http_jetty.configuration.ThreadingParametersType; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; public class JettyHTTPServerEngineFactoryHolder { @@ -54,6 +58,10 @@ public class JettyHTTPServerEngineFactoryHolder { private String parsedElement; private JettyHTTPServerEngineFactory factory; + +private Map connectorMap; + +private Map> handlersMap; private JAXBContext jaxbContext; private Set> jaxbClasses; @@ -111,13 +119,30 @@ public class JettyHTTPServerEngineFactoryHolder { List engineList = new ArrayList(); for (JettyHTTPServerEngineConfigType engine : config.getEngine()) { JettyHTTPServerEngine eng = new JettyHTTPServerEngine(); -//eng.setConnector(engine.getConnector()); +if (engine.getConnector() != null && connectorMap != null) { +// we need to setup the Connector from the connectorMap +Connector connector = connectorMap.get(engine.getPort().toString()); +if (connector != null) { +eng.setConnector(connector); +} else { +throw new RuntimeException("Could not find the connector instance for engine with port" ++ engine.getPort().toString()); +} +} +if (engine.getHandlers() != null && handlersMap != null) { +List handlers = handlersMap.get(engine.getPort().toString()); +if (handlers != null) { +eng.setHandlers(handlers); +} else { +throw new RuntimeException("Could not find the handlers instance for engine with port" ++ engine.getPort().toString()); +} +} if (engine.isContinuationsEnabled() != null) { eng.setContinuationsEnabled(engine.isContinuationsEnabled()); } -// eng.setHandlers(engine.getHandlers()); - + if (engine.getHost() != null && !StringUtils.isEmpty(engine.getHost())) { eng.setHost(engine.getHost()); } @@ -180,6 +205,14 @@ public class JettyHTTPServerEngineFactoryHolder { public void
git commit: [CXF-5842] Make sure the cache gets cleaned up if it fails to cache the input
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 22b612ffc -> 9c11b61bc [CXF-5842] Make sure the cache gets cleaned up if it fails to cache the input Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9c11b61b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9c11b61b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9c11b61b Branch: refs/heads/2.7.x-fixes Commit: 9c11b61bcbc9553a4220a345d7195889c3f697d5 Parents: 22b612f Author: Daniel Kulp Authored: Wed Jul 9 10:58:33 2014 -0400 Committer: Daniel Kulp Committed: Wed Jul 9 11:55:58 2014 -0400 -- .../cxf/attachment/AttachmentDataSource.java| 28 +++- .../cxf/jaxrs/ext/MessageContextImpl.java | 2 +- 2 files changed, 23 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/9c11b61b/api/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java -- diff --git a/api/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java b/api/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java index 42194f5..d1b64b8 100644 --- a/api/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java +++ b/api/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java @@ -26,6 +26,7 @@ import java.io.OutputStream; import javax.activation.DataSource; import org.apache.cxf.helpers.IOUtils; +import org.apache.cxf.io.CacheSizeExceededException; import org.apache.cxf.io.CachedOutputStream; import org.apache.cxf.message.Message; @@ -49,12 +50,27 @@ public class AttachmentDataSource implements DataSource { if (cache == null) { cache = new CachedOutputStream(); AttachmentUtil.setStreamedAttachmentProperties(message, cache); -IOUtils.copy(ins, cache); -cache.lockOutputStream(); -ins.close(); -ins = null; -if (delegate != null) { -delegate.setInputStream(cache.getInputStream()); +try { +IOUtils.copy(ins, cache); +cache.lockOutputStream(); +if (delegate != null) { +delegate.setInputStream(cache.getInputStream()); +} +} catch (CacheSizeExceededException cee) { +cache.close(); +cache = null; +throw cee; +} catch (IOException cee) { +cache.close(); +cache = null; +throw cee; +} finally { +try { +ins.close(); +} catch (Exception ex) { +//ignore +} +ins = null; } } } http://git-wip-us.apache.org/repos/asf/cxf/blob/9c11b61b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java -- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java index 80449f6..f3ed0fd 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java @@ -77,7 +77,7 @@ public class MessageContextImpl implements MessageContext { return createAttachments(key.toString()); } catch (CacheSizeExceededException e) { m.getExchange().put("cxf.io.cacheinput", Boolean.FALSE); -throw new WebApplicationException(413); +throw new WebApplicationException(e, 413); } } if (keyValue.equals("WRITE-" + Message.ATTACHMENTS)) {
git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 9c11b61bc -> c61bff324 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/c61bff32 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c61bff32 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c61bff32 Branch: refs/heads/2.7.x-fixes Commit: c61bff324caed93317bdd07cbb0849456e049c63 Parents: 9c11b61 Author: Daniel Kulp Authored: Wed Jul 9 11:56:16 2014 -0400 Committer: Daniel Kulp Committed: Wed Jul 9 11:56:16 2014 -0400 -- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/c61bff32/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index b23c3d4..7def845 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -78,6 +78,7 @@ B 0fcb49380d93b974e918e32051b5438cdc5e179c B 0fd41e29ea4a79d7dd44569db6c804c5b257085b B 0ff365aa8bb9b7b2180dbf1afd17b4cc39020f40 B 100bf13fe2cf118167f0d0aaf02c34e6337c12ec +B 1075d1f4775b02fe7305d9b71379a857dd358fca B 1138017fa68e60f5920c48d4cce39632af6067c7 B 118eceb436013ae2c2f94fa3dfeadc615149a0e8 B 11bccec4f48f65f36907cd04230b1b751a34d0e1 @@ -1091,10 +1092,12 @@ B f32709f86d7f1aefb23a60c705d6d658d7b958e2 B f34899128e0e27850a3cc31bbf58658290931506 B f3497b00bd89e2978d605425c98f93fd310f442e B f360f14089d616160553b1ea336c0d51a0206443 +B f372fffe46870f44ba491afbff1807d4a8799b75 B f42f6b6ba6037850bd200923b72fd3e716ccbbff B f45bfa1b92dac579d570b86d20fdbfe6ac4b5feb B f47125823394579b307d8dbab89fc6cdb38e8c80 B f4c0d943011197b0223607959104983a5f8d87e1 +B f4ce90b50cf2ccd771d05f5c5c0bcf76341744e3 B f4e85ce1f779e95b8bad25450523e9c35b383bf9 B f4f4ddaee93e441843b481293e08a4686505116a B f4f50aa0412bba172fd0f5ebb3e73eb6457c3812
git commit: Updating OAuth2 Client to hold the whole public cert chain if needed
Repository: cxf Updated Branches: refs/heads/master ebf24b72c -> 2c9464299 Updating OAuth2 Client to hold the whole public cert chain if needed Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2c946429 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2c946429 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2c946429 Branch: refs/heads/master Commit: 2c9464299c2ec61779dd0e885802c2b6072df191 Parents: ebf24b7 Author: Sergey Beryozkin Authored: Wed Jul 9 21:43:37 2014 +0100 Committer: Sergey Beryozkin Committed: Wed Jul 9 21:43:37 2014 +0100 -- .../cxf/rs/security/oauth2/common/Client.java | 12 .../oauth2/common/OAuthAuthorizationData.java | 11 .../oauth2/services/AbstractTokenService.java | 29 .../services/RedirectionBasedGrantService.java | 2 +- .../utils/crypto/ModelEncryptionSupport.java| 6 ++-- .../security/oauth2/OAuthDataProviderImpl.java | 3 +- 6 files changed, 36 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/2c946429/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java -- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java index 88a3c4a..f87370b 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java @@ -38,7 +38,7 @@ public class Client implements Serializable { private String applicationDescription; private String applicationWebUri; private String applicationLogoUri; -private String applicationCertificate; +private List applicationCertificates = new LinkedList(); private List redirectUris = new LinkedList(); private boolean isConfidential; @@ -283,16 +283,16 @@ public class Client implements Serializable { this.registeredAudiences = registeredAudiences; } -public String getApplicationCertificate() { -return applicationCertificate; +public List getApplicationCertificates() { +return applicationCertificates; } /* - * Set the optional Base64 encoded Application Public X509 Certificate + * Set the Base64 encoded Application Public X509 Certificate * It can be used in combination with the clientSecret property to support * Basic or other password-aware authentication on top of 2-way TLS. */ -public void setApplicationCertificate(String applicationCertificate) { -this.applicationCertificate = applicationCertificate; +public void setApplicationCertificates(List applicationCertificates) { +this.applicationCertificates = applicationCertificates; } } http://git-wip-us.apache.org/repos/asf/cxf/blob/2c946429/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java -- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java index 0b98d08..5c3201f 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java @@ -20,6 +20,7 @@ package org.apache.cxf.rs.security.oauth2.common; import java.io.Serializable; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -48,7 +49,7 @@ public class OAuthAuthorizationData implements Serializable { private String applicationWebUri; private String applicationDescription; private String applicationLogoUri; -private String applicationCertificate; +private List applicationCertificates = new LinkedList(); private Map extraApplicationProperties = new HashMap(); private List permissions; @@ -263,12 +264,12 @@ public class OAuthAuthorizationData implements Serializable { this.audience = audience; } -public String getApplicationCertificate() { -return applicationCertificate; +public List getApplicationCertificates() { +return applicationCertificates; } -public void setApplicationCertificate(String applicationCertificate)
git commit: [CXF-5866] Adding XMLStreamReaderWrapper to WSDLManagerImpl and providing a XMLStreamReader wrapper that resolves system properties
Repository: cxf Updated Branches: refs/heads/master 2c9464299 -> e0b7f3556 [CXF-5866] Adding XMLStreamReaderWrapper to WSDLManagerImpl and providing a XMLStreamReader wrapper that resolves system properties Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e0b7f355 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e0b7f355 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e0b7f355 Branch: refs/heads/master Commit: e0b7f35566bdcb2f364f85caa70c4b100433ed8a Parents: 2c94642 Author: Alessio Soldano Authored: Thu Jul 10 00:04:09 2014 +0200 Committer: Alessio Soldano Committed: Thu Jul 10 00:08:08 2014 +0200 -- .../staxutils/DelegatingXMLStreamReader.java| 264 +++ .../staxutils/SysPropExpandingStreamReader.java | 90 +++ .../cxf/staxutils/XMLStreamReaderWrapper.java | 30 +++ .../SysPropExpandingStreamReaderTest.java | 63 + .../apache/cxf/staxutils/resources/sysprops.xml | 23 ++ .../org/apache/cxf/wsdl11/WSDLManagerImpl.java | 26 +- .../apache/cxf/wsdl11/WSDLManagerImplTest.java | 28 ++ .../org/apache/cxf/wsdl11/hello_world_wrap.wsdl | 161 +++ 8 files changed, 680 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/e0b7f355/core/src/main/java/org/apache/cxf/staxutils/DelegatingXMLStreamReader.java -- diff --git a/core/src/main/java/org/apache/cxf/staxutils/DelegatingXMLStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/DelegatingXMLStreamReader.java new file mode 100644 index 000..56564a7 --- /dev/null +++ b/core/src/main/java/org/apache/cxf/staxutils/DelegatingXMLStreamReader.java @@ -0,0 +1,264 @@ +/** + * 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.staxutils; + +import javax.xml.namespace.NamespaceContext; +import javax.xml.namespace.QName; +import javax.xml.stream.Location; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; + +/** + * A XMLStreamReader that delegates to a provided XMLStreamReader instance. + * + */ +public class DelegatingXMLStreamReader implements XMLStreamReader { + +private final XMLStreamReader delegate; + +public DelegatingXMLStreamReader(XMLStreamReader reader) { +this.delegate = reader; +} + +@Override +public Object getProperty(String name) throws IllegalArgumentException { +return delegate.getProperty(name); +} + +@Override +public int next() throws XMLStreamException { +return delegate.next(); +} + +@Override +public void require(int type, String namespaceURI, String localName) throws XMLStreamException { +delegate.require(type, namespaceURI, localName); +} + +@Override +public String getElementText() throws XMLStreamException { +return delegate.getElementText(); +} + +@Override +public int nextTag() throws XMLStreamException { +return delegate.nextTag(); +} + +@Override +public boolean hasNext() throws XMLStreamException { +return delegate.hasNext(); +} + +@Override +public void close() throws XMLStreamException { +delegate.close(); +} + +@Override +public String getNamespaceURI(String prefix) { +return delegate.getNamespaceURI(prefix); +} + +@Override +public boolean isStartElement() { +return delegate.isStartElement(); +} + +@Override +public boolean isEndElement() { +return delegate.isEndElement(); +} + +@Override +public boolean isCharacters() { +return delegate.isCharacters(); +} + +@Override +public boolean isWhiteSpace() { +return delegate.isWhiteSpace(); +} + +@Override +public String getAttributeValue(String namespaceURI, String localName) { +return delegate.getAttributeValue(namespaceURI, localName); +} + +@Override +public int getAttributeCount() { +return delegate