[5/5] cxf git commit: Updating javadocs
Updating javadocs
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/292fe254
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/292fe254
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/292fe254
Branch: refs/heads/master
Commit: 292fe2541e32bb31a59955975972cd6adfa1a9dc
Parents: 8176b1b
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Fri Jul 17 12:45:09 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Fri Jul 17 15:17:01 2015 +0100
--
.../cxf/rt/security/saml/xacml2/DefaultXACMLRequestBuilder.java| 2 +-
.../apache/cxf/rt/security/saml/xacml2/PolicyDecisionPoint.java| 2 +-
.../cxf/rt/security/saml/xacml2/XACMLAuthorizingInterceptor.java | 2 +-
.../apache/cxf/rt/security/saml/xacml2/XACMLRequestBuilder.java| 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/292fe254/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/DefaultXACMLRequestBuilder.java
--
diff --git
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/DefaultXACMLRequestBuilder.java
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/DefaultXACMLRequestBuilder.java
index 468d875..20ba102 100644
---
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/DefaultXACMLRequestBuilder.java
+++
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/DefaultXACMLRequestBuilder.java
@@ -39,7 +39,7 @@ import org.opensaml.xacml.ctx.ResourceType;
import org.opensaml.xacml.ctx.SubjectType;
/**
- * This class constructs an XACML Request given a Principal, list of roles and
MessageContext,
+ * This class constructs an XACML 2.0 Request given a Principal, list of roles
and MessageContext,
* following the SAML 2.0 profile of XACML 2.0. The principal name is inserted
as the Subject ID,
* and the list of roles associated with that principal are inserted as
Subject roles. The action
* to send defaults to execute.
http://git-wip-us.apache.org/repos/asf/cxf/blob/292fe254/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/PolicyDecisionPoint.java
--
diff --git
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/PolicyDecisionPoint.java
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/PolicyDecisionPoint.java
index 1bf1bdb..da84025 100644
---
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/PolicyDecisionPoint.java
+++
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/PolicyDecisionPoint.java
@@ -22,7 +22,7 @@ import org.opensaml.xacml.ctx.RequestType;
import org.opensaml.xacml.ctx.ResponseType;
/**
- * An interface that describes a PolicyDecisionPoint (PDP).
+ * An interface that describes a PolicyDecisionPoint (PDP) that supports XACML
2.0 using OpenSAML
*/
public interface PolicyDecisionPoint {
http://git-wip-us.apache.org/repos/asf/cxf/blob/292fe254/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/XACMLAuthorizingInterceptor.java
--
diff --git
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/XACMLAuthorizingInterceptor.java
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/XACMLAuthorizingInterceptor.java
index ca76382..1238099 100644
---
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/XACMLAuthorizingInterceptor.java
+++
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/XACMLAuthorizingInterceptor.java
@@ -47,7 +47,7 @@ import org.opensaml.xacml.ctx.ResultType;
import org.opensaml.xacml.ctx.StatusType;
/**
- * An interceptor to perform an XACML authorization request to a remote PDP,
+ * An interceptor to perform an XACML 2.0 authorization request to a remote
PDP using OpenSAML,
* and make an authorization decision based on the response. It takes the
principal and roles
* from the SecurityContext, and uses the XACMLRequestBuilder to construct an
XACML Request
* statement.
http://git-wip-us.apache.org/repos/asf/cxf/blob/292fe254/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/XACMLRequestBuilder.java
--
diff --git
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/XACMLRequestBuilder.java
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/XACMLRequestBuilder.java
index 8aa6e4c..99b32ef 100644
---
[3/5] cxf git commit: Refactoring of XACML code
Refactoring of XACML code Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8176b1b0 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8176b1b0 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8176b1b0 Branch: refs/heads/master Commit: 8176b1b0faad2de44a4ff85083c74b5a4b74918a Parents: 2804875 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Fri Jul 17 12:43:20 2015 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Fri Jul 17 15:17:01 2015 +0100 -- .../AbstractXACMLAuthorizingInterceptor.java| 167 -- .../saml/xacml/DefaultXACMLRequestBuilder.java | 218 - .../saml/xacml/RequestComponentBuilder.java | 183 --- .../saml/xacml/SamlRequestComponentBuilder.java | 118 --- .../saml/xacml/XACMLAuthorizingInterceptor.java | 89 -- .../saml/xacml/XACMLRequestBuilder.java | 62 .../saml/xacml/pdp/api/PolicyDecisionPoint.java | 35 --- .../saml/xacml2/DefaultXACMLRequestBuilder.java | 210 + .../saml/xacml2/PolicyDecisionPoint.java| 36 +++ .../saml/xacml2/RequestComponentBuilder.java| 183 +++ .../xacml2/SamlRequestComponentBuilder.java | 118 +++ .../xacml2/XACMLAuthorizingInterceptor.java | 167 ++ .../saml/xacml2/XACMLRequestBuilder.java| 45 +++ .../cxf/rt/security/saml/xacml/DummyPDP.java| 153 - .../saml/xacml/RequestComponentBuilderTest.java | 222 - .../xacml/SamlRequestComponentBuilderTest.java | 153 - .../xacml/XACMLAuthorizingInterceptorTest.java | 127 .../saml/xacml/XACMLRequestBuilderTest.java | 308 --- .../cxf/rt/security/saml/xacml2/DummyPDP.java | 113 +++ .../xacml2/RequestComponentBuilderTest.java | 222 + .../xacml2/SamlRequestComponentBuilderTest.java | 153 + .../xacml2/XACMLAuthorizingInterceptorTest.java | 124 .../saml/xacml2/XACMLRequestBuilderTest.java| 308 +++ .../ws/saml/PolicyDecisionPointMockImpl.java| 45 +-- .../org/apache/cxf/systest/ws/saml/server.xml | 2 +- .../apache/cxf/systest/ws/saml/stax-server.xml | 2 +- 26 files changed, 1684 insertions(+), 1879 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/8176b1b0/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/AbstractXACMLAuthorizingInterceptor.java -- diff --git a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/AbstractXACMLAuthorizingInterceptor.java b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/AbstractXACMLAuthorizingInterceptor.java deleted file mode 100644 index 69ca071..000 --- a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/AbstractXACMLAuthorizingInterceptor.java +++ /dev/null @@ -1,167 +0,0 @@ -/** - * 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.rt.security.saml.xacml; - -import java.security.Principal; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -import org.apache.cxf.common.logging.LogUtils; -import org.apache.cxf.helpers.DOMUtils; -import org.apache.cxf.interceptor.Fault; -import org.apache.cxf.interceptor.security.AccessDeniedException; -import org.apache.cxf.message.Message; -import org.apache.cxf.phase.AbstractPhaseInterceptor; -import org.apache.cxf.phase.Phase; -import org.apache.cxf.security.LoginSecurityContext; -import org.apache.cxf.security.SecurityContext; -import org.apache.wss4j.common.saml.OpenSAMLUtil; -import org.apache.wss4j.common.util.DOM2Writer; -import org.opensaml.xacml.ctx.DecisionType.DECISION; -import org.opensaml.xacml.ctx.RequestType; -import org.opensaml.xacml.ctx.ResponseType; -import org.opensaml.xacml.ctx.ResultType; -import org.opensaml.xacml.ctx.StatusType; - - -/** - * An
[1/5] cxf git commit: Revert PEP merge from yesterday
Repository: cxf
Updated Branches:
refs/heads/master b52efaeba - 2302aa582
Revert PEP merge from yesterday
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/28048751
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/28048751
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/28048751
Branch: refs/heads/master
Commit: 280487512eb1c34a6c05bcfe3e2e182388359a25
Parents: b52efae
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Fri Jul 17 12:26:16 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Fri Jul 17 15:17:00 2015 +0100
--
.../AbstractXACMLAuthorizingInterceptor.java| 3 -
.../saml/xacml/DefaultXACMLRequestBuilder.java | 2 -
.../saml/xacml/XACMLAuthorizingInterceptor.java | 3 -
.../saml/xacml/XACMLRequestBuilder.java | 3 -
.../AbstractXACMLAuthorizingInterceptor.java| 112 ---
.../OpenSAMLXACMLAuthorizingInterceptor.java| 158 --
.../xacml/pep/OpenSAMLXACMLRequestBuilder.java | 209 -
.../saml/xacml/pep/XACMLRequestBuilder.java | 44 ---
.../saml/xacml/OldXACMLRequestBuilderTest.java | 308 ---
.../saml/xacml/XACMLRequestBuilderTest.java | 40 ++-
.../cxf/systest/ws/saml/SamlTokenTest.java | 48 ---
.../cxf/systest/ws/saml/DoubleItSaml.wsdl | 3 -
.../org/apache/cxf/systest/ws/saml/client.xml | 6 -
.../org/apache/cxf/systest/ws/saml/server.xml | 13 -
.../apache/cxf/systest/ws/saml/stax-server.xml | 15 -
15 files changed, 19 insertions(+), 948 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/28048751/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/AbstractXACMLAuthorizingInterceptor.java
--
diff --git
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/AbstractXACMLAuthorizingInterceptor.java
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/AbstractXACMLAuthorizingInterceptor.java
index 3ece64a..69ca071 100644
---
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/AbstractXACMLAuthorizingInterceptor.java
+++
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/AbstractXACMLAuthorizingInterceptor.java
@@ -54,10 +54,7 @@ import org.opensaml.xacml.ctx.StatusType;
* statement.
*
* This class must be subclassed to actually perform the request to the PDP.
- *
- * @deprecated: Use pep.AbstractXACMLAuthorizingInterceptor instead
*/
-@Deprecated
public abstract class AbstractXACMLAuthorizingInterceptor extends
AbstractPhaseInterceptorMessage {
private static final Logger LOG =
LogUtils.getL7dLogger(AbstractXACMLAuthorizingInterceptor.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/28048751/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/DefaultXACMLRequestBuilder.java
--
diff --git
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/DefaultXACMLRequestBuilder.java
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/DefaultXACMLRequestBuilder.java
index ded3025..1040a56 100644
---
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/DefaultXACMLRequestBuilder.java
+++
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/DefaultXACMLRequestBuilder.java
@@ -52,9 +52,7 @@ import org.opensaml.xacml.ctx.SubjectType;
* send the truncated request URI instead for a SOAP or REST service. The
current DateTime is
* also sent in an Environment, however this can be disabled via configuration.
*
- * @deprecated: Use pep.OpenSAMLXACMLRequestBuilder instead
*/
-@Deprecated
public class DefaultXACMLRequestBuilder implements XACMLRequestBuilder {
private boolean sendDateTime = true;
http://git-wip-us.apache.org/repos/asf/cxf/blob/28048751/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/XACMLAuthorizingInterceptor.java
--
diff --git
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/XACMLAuthorizingInterceptor.java
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/XACMLAuthorizingInterceptor.java
index d198c43..78875a3 100644
---
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/XACMLAuthorizingInterceptor.java
+++
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/XACMLAuthorizingInterceptor.java
@@ -42,10 +42,7 @@ import org.opensaml.xacml.ctx.ResponseType;
* and make an authorization decision based on the response. It takes the
principal and roles
* from the SecurityContext, and uses the
[2/5] cxf git commit: Refactoring of XACML code
http://git-wip-us.apache.org/repos/asf/cxf/blob/8176b1b0/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml/RequestComponentBuilderTest.java
--
diff --git
a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml/RequestComponentBuilderTest.java
b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml/RequestComponentBuilderTest.java
deleted file mode 100644
index 53cd863..000
---
a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml/RequestComponentBuilderTest.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/**
- * 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.rt.security.saml.xacml;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import org.apache.wss4j.common.saml.OpenSAMLUtil;
-import org.joda.time.DateTime;
-import org.opensaml.xacml.ctx.ActionType;
-import org.opensaml.xacml.ctx.AttributeType;
-import org.opensaml.xacml.ctx.AttributeValueType;
-import org.opensaml.xacml.ctx.EnvironmentType;
-import org.opensaml.xacml.ctx.RequestType;
-import org.opensaml.xacml.ctx.ResourceType;
-import org.opensaml.xacml.ctx.SubjectType;
-
-
-/**
- * Some unit tests to create a XACML Request using the RequestComponentBuilder.
- */
-public class RequestComponentBuilderTest extends org.junit.Assert {
-
-private DocumentBuilder docBuilder;
-static {
-OpenSAMLUtil.initSamlEngine();
-}
-
-public RequestComponentBuilderTest() throws ParserConfigurationException {
-DocumentBuilderFactory docBuilderFactory =
DocumentBuilderFactory.newInstance();
-docBuilderFactory.setNamespaceAware(true);
-docBuilder = docBuilderFactory.newDocumentBuilder();
-}
-
-@org.junit.Test
-public void testCreateXACMLRequest() throws Exception {
-Document doc = docBuilder.newDocument();
-
-// Subject
-AttributeValueType subjectIdAttributeValue =
-RequestComponentBuilder.createAttributeValueType(
-alice-u...@apache.org
-);
-AttributeType subjectIdAttribute =
-RequestComponentBuilder.createAttributeType(
-XACMLConstants.SUBJECT_ID,
-XACMLConstants.RFC_822_NAME,
-null,
-Collections.singletonList(subjectIdAttributeValue)
-);
-
-AttributeValueType subjectGroupAttributeValue =
-RequestComponentBuilder.createAttributeValueType(
-manager
-);
-AttributeType subjectGroupAttribute =
-RequestComponentBuilder.createAttributeType(
-XACMLConstants.SUBJECT_ROLE,
-XACMLConstants.XS_ANY_URI,
-admin-u...@apache.org,
-Collections.singletonList(subjectGroupAttributeValue)
-);
-ListAttributeType attributes = new ArrayListAttributeType();
-attributes.add(subjectIdAttribute);
-attributes.add(subjectGroupAttribute);
-SubjectType subject =
RequestComponentBuilder.createSubjectType(attributes, null);
-
-// Resource
-AttributeValueType resourceAttributeValue =
-RequestComponentBuilder.createAttributeValueType(
-{http://www.example.org/contract/DoubleIt}DoubleIt;
-);
-AttributeType resourceAttribute =
-RequestComponentBuilder.createAttributeType(
-XACMLConstants.RESOURCE_ID,
-XACMLConstants.XS_STRING,
-null,
-Collections.singletonList(resourceAttributeValue)
-);
-attributes.clear();
-attributes.add(resourceAttribute);
-ResourceType resource =
RequestComponentBuilder.createResourceType(attributes, null);
-
-// Action
-AttributeValueType
cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes aac5ae771 - dd618ce58 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/dd618ce5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dd618ce5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dd618ce5 Branch: refs/heads/3.0.x-fixes Commit: dd618ce580e2cf2394235767e059919d9fc290a4 Parents: aac5ae7 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Fri Jul 17 15:17:28 2015 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Fri Jul 17 15:17:28 2015 +0100 -- .gitmergeinfo | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/dd618ce5/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index b63298a..64221a9 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -43,6 +43,7 @@ B 1e927cdfaafb2efc8d29184cb5b7b05ce3c3ad7f B 1f02b3d4f2c9d341046ce35222c8f4d7674b10b2 B 2004b1021ce0d0975eb49cae36416863bd8c59bb B 222137cb2ee577e6582a644b7ae73bbc0a75d4d1 +B 2302aa5820661975bb04857fa6d48bb68bebb4f7 B 237ace40ea2c204f68848309b9483c322499b524 B 23849faa6058427381cd3a737d2f37b551db9938 B 2426a0879b06cf6dea32004af16f96f793d568eb @@ -51,8 +52,10 @@ B 24e330c8b6be65c98cd3914f6fe7498e980f4568 B 2616fd04151e5bb7b8a31428f8a9fd0c957dfb48 B 26762a780f4dd498d9304f70072f1bd339223d8a B 27c2c25dc3c2c3019543e31afdca7b166911f278 +B 280487512eb1c34a6c05bcfe3e2e182388359a25 B 28e185b27e8c80cd773cac46d1b9b19529c4fab0 B 28e8f04af96d3e353f0da5018a4531d45592c663 +B 292fe2541e32bb31a59955975972cd6adfa1a9dc B 29f0620a9a025afcd2057cdf97c7d93caf6c179f B 2a5d201be1b85344585094d0f044e9bf1b605fac B 2afb9d3cacb299bea854d1ff4824e4c981a41d6a @@ -195,6 +198,7 @@ B 7e8d0b4b1cd868272380ca5779e67a15e46cf799 B 7e95279dd1170f5878687d7eea27f7d7f03a434b B 80014cf0e6fb1ba62ffdb3766acffd2130eef9d6 B 80d7128a3ba1944a603c73e5e908d86c9bf27648 +B 8176b1b0faad2de44a4ff85083c74b5a4b74918a B 81bc682a409806567fc3485157e184e72feaf086 B 842fade62621490a407729fa1357f043216f25e6 B 857b55796dc7fc2b302e26d99f84df1712ff9c58
cxf git commit: Update the java version for what the xmlbeans plugin creates
Repository: cxf
Updated Branches:
refs/heads/master 2302aa582 - 20539c027
Update the java version for what the xmlbeans plugin creates
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/20539c02
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/20539c02
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/20539c02
Branch: refs/heads/master
Commit: 20539c0278472689722204f0c08e68a86597aae1
Parents: 2302aa5
Author: Daniel Kulp dk...@apache.org
Authored: Fri Jul 17 10:20:59 2015 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Fri Jul 17 10:21:25 2015 -0400
--
rt/databinding/xmlbeans/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/20539c02/rt/databinding/xmlbeans/pom.xml
--
diff --git a/rt/databinding/xmlbeans/pom.xml b/rt/databinding/xmlbeans/pom.xml
index 3ff9667..02c66bd 100644
--- a/rt/databinding/xmlbeans/pom.xml
+++ b/rt/databinding/xmlbeans/pom.xml
@@ -137,7 +137,7 @@
sourceGenerationDirectory${project.build.directory}/generated/src/test/java/sourceGenerationDirectory
classGenerationDirectory${project.build.directory}/generated/src/test/resources/classGenerationDirectory
!--noJavactrue/noJavac--
-javaSource1.5/javaSource
+javaSource1.7/javaSource
/configuration
/plugin
plugin
cxf git commit: [CXF-6502] Avoiding IndexOutOfBoundsException if ContentType is empty
Repository: cxf
Updated Branches:
refs/heads/master 90c777969 - b52efaeba
[CXF-6502] Avoiding IndexOutOfBoundsException if ContentType is empty
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b52efaeb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b52efaeb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b52efaeb
Branch: refs/heads/master
Commit: b52efaebaadce25cebc0797dbf100fc4476b63db
Parents: 90c7779
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Fri Jul 17 16:41:10 2015 +0300
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Fri Jul 17 16:41:10 2015 +0300
--
.../java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b52efaeb/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
index 5c3e389..e685d30 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
@@ -118,7 +118,7 @@ public class JAXRSInInterceptor extends
AbstractPhaseInterceptorMessage {
// Content-Type
String requestContentType = null;
ListString ctHeaderValues =
protocolHeaders.get(Message.CONTENT_TYPE);
-if (ctHeaderValues != null) {
+if (ctHeaderValues != null !ctHeaderValues.isEmpty()) {
requestContentType = ctHeaderValues.get(0);
message.put(Message.CONTENT_TYPE, requestContentType);
}
cxf git commit: [CXF-6502] Avoiding IndexOutOfBoundsException if ContentType is empty
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes b1ee19bcf - aac5ae771
[CXF-6502] Avoiding IndexOutOfBoundsException if ContentType is empty
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aac5ae77
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aac5ae77
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aac5ae77
Branch: refs/heads/3.0.x-fixes
Commit: aac5ae7715fddacc1a9da2fb476a129d56ee4ed0
Parents: b1ee19b
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Fri Jul 17 16:41:10 2015 +0300
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Fri Jul 17 16:42:03 2015 +0300
--
.../java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/aac5ae77/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
index e32f05c..2154cd3 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
@@ -118,7 +118,7 @@ public class JAXRSInInterceptor extends
AbstractPhaseInterceptorMessage {
// Content-Type
String requestContentType = null;
ListString ctHeaderValues =
protocolHeaders.get(Message.CONTENT_TYPE);
-if (ctHeaderValues != null) {
+if (ctHeaderValues != null !ctHeaderValues.isEmpty()) {
requestContentType = ctHeaderValues.get(0);
message.put(Message.CONTENT_TYPE, requestContentType);
}
cxf git commit: [CXF-6502] Avoiding IndexOutOfBoundsException if ContentType is empty
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes f3e3b7c63 - e196f40b3
[CXF-6502] Avoiding IndexOutOfBoundsException if ContentType is empty
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e196f40b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e196f40b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e196f40b
Branch: refs/heads/2.7.x-fixes
Commit: e196f40b36e5159fa8177d429ab1afed9a782801
Parents: f3e3b7c
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Fri Jul 17 16:41:10 2015 +0300
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Fri Jul 17 16:44:13 2015 +0300
--
.../java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/e196f40b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
index f1ba2ce..244bd82 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
@@ -127,7 +127,7 @@ public class JAXRSInInterceptor extends
AbstractPhaseInterceptorMessage {
// Content-Type
String requestContentType = null;
ListString ctHeaderValues =
protocolHeaders.get(Message.CONTENT_TYPE);
-if (ctHeaderValues != null) {
+if (ctHeaderValues != null !ctHeaderValues.isEmpty()) {
requestContentType = ctHeaderValues.get(0);
message.put(Message.CONTENT_TYPE, requestContentType);
}
[2/2] cxf git commit: Adding WADLGenerator usePathParamsToCompareOperations setter, thanks to Francesco
Adding WADLGenerator usePathParamsToCompareOperations setter, thanks to
Francesco
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/06e7064d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/06e7064d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/06e7064d
Branch: refs/heads/3.0.x-fixes
Commit: 06e7064de67d93a68e725309260b8fe69aa57c3c
Parents: 42e6985
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Fri Jul 17 16:06:04 2015 +0300
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Fri Jul 17 16:07:06 2015 +0300
--
.../main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/06e7064d/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
--
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 90b6fac..92f33fd 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -2158,6 +2158,10 @@ public class WadlGenerator implements
ContainerRequestFilter {
this.applyStylesheetLocally = applyStylesheetLocally;
}
+public void setUsePathParamsToCompareOperations(boolean
usePathParamsToCompareOperations) {
+this.usePathParamsToCompareOperations =
usePathParamsToCompareOperations;
+}
+
private static class SchemaConverter extends DelegatingXMLStreamWriter {
private static final String SCHEMA_LOCATION = schemaLocation;
private MapString, String locsMap;
[1/2] cxf git commit: [CXF-6487] Avoiding NPE in the RP service if no redirect is needed
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes c033da8ec - 06e7064de
[CXF-6487] Avoiding NPE in the RP service if no redirect is needed
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/42e6985b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/42e6985b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/42e6985b
Branch: refs/heads/3.0.x-fixes
Commit: 42e6985bef61d70032b7fb0d6835107adb4e9e24
Parents: c033da8
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Thu Jul 16 17:34:45 2015 +0300
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Thu Jul 16 17:41:44 2015 +0300
--
.../cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/42e6985b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
--
diff --git
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
index 5857159..3d0f7e5 100644
---
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
+++
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
@@ -61,7 +61,7 @@ public class OidcRpAuthenticationService {
if (location == null defaultLocation != null) {
String basePath = (String)mc.get(http.base.path);
redirectUri =
UriBuilder.fromUri(basePath).path(defaultLocation).build();
-} else {
+} else if (location != null) {
redirectUri = URI.create(location);
}
if (redirectUri != null) {
cxf git commit: Adding WADLGenerator usePathParamsToCompareOperations setter, thanks to Francesco
Repository: cxf
Updated Branches:
refs/heads/master c933c0be9 - 097fd159f
Adding WADLGenerator usePathParamsToCompareOperations setter, thanks to
Francesco
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/097fd159
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/097fd159
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/097fd159
Branch: refs/heads/master
Commit: 097fd159fd185dee6f7966b8a4acef89c440f12d
Parents: c933c0b
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Fri Jul 17 16:06:04 2015 +0300
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Fri Jul 17 16:06:04 2015 +0300
--
.../main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/097fd159/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
--
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index ac33eaf..b3163c5 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -2157,6 +2157,10 @@ public class WadlGenerator implements
ContainerRequestFilter {
this.applyStylesheetLocally = applyStylesheetLocally;
}
+public void setUsePathParamsToCompareOperations(boolean
usePathParamsToCompareOperations) {
+this.usePathParamsToCompareOperations =
usePathParamsToCompareOperations;
+}
+
private static class SchemaConverter extends DelegatingXMLStreamWriter {
private static final String SCHEMA_LOCATION = schemaLocation;
private MapString, String locsMap;
cxf git commit: [CXF-6491] More work to do with supporting wadl methods with multiple in and out reps
Repository: cxf
Updated Branches:
refs/heads/master 097fd159f - 90c777969
[CXF-6491] More work to do with supporting wadl methods with multiple in and
out reps
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/90c77796
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/90c77796
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/90c77796
Branch: refs/heads/master
Commit: 90c777969b0c7cedf8394cefb68fe25da68ad9e2
Parents: 097fd15
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Fri Jul 17 16:20:32 2015 +0300
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Fri Jul 17 16:20:32 2015 +0300
--
.../org/apache/cxf/common/util/StringUtils.java | 2 +-
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 110 ++-
2 files changed, 85 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/90c77796/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
index a8cc568..2825d31 100644
--- a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
@@ -34,7 +34,7 @@ import java.util.regex.Pattern;
public final class StringUtils {
public static final MapString, Pattern PATTERN_MAP = new HashMapString,
Pattern();
static {
-String patterns[] = {/, , :, , , ;, =, \\.};
+String patterns[] = {/, , :, , , ;, =, \\., \\+};
for (String p : patterns) {
PATTERN_MAP.put(p, Pattern.compile(p));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/90c77796/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
--
diff --git
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index d74204b..de82530 100644
---
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -688,7 +688,9 @@ public class SourceGenerator {
ListElement requestEls = getWadlElements(methodEl, request);
Element firstRequestEl = requestEls.size() = 1 ? requestEls.get(0) :
null;
ListElement allRequestReps = getWadlElements(firstRequestEl,
representation);
-ListElement requestRepsWithElements =
getRepsWithElements(allRequestReps, info.getGrammarInfo());
+ListElement requestRepsWithElements = new LinkedListElement();
+boolean duplicatesAvailable =
+getRepsWithElements(allRequestReps, requestRepsWithElements,
info.getGrammarInfo());
final String methodNameLowerCase =
methodEl.getAttribute(name).toLowerCase();
String id = methodEl.getAttribute(id);
@@ -701,16 +703,30 @@ public class SourceGenerator {
boolean jaxpSourceRequired = requestRepsWithElements.size() 1
!supportMultipleRepsWithElements;
int numOfMethods = jaxpSourceRequired ? 1 :
requestRepsWithElements.size();
+
for (int i = 0; i numOfMethods; i++) {
ListElement requestReps = allRequestReps;
Element requestRepWithElement = requestRepsWithElements.get(i);
String suffixName = ;
-if (!jaxpSourceRequired requestRepWithElement != null
requestRepsWithElements.size() 1) {
-String value = requestRepWithElement.getAttribute(element);
-int index = value.indexOf(:);
-suffixName = value.substring(index + 1).replace(-, );
+if (supportMultipleRepsWithElements requestRepWithElement !=
null
+ requestRepsWithElements.size() 1) {
+String elementRef =
requestRepWithElement.getAttribute(element);
+int index = elementRef.indexOf(:);
+suffixName = elementRef.substring(index + 1).replace(-, );
+if (duplicatesAvailable) {
+String mediaType =
requestRepWithElement.getAttribute(mediaType);
+if (!StringUtils.isEmpty(mediaType)) {
+String subType =
MediaType.valueOf(mediaType).getSubtype();
+String[] parts = StringUtils.split(subType, \\+);
+if (parts.length == 2) {
+suffixName += StringUtils.capitalize(parts[1]);
+} else {
+
cxf git commit: [CXF-6491] More work to do with supporting wadl methods with multiple in and out reps
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 06e7064de - b1ee19bcf
[CXF-6491] More work to do with supporting wadl methods with multiple in and
out reps
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b1ee19bc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b1ee19bc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b1ee19bc
Branch: refs/heads/3.0.x-fixes
Commit: b1ee19bcf238e90dbfbb9762619a785f77475a75
Parents: 06e7064
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Fri Jul 17 16:20:32 2015 +0300
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Fri Jul 17 16:22:36 2015 +0300
--
.../org/apache/cxf/common/util/StringUtils.java | 2 +-
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 110 ++-
2 files changed, 85 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b1ee19bc/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
index 6c7ed73..b4f7a8c 100644
--- a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
@@ -34,7 +34,7 @@ import java.util.regex.Pattern;
public final class StringUtils {
public static final MapString, Pattern PATTERN_MAP = new HashMapString,
Pattern();
static {
-String patterns[] = {/, , :, , , ;, =, \\.};
+String patterns[] = {/, , :, , , ;, =, \\., \\+};
for (String p : patterns) {
PATTERN_MAP.put(p, Pattern.compile(p));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/b1ee19bc/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
--
diff --git
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index 2d4bed0..9267f71 100644
---
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -688,7 +688,9 @@ public class SourceGenerator {
ListElement requestEls = getWadlElements(methodEl, request);
Element firstRequestEl = requestEls.size() = 1 ? requestEls.get(0) :
null;
ListElement allRequestReps = getWadlElements(firstRequestEl,
representation);
-ListElement requestRepsWithElements =
getRepsWithElements(allRequestReps, info.getGrammarInfo());
+ListElement requestRepsWithElements = new LinkedListElement();
+boolean duplicatesAvailable =
+getRepsWithElements(allRequestReps, requestRepsWithElements,
info.getGrammarInfo());
final String methodNameLowerCase =
methodEl.getAttribute(name).toLowerCase();
String id = methodEl.getAttribute(id);
@@ -701,16 +703,30 @@ public class SourceGenerator {
boolean jaxpSourceRequired = requestRepsWithElements.size() 1
!supportMultipleRepsWithElements;
int numOfMethods = jaxpSourceRequired ? 1 :
requestRepsWithElements.size();
+
for (int i = 0; i numOfMethods; i++) {
ListElement requestReps = allRequestReps;
Element requestRepWithElement = requestRepsWithElements.get(i);
String suffixName = ;
-if (!jaxpSourceRequired requestRepWithElement != null
requestRepsWithElements.size() 1) {
-String value = requestRepWithElement.getAttribute(element);
-int index = value.indexOf(:);
-suffixName = value.substring(index + 1).replace(-, );
+if (supportMultipleRepsWithElements requestRepWithElement !=
null
+ requestRepsWithElements.size() 1) {
+String elementRef =
requestRepWithElement.getAttribute(element);
+int index = elementRef.indexOf(:);
+suffixName = elementRef.substring(index + 1).replace(-, );
+if (duplicatesAvailable) {
+String mediaType =
requestRepWithElement.getAttribute(mediaType);
+if (!StringUtils.isEmpty(mediaType)) {
+String subType =
MediaType.valueOf(mediaType).getSubtype();
+String[] parts = StringUtils.split(subType, \\+);
+if (parts.length == 2) {
+suffixName += StringUtils.capitalize(parts[1]);
+
cxf git commit: Use IOUtils methods in CachedStreamTestBase to handle stream reading
Repository: cxf
Updated Branches:
refs/heads/master 20539c027 - 17f140eb2
Use IOUtils methods in CachedStreamTestBase to handle stream reading
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/17f140eb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/17f140eb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/17f140eb
Branch: refs/heads/master
Commit: 17f140eb2bf93444e7f8e028b45a371d14688cda
Parents: 20539c0
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Fri Jul 17 16:25:07 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Fri Jul 17 16:25:34 2015 +0100
--
.../java/org/apache/cxf/helpers/IOUtils.java| 23 +-
.../org/apache/cxf/io/CachedStreamTestBase.java | 86 +---
2 files changed, 40 insertions(+), 69 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/17f140eb/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
index 3aff6d5..82c5535 100644
--- a/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
@@ -228,13 +228,32 @@ public final class IOUtils {
n = input.read(buffer, 0, n);
}
}
+
+public static void copyAtLeast(final Reader input,
+ final Writer output,
+ int atLeast) throws IOException {
+final char[] buffer = new char[4096];
+int n = atLeast buffer.length ? buffer.length : atLeast;
+n = input.read(buffer, 0, n);
+while (-1 != n) {
+if (n == 0) {
+throw new IOException(0 bytes read in violation of
Reader.read(char[]));
+}
+output.write(buffer, 0, n);
+atLeast -= n;
+if (atLeast = 0) {
+return;
+}
+n = atLeast buffer.length ? buffer.length : atLeast;
+n = input.read(buffer, 0, n);
+}
+}
public static void copy(final Reader input, final Writer output,
final int bufferSize) throws IOException {
final char[] buffer = new char[bufferSize];
-int n = 0;
-n = input.read(buffer);
+int n = input.read(buffer);
while (-1 != n) {
output.write(buffer, 0, n);
n = input.read(buffer);
http://git-wip-us.apache.org/repos/asf/cxf/blob/17f140eb/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
--
diff --git a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
index c62ad71..8daa350 100755
--- a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
@@ -19,17 +19,19 @@
package org.apache.cxf.io;
import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+import java.io.StringWriter;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.apache.cxf.helpers.IOUtils;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Test;
@@ -171,10 +173,8 @@ public abstract class CachedStreamTestBase extends Assert {
assertEquals(text is not decoded correctly, text, dectext);
// close the partially read stream
-if (fin instanceof InputStream) {
-((InputStream)fin).close();
-} else if (fin instanceof Reader) {
-((Reader)fin).close();
+if (fin instanceof Closeable) {
+((Closeable)fin).close();
}
// the file is deleted when cos is closed while all the associated
inputs are closed
@@ -245,85 +245,37 @@ public abstract class CachedStreamTestBase extends Assert
{
}
private static void close(Object obj) throws IOException {
-if (obj instanceof CachedOutputStream) {
-((CachedOutputStream)obj).close();
-} else if (obj instanceof CachedWriter) {
-((CachedWriter)obj).close();
-} else if (obj instanceof InputStream) {
-((InputStream)obj).close();
-} else if (obj instanceof Reader) {
-((Reader)obj).close();
+if (obj instanceof Closeable) {
+((Closeable)obj).close();
}
}
protected static String readFromStream(InputStream is) throws IOException {
-
cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes e196f40b3 - 12df45699 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/12df4569 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/12df4569 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/12df4569 Branch: refs/heads/2.7.x-fixes Commit: 12df45699eda2e1009f930867a0aab58d5048893 Parents: e196f40 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Fri Jul 17 16:36:22 2015 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Fri Jul 17 16:36:22 2015 +0100 -- .gitmergeinfo | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/12df4569/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 2b10375..eba506e 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -220,6 +220,8 @@ B 1797749c7e90d0b486d41d3ec78bb0540e26741d B 179c1d418e870de16c60630255cae204c5b50664 B 17a6302e91d067c9a9c71b9897299d1ae21dc9eb B 17c66755fc2376920f9b20b8e28a8314ec0de0c0 +B 17f221b25e01a9c5824b0005b30e8aee0668fea7 +B 17fef20055ca5ae3495e6fe923a9048dab0ac3a7 B 183b062de15297fe5264d023237ad7e8d04e B 184f5126dd1b12676e6f59dabc28631d5b0a4915 B 185f6743a55a4a318542beb86564c6da6d35d523 @@ -1667,6 +1669,7 @@ B bfb06cb61df28ae5f64ef8f80d3cc63a8b1edb47 B bfd4a8c6fa96616883b8fee7c56a9e84e1e16f93 B bfd50e974ed07f49bf8f981fae30cb80b213db37 B c015b609bc41b8095e1bc83a443cf9d2e44000ab +B c033da8ecbd4ea53f80a163f660c08c61a5664b3 B c03492dca099f5b5827ee4a27b01b5a1c9fbf00d B c0698e5ef5bc51da7599ca2774854c979e258c41 B c099c7d07aab30939dd1213411fc7878cc6bb25e @@ -1733,6 +1736,7 @@ B c766f1069dec6b8682865390e0c6fed133ebbe5d B c775be776e9c6946c55d626847029cbfb6ace677 B c79696bfc1aee1d1204cbd592f6bc5c83c0d9dae B c7a7e9978b7b9e392690d3e5e99c7e6f02f613fe +B c7b9638cf60cc38342828192f5ce80e4a81ce9a3 B c7ba4fe2ee916c54b542e4b33466b4db0aef24be B c7bf868270c0cdf6f794d3e2227f16649ece82fa B c7f4ce23ac7454dc383eb5f0c5d3f6f55aee95e8 @@ -1910,6 +1914,7 @@ B dd2f603ae47ac06bcc6ff413bcb1880ab3144fe4 B dd31efec968b7e0fc084065c058fdb1f6e66af72 B dd56dc911980478cc2702300865d2e9fe6d93ecc B dd61195c15e6810e3edbe6547162e8d19bbf2f72 +B dd618ce580e2cf2394235767e059919d9fc290a4 B dd7889902be831becf1dc57b3639cc882d953267 B dda04a0d825d4fff19eda772b0b1d52c6b5978c2 B ddb5a9740861a2242d97ee582f751cde564e324d
[2/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/17f221b2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/17f221b2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/17f221b2 Branch: refs/heads/3.0.x-fixes Commit: 17f221b25e01a9c5824b0005b30e8aee0668fea7 Parents: 17fef20 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Fri Jul 17 16:26:56 2015 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Fri Jul 17 16:26:56 2015 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/17f221b2/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 64221a9..895c8dc 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -400,6 +400,7 @@ M 12d070f4392316cdfff03eb41abe22531ed64ee9 M 16ffa0f10dac874cd5727d312ac56a78b13e5ca9 M 1701e6c8d4e794f25d69781e3f69357723ad7fcf M 174bd11dcfeae47998723757542abe56c792cc76 +M 17f140eb2bf93444e7f8e028b45a371d14688cda M 18a3d43cb0044fcb84d3cc89f138fd9e7110dd04 M 1946e323a0df6e5f9748af82106cff39d7b5d01f M 19e912e8d4b6d3f3a4c2b88b1d53e691496d7dc0
[1/3] cxf git commit: Use IOUtils methods in CachedStreamTestBase to handle stream reading
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes dd618ce58 - c7b9638cf
Use IOUtils methods in CachedStreamTestBase to handle stream reading
Conflicts:
core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/17fef200
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/17fef200
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/17fef200
Branch: refs/heads/3.0.x-fixes
Commit: 17fef20055ca5ae3495e6fe923a9048dab0ac3a7
Parents: dd618ce
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Fri Jul 17 16:25:07 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Fri Jul 17 16:26:55 2015 +0100
--
.../java/org/apache/cxf/helpers/IOUtils.java| 23 ++-
.../org/apache/cxf/io/CachedStreamTestBase.java | 67
2 files changed, 46 insertions(+), 44 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/17fef200/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
index aab3ab9..5fab355 100644
--- a/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
@@ -229,13 +229,32 @@ public final class IOUtils {
n = input.read(buffer, 0, n);
}
}
+
+public static void copyAtLeast(final Reader input,
+ final Writer output,
+ int atLeast) throws IOException {
+final char[] buffer = new char[4096];
+int n = atLeast buffer.length ? buffer.length : atLeast;
+n = input.read(buffer, 0, n);
+while (-1 != n) {
+if (n == 0) {
+throw new IOException(0 bytes read in violation of
Reader.read(char[]));
+}
+output.write(buffer, 0, n);
+atLeast -= n;
+if (atLeast = 0) {
+return;
+}
+n = atLeast buffer.length ? buffer.length : atLeast;
+n = input.read(buffer, 0, n);
+}
+}
public static void copy(final Reader input, final Writer output,
final int bufferSize) throws IOException {
final char[] buffer = new char[bufferSize];
-int n = 0;
-n = input.read(buffer);
+int n = input.read(buffer);
while (-1 != n) {
output.write(buffer, 0, n);
n = input.read(buffer);
http://git-wip-us.apache.org/repos/asf/cxf/blob/17fef200/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
--
diff --git a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
index 56e35c1..222705c 100755
--- a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
@@ -19,17 +19,19 @@
package org.apache.cxf.io;
import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+import java.io.StringWriter;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.apache.cxf.helpers.IOUtils;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Test;
@@ -171,10 +173,8 @@ public abstract class CachedStreamTestBase extends Assert {
assertEquals(text is not decoded correctly, text, dectext);
// close the partially read stream
-if (fin instanceof InputStream) {
-((InputStream)fin).close();
-} else if (fin instanceof Reader) {
-((Reader)fin).close();
+if (fin instanceof Closeable) {
+((Closeable)fin).close();
}
// the file is deleted when cos is closed while all the associated
inputs are closed
@@ -245,53 +245,27 @@ public abstract class CachedStreamTestBase extends Assert
{
}
private static void close(Object obj) throws IOException {
-if (obj instanceof CachedOutputStream) {
-((CachedOutputStream)obj).close();
-} else if (obj instanceof CachedWriter) {
-((CachedWriter)obj).close();
-} else if (obj instanceof InputStream) {
-((InputStream)obj).close();
-} else if (obj instanceof Reader) {
-((Reader)obj).close();
+if (obj instanceof Closeable) {
+((Closeable)obj).close();
}
[3/3] cxf git commit: Fixing backmerge
Fixing backmerge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c7b9638c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c7b9638c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c7b9638c
Branch: refs/heads/3.0.x-fixes
Commit: c7b9638cf60cc38342828192f5ce80e4a81ce9a3
Parents: 17f221b
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Fri Jul 17 16:35:40 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Fri Jul 17 16:35:40 2015 +0100
--
.../org/apache/cxf/io/CachedStreamTestBase.java | 49 ++--
1 file changed, 15 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7b9638c/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
--
diff --git a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
index 222705c..211e928 100755
--- a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
@@ -251,61 +251,42 @@ public abstract class CachedStreamTestBase extends Assert
{
}
protected static String readFromStream(InputStream is) throws IOException {
-try (ByteArrayOutputStream buf = new ByteArrayOutputStream()) {
+ByteArrayOutputStream buf = new ByteArrayOutputStream();
+try {
IOUtils.copyAndCloseInput(is, buf);
return new String(buf.toByteArray(), UTF-8);
+} finally {
+buf.close();
}
}
protected static String readPartiallyFromStream(InputStream is, int len)
throws IOException {
-try (ByteArrayOutputStream buf = new ByteArrayOutputStream()) {
+ByteArrayOutputStream buf = new ByteArrayOutputStream();
+try {
IOUtils.copyAtLeast(is, buf, len);
return new String(buf.toByteArray(), UTF-8);
+} finally {
+buf.close();
}
}
protected static String readFromReader(Reader is) throws IOException {
- HEAD
-StringBuffer buf = new StringBuffer();
+StringWriter writer = new StringWriter();
try {
-char[] b = new char[100];
-for (;;) {
-int n = is.read(b, 0, b.length);
-if (n 0) {
-break;
-}
-buf.append(b, 0, n);
-}
-} finally {
-is.close();
-===
-try (StringWriter writer = new StringWriter()) {
IOUtils.copyAndCloseInput(is, writer);
return writer.toString();
- 17f140e... Use IOUtils methods in CachedStreamTestBase to handle
stream reading
+} finally {
+writer.close();
}
}
protected static String readPartiallyFromReader(Reader is, int len) throws
IOException {
- HEAD
-StringBuffer buf = new StringBuffer();
-char[] b = new char[len];
-int rn = 0;
-for (;;) {
-int n = is.read(b, 0, b.length);
-if (n 0) {
-break;
-}
-buf.append(b, 0, n);
-rn += n;
-if (len = rn) {
-break;
-}
-===
-try (StringWriter writer = new StringWriter()) {
+StringWriter writer = new StringWriter();
+try {
IOUtils.copyAtLeast(is, writer, len);
return writer.toString();
- 17f140e... Use IOUtils methods in CachedStreamTestBase to handle
stream reading
+} finally {
+writer.close();
}
}
cxf git commit: Updating WSS4J
Repository: cxf Updated Branches: refs/heads/master 17f140eb2 - b0b51cf57 Updating WSS4J Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b0b51cf5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b0b51cf5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b0b51cf5 Branch: refs/heads/master Commit: b0b51cf57ba0236f75485183888906c406bfdd51 Parents: 17f140e Author: Colm O hEigeartaigh cohei...@apache.org Authored: Fri Jul 17 18:56:27 2015 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Fri Jul 17 18:56:27 2015 +0100 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/b0b51cf5/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 9985762..e0ab675 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -147,7 +147,7 @@ cxf.woodstox.core.version4.4.1/cxf.woodstox.core.version cxf.woodstox.stax2-api.version3.1.4/cxf.woodstox.stax2-api.version cxf.wsdl4j.version1.6.3/cxf.wsdl4j.version -cxf.wss4j.version2.1.2-SNAPSHOT/cxf.wss4j.version +cxf.wss4j.version2.1.2/cxf.wss4j.version cxf.xerces.version2.11.0/cxf.xerces.version cxf.xmlbeans.version2.6.0/cxf.xmlbeans.version cxf.xmlschema.version2.2.1/cxf.xmlschema.version
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes c7b9638cf - 4ea14212c 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/c56643bb Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c56643bb Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c56643bb Branch: refs/heads/3.0.x-fixes Commit: c56643bb3be24b8c96d865cbd0183aa80e8e1694 Parents: c7b9638 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Fri Jul 17 18:56:53 2015 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Fri Jul 17 18:56:53 2015 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/c56643bb/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 895c8dc..b31d9d2 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -270,6 +270,7 @@ B af100a919178b0938fcc04d9c8d1dd1269e351b9 B afd70f562f769c1f1ed26a275cbb3763b24cba43 B afeb2ab056a4a4377db11d597c675108eb780d16 B b08a6ba02f0e67ea29cc69fb5c878fc1e57dee75 +B b0b51cf57ba0236f75485183888906c406bfdd51 B b18a2bad64c343520795175cf377cdf1b981da2a B b19f59d369503a8676cb909e80af97e5814898a9 B b1b3fc2e1b4a0637d85bb67eb0a59abde91b0f9a
[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/903c81fe Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/903c81fe Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/903c81fe Branch: refs/heads/master Commit: 903c81fec8c8eb50116d1d9d85739860e0ddf24b Parents: 408f5e3 b0b51cf Author: Sergey Beryozkin sberyoz...@talend.com Authored: Fri Jul 17 20:56:55 2015 +0300 Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Fri Jul 17 20:56:55 2015 +0300 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] cxf git commit: Updating WSS4J
Updating WSS4J Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4ea14212 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4ea14212 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4ea14212 Branch: refs/heads/3.0.x-fixes Commit: 4ea14212ce5c077e1af9e20f2f90c672617d59d7 Parents: c56643b Author: Colm O hEigeartaigh cohei...@apache.org Authored: Fri Jul 17 18:57:13 2015 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Fri Jul 17 18:57:13 2015 +0100 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/4ea14212/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 0ee0e75..7b0e068 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -161,7 +161,7 @@ cxf.woodstox.core.version4.4.1/cxf.woodstox.core.version cxf.woodstox.stax2-api.version3.1.4/cxf.woodstox.stax2-api.version cxf.wsdl4j.version1.6.3/cxf.wsdl4j.version -cxf.wss4j.version2.0.5-SNAPSHOT/cxf.wss4j.version +cxf.wss4j.version2.0.5/cxf.wss4j.version cxf.xerces.version2.11.0/cxf.xerces.version cxf.xmlbeans.version2.6.0/cxf.xmlbeans.version cxf.xmlschema.version2.2.1/cxf.xmlschema.version
[1/2] cxf git commit: Fixing a checkstyle error
Repository: cxf
Updated Branches:
refs/heads/master b0b51cf57 - 903c81fec
Fixing a checkstyle error
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/408f5e3f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/408f5e3f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/408f5e3f
Branch: refs/heads/master
Commit: 408f5e3f4fea3182177c3ceddb9b48765dd9175b
Parents: 17f140e
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Fri Jul 17 20:56:33 2015 +0300
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Fri Jul 17 20:56:33 2015 +0300
--
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 49
1 file changed, 29 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/408f5e3f/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
--
diff --git
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index de82530..a210726 100644
---
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -779,26 +779,7 @@ public class SourceGenerator {
}
sbCode.append(genMethodName.replace(-, ));
} else {
-boolean expandedQName = id.startsWith({);
-QName qname = convertToQName(id, expandedQName);
-String packageName =
possiblyConvertNamespaceURI(qname.getNamespaceURI(), expandedQName);
-
-String clsFullName = getSchemaClassName(packageName,
info.getGrammarInfo(),
-qname.getLocalPart(), info.getTypeClassNames());
-int lastDotIndex = clsFullName == null ? -1 :
clsFullName.lastIndexOf(.);
-String localName = clsFullName == null
-? getClassName(qname.getLocalPart(), true,
info.getTypeClassNames())
-: clsFullName.substring(lastDotIndex + 1);
-String subResponseNs = clsFullName == null ?
getClassPackageName(packageName)
-: clsFullName.substring(0, lastDotIndex);
-Object parentNode = resourceEl.getParentNode();
-String parentId = parentNode instanceof Element
-? ((Element)parentNode).getAttribute(id)
-: ;
-writeSubResponseType(id.equals(parentId), subResponseNs,
localName,
-sbCode, imports);
-
-sbCode.append(get + localName + suffixName);
+writeSubresourceMethod(resourceEl, imports, sbCode, info, id,
suffixName);
}
sbCode.append(();
@@ -819,6 +800,34 @@ public class SourceGenerator {
}
}
+private void writeSubresourceMethod(Element resourceEl,
+SetString imports,
+StringBuilder sbCode,
+ContextInfo info,
+String id,
+String suffixName) {
+boolean expandedQName = id.startsWith({);
+QName qname = convertToQName(id, expandedQName);
+String packageName =
possiblyConvertNamespaceURI(qname.getNamespaceURI(), expandedQName);
+
+String clsFullName = getSchemaClassName(packageName,
info.getGrammarInfo(),
+qname.getLocalPart(), info.getTypeClassNames());
+int lastDotIndex = clsFullName == null ? -1 :
clsFullName.lastIndexOf(.);
+String localName = clsFullName == null
+? getClassName(qname.getLocalPart(), true,
info.getTypeClassNames())
+: clsFullName.substring(lastDotIndex + 1);
+String subResponseNs = clsFullName == null ?
getClassPackageName(packageName)
+: clsFullName.substring(0, lastDotIndex);
+Object parentNode = resourceEl.getParentNode();
+String parentId = parentNode instanceof Element
+? ((Element)parentNode).getAttribute(id)
+: ;
+writeSubResponseType(id.equals(parentId), subResponseNs, localName,
+sbCode, imports);
+
+sbCode.append(get + localName + suffixName);
+}
+
private static boolean isMethodMatched(SetString methodNames, String
methodNameLowerCase, String id) {
if (methodNames.isEmpty()) {
return false;
[2/2] cxf git commit: Merge branch '3.0.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.0.x-fixes
Merge branch '3.0.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.0.x-fixes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/af03a164 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/af03a164 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/af03a164 Branch: refs/heads/3.0.x-fixes Commit: af03a164fd64c75c0329a9ab5a67db1560247eea Parents: b9be193 4ea1421 Author: Sergey Beryozkin sberyoz...@talend.com Authored: Fri Jul 17 20:58:15 2015 +0300 Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Fri Jul 17 20:58:15 2015 +0300 -- .gitmergeinfo | 1 + parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) --
cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 12df45699 - 70bf6e3f8 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/70bf6e3f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/70bf6e3f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/70bf6e3f Branch: refs/heads/2.7.x-fixes Commit: 70bf6e3f8d719e9196d75ecfc571986254c485bf Parents: 12df456 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Fri Jul 17 18:58:19 2015 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Fri Jul 17 18:58:19 2015 +0100 -- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/70bf6e3f/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index eba506e..2cf7090 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -712,6 +712,7 @@ B 4e3351ea605f6ea71e0242130b3d0c33b8c41918 B 4e3ffb95a8bdb049cbc6b320d0dd9b8b1751c6af B 4e85d25dcc21ac18500bad7eceeae6bd04969332 B 4e8f85d8d98b578b799d8a9b568fb78d53b419e8 +B 4ea14212ce5c077e1af9e20f2f90c672617d59d7 B 4ea7db88c0894904f8b904d4049753be4ebec068 B 4eb021814b076ac152c6ae4d8f6ac5ca56b6b0ee B 4f308df6b936bb0076c33062f0de3a8cc53eaa18 @@ -1716,6 +1717,7 @@ B c51282ea7e737c4ee92c7e6e10983d84373448e0 B c5421983e06778b38dfdcca0dbe27c08060197b6 B c54a538bff6318d5f9b05e135dbfcc59c305cfcf B c55f816a01cf510ce13966d504050b7f8a859b66 +B c56643bb3be24b8c96d865cbd0183aa80e8e1694 B c59b1505da23db8ed43fada79231862a5097fc2b B c5e4dc05175917365dd9dae82685f2c280e6709d B c5f3efe0ae4f39ac133d3de8c55a5b467611
[1/2] cxf git commit: Fixing a checkstyle error
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 4ea14212c - af03a164f
Fixing a checkstyle error
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b9be1936
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b9be1936
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b9be1936
Branch: refs/heads/3.0.x-fixes
Commit: b9be193670641b171633c6b7c784dc68991206bc
Parents: c7b9638
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Fri Jul 17 20:56:33 2015 +0300
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Fri Jul 17 20:57:51 2015 +0300
--
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 49
1 file changed, 29 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b9be1936/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
--
diff --git
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index 9267f71..564cdbc 100644
---
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -779,26 +779,7 @@ public class SourceGenerator {
}
sbCode.append(genMethodName.replace(-, ));
} else {
-boolean expandedQName = id.startsWith({);
-QName qname = convertToQName(id, expandedQName);
-String packageName =
possiblyConvertNamespaceURI(qname.getNamespaceURI(), expandedQName);
-
-String clsFullName = getSchemaClassName(packageName,
info.getGrammarInfo(),
-qname.getLocalPart(), info.getTypeClassNames());
-int lastDotIndex = clsFullName == null ? -1 :
clsFullName.lastIndexOf(.);
-String localName = clsFullName == null
-? getClassName(qname.getLocalPart(), true,
info.getTypeClassNames())
-: clsFullName.substring(lastDotIndex + 1);
-String subResponseNs = clsFullName == null ?
getClassPackageName(packageName)
-: clsFullName.substring(0, lastDotIndex);
-Object parentNode = resourceEl.getParentNode();
-String parentId = parentNode instanceof Element
-? ((Element)parentNode).getAttribute(id)
-: ;
-writeSubResponseType(id.equals(parentId), subResponseNs,
localName,
-sbCode, imports);
-
-sbCode.append(get + localName + suffixName);
+writeSubresourceMethod(resourceEl, imports, sbCode, info, id,
suffixName);
}
sbCode.append(();
@@ -819,6 +800,34 @@ public class SourceGenerator {
}
}
+private void writeSubresourceMethod(Element resourceEl,
+SetString imports,
+StringBuilder sbCode,
+ContextInfo info,
+String id,
+String suffixName) {
+boolean expandedQName = id.startsWith({);
+QName qname = convertToQName(id, expandedQName);
+String packageName =
possiblyConvertNamespaceURI(qname.getNamespaceURI(), expandedQName);
+
+String clsFullName = getSchemaClassName(packageName,
info.getGrammarInfo(),
+qname.getLocalPart(), info.getTypeClassNames());
+int lastDotIndex = clsFullName == null ? -1 :
clsFullName.lastIndexOf(.);
+String localName = clsFullName == null
+? getClassName(qname.getLocalPart(), true,
info.getTypeClassNames())
+: clsFullName.substring(lastDotIndex + 1);
+String subResponseNs = clsFullName == null ?
getClassPackageName(packageName)
+: clsFullName.substring(0, lastDotIndex);
+Object parentNode = resourceEl.getParentNode();
+String parentId = parentNode instanceof Element
+? ((Element)parentNode).getAttribute(id)
+: ;
+writeSubResponseType(id.equals(parentId), subResponseNs, localName,
+sbCode, imports);
+
+sbCode.append(get + localName + suffixName);
+}
+
private static boolean isMethodMatched(SetString methodNames, String
methodNameLowerCase, String id) {
if (methodNames.isEmpty()) {
return false;
