date:20160318

[08/10] cxf git commit: [CXF-6783], WSDL-generation: don't create anonymous top-level types This closes #110 This closes #109

2016-03-18 Thread dkulp

[CXF-6783], WSDL-generation: don't create anonymous top-level types
This closes #110
This closes #109


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

Branch: refs/heads/3.0.x-fixes
Commit: 0f829973591ca1683410aa972e9b99c3f7a312a7
Parents: 41ce3c2
Author: Barnabas Bodnar 
Authored: Thu Feb 18 17:52:15 2016 +0100
Committer: Daniel Kulp 
Committed: Wed Mar 16 11:03:12 2016 -0400

--
 .../cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0f829973/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
--
diff --git 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
index a6a5e1f..e93d790 100644
--- 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
+++ 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
@@ -1297,9 +1297,11 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
 
 wrappedMessage.getFirstMessagePart().setXmlSchema(el);
 
-XmlSchemaComplexType ct = new XmlSchemaComplexType(schema, true);
+boolean anonymousType = isAnonymousWrapperTypes();
+XmlSchemaComplexType ct = new XmlSchemaComplexType(schema,
+/*CXF-6783: don't create anonymous top-level 
types*/!anonymousType);
 
-if (!isAnonymousWrapperTypes()) {
+if (!anonymousType) {
 ct.setName(wrapperName.getLocalPart());
 el.setSchemaTypeName(wrapperName);
 }

[2/3] cxf-fediz git commit: More work on the IdP beans

2016-03-18 Thread coheigea

More work on the IdP beans


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

Branch: refs/heads/master
Commit: 16a974cba12883286453a6c7c471b4461bc44743
Parents: c23f3a8
Author: Colm O hEigeartaigh 
Authored: Wed Mar 16 16:55:25 2016 +
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 16 16:55:25 2016 +

--
 .../service/idp/beans/STSClientAction.java  | 46 +--
 .../idp/beans/wsfed/WreplyValidator.java| 81 
 .../WEB-INF/flows/federation-signin-request.xml | 12 ++-
 .../flows/federation-validate-request.xml   |  4 +-
 .../WEB-INF/flows/saml-validate-request.xml |  2 +-
 5 files changed, 96 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/16a974cb/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
--
diff --git 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
index 3efd103..ad0a6f4 100644
--- 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
+++ 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
@@ -26,7 +26,6 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.cert.X509Certificate;
 import java.util.List;
-import java.util.regex.Matcher;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.xml.namespace.QName;
@@ -37,7 +36,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.validator.routines.UrlValidator;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.binding.soap.SoapFault;
@@ -66,8 +64,6 @@ import org.springframework.webflow.execution.RequestContext;
 
 public class STSClientAction {
 
-private static final String IDP_CONFIG = "idpConfig";
-
 private static final String HTTP_SCHEMAS_XMLSOAP_ORG_WS_2005_05_IDENTITY = 
 "http://schemas.xmlsoap.org/ws/2005/05/identity;;
 
@@ -177,19 +173,18 @@ public class STSClientAction {
 }
 
 /**
- * @param realm The client/application realm
  * @param context the webflow request context
+ * @param realm The client/application realm
  * @return a serialized RP security token
  * @throws Exception
  */
-public String submit(String realm, RequestContext context)
+public String submit(RequestContext context, String realm)
 throws Exception {
 
 SecurityToken idpToken = getSecurityToken(context);
 
-Idp idpConfig = (Idp) WebUtils.getAttributeFromFlowScope(context, 
IDP_CONFIG);
-
 Bus cxfBus = getBus();
+Idp idpConfig = (Idp) WebUtils.getAttributeFromFlowScope(context, 
"idpConfig");
 
 IdpSTSClient sts = new IdpSTSClient(cxfBus);
 sts.setAddressingNamespace(HTTP_WWW_W3_ORG_2005_08_ADDRESSING);
@@ -200,9 +195,6 @@ public class STSClientAction {
 throw new ProcessingException(TYPE.BAD_REQUEST);
 }
 
-// Check that the wreply parameter is valid
-validateApplicationEndpoint(serviceConfig, context);
-
 // Parse wreq parameter - we only support parsing TokenType and 
KeyType for now
 String wreq = (String)WebUtils.getAttributeFromFlowScope(context, 
FederationConstants.PARAM_REQUEST);
 String stsTokenType = null;
@@ -305,38 +297,6 @@ public class STSClientAction {
 return StringEscapeUtils.escapeXml11(rpToken);
 }
 
-// The wreply address must match the passive endpoint requestor constraint 
(if it is specified)
-// Also, it must be a valid URL + start with https
-protected void validateApplicationEndpoint(Application serviceConfig, 
RequestContext context) 
-throws ProcessingException {
-
-String wreply = 
-(String)WebUtils.getAttributeFromFlowScope(context, 
FederationConstants.PARAM_REPLY);
-
-if (wreply != null) {
-// Validate it first using commons-validator
-UrlValidator urlValidator = new 
UrlValidator(UrlValidator.ALLOW_LOCAL_URLS
- + 
UrlValidator.ALLOW_ALL_SCHEMES);
-if (!urlValidator.isValid(wreply)) {
-LOG.warn("The given wreply parameter {} is not a valid URL", 
wreply);
-

[4/5] cxf-fediz git commit: Updating Build utils

2016-03-18 Thread coheigea

Updating Build utils


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

Branch: refs/heads/master
Commit: e8c840ff868884ce635ca6a2f30c2cb30553957a
Parents: dcbbe66
Author: Colm O hEigeartaigh 
Authored: Fri Mar 18 16:50:46 2016 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 18 16:50:46 2016 +

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e8c840ff/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f573ccb..d8c6a7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 2.4
 1.5.0
 3.1.6-SNAPSHOT
-3.1.0
+3.2.0
 3.4
 4.4.2
 2.9.0

cxf git commit: Make sure the build passes with "-Dmaven.test.skip" set

2016-03-18 Thread coheigea

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 18de76943 -> 0213838ad


Make sure the build passes with "-Dmaven.test.skip" set


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

Branch: refs/heads/3.0.x-fixes
Commit: 0213838adfc77fa7e59d5ec77eff08aaac0ba092
Parents: 18de769
Author: Colm O hEigeartaigh 
Authored: Wed Mar 16 11:28:43 2016 +
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 16 11:30:01 2016 +

--
 systests/jibx/databinding-jibx/pom.xml | 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0213838a/systests/jibx/databinding-jibx/pom.xml
--
diff --git a/systests/jibx/databinding-jibx/pom.xml 
b/systests/jibx/databinding-jibx/pom.xml
index 5066d8f..eebcf4a 100644
--- a/systests/jibx/databinding-jibx/pom.xml
+++ b/systests/jibx/databinding-jibx/pom.xml
@@ -139,6 +139,18 @@
 none
 
 
+
+skipTests
+
+
+maven.test.skip
+
+
+
+none
+none
+
+

cxf git commit: Make sure the build passes with "-Dmaven.test.skip" set

2016-03-18 Thread coheigea

Repository: cxf
Updated Branches:
  refs/heads/master c28201f2c -> b34e734a6


Make sure the build passes with "-Dmaven.test.skip" set


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

Branch: refs/heads/master
Commit: b34e734a6b2e0f2354166cf0090bfed7b9152a7e
Parents: c28201f
Author: Colm O hEigeartaigh 
Authored: Wed Mar 16 11:28:43 2016 +
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 16 11:28:43 2016 +

--
 systests/jibx/databinding-jibx/pom.xml | 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b34e734a/systests/jibx/databinding-jibx/pom.xml
--
diff --git a/systests/jibx/databinding-jibx/pom.xml 
b/systests/jibx/databinding-jibx/pom.xml
index 3c67501..cdf38f1 100644
--- a/systests/jibx/databinding-jibx/pom.xml
+++ b/systests/jibx/databinding-jibx/pom.xml
@@ -181,6 +181,18 @@
 none
 
 
+
+skipTests
+
+
+maven.test.skip
+
+
+
+none
+none
+
+

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

2016-03-18 Thread coheigea

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes cd62f0a6c -> d3baa23e3


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

Branch: refs/heads/3.1.x-fixes
Commit: d3baa23e3cbac2364498f81ab293aeb61902caa7
Parents: bc5bbe8
Author: Colm O hEigeartaigh 
Authored: Fri Mar 18 14:50:03 2016 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 18 14:50:03 2016 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/d3baa23e/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 8191d2a..d5c56c8 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -50,6 +50,7 @@ B f98785bd8490c4717353f1a9688cae3e7a823ec2
 B fb30f8bffc85fcc3208fcc0e1eda4b54a89b5d37
 M 0222768baf6b60742c4a8332308edf2be0f4a2e4
 M 0578e16146527b0782530c40ba2db17531756d96
+M 1184e08f0d1c40c754e39fd5d6340d1057fbdd17
 M 2e8219cf3d047abc3a7e2611bf284aadbc20b7d6
 M 386805560479b35276d88605c5acf805e3004aa5
 M 39c772a0764b323f98ab58e00345f4fca924c425

[09/10] cxf git commit: Fix a typo in FIXED_PARAMETER_ORDER This closes #122

2016-03-18 Thread dkulp

Fix a typo in FIXED_PARAMETER_ORDER
This closes #122


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

Branch: refs/heads/3.0.x-fixes
Commit: f643f9964db87d4849318e288bd084dd63b045c4
Parents: 0f82997
Author: Tomas Rohovsky 
Authored: Tue Mar 15 13:32:54 2016 +0100
Committer: Daniel Kulp 
Committed: Wed Mar 16 11:03:34 2016 -0400

--
 core/src/main/java/org/apache/cxf/message/Message.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f643f996/core/src/main/java/org/apache/cxf/message/Message.java
--
diff --git a/core/src/main/java/org/apache/cxf/message/Message.java 
b/core/src/main/java/org/apache/cxf/message/Message.java
index 91dbcde..6c8ca19 100644
--- a/core/src/main/java/org/apache/cxf/message/Message.java
+++ b/core/src/main/java/org/apache/cxf/message/Message.java
@@ -145,7 +145,7 @@ public interface Message extends StringMap {
 String ACCEPT_CONTENT_TYPE = "Accept";
 String BASE_PATH = Message.class.getName() + ".BASE_PATH";
 String ENCODING = Message.class.getName() + ".ENCODING";
-String FIXED_PARAMETER_ORDER = Message.class.getName() + 
"FIXED_PARAMETER_ORDER";
+String FIXED_PARAMETER_ORDER = Message.class.getName() + 
".FIXED_PARAMETER_ORDER";
 String MAINTAIN_SESSION = Message.class.getName() + ".MAINTAIN_SESSION";
 String ATTACHMENTS = Message.class.getName() + ".ATTACHMENTS";

[08/10] cxf git commit: [CXF-6783], WSDL-generation: don't create anonymous top-level types This closes #110 This closes #109

[2/3] cxf-fediz git commit: More work on the IdP beans

[4/5] cxf-fediz git commit: Updating Build utils

cxf git commit: Make sure the build passes with "-Dmaven.test.skip" set

cxf git commit: Make sure the build passes with "-Dmaven.test.skip" set

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

[09/10] cxf git commit: Fix a typo in FIXED_PARAMETER_ORDER This closes #122

7 matches

Site Navigation

Mail list logo

Footer information