Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 61E1D9BD2 for ; Thu, 14 Jun 2012 20:56:41 +0000 (UTC) Received: (qmail 87423 invoked by uid 500); 14 Jun 2012 20:56:41 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 87358 invoked by uid 500); 14 Jun 2012 20:56:41 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 87351 invoked by uid 99); 14 Jun 2012 20:56:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jun 2012 20:56:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jun 2012 20:56:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6796E2388A33; Thu, 14 Jun 2012 20:56:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1350400 - in /cxf/fediz/trunk/plugins/core/src: main/java/org/apache/cxf/fediz/core/ main/java/org/apache/cxf/fediz/core/config/ main/java/org/apache/cxf/fediz/core/metadata/ main/resources/schemas/ test/java/org/apache/cxf/fediz/core/ tes... Date: Thu, 14 Jun 2012 20:56:16 -0000 To: commits@cxf.apache.org From: owulff@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120614205616.6796E2388A33@eris.apache.org> Author: owulff Date: Thu Jun 14 20:56:15 2012 New Revision: 1350400 URL: http://svn.apache.org/viewvc?rev=1350400&view=rev Log: ApplicationServiceURL config added Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationProcessorImpl.java cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FederationProtocol.java cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java cxf/fediz/trunk/plugins/core/src/main/resources/schemas/FedizConfig.xsd cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/FederationProcessorTest.java cxf/fediz/trunk/plugins/core/src/test/resources/fediz_meta_test_config.xml Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationProcessorImpl.java URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationProcessorImpl.java?rev=1350400&r1=1350399&r2=1350400&view=diff ============================================================================== --- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationProcessorImpl.java (original) +++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationProcessorImpl.java Thu Jun 14 20:56:15 2012 @@ -358,7 +358,7 @@ public class FederationProcessorImpl imp .append(URLEncoder.encode(homeRealm, "UTF-8")); } - // add wct + // add current time parameter wct Date creationTime = new Date(); XmlSchemaDateFormat fmt = new XmlSchemaDateFormat(); String wct = fmt.format(creationTime); Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FederationProtocol.java URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FederationProtocol.java?rev=1350400&r1=1350399&r2=1350400&view=diff ============================================================================== --- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FederationProtocol.java (original) +++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FederationProtocol.java Thu Jun 14 20:56:15 2012 @@ -111,6 +111,14 @@ public class FederationProtocol extends public void setRoleURI(String value) { getFederationProtocol().setRoleURI(value); } + + public String getApplicationServiceURL() { + return getFederationProtocol().getApplicationServiceURL(); + } + + public void setApplicationServiceURL(String value) { + getFederationProtocol().setApplicationServiceURL(value); + } public Object getAuthenticationType() { if (this.authenticationType != null) { Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java?rev=1350400&r1=1350399&r2=1350400&view=diff ============================================================================== --- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java (original) +++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java Thu Jun 14 20:56:15 2012 @@ -98,13 +98,19 @@ public class MetadataWriter { writer.writeAttribute("ID", referenceID); String audience = "_someID"; + String serviceURL = null; if (protocol instanceof FederationProtocol) { + serviceURL = ((FederationProtocol)protocol).getApplicationServiceURL(); List audienceList = config.getAudienceUris(); if (audienceList != null && audienceList.size() > 0 && !"".equals(audienceList.get(0))) { audience = audienceList.get(0); } } - writer.writeAttribute("entityID", audience); + if (serviceURL == null) { + serviceURL = audience; + } + + writer.writeAttribute("entityID", serviceURL); writer.writeNamespace("fed", WS_FEDERATION_NS); writer.writeNamespace("wsa", WS_ADDRESSING_NS); @@ -119,7 +125,7 @@ public class MetadataWriter { writer.writeStartElement("wsa", "EndpointReference", WS_ADDRESSING_NS); writer.writeStartElement("wsa", "Address", WS_ADDRESSING_NS); - writer.writeCharacters(audience); + writer.writeCharacters(serviceURL); writer.writeEndElement(); // Address writer.writeEndElement(); // EndpointReference Modified: cxf/fediz/trunk/plugins/core/src/main/resources/schemas/FedizConfig.xsd URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/resources/schemas/FedizConfig.xsd?rev=1350400&r1=1350399&r2=1350400&view=diff ============================================================================== --- cxf/fediz/trunk/plugins/core/src/main/resources/schemas/FedizConfig.xsd (original) +++ cxf/fediz/trunk/plugins/core/src/main/resources/schemas/FedizConfig.xsd Thu Jun 14 20:56:15 2012 @@ -1,6 +1,7 @@ + @@ -27,10 +28,6 @@ - - @@ -54,8 +51,6 @@ - - @@ -75,14 +70,12 @@ - - - + @@ -102,12 +95,9 @@ + - - - - @@ -115,6 +105,7 @@ + Modified: cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/FederationProcessorTest.java URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/FederationProcessorTest.java?rev=1350400&r1=1350399&r2=1350400&view=diff ============================================================================== --- cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/FederationProcessorTest.java (original) +++ cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/FederationProcessorTest.java Thu Jun 14 20:56:15 2012 @@ -55,6 +55,7 @@ import org.apache.ws.security.util.DOM2W import org.joda.time.DateTime; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Ignore; import org.opensaml.common.SAMLVersion; @@ -182,7 +183,13 @@ public class FederationProcessorTest { } } - + @Ignore + @org.junit.Test + public void validateTokenAndCreateMetadata() throws Exception { + validateSAML2Token(); + FederationMetaDataTest other = new FederationMetaDataTest(); + other.validateMetaDataWithAlias(); + } /** * Validate SAML 2 token which includes the role attribute with 2 values Modified: cxf/fediz/trunk/plugins/core/src/test/resources/fediz_meta_test_config.xml URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/test/resources/fediz_meta_test_config.xml?rev=1350400&r1=1350399&r2=1350400&view=diff ============================================================================== --- cxf/fediz/trunk/plugins/core/src/test/resources/fediz_meta_test_config.xml (original) +++ cxf/fediz/trunk/plugins/core/src/test/resources/fediz_meta_test_config.xml Thu Jun 14 20:56:15 2012 @@ -21,6 +21,7 @@ http://Server:Port/value from protocol.realm config property + http://Server:port/value from protocol.applicationServiceURL config property http://Server:Port/value from protocol.issuer config property ; http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role