You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/10/01 09:52:36 UTC

[3/8] git commit: More Metadata namespace fixes

More Metadata namespace fixes


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

Branch: refs/heads/master
Commit: 7d4abd357dd9e0d3fdb464ba6d979cd50a032d18
Parents: 63c1d78
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Sep 29 14:59:10 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Sep 29 14:59:10 2014 +0100

----------------------------------------------------------------------
 .../apache/cxf/fediz/core/metadata/MetadataWriter.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7d4abd35/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java
index 7f692bf..20fa3fe 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java
@@ -247,13 +247,13 @@ public class MetadataWriter {
         writer.writeAttribute("protocolSupportEnumeration", "urn:oasis:names:tc:SAML:2.0:protocol");
         
         if (config.getLogoutURL() != null) {
-            writer.writeStartElement("", "SingleLogoutService", SAML2_METADATA_NS);
+            writer.writeStartElement("md", "SingleLogoutService", SAML2_METADATA_NS);
             writer.writeAttribute("Location", config.getLogoutURL());
             writer.writeAttribute("Binding", "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST");
             writer.writeEndElement(); // SingleLogoutService
         }
         
-        writer.writeStartElement("", "AssertionConsumerService", SAML2_METADATA_NS);
+        writer.writeStartElement("md", "AssertionConsumerService", SAML2_METADATA_NS);
         writer.writeAttribute("Location", serviceURL);
         writer.writeAttribute("index", "0");
         writer.writeAttribute("isDefault", "true");
@@ -261,16 +261,16 @@ public class MetadataWriter {
         writer.writeEndElement(); // AssertionConsumerService
         
         if (protocol.getClaimTypesRequested() != null && !protocol.getClaimTypesRequested().isEmpty()) {
-            writer.writeStartElement("", "AttributeConsumingService", SAML2_METADATA_NS);
+            writer.writeStartElement("md", "AttributeConsumingService", SAML2_METADATA_NS);
             writer.writeAttribute("index", "0");
             
-            writer.writeStartElement("", "ServiceName", SAML2_METADATA_NS);
+            writer.writeStartElement("md", "ServiceName", SAML2_METADATA_NS);
             writer.writeAttribute("xml:lang", "en");
             writer.writeCharacters(config.getName());
             writer.writeEndElement(); // ServiceName
             
             for (Claim claim : protocol.getClaimTypesRequested()) {
-                writer.writeStartElement("", "RequestedAttribute", SAML2_METADATA_NS);
+                writer.writeStartElement("md", "RequestedAttribute", SAML2_METADATA_NS);
                 writer.writeAttribute("isRequired", Boolean.toString(claim.isOptional()));
                 writer.writeAttribute("Name", claim.getType());
                 writer.writeAttribute("NameFormat", 
@@ -290,7 +290,7 @@ public class MetadataWriter {
             LOG.info("No signingKey element found in config: " + ex.getMessage());
         }
         if (protocol.isSignRequest() && hasSigningKey) {
-            writer.writeStartElement("", "KeyDescriptor", SAML2_METADATA_NS);
+            writer.writeStartElement("md", "KeyDescriptor", SAML2_METADATA_NS);
             writer.writeAttribute("use", "signing");
             
             writer.writeStartElement("ds", "KeyInfo", "http://www.w3.org/2000/09/xmldsig#");