[java-opensaml] branch master updated: OSJ-291 - Sweep SAML XMLObject interfaces for consistency
Scott Cantor
cantor.2 at osu.edu
Tue Nov 26 10:37:13 EST 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=827bc6ad8a3dc179edd473f7736d263b49a90878
The following commit(s) were added to refs/heads/master by this push:
new 827bc6a OSJ-291 - Sweep SAML XMLObject interfaces for consistency
827bc6a is described below
commit 827bc6ad8a3dc179edd473f7736d263b49a90878
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Nov 26 10:37:08 2019 -0500
OSJ-291 - Sweep SAML XMLObject interfaces for consistency
https://issues.shibboleth.net/jira/browse/OSJ-291
Eliminate no-op marshalling code.
---
.../saml/ext/reqattr/RequestedAttributes.java | 22 +++--
.../opensaml/saml/saml2/core/AttributeValue.java | 11 ++-
.../saml/saml2/metadata/AffiliateMember.java | 32 ++++--
.../idpdisco/impl/DiscoveryResponseMarshaller.java | 25 -----
.../impl/DiscoveryResponseUnmarshaller.java | 25 -----
.../impl/ActionNamespaceMarshaller.java | 44 ---------
.../impl/ActionNamespaceUnmarshaller.java | 35 -------
.../impl/RequestInitiatorMarshaller.java | 31 ------
.../impl/RequestInitiatorUnmarshaller.java | 31 ------
.../impl/RegistrationPolicyMarshaller.java | 27 ------
.../impl/RegistrationPolicyUnmarshaller.java | 27 ------
.../ext/saml2mdrpi/impl/UsagePolicyMarshaller.java | 28 ------
.../saml2mdrpi/impl/UsagePolicyUnmarshaller.java | 28 ------
.../ext/saml2mdui/impl/DescriptionMarshaller.java | 28 ------
.../saml2mdui/impl/DescriptionUnmarshaller.java | 28 ------
.../ext/saml2mdui/impl/DisplayNameMarshaller.java | 27 ------
.../saml2mdui/impl/DisplayNameUnmarshaller.java | 27 ------
.../ext/saml2mdui/impl/DomainHintMarshaller.java | 42 --------
.../ext/saml2mdui/impl/DomainHintUnmarshaller.java | 27 ------
.../saml2mdui/impl/GeolocationHintMarshaller.java | 42 --------
.../impl/GeolocationHintUnmarshaller.java | 28 ------
.../saml/ext/saml2mdui/impl/IPHintMarshaller.java | 42 --------
.../ext/saml2mdui/impl/IPHintUnmarshaller.java | 28 ------
.../saml2mdui/impl/InformationURLMarshaller.java | 27 ------
.../saml2mdui/impl/InformationURLUnmarshaller.java | 26 -----
.../impl/PrivacyStatementURLMarshaller.java | 27 ------
.../impl/PrivacyStatementURLUnmarshaller.java | 27 ------
.../ext/samlpthrpty/impl/RespondToMarshaller.java | 27 ------
.../samlpthrpty/impl/RespondToUnmarshaller.java | 27 ------
.../saml/saml2/core/impl/ActionMarshaller.java | 11 ---
.../saml/saml2/core/impl/ArtifactMarshaller.java | 46 ---------
.../saml/saml2/core/impl/ArtifactUnmarshaller.java | 32 ------
.../saml2/core/impl/AssertionIDRefMarshaller.java | 46 ---------
.../core/impl/AssertionIDRefUnmarshaller.java | 32 ------
.../saml2/core/impl/AssertionURIRefMarshaller.java | 46 ---------
.../core/impl/AssertionURIRefUnmarshaller.java | 32 ------
...eMarshaller.java => AttributeValueBuilder.java} | 29 +++---
...erIDMarshaller.java => AttributeValueImpl.java} | 33 ++++---
.../saml/saml2/core/impl/AudienceMarshaller.java | 46 ---------
.../saml/saml2/core/impl/AudienceUnmarshaller.java | 32 ------
.../impl/AuthenticatingAuthorityMarshaller.java | 46 ---------
.../impl/AuthenticatingAuthorityUnmarshaller.java | 32 ------
.../core/impl/AuthnContextClassRefMarshaller.java | 46 ---------
.../impl/AuthnContextClassRefUnmarshaller.java | 32 ------
.../saml2/core/impl/AuthnContextDeclBuilder.java | 5 -
.../saml/saml2/core/impl/AuthnContextDeclImpl.java | 60 ++----------
.../core/impl/AuthnContextDeclMarshaller.java | 69 -------------
.../core/impl/AuthnContextDeclRefMarshaller.java | 46 ---------
.../core/impl/AuthnContextDeclRefUnmarshaller.java | 32 ------
.../core/impl/AuthnContextDeclUnmarshaller.java | 68 -------------
.../saml2/core/impl/GetCompleteUnmarshaller.java | 33 -------
.../saml/saml2/core/impl/IssuerMarshaller.java | 26 -----
.../saml/saml2/core/impl/IssuerUnmarshaller.java | 25 -----
.../saml/saml2/core/impl/NameIDMarshaller.java | 25 -----
...peMarshaller.java => NameIDTypeMarshaller.java} | 6 +-
...marshaller.java => NameIDTypeUnmarshaller.java} | 2 +-
.../saml/saml2/core/impl/NameIDUnmarshaller.java | 26 -----
.../saml/saml2/core/impl/NewIDMarshaller.java | 46 ---------
.../saml/saml2/core/impl/NewIDUnmarshaller.java | 32 ------
.../saml2/core/impl/RequesterIDUnmarshaller.java | 32 ------
.../saml2/core/impl/SessionIndexMarshaller.java | 47 ---------
.../saml2/core/impl/SessionIndexUnmarshaller.java | 32 ------
.../saml2/core/impl/StatusMessageMarshaller.java | 46 ---------
.../saml2/core/impl/StatusMessageUnmarshaller.java | 33 -------
.../saml2/metadata/impl/AffiliateMemberImpl.java | 30 ++----
.../metadata/impl/AffiliateMemberMarshaller.java | 43 --------
.../metadata/impl/AffiliateMemberUnmarshaller.java | 34 -------
.../impl/ArtifactResolutionServiceMarshaller.java | 29 ------
.../ArtifactResolutionServiceUnmarshaller.java | 29 ------
.../impl/AssertionConsumerServiceMarshaller.java | 29 ------
.../impl/AssertionConsumerServiceUnmarshaller.java | 29 ------
.../impl/AssertionIDRequestServiceMarshaller.java | 29 ------
.../AssertionIDRequestServiceUnmarshaller.java | 29 ------
.../metadata/impl/AttributeProfileMarshaller.java | 45 ---------
.../impl/AttributeProfileUnmarshaller.java | 32 ------
.../metadata/impl/AttributeServiceMarshaller.java | 29 ------
.../impl/AttributeServiceUnmarshaller.java | 29 ------
.../metadata/impl/AuthnQueryServiceMarshaller.java | 29 ------
.../impl/AuthnQueryServiceUnmarshaller.java | 25 -----
.../metadata/impl/AuthzServiceMarshaller.java | 29 ------
.../metadata/impl/AuthzServiceUnmarshaller.java | 29 ------
.../saml2/metadata/impl/CompanyMarshaller.java | 46 ---------
.../saml2/metadata/impl/CompanyUnmarshaller.java | 32 ------
.../metadata/impl/EmailAddressMarshaller.java | 46 ---------
.../metadata/impl/EmailAddressUnmarshaller.java | 32 ------
.../metadata/impl/EncryptionMethodMarshaller.java | 26 -----
.../impl/EncryptionMethodUnmarshaller.java | 25 -----
.../saml2/metadata/impl/GivenNameMarshaller.java | 46 ---------
.../saml2/metadata/impl/GivenNameUnmarshaller.java | 32 ------
.../impl/ManageNameIDServiceMarshaller.java | 29 ------
.../impl/ManageNameIDServiceUnmarshaller.java | 29 ------
.../metadata/impl/NameIDFormatMarshaller.java | 46 ---------
.../metadata/impl/NameIDFormatUnmarshaller.java | 32 ------
.../impl/NameIDMappingServiceMarshaller.java | 29 ------
.../impl/NameIDMappingServiceUnmarshaller.java | 29 ------
.../impl/OrganizationDisplayNameMarshaller.java | 30 ------
.../impl/OrganizationDisplayNameUnmarshaller.java | 31 ------
.../metadata/impl/OrganizationNameMarshaller.java | 30 ------
.../impl/OrganizationNameUnmarshaller.java | 31 ------
.../metadata/impl/OrganizationURLMarshaller.java | 30 ------
.../metadata/impl/OrganizationURLUnmarshaller.java | 30 ------
.../impl/ServiceDescriptionMarshaller.java | 30 ------
.../impl/ServiceDescriptionUnmarshaller.java | 30 ------
.../saml2/metadata/impl/ServiceNameMarshaller.java | 30 ------
.../metadata/impl/ServiceNameUnmarshaller.java | 25 -----
.../impl/SingleLogoutServiceMarshaller.java | 29 ------
.../impl/SingleLogoutServiceUnmarshaller.java | 29 ------
.../impl/SingleSignOnServiceMarshaller.java | 29 ------
.../impl/SingleSignOnServiceUnmarshaller.java | 29 ------
.../saml2/metadata/impl/SurNameMarshaller.java | 47 ---------
.../saml2/metadata/impl/SurNameUnmarshaller.java | 32 ------
.../metadata/impl/TelephoneNumberMarshaller.java | 46 ---------
.../metadata/impl/TelephoneNumberUnmarshaller.java | 32 ------
.../src/main/resources/saml2-assertion-config.xml | 47 +++++----
.../src/main/resources/saml2-metadata-config.xml | 108 ++++++++++-----------
.../saml2-metadata-idp-discovery-config.xml | 4 +-
.../main/resources/saml2-metadata-query-config.xml | 4 +-
.../resources/saml2-metadata-reqinit-config.xml | 4 +-
.../main/resources/saml2-metadata-rpi-config.xml | 8 +-
.../main/resources/saml2-metadata-ui-config.xml | 28 +++---
.../src/main/resources/saml2-protocol-config.xml | 24 ++---
.../resources/saml2-protocol-thirdparty-config.xml | 4 +-
.../src/main/resources/saml2-req-attr-config.xml | 8 +-
123 files changed, 221 insertions(+), 3673 deletions(-)
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/reqattr/RequestedAttributes.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/reqattr/RequestedAttributes.java
index 54bcd24..071a518 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/reqattr/RequestedAttributes.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/ext/reqattr/RequestedAttributes.java
@@ -19,29 +19,39 @@ package org.opensaml.saml.ext.reqattr;
import java.util.List;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.RequestedAttribute;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+
/**
* SAML V2.0 Protocol Extension For Requesting Attributes Per Request.
*/
public interface RequestedAttributes extends SAMLObject {
/** Name of the element inside the Extensions. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RequestedAttributes";
+ @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "RequestedAttributes";
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20PREQ_ATTR_NS,
+ @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20PREQ_ATTR_NS,
DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20PREQ_ATTRR_PREFIX);
+ /** Local name of the XSI type. */
+ @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "RequestedAttributesType";
+
+ /** QName of the XSI type. */
+ @Nonnull static final QName TYPE_NAME =
+ new QName(SAMLConstants.SAML20PREQ_ATTR_NS, TYPE_LOCAL_NAME, SAMLConstants.SAML20PREQ_ATTRR_PREFIX);
+
/** Local name of the supportsRequestedAttributes attribute. */
- public static final String SUPPORTS_REQUESTED_ATTRIBUTES_LOCAL_NAME = "supportsRequestedAttributes";
+ @Nonnull @NotEmpty static final String SUPPORTS_REQUESTED_ATTRIBUTES_LOCAL_NAME = "supportsRequestedAttributes";
/** QName of the XSI type. */
- public static final QName SUPPORTS_REQUESTED_ATTRIBUTES = new QName(SAMLConstants.SAML20PREQ_ATTR_NS,
+ @Nonnull static final QName SUPPORTS_REQUESTED_ATTRIBUTES = new QName(SAMLConstants.SAML20PREQ_ATTR_NS,
SUPPORTS_REQUESTED_ATTRIBUTES_LOCAL_NAME, SAMLConstants.SAML20PREQ_ATTRR_PREFIX);
/**
@@ -49,6 +59,6 @@ public interface RequestedAttributes extends SAMLObject {
*
* @return list of child RequestedAttribute s
*/
- public List<RequestedAttribute> getRequestedAttributes();
+ List<RequestedAttribute> getRequestedAttributes();
-}
+}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AttributeValue.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AttributeValue.java
index 6f2b96a..dd2ed1a 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AttributeValue.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/core/AttributeValue.java
@@ -17,20 +17,25 @@
package org.opensaml.saml.saml2.core;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.schema.XSAny;
import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+
/**
* This interface defines how the object representing a SAML 2 <code> AttributeValue </code> element behaves.
*/
-public interface AttributeValue extends SAMLObject {
+public interface AttributeValue extends SAMLObject, XSAny {
/** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "AttributeValue";
+ @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "AttributeValue";
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+ @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20_NS, DEFAULT_ELEMENT_LOCAL_NAME,
SAMLConstants.SAML20_PREFIX);
+
}
\ No newline at end of file
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AffiliateMember.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AffiliateMember.java
index 68b289f..b6379b6 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AffiliateMember.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/AffiliateMember.java
@@ -17,41 +17,55 @@
package org.opensaml.saml.saml2.metadata;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.schema.XSURI;
import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+
/**
* SAML 2.0 Metadata AffiliateMember.
*/
-public interface AffiliateMember extends SAMLObject {
+public interface AffiliateMember extends SAMLObject, XSURI {
/** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "AffiliateMember";
+ @Nonnull @NotEmpty static final String DEFAULT_ELEMENT_LOCAL_NAME = "AffiliateMember";
/** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20MD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
+ @Nonnull static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20MD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
SAMLConstants.SAML20MD_PREFIX);
/** Local name of the XSI type. */
- public static final String TYPE_LOCAL_NAME = "entityIDType";
+ @Nonnull @NotEmpty static final String TYPE_LOCAL_NAME = "entityIDType";
/** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAMLConstants.SAML20MD_NS, TYPE_LOCAL_NAME,
+ @Nonnull static final QName TYPE_NAME = new QName(SAMLConstants.SAML20MD_NS, TYPE_LOCAL_NAME,
SAMLConstants.SAML20MD_PREFIX);
/**
* Gets the member's entity ID.
*
* @return the member's ID
+ *
+ * @deprecated
*/
- public String getID();
+ @Nullable default String getID() {
+ return getURI();
+ }
/**
* Sets the member's entity ID.
*
- * @param memberID the member's ID
+ * @param uri the member's ID
+ *
+ * @deprecated
*/
- public void setID(String memberID);
-}
+ default void setID(@Nullable final String uri) {
+ setURI(uri);
+ }
+
+}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseMarshaller.java
deleted file mode 100644
index 6b56d31..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseMarshaller.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.idpdisco.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.IndexedEndpointMarshaller;
-
-/** A thread-safe Marshaller for {@link org.opensaml.saml.ext.idpdisco.DiscoveryResponse} objects. */
-public class DiscoveryResponseMarshaller extends IndexedEndpointMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseUnmarshaller.java
deleted file mode 100644
index 12e2df3..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseUnmarshaller.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.idpdisco.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.IndexedEndpointUnmarshaller;
-
-/** A thread-safe Unmarshaller for {@link org.opensaml.saml.ext.idpdisco.DiscoveryResponse} objects. */
-public class DiscoveryResponseUnmarshaller extends IndexedEndpointUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceMarshaller.java
deleted file mode 100644
index 44aa5b8..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceMarshaller.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdquery.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.saml.common.AbstractSAMLObjectMarshaller;
-import org.opensaml.saml.ext.saml2mdquery.ActionNamespace;
-import org.w3c.dom.Element;
-
-import com.google.common.base.Strings;
-
-/**
- * Marshaller of {@link ActionNamespace} objects.
- */
-public class ActionNamespaceMarshaller extends AbstractSAMLObjectMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
- throws MarshallingException {
- final ActionNamespace actionNamespace = (ActionNamespace) xmlObject;
-
- if (!Strings.isNullOrEmpty(actionNamespace.getURI())) {
- ElementSupport.appendTextContent(domElement, actionNamespace.getURI());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceUnmarshaller.java
deleted file mode 100644
index 768e1aa..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceUnmarshaller.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdquery.impl;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObjectUnmarshaller;
-import org.opensaml.saml.ext.saml2mdquery.ActionNamespace;
-
-/**
- * Unmarshaller for {@link ActionNamespace} objects.
- */
-public class ActionNamespaceUnmarshaller extends AbstractSAMLObjectUnmarshaller {
-
- /** {@inheritDoc} */
- protected void processElementContent(final XMLObject samlObject, final String elementContent) {
- final ActionNamespace actionNamespace = (ActionNamespace) samlObject;
-
- actionNamespace.setURI(elementContent);
- }
-}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorMarshaller.java
deleted file mode 100644
index 5a11135..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorMarshaller.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdreqinit.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.EndpointMarshaller;
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.ext.saml2mdreqinit.RequestInitiator} objects.
- */
-public class RequestInitiatorMarshaller extends EndpointMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorUnmarshaller.java
deleted file mode 100644
index fe1500c..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorUnmarshaller.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdreqinit.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.EndpointUnmarshaller;
-
-/**
- * A thread safe Unmarshaller for {@link org.opensaml.saml.ext.saml2mdreqinit.RequestInitiator} objects.
- */
-public class RequestInitiatorUnmarshaller extends EndpointUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyMarshaller.java
deleted file mode 100644
index c01302c..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyMarshaller.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdrpi.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.LocalizedURIMarshaller;
-
-/**
- * An marshaller for {@link org.opensaml.saml.ext.saml2mdrpi.RegistrationPolicy}.
- */
-public class RegistrationPolicyMarshaller extends LocalizedURIMarshaller {
-
-}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyUnmarshaller.java
deleted file mode 100644
index e635af1..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyUnmarshaller.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdrpi.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.LocalizedURIUnmarshaller;
-
-/**
- * An unmarshaller for {@link org.opensaml.saml.ext.saml2mdrpi.RegistrationPolicy}.
- */
-public class RegistrationPolicyUnmarshaller extends LocalizedURIUnmarshaller {
-
-}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyMarshaller.java
deleted file mode 100644
index 1f534f3..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyMarshaller.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdrpi.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.LocalizedURIMarshaller;
-
-
-/**
- * An marshaller for {@link org.opensaml.saml.ext.saml2mdrpi.UsagePolicy}.
- */
-public class UsagePolicyMarshaller extends LocalizedURIMarshaller {
-
-}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyUnmarshaller.java
deleted file mode 100644
index 31ed837..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyUnmarshaller.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdrpi.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.LocalizedURIUnmarshaller;
-
-
-/**
- * An unmarshaller for {@link org.opensaml.saml.ext.saml2mdrpi.UsagePolicy}.
- */
-public class UsagePolicyUnmarshaller extends LocalizedURIUnmarshaller {
-
-}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionMarshaller.java
deleted file mode 100644
index f90c238..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionMarshaller.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdui.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.LocalizedNameMarshaller;
-
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.ext.saml2mdui.Description} objects.
- */
-public class DescriptionMarshaller extends LocalizedNameMarshaller {
-
-}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionUnmarshaller.java
deleted file mode 100644
index d5f98ec..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionUnmarshaller.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdui.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.LocalizedNameUnmarshaller;
-
-
-/**
- * A thread-safe unmarshaller for {@link org.opensaml.saml.ext.saml2mdui.Description} objects.
- */
-public class DescriptionUnmarshaller extends LocalizedNameUnmarshaller {
-
-}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameMarshaller.java
deleted file mode 100644
index 7b37c0f..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameMarshaller.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdui.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.LocalizedNameMarshaller;
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.ext.saml2mdui.DisplayName} objects.
- */
-public class DisplayNameMarshaller extends LocalizedNameMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameUnmarshaller.java
deleted file mode 100644
index e2191f4..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameUnmarshaller.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdui.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.LocalizedNameUnmarshaller;
-
-/**
- * A thread-safe unmarshaller for {@link org.opensaml.saml.ext.saml2mdui.DisplayName} objects.
- */
-public class DisplayNameUnmarshaller extends LocalizedNameUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintMarshaller.java
deleted file mode 100644
index 23dc9cd..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintMarshaller.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdui.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSStringMarshaller;
-import org.opensaml.saml.ext.saml2mdui.DomainHint;
-import org.w3c.dom.Element;
-
-/**
- * A thread safe Marshaller for {@link DomainHint} objects.
- */
-public class DomainHintMarshaller extends XSStringMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final DomainHint name = (DomainHint) samlObject;
-
- if (name.getValue() != null) {
- ElementSupport.appendTextContent(domElement, name.getValue());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintUnmarshaller.java
deleted file mode 100644
index b4dda11..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintUnmarshaller.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdui.impl;
-
-import org.opensaml.core.xml.schema.impl.XSStringUnmarshaller;
-import org.opensaml.saml.ext.saml2mdui.DomainHint;
-
-/**
- * A thread-safe unmarshaller for {@link DomainHint} objects.
- */
-public class DomainHintUnmarshaller extends XSStringUnmarshaller {
-}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintMarshaller.java
deleted file mode 100644
index 7f650d2..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintMarshaller.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdui.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSURIMarshaller;
-import org.opensaml.saml.ext.saml2mdui.GeolocationHint;
-import org.w3c.dom.Element;
-
-/**
- * A thread safe Marshaller for {@link GeolocationHint} objects.
- */
-public class GeolocationHintMarshaller extends XSURIMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final GeolocationHint name = (GeolocationHint) samlObject;
-
- if (name.getURI() != null) {
- ElementSupport.appendTextContent(domElement, name.getURI());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintUnmarshaller.java
deleted file mode 100644
index 76263d4..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintUnmarshaller.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdui.impl;
-
-import org.opensaml.core.xml.schema.impl.XSURIUnmarshaller;
-import org.opensaml.saml.ext.saml2mdui.GeolocationHint;
-
-/**
- * A thread-safe unmarshaller for {@link GeolocationHint} objects.
- */
-public class GeolocationHintUnmarshaller extends XSURIUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintMarshaller.java
deleted file mode 100644
index 63d79cb..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintMarshaller.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdui.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSStringMarshaller;
-import org.opensaml.saml.ext.saml2mdui.IPHint;
-import org.w3c.dom.Element;
-
-/**
- * A thread safe Marshaller for {@link IPHint} objects.
- */
-public class IPHintMarshaller extends XSStringMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final IPHint name = (IPHint) samlObject;
-
- if (name.getValue() != null) {
- ElementSupport.appendTextContent(domElement, name.getValue());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintUnmarshaller.java
deleted file mode 100644
index 61f438f..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintUnmarshaller.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdui.impl;
-
-import org.opensaml.core.xml.schema.impl.XSStringUnmarshaller;
-import org.opensaml.saml.ext.saml2mdui.IPHint;
-
-/**
- * A thread-safe unmarshaller for {@link IPHint} objects.
- */
-public class IPHintUnmarshaller extends XSStringUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLMarshaller.java
deleted file mode 100644
index 6d253f5..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLMarshaller.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdui.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.LocalizedURIMarshaller;
-
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.ext.saml2mdui.InformationURL} objects.
- */
-public class InformationURLMarshaller extends LocalizedURIMarshaller {
-}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLUnmarshaller.java
deleted file mode 100644
index 1a288cf..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdui.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.LocalizedURIUnmarshaller;
-
-/**
- * A thread-safe unmarshaller for {@link org.opensaml.saml.ext.saml2mdui.InformationURL} objects.
- */
-public class InformationURLUnmarshaller extends LocalizedURIUnmarshaller {
-}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLMarshaller.java
deleted file mode 100644
index c617df9..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLMarshaller.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdui.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.LocalizedURIMarshaller;
-
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.ext.saml2mdui.PrivacyStatementURL} objects.
- */
-public class PrivacyStatementURLMarshaller extends LocalizedURIMarshaller {
-}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLUnmarshaller.java
deleted file mode 100644
index 37eaf45..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLUnmarshaller.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.saml2mdui.impl;
-
-import org.opensaml.saml.saml2.metadata.impl.LocalizedURIUnmarshaller;
-
-
-/**
- * A thread-safe unmarshaller for {@link org.opensaml.saml.ext.saml2mdui.PrivacyStatementURL} objects.
- */
-public class PrivacyStatementURLUnmarshaller extends LocalizedURIUnmarshaller {
-}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlpthrpty/impl/RespondToMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlpthrpty/impl/RespondToMarshaller.java
deleted file mode 100644
index ec852a8..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlpthrpty/impl/RespondToMarshaller.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.samlpthrpty.impl;
-
-import org.opensaml.saml.saml2.core.impl.AbstractNameIDTypeMarshaller;
-
-/**
- * Marshaller of {@link org.opensaml.saml.ext.samlpthrpty.RespondTo} objects.
- */
-public class RespondToMarshaller extends AbstractNameIDTypeMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlpthrpty/impl/RespondToUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlpthrpty/impl/RespondToUnmarshaller.java
deleted file mode 100644
index 356e0bd..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlpthrpty/impl/RespondToUnmarshaller.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.ext.samlpthrpty.impl;
-
-import org.opensaml.saml.saml2.core.impl.AbstractNameIDTypeUnmarshaller;
-
-/**
- * Unmarshaller for {@link org.opensaml.saml.ext.samlpthrpty.RespondTo} objects.
- */
-public class RespondToUnmarshaller extends AbstractNameIDTypeUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionMarshaller.java
index bd0b0aa..e3891d3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionMarshaller.java
@@ -21,8 +21,6 @@
package org.opensaml.saml.saml2.core.impl;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.schema.impl.XSStringMarshaller;
@@ -44,13 +42,4 @@ public class ActionMarshaller extends XSStringMarshaller {
}
}
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final Action action = (Action) samlObject;
-
- if (action.getValue() != null) {
- ElementSupport.appendTextContent(domElement, action.getValue());
- }
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactMarshaller.java
deleted file mode 100644
index 369f899..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSStringMarshaller;
-import org.opensaml.saml.saml2.core.Artifact;
-import org.w3c.dom.Element;
-
-/**
- * A thread-safe Marshaller for {@link Artifact}.
- */
-public class ArtifactMarshaller extends XSStringMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final Artifact artifact = (Artifact) samlObject;
-
- if (artifact.getValue() != null) {
- ElementSupport.appendTextContent(domElement, artifact.getValue());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactUnmarshaller.java
deleted file mode 100644
index 7ffe52b..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import org.opensaml.core.xml.schema.impl.XSStringUnmarshaller;
-import org.opensaml.saml.saml2.core.Artifact;
-
-/**
- * A thead-safe Unmarshaller for {@link Artifact}.
- */
-public class ArtifactUnmarshaller extends XSStringUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefMarshaller.java
deleted file mode 100644
index 2ecbf1a..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSStringMarshaller;
-import org.opensaml.saml.saml2.core.AssertionIDRef;
-import org.w3c.dom.Element;
-
-/**
- * A thread-safe Marshaller for {@link AssertionIDRef}.
- */
-public class AssertionIDRefMarshaller extends XSStringMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final AssertionIDRef assertionIDRef = (AssertionIDRef) samlObject;
-
- if (assertionIDRef.getValue() != null) {
- ElementSupport.appendTextContent(domElement, assertionIDRef.getValue());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefUnmarshaller.java
deleted file mode 100644
index 7d066e7..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import org.opensaml.core.xml.schema.impl.XSStringUnmarshaller;
-import org.opensaml.saml.saml2.core.AssertionIDRef;
-
-/**
- * A thead-safe Unmarshaller for {@link AssertionIDRef}.
- */
-public class AssertionIDRefUnmarshaller extends XSStringUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefMarshaller.java
deleted file mode 100644
index 6b9b566..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSURIMarshaller;
-import org.opensaml.saml.saml2.core.AssertionURIRef;
-import org.w3c.dom.Element;
-
-/**
- * A thread-safe Marshaller for {@link AssertionURIRef}.
- */
-public class AssertionURIRefMarshaller extends XSURIMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final AssertionURIRef assertionURIRef = (AssertionURIRef) samlObject;
-
- if (assertionURIRef.getURI() != null) {
- ElementSupport.appendTextContent(domElement, assertionURIRef.getURI());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefUnmarshaller.java
deleted file mode 100644
index bb7defd..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import org.opensaml.core.xml.schema.impl.XSURIUnmarshaller;
-import org.opensaml.saml.saml2.core.AssertionURIRef;
-
-/**
- * A thread-safe Unmarshaller for {@link AssertionURIRef}.
- */
-public class AssertionURIRefUnmarshaller extends XSURIUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeValueBuilder.java
similarity index 56%
rename from opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteMarshaller.java
rename to opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeValueBuilder.java
index 3b82baf..4d91e00 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeValueBuilder.java
@@ -21,26 +21,25 @@
package org.opensaml.saml.saml2.core.impl;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSURIMarshaller;
-import org.opensaml.saml.saml2.core.GetComplete;
-import org.w3c.dom.Element;
+import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
+import org.opensaml.saml.common.xml.SAMLConstants;
+import org.opensaml.saml.saml2.core.AttributeValue;
/**
- * A thread safe Marshaller for {@link GetComplete} objects.
+ * Builder for {@link AttributeValue} objects.
*/
-public class GetCompleteMarshaller extends XSURIMarshaller {
+public class AttributeValueBuilder extends AbstractSAMLObjectBuilder<AttributeValue> {
/** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final GetComplete gc = (GetComplete) samlObject;
+ public AttributeValue buildObject() {
+ return buildObject(SAMLConstants.SAML20_NS, AttributeValue.DEFAULT_ELEMENT_LOCAL_NAME,
+ SAMLConstants.SAML20_PREFIX);
+ }
- if (gc.getURI() != null) {
- ElementSupport.appendTextContent(domElement, gc.getURI());
- }
+ /** {@inheritDoc} */
+ public AttributeValue buildObject(final String namespaceURI, final String localName,
+ final String namespacePrefix) {
+ return new AttributeValueImpl(namespaceURI, localName, namespacePrefix);
}
+
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeValueImpl.java
similarity index 53%
rename from opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDMarshaller.java
rename to opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeValueImpl.java
index a6088bc..0018121 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeValueImpl.java
@@ -21,26 +21,27 @@
package org.opensaml.saml.saml2.core.impl;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSURIMarshaller;
-import org.opensaml.saml.saml2.core.RequesterID;
-import org.w3c.dom.Element;
+import org.opensaml.core.xml.schema.impl.XSAnyImpl;
+import org.opensaml.saml.saml2.core.AttributeValue;
/**
- * A thread safe Marshaller for {@link RequesterID} objects.
+ * A concrete implementation of {@link AttributeValue}.
*/
-public class RequesterIDMarshaller extends XSURIMarshaller {
+public class AttributeValueImpl extends XSAnyImpl implements AttributeValue {
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final RequesterID reqID = (RequesterID) samlObject;
-
- if (reqID.getURI() != null) {
- ElementSupport.appendTextContent(domElement, reqID.getURI());
- }
+ /**
+ * Constructor.
+ *
+ * @param namespaceURI the namespace the element is in
+ * @param elementLocalName the local name of the XML element this Object represents
+ * @param namespacePrefix the prefix for the given namespace
+ */
+ protected AttributeValueImpl(@Nullable final String namespaceURI, @Nonnull final String elementLocalName,
+ @Nullable final String namespacePrefix) {
+ super(namespaceURI, elementLocalName, namespacePrefix);
}
+
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceMarshaller.java
deleted file mode 100644
index f86d600..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSURIMarshaller;
-import org.opensaml.saml.saml2.core.Audience;
-import org.w3c.dom.Element;
-
-/**
- * A thread safe Marshaller for {@link Audience} objects.
- */
-public class AudienceMarshaller extends XSURIMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final Audience audience = (Audience) samlObject;
-
- if (audience.getURI() != null) {
- ElementSupport.appendTextContent(domElement, audience.getURI());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceUnmarshaller.java
deleted file mode 100644
index e04007d..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import org.opensaml.core.xml.schema.impl.XSURIUnmarshaller;
-import org.opensaml.saml.saml2.core.Audience;
-
-/**
- * A thread-safe Unmarshaller for {@link Audience} objects.
- */
-public class AudienceUnmarshaller extends XSURIUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityMarshaller.java
deleted file mode 100644
index 100ebe8..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSURIMarshaller;
-import org.opensaml.saml.saml2.core.AuthenticatingAuthority;
-import org.w3c.dom.Element;
-
-/**
- * A thread-safe Marshaller for {@link AuthenticatingAuthority}.
- */
-public class AuthenticatingAuthorityMarshaller extends XSURIMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final AuthenticatingAuthority authenticatingAuthority = (AuthenticatingAuthority) samlObject;
-
- if (authenticatingAuthority.getURI() != null) {
- ElementSupport.appendTextContent(domElement, authenticatingAuthority.getURI());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityUnmarshaller.java
deleted file mode 100644
index 95d5450..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import org.opensaml.core.xml.schema.impl.XSURIUnmarshaller;
-import org.opensaml.saml.saml2.core.AuthenticatingAuthority;
-
-/**
- * A thread-safe Unmarshaller for {@link AuthenticatingAuthority}.
- */
-public class AuthenticatingAuthorityUnmarshaller extends XSURIUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefMarshaller.java
deleted file mode 100644
index e83a23b..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSStringMarshaller;
-import org.opensaml.saml.saml2.core.AuthnContextClassRef;
-import org.w3c.dom.Element;
-
-/**
- * A thread-safe Marshaller for {@link AuthnContextClassRef}.
- */
-public class AuthnContextClassRefMarshaller extends XSStringMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final AuthnContextClassRef authnContextClassRef = (AuthnContextClassRef) samlObject;
-
- if (authnContextClassRef.getURI() != null) {
- ElementSupport.appendTextContent(domElement, authnContextClassRef.getURI());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefUnmarshaller.java
deleted file mode 100644
index a65437d..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import org.opensaml.core.xml.schema.impl.XSURIUnmarshaller;
-import org.opensaml.saml.saml2.core.AuthnContextClassRef;
-
-/**
- * A thread-safe Unmarshaller for {@link AuthnContextClassRef}.
- */
-public class AuthnContextClassRefUnmarshaller extends XSURIUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclBuilder.java
index 03b7ef4..104db7a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclBuilder.java
@@ -30,11 +30,6 @@ import org.opensaml.saml.saml2.core.AuthnContextDecl;
*/
public class AuthnContextDeclBuilder extends AbstractSAMLObjectBuilder<AuthnContextDecl> {
- /** Constructor. */
- public AuthnContextDeclBuilder() {
-
- }
-
/** {@inheritDoc} */
public AuthnContextDecl buildObject() {
return buildObject(SAMLConstants.SAML20_NS, AuthnContextDecl.DEFAULT_ELEMENT_LOCAL_NAME,
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclImpl.java
index ba87634..e3f89a8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclImpl.java
@@ -21,30 +21,16 @@
package org.opensaml.saml.saml2.core.impl;
-import java.util.Collections;
-import java.util.List;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
-import javax.xml.namespace.QName;
-
-import org.opensaml.core.xml.AbstractXMLObject;
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.util.AttributeMap;
-import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
+import org.opensaml.core.xml.schema.impl.XSAnyImpl;
import org.opensaml.saml.saml2.core.AuthnContextDecl;
/**
- * A concrete implementation of {@link org.opensaml.saml.saml2.core.AuthnContextDecl}.
+ * A concrete implementation of {@link AuthnContextDecl}.
*/
-public class AuthnContextDeclImpl extends AbstractXMLObject implements AuthnContextDecl {
-
- /** Child XMLObjects. */
- private IndexedXMLObjectChildrenList<XMLObject> unknownXMLObjects;
-
- /** Attributes for this element. */
- private AttributeMap unknownAttributes;
-
- /** Text content of the element. */
- private String textContent;
+public class AuthnContextDeclImpl extends XSAnyImpl implements AuthnContextDecl {
/**
* Constructor.
@@ -53,41 +39,9 @@ public class AuthnContextDeclImpl extends AbstractXMLObject implements AuthnCont
* @param elementLocalName the local name of the XML element this Object represents
* @param namespacePrefix the prefix for the given namespace
*/
- protected AuthnContextDeclImpl(final String namespaceURI, final String elementLocalName,
- final String namespacePrefix) {
+ protected AuthnContextDeclImpl(@Nullable final String namespaceURI, @Nonnull final String elementLocalName,
+ @Nullable final String namespacePrefix) {
super(namespaceURI, elementLocalName, namespacePrefix);
-
- unknownXMLObjects = new IndexedXMLObjectChildrenList<>(this);
- unknownAttributes = new AttributeMap(this);
- }
-
- /** {@inheritDoc} */
- public String getTextContent() {
- return textContent;
}
- /** {@inheritDoc} */
- public void setTextContent(final String newContent) {
- textContent = prepareForAssignment(textContent, newContent);
- }
-
- /** {@inheritDoc} */
- public List<XMLObject> getUnknownXMLObjects() {
- return unknownXMLObjects;
- }
-
- /** {@inheritDoc} */
- public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
- return (List<XMLObject>) unknownXMLObjects.subList(typeOrName);
- }
-
- /** {@inheritDoc} */
- public List<XMLObject> getOrderedChildren() {
- return Collections.unmodifiableList(unknownXMLObjects);
- }
-
- /** {@inheritDoc} */
- public AttributeMap getUnknownAttributes() {
- return unknownAttributes;
- }
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclMarshaller.java
deleted file mode 100644
index a59494c..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclMarshaller.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import java.util.Map.Entry;
-
-import javax.xml.namespace.QName;
-
-import net.shibboleth.utilities.java.support.xml.AttributeSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.saml.common.AbstractSAMLObjectMarshaller;
-import org.opensaml.saml.saml2.core.AuthnContextDecl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-
-/**
- * A thread-safe Marshaller for {@link org.opensaml.saml.saml2.core.AuthnContextDecl}.
- */
-public class AuthnContextDeclMarshaller extends AbstractSAMLObjectMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- final AuthnContextDecl authnCtxDecl = (AuthnContextDecl) xmlObject;
-
- Attr attribute;
- for (final Entry<QName, String> entry : authnCtxDecl.getUnknownAttributes().entrySet()) {
- attribute = AttributeSupport.constructAttribute(domElement.getOwnerDocument(), entry.getKey());
- attribute.setValue(entry.getValue());
- domElement.setAttributeNodeNS(attribute);
- if (XMLObjectProviderRegistrySupport.isIDAttribute(entry.getKey())
- || authnCtxDecl.getUnknownAttributes().isIDAttribute(entry.getKey())) {
- attribute.getOwnerElement().setIdAttributeNode(attribute, true);
- }
- }
- }
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
- throws MarshallingException {
- final AuthnContextDecl authnCtxDecl = (AuthnContextDecl) xmlObject;
-
- if (authnCtxDecl.getTextContent() != null) {
- ElementSupport.appendTextContent(domElement, authnCtxDecl.getTextContent());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefMarshaller.java
deleted file mode 100644
index d058340..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSURIMarshaller;
-import org.opensaml.saml.saml2.core.AuthnContextDeclRef;
-import org.w3c.dom.Element;
-
-/**
- * A thread-safe Marshaller for {@link AuthnContextDeclRef}.
- */
-public class AuthnContextDeclRefMarshaller extends XSURIMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final AuthnContextDeclRef authnContextDeclRef = (AuthnContextDeclRef) samlObject;
-
- if (authnContextDeclRef.getURI() != null) {
- ElementSupport.appendTextContent(domElement, authnContextDeclRef.getURI());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefUnmarshaller.java
deleted file mode 100644
index 06eac14..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import org.opensaml.core.xml.schema.impl.XSURIUnmarshaller;
-import org.opensaml.saml.saml2.core.AuthnContextDeclRef;
-
-/**
- * A thread-safe Unmarshaller for {@link AuthnContextDeclRef}.
- */
-public class AuthnContextDeclRefUnmarshaller extends XSURIUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclUnmarshaller.java
deleted file mode 100644
index 2fcf6c1..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclUnmarshaller.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import javax.xml.namespace.QName;
-
-import net.shibboleth.utilities.java.support.xml.QNameSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.UnmarshallingException;
-import org.opensaml.saml.common.AbstractSAMLObjectUnmarshaller;
-import org.opensaml.saml.saml2.core.AuthnContextDecl;
-import org.w3c.dom.Attr;
-
-/**
- * A thread-safe Unmarshaller for {@link org.opensaml.saml.saml2.core.AuthnContextDecl}.
- */
-public class AuthnContextDeclUnmarshaller extends AbstractSAMLObjectUnmarshaller {
-
- /** {@inheritDoc} */
- protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
- throws UnmarshallingException {
- final AuthnContextDecl authnCtcDecl = (AuthnContextDecl) parentXMLObject;
-
- authnCtcDecl.getUnknownXMLObjects().add(childXMLObject);
- }
-
- /** {@inheritDoc} */
- protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- final AuthnContextDecl authnCtcDecl = (AuthnContextDecl) xmlObject;
-
- final QName attribQName = QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(),
- attribute
- .getPrefix());
-
- if (attribute.isId()) {
- authnCtcDecl.getUnknownAttributes().registerID(attribQName);
- }
-
- authnCtcDecl.getUnknownAttributes().put(attribQName, attribute.getValue());
- }
-
- /** {@inheritDoc} */
- protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
- final AuthnContextDecl authnCtcDecl = (AuthnContextDecl) xmlObject;
-
- authnCtcDecl.setTextContent(elementContent);
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteUnmarshaller.java
deleted file mode 100644
index 8817fc9..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteUnmarshaller.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import org.opensaml.core.xml.schema.impl.XSURIUnmarshaller;
-import org.opensaml.saml.saml2.core.GetComplete;
-
-/**
- * A thread-safe Unmarshaller for {@link GetComplete} objects.
- */
-public class GetCompleteUnmarshaller extends XSURIUnmarshaller {
-
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IssuerMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IssuerMarshaller.java
deleted file mode 100644
index d013b43..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IssuerMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-
-/**
- * A thread-safe Marshaller for {@link org.opensaml.saml.saml2.core.Issuer}.
- */
-public class IssuerMarshaller extends AbstractNameIDTypeMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IssuerUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IssuerUnmarshaller.java
deleted file mode 100644
index 3c51585..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IssuerUnmarshaller.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-/**
- * A thread-safe Unmarshaller for {@link org.opensaml.saml.saml2.core.Issuer}.
- */
-public class IssuerUnmarshaller extends AbstractNameIDTypeUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMarshaller.java
deleted file mode 100644
index 2d5830a..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMarshaller.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.core.NameID} objects.
- */
-public class NameIDMarshaller extends AbstractNameIDTypeMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDTypeMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDTypeMarshaller.java
similarity index 92%
rename from opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDTypeMarshaller.java
rename to opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDTypeMarshaller.java
index 406c04c..c2804af 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDTypeMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDTypeMarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Element;
/**
* A thread safe Marshaller for {@link NameIDType} objects.
*/
-public abstract class AbstractNameIDTypeMarshaller extends XSStringMarshaller {
+public class NameIDTypeMarshaller extends XSStringMarshaller {
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject samlObject, final Element domElement)
@@ -58,8 +58,6 @@ public abstract class AbstractNameIDTypeMarshaller extends XSStringMarshaller {
throws MarshallingException {
final NameIDType nameID = (NameIDType) samlObject;
- if (nameID.getValue() != null) {
- ElementSupport.appendTextContent(domElement, nameID.getValue());
- }
+ ElementSupport.appendTextContent(domElement, nameID.getValue());
}
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDTypeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDTypeUnmarshaller.java
similarity index 96%
rename from opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDTypeUnmarshaller.java
rename to opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDTypeUnmarshaller.java
index b52c338..ed28c3f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDTypeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDTypeUnmarshaller.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Attr;
/**
* A thread-safe Unmarshaller for {@link NameIDType} objects.
*/
-public abstract class AbstractNameIDTypeUnmarshaller extends XSStringUnmarshaller {
+public class NameIDTypeUnmarshaller extends XSStringUnmarshaller {
/** {@inheritDoc} */
protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDUnmarshaller.java
deleted file mode 100644
index 059677c..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-
-/**
- * A thread-safe Unmarshaller for {@link org.opensaml.saml.saml2.core.NameID} objects.
- */
-public class NameIDUnmarshaller extends AbstractNameIDTypeUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDMarshaller.java
deleted file mode 100644
index 5ed4dd4..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSStringMarshaller;
-import org.opensaml.saml.saml2.core.NewID;
-import org.w3c.dom.Element;
-
-/**
- * A thread safe Marshaller for {@link NewID} objects.
- */
-public class NewIDMarshaller extends XSStringMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final NewID newID = (NewID) samlObject;
-
- if (newID.getValue() != null) {
- ElementSupport.appendTextContent(domElement, newID.getValue());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDUnmarshaller.java
deleted file mode 100644
index d9d9eb8..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import org.opensaml.core.xml.schema.impl.XSStringUnmarshaller;
-import org.opensaml.saml.saml2.core.NewID;
-
-/**
- * A thread-safe Unmarshaller for {@link NewID} objects.
- */
-public class NewIDUnmarshaller extends XSStringUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDUnmarshaller.java
deleted file mode 100644
index 2fbcfd3..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import org.opensaml.core.xml.schema.impl.XSURIUnmarshaller;
-import org.opensaml.saml.saml2.core.RequesterID;
-
-/**
- * A thread-safe Unmarshaller for {@link RequesterID} objects.
- */
-public class RequesterIDUnmarshaller extends XSURIUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexMarshaller.java
deleted file mode 100644
index 9f247a9..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexMarshaller.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSStringMarshaller;
-import org.opensaml.saml.saml2.core.SessionIndex;
-import org.w3c.dom.Element;
-
-/**
- * A thread safe Marshaller for {@link SessionIndex} objects.
- */
-public class SessionIndexMarshaller extends XSStringMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final SessionIndex si = (SessionIndex) samlObject;
-
- if (si.getValue() != null) {
- ElementSupport.appendTextContent(domElement, si.getValue());
- }
- }
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexUnmarshaller.java
deleted file mode 100644
index 9698d04..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import org.opensaml.core.xml.schema.impl.XSStringUnmarshaller;
-import org.opensaml.saml.saml2.core.SessionIndex;
-
-/**
- * A thread-safe Unmarshaller for {@link SessionIndex} objects.
- */
-public class SessionIndexUnmarshaller extends XSStringUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageMarshaller.java
deleted file mode 100644
index 75e630c..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSStringMarshaller;
-import org.opensaml.saml.saml2.core.StatusMessage;
-import org.w3c.dom.Element;
-
-/**
- * A thread safe Marshaller for {@link StatusMessage} objects.
- */
-public class StatusMessageMarshaller extends XSStringMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final StatusMessage message = (StatusMessage) samlObject;
-
- if (message.getValue() != null) {
- ElementSupport.appendTextContent(domElement, message.getValue());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageUnmarshaller.java
deleted file mode 100644
index 2cbc60c..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageUnmarshaller.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.core.impl;
-
-import org.opensaml.core.xml.schema.impl.XSStringUnmarshaller;
-import org.opensaml.saml.saml2.core.StatusMessage;
-
-/**
- * A thread-safe Unmarshaller for {@link StatusMessage} objects.
- *
- */
-public class StatusMessageUnmarshaller extends XSStringUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberImpl.java
index 436fa02..ea62051 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberImpl.java
@@ -17,19 +17,15 @@
package org.opensaml.saml.saml2.metadata.impl;
-import java.util.List;
+import javax.annotation.Nullable;
-import org.opensaml.core.xml.AbstractXMLObject;
-import org.opensaml.core.xml.XMLObject;
+import org.opensaml.core.xml.schema.impl.XSURIImpl;
import org.opensaml.saml.saml2.metadata.AffiliateMember;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.metadata.AffiliateMember}.
*/
-public class AffiliateMemberImpl extends AbstractXMLObject implements AffiliateMember {
-
- /** ID of this member. */
- private String id;
+public class AffiliateMemberImpl extends XSURIImpl implements AffiliateMember {
/**
* Constructor.
@@ -45,24 +41,12 @@ public class AffiliateMemberImpl extends AbstractXMLObject implements AffiliateM
/** {@inheritDoc} */
@Override
- public String getID() {
- return id;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setID(final String newID) {
- if (newID != null && newID.length() > 1024) {
+ public void setURI(@Nullable final String uri) {
+ if (uri != null && uri.length() > 1024) {
throw new IllegalArgumentException("Member ID can not exceed 1024 characters in length");
}
- id = prepareForAssignment(id, newID);
- }
-
- /** {@inheritDoc} */
- @Override
- public List<XMLObject> getOrderedChildren() {
- // No children
- return null;
+ super.setURI(uri);
}
+
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberMarshaller.java
deleted file mode 100644
index b7e7e24..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberMarshaller.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.saml.common.AbstractSAMLObjectMarshaller;
-import org.opensaml.saml.saml2.metadata.AffiliateMember;
-import org.w3c.dom.Element;
-
-/**
- * A thread-safe Marshaller for {@link org.opensaml.saml.saml2.metadata.AffiliateMember} objects.
- */
-public class AffiliateMemberMarshaller extends AbstractSAMLObjectMarshaller {
-
- /**
- * {@inheritDoc}
- */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- super.marshallElementContent(samlObject, domElement);
-
- final AffiliateMember member = (AffiliateMember) samlObject;
- if (member.getID() != null) {
- domElement.appendChild(domElement.getOwnerDocument().createTextNode(member.getID()));
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberUnmarshaller.java
deleted file mode 100644
index 4a2b6c2..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberUnmarshaller.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObjectUnmarshaller;
-import org.opensaml.saml.saml2.metadata.AffiliateMember;
-
-/**
- * A thread-safe Unmarshaller for {@link org.opensaml.saml.saml2.metadata.AffiliateMember}s.
- */
-public class AffiliateMemberUnmarshaller extends AbstractSAMLObjectUnmarshaller {
-
- /** {@inheritDoc} */
- protected void processElementContent(final XMLObject samlObject, final String elementContent) {
- final AffiliateMember member = (AffiliateMember) samlObject;
- member.setID(elementContent);
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceMarshaller.java
deleted file mode 100644
index e19d964..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceMarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.ArtifactResolutionService} objects.
- */
-public class ArtifactResolutionServiceMarshaller extends IndexedEndpointMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceUnmarshaller.java
deleted file mode 100644
index eb2883f..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceUnmarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread-safe Unmarshaller for {@link org.opensaml.saml.saml2.metadata.ArtifactResolutionService} objects.
- */
-public class ArtifactResolutionServiceUnmarshaller extends IndexedEndpointUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceMarshaller.java
deleted file mode 100644
index 142fc37..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceMarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.AssertionConsumerService} objects.
- */
-public class AssertionConsumerServiceMarshaller extends IndexedEndpointMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceUnmarshaller.java
deleted file mode 100644
index 11e87a0..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceUnmarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread-safe Unmarshaller for {@link org.opensaml.saml.saml2.metadata.AssertionConsumerService} objects.
- */
-public class AssertionConsumerServiceUnmarshaller extends IndexedEndpointUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceMarshaller.java
deleted file mode 100644
index 1e73cb3..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceMarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.AssertionIDRequestService}s.
- */
-public class AssertionIDRequestServiceMarshaller extends EndpointMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceUnmarshaller.java
deleted file mode 100644
index 78ee42f..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceUnmarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread safe Unmarshaller for {@link org.opensaml.saml.saml2.metadata.AssertionIDRequestService}s.
- */
-public class AssertionIDRequestServiceUnmarshaller extends EndpointUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileMarshaller.java
deleted file mode 100644
index dbad59a..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileMarshaller.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.saml.common.AbstractSAMLObjectMarshaller;
-import org.opensaml.saml.saml2.metadata.AttributeProfile;
-import org.w3c.dom.Element;
-
-/**
- * A thread safe Marshaller for {@link AttributeProfile} objects.
- */
-public class AttributeProfileMarshaller extends AbstractSAMLObjectMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final AttributeProfile profile = (AttributeProfile) samlObject;
- if (profile.getURI() != null) {
- ElementSupport.appendTextContent(domElement, profile.getURI());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileUnmarshaller.java
deleted file mode 100644
index 7aae6f9..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-import org.opensaml.core.xml.schema.impl.XSURIUnmarshaller;
-import org.opensaml.saml.saml2.metadata.AttributeProfile;
-
-/**
- * A thread safe Unmarshaller for {@link AttributeProfile} objects.
- */
-public class AttributeProfileUnmarshaller extends XSURIUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceMarshaller.java
deleted file mode 100644
index f40b852..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceMarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.AttributeService} objects.
- */
-public class AttributeServiceMarshaller extends EndpointMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceUnmarshaller.java
deleted file mode 100644
index 99146a1..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceUnmarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread-safe Unmarshaller for {@link org.opensaml.saml.saml2.metadata.AttributeService} objects.
- */
-public class AttributeServiceUnmarshaller extends EndpointUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceMarshaller.java
deleted file mode 100644
index d75fe70..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceMarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.AuthnQueryService} objects.
- */
-public class AuthnQueryServiceMarshaller extends EndpointMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceUnmarshaller.java
deleted file mode 100644
index 6fe5bf5..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceUnmarshaller.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread-safe Unmarshaller for {@link org.opensaml.saml.saml2.metadata.AuthnQueryService} objects.
- */
-public class AuthnQueryServiceUnmarshaller extends EndpointUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceMarshaller.java
deleted file mode 100644
index 6c79ee2..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceMarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.AuthzService} objects.
- */
-public class AuthzServiceMarshaller extends EndpointMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceUnmarshaller.java
deleted file mode 100644
index 06836cb..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceUnmarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread-safe Unmarshaller for {@link org.opensaml.saml.saml2.metadata.AuthzService} objects.
- */
-public class AuthzServiceUnmarshaller extends EndpointUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyMarshaller.java
deleted file mode 100644
index 9090205..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.saml.common.AbstractSAMLObjectMarshaller;
-import org.opensaml.saml.saml2.metadata.Company;
-import org.w3c.dom.Element;
-
-/**
- * A thread safe Marshaller for {@link Company} objects.
- */
-public class CompanyMarshaller extends AbstractSAMLObjectMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final Company company = (Company) samlObject;
-
- if (company.getValue() != null) {
- ElementSupport.appendTextContent(domElement, company.getValue());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyUnmarshaller.java
deleted file mode 100644
index 2305944..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-import org.opensaml.core.xml.schema.impl.XSStringUnmarshaller;
-import org.opensaml.saml.saml2.metadata.Company;
-
-/**
- * A thread-safe Unmarshaller for {@link Company} objects.
- */
-public class CompanyUnmarshaller extends XSStringUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressMarshaller.java
deleted file mode 100644
index b06e69f..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.saml.common.AbstractSAMLObjectMarshaller;
-import org.opensaml.saml.saml2.metadata.EmailAddress;
-import org.w3c.dom.Element;
-
-/**
- * A thread safe Marshaller for {@link EmailAddress} objects.
- */
-public class EmailAddressMarshaller extends AbstractSAMLObjectMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final EmailAddress address = (EmailAddress) samlObject;
-
- if (address.getURI() != null) {
- ElementSupport.appendTextContent(domElement, address.getURI());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressUnmarshaller.java
deleted file mode 100644
index 1eec5d8..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-import org.opensaml.core.xml.schema.impl.XSURIUnmarshaller;
-import org.opensaml.saml.saml2.metadata.EmailAddress;
-
-/**
- * A thread-safe Unmarshaller for {@link EmailAddress} objects.
- */
-public class EmailAddressUnmarshaller extends XSURIUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodMarshaller.java
deleted file mode 100644
index 00c55f7..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.EncryptionMethod} objects.
- */
-public class EncryptionMethodMarshaller extends org.opensaml.xmlsec.encryption.impl.EncryptionMethodMarshaller {
-
-}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodUnmarshaller.java
deleted file mode 100644
index abf2035..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodUnmarshaller.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread safe Unmarshaller for {@link org.opensaml.saml.saml2.metadata.EncryptionMethod} objects.
- */
-public class EncryptionMethodUnmarshaller extends org.opensaml.xmlsec.encryption.impl.EncryptionMethodUnmarshaller {
-
-}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameMarshaller.java
deleted file mode 100644
index 1158ca2..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.saml.common.AbstractSAMLObjectMarshaller;
-import org.opensaml.saml.saml2.metadata.GivenName;
-import org.w3c.dom.Element;
-
-/**
- * A thread safe Marshaller for {@link GivenName} objects.
- */
-public class GivenNameMarshaller extends AbstractSAMLObjectMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final GivenName name = (GivenName) samlObject;
-
- if (name.getValue() != null) {
- ElementSupport.appendTextContent(domElement, name.getValue());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameUnmarshaller.java
deleted file mode 100644
index 7cd7f12..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-import org.opensaml.core.xml.schema.impl.XSStringUnmarshaller;
-import org.opensaml.saml.saml2.metadata.GivenName;
-
-/**
- * A thread-safe Unmarshaller for {@link GivenName} objects.
- */
-public class GivenNameUnmarshaller extends XSStringUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceMarshaller.java
deleted file mode 100644
index f38aead..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceMarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.ManageNameIDService} objects.
- */
-public class ManageNameIDServiceMarshaller extends EndpointMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceUnmarshaller.java
deleted file mode 100644
index ac6d2db..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceUnmarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread safe Unmarshaller for {@link org.opensaml.saml.saml2.metadata.ManageNameIDService} objects.
- */
-public class ManageNameIDServiceUnmarshaller extends EndpointUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatMarshaller.java
deleted file mode 100644
index 4f3be48..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSURIMarshaller;
-import org.opensaml.saml.saml2.metadata.NameIDFormat;
-import org.w3c.dom.Element;
-
-/**
- * A thread safe Marshaller for {@link NameIDFormat} objects.
- */
-public class NameIDFormatMarshaller extends XSURIMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final NameIDFormat format = (NameIDFormat) samlObject;
-
- if (format.getURI() != null) {
- ElementSupport.appendTextContent(domElement, format.getURI());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatUnmarshaller.java
deleted file mode 100644
index 860afba..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-import org.opensaml.core.xml.schema.impl.XSURIUnmarshaller;
-import org.opensaml.saml.saml2.metadata.NameIDFormat;
-
-/**
- * A thread-safe Unmarshaller for {@link NameIDFormat} objects.
- */
-public class NameIDFormatUnmarshaller extends XSURIUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceMarshaller.java
deleted file mode 100644
index a0504d2..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceMarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.NameIDMappingService} objects.
- */
-public class NameIDMappingServiceMarshaller extends EndpointMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceUnmarshaller.java
deleted file mode 100644
index 7dac6e7..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceUnmarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread safe Unmarshaller for {@link org.opensaml.saml.saml2.metadata.NameIDMappingService} objects.
- */
-public class NameIDMappingServiceUnmarshaller extends EndpointUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameMarshaller.java
deleted file mode 100644
index 58c3e36..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameMarshaller.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.OrganizationDisplayName} objects.
- */
-public class OrganizationDisplayNameMarshaller extends LocalizedNameMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameUnmarshaller.java
deleted file mode 100644
index c61c12a..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameUnmarshaller.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-
-/**
- * A thread-safe unmarshaller for {@link org.opensaml.saml.saml2.metadata.OrganizationDisplayName} objects.
- */
-public class OrganizationDisplayNameUnmarshaller extends LocalizedNameUnmarshaller {
-
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameMarshaller.java
deleted file mode 100644
index 6587782..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameMarshaller.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.OrganizationName} objects.
- */
-public class OrganizationNameMarshaller extends LocalizedNameMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameUnmarshaller.java
deleted file mode 100644
index 9986359..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameUnmarshaller.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-
-/**
- * A thread-safe Unmarshaller for {@link org.opensaml.saml.saml2.metadata.OrganizationName} objects.
- */
-public class OrganizationNameUnmarshaller extends LocalizedNameUnmarshaller {
-
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLMarshaller.java
deleted file mode 100644
index 24e093d..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLMarshaller.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.OrganizationURL} objects.
- */
-public class OrganizationURLMarshaller extends LocalizedURIMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLUnmarshaller.java
deleted file mode 100644
index 248b7ee..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLUnmarshaller.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-
-/**
- * A thread-safe Unmarshaller for {@link org.opensaml.saml.saml2.metadata.OrganizationURL} objects.
- */
-public class OrganizationURLUnmarshaller extends LocalizedURIUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionMarshaller.java
deleted file mode 100644
index 89d6b0c..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionMarshaller.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.ServiceDescription} objects.
- */
-public class ServiceDescriptionMarshaller extends LocalizedNameMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionUnmarshaller.java
deleted file mode 100644
index c034f40..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionUnmarshaller.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-
-/**
- * A thread-safe Unmarshaller for {@link org.opensaml.saml.saml2.metadata.ServiceDescription} objects.
- */
-public class ServiceDescriptionUnmarshaller extends LocalizedNameUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameMarshaller.java
deleted file mode 100644
index c93007f..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameMarshaller.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.ServiceName} objects.
- */
-public class ServiceNameMarshaller extends LocalizedNameMarshaller {
-
-}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameUnmarshaller.java
deleted file mode 100644
index aa29cca..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameUnmarshaller.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread-safe Unmarshaller for {@link org.opensaml.saml.saml2.metadata.ServiceName} objects.
- */
-public class ServiceNameUnmarshaller extends LocalizedNameUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceMarshaller.java
deleted file mode 100644
index 8cfc9e2..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceMarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.SingleLogoutService} objects.
- */
-public class SingleLogoutServiceMarshaller extends EndpointMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceUnmarshaller.java
deleted file mode 100644
index 848a049..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceUnmarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread safe Unmarshaller for {@link org.opensaml.saml.saml2.metadata.SingleLogoutService} objects.
- */
-public class SingleLogoutServiceUnmarshaller extends EndpointUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceMarshaller.java
deleted file mode 100644
index 122014c..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceMarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.SingleSignOnService} objects.
- */
-public class SingleSignOnServiceMarshaller extends EndpointMarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceUnmarshaller.java
deleted file mode 100644
index 248e461..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceUnmarshaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-/**
- * A thread safe Unmarshaller for {@link org.opensaml.saml.saml2.metadata.SingleSignOnService} objects.
- */
-public class SingleSignOnServiceUnmarshaller extends EndpointUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameMarshaller.java
deleted file mode 100644
index 6fb74ed..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameMarshaller.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSStringMarshaller;
-import org.opensaml.saml.saml2.metadata.SurName;
-import org.w3c.dom.Element;
-
-/**
- * A thread safe Marshaller for {@link SurName} objects.
- */
-public class SurNameMarshaller extends XSStringMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final SurName name = (SurName) samlObject;
-
- if (name.getValue() != null) {
- ElementSupport.appendTextContent(domElement, name.getValue());
- }
- }
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameUnmarshaller.java
deleted file mode 100644
index 192827c..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-import org.opensaml.core.xml.schema.impl.XSStringUnmarshaller;
-import org.opensaml.saml.saml2.metadata.SurName;
-
-/**
- * A thread-safe Unmarshaller for {@link SurName} objects.
- */
-public class SurNameUnmarshaller extends XSStringUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberMarshaller.java
deleted file mode 100644
index a630e9c..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.core.xml.schema.impl.XSStringMarshaller;
-import org.opensaml.saml.saml2.metadata.TelephoneNumber;
-import org.w3c.dom.Element;
-
-/**
- * A thread safe Marshaller for {@link org.opensaml.saml.saml2.metadata.TelephoneNumber} objects.
- */
-public class TelephoneNumberMarshaller extends XSStringMarshaller {
-
- /** {@inheritDoc} */
- protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
- throws MarshallingException {
- final TelephoneNumber number = (TelephoneNumber) samlObject;
-
- if (number.getValue() != null) {
- ElementSupport.appendTextContent(domElement, number.getValue());
- }
- }
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberUnmarshaller.java
deleted file mode 100644
index f628e2e..0000000
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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.opensaml.saml.saml2.metadata.impl;
-
-import org.opensaml.core.xml.schema.impl.XSStringUnmarshaller;
-import org.opensaml.saml.saml2.metadata.TelephoneNumber;
-
-/**
- * A thread-safe Unmarshaller for {@link TelephoneNumber} objects.
- */
-public class TelephoneNumberUnmarshaller extends XSStringUnmarshaller {
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/resources/saml2-assertion-config.xml b/opensaml-saml-impl/src/main/resources/saml2-assertion-config.xml
index 8da1205..a8062ea 100644
--- a/opensaml-saml-impl/src/main/resources/saml2-assertion-config.xml
+++ b/opensaml-saml-impl/src/main/resources/saml2-assertion-config.xml
@@ -46,15 +46,15 @@
<!-- AssertionIDRef -->
<ObjectProvider qualifiedName="saml2:AssertionIDRef">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.AssertionIDRefBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.core.impl.AssertionIDRefMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.AssertionIDRefUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
</ObjectProvider>
<!-- AssertionURIRef -->
<ObjectProvider qualifiedName="saml2:AssertionURIRef">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.AssertionURIRefBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.core.impl.AssertionURIRefMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.AssertionURIRefUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIUnmarshaller"/>
</ObjectProvider>
<!-- Attribute -->
@@ -70,6 +70,13 @@
<UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.AttributeUnmarshaller"/>
</ObjectProvider>
+ <!-- AttributeValue -->
+ <ObjectProvider qualifiedName="saml2:AttributeValue">
+ <BuilderClass className="org.opensaml.saml.saml2.core.impl.AttributeValueBuilder"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSAnyMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSAnyUnmarshaller"/>
+ </ObjectProvider>
+
<!-- AttributeStatement provider -->
<ObjectProvider qualifiedName="saml2:AttributeStatement">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.AttributeStatementBuilder"/>
@@ -86,8 +93,8 @@
<!-- Audience -->
<ObjectProvider qualifiedName="saml2:Audience">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.AudienceBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.core.impl.AudienceMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.AudienceUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIUnmarshaller"/>
</ObjectProvider>
<!-- AudienceRestriction -->
@@ -106,8 +113,8 @@
<!-- AuthenticatingAuthority -->
<ObjectProvider qualifiedName="saml2:AuthenticatingAuthority">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.AuthenticatingAuthorityBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.core.impl.AuthenticatingAuthorityMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.AuthenticatingAuthorityUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIUnmarshaller"/>
</ObjectProvider>
<!-- AuthnContext -->
@@ -126,22 +133,22 @@
<!-- AuthnContextClassRef -->
<ObjectProvider qualifiedName="saml2:AuthnContextClassRef">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.AuthnContextClassRefBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.core.impl.AuthnContextClassRefMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.AuthnContextClassRefUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIUnmarshaller"/>
</ObjectProvider>
<!-- AuthnContextDecl -->
<ObjectProvider qualifiedName="saml2:AuthnContextDecl">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.AuthnContextDeclBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.core.impl.AuthnContextDeclMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.AuthnContextDeclUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSAnyMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSAnyUnmarshaller"/>
</ObjectProvider>
<!-- AuthnContextDeclRef -->
<ObjectProvider qualifiedName="saml2:AuthnContextDeclRef">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.AuthnContextDeclRefBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.core.impl.AuthnContextDeclRefMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.AuthnContextDeclRefUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIUnmarshaller"/>
</ObjectProvider>
<!-- AuthnStatement -->
@@ -220,8 +227,8 @@
<!-- Issuer -->
<ObjectProvider qualifiedName="saml2:Issuer">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.IssuerBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.core.impl.IssuerMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.IssuerUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDTypeMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDTypeUnmarshaller"/>
</ObjectProvider>
<!-- KeyInfoConfirmationDataType -->
@@ -234,14 +241,14 @@
<!-- NameID -->
<ObjectProvider qualifiedName="saml2:NameID">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.NameIDBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDTypeMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDTypeUnmarshaller"/>
</ObjectProvider>
<ObjectProvider qualifiedName="saml2:NameIDType">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.NameIDBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDTypeMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDTypeUnmarshaller"/>
</ObjectProvider>
<!-- OneTimeUse -->
diff --git a/opensaml-saml-impl/src/main/resources/saml2-metadata-config.xml b/opensaml-saml-impl/src/main/resources/saml2-metadata-config.xml
index da8c93c..a02d161 100644
--- a/opensaml-saml-impl/src/main/resources/saml2-metadata-config.xml
+++ b/opensaml-saml-impl/src/main/resources/saml2-metadata-config.xml
@@ -21,8 +21,8 @@
<!-- AffiliateMember -->
<ObjectProvider qualifiedName="saml2md:AffiliateMember">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.AffiliateMemberBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.AffiliateMemberMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.AffiliateMemberUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIUnmarshaller"/>
</ObjectProvider>
<!-- AffiliationDescriptor -->
@@ -37,19 +37,26 @@
<MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.AffiliationDescriptorMarshaller"/>
<UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.AffiliationDescriptorUnmarshaller"/>
</ObjectProvider>
-
+
+ <!-- ArtifactResolutionService -->
+ <ObjectProvider qualifiedName="saml2md:ArtifactResolutionService">
+ <BuilderClass className="org.opensaml.saml.saml2.metadata.impl.ArtifactResolutionServiceBuilder"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.IndexedEndpointMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.IndexedEndpointUnmarshaller"/>
+ </ObjectProvider>
+
<!-- AssertionConsumerService -->
<ObjectProvider qualifiedName="saml2md:AssertionConsumerService">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.AssertionConsumerServiceBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.AssertionConsumerServiceMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.AssertionConsumerServiceUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.IndexedEndpointMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.IndexedEndpointUnmarshaller"/>
</ObjectProvider>
<!-- AssertionIDRequestService -->
<ObjectProvider qualifiedName="saml2md:AssertionIDRequestService">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.AssertionIDRequestServiceBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.AssertionIDRequestServiceMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.AssertionIDRequestServiceUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointUnmarshaller"/>
</ObjectProvider>
<!-- AttributeAuthorityDescriptor -->
@@ -81,22 +88,15 @@
<!-- AttributeProfile -->
<ObjectProvider qualifiedName="saml2md:AttributeProfile">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.AttributeProfileBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.AttributeProfileMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.AttributeProfileUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIUnmarshaller"/>
</ObjectProvider>
<!-- AttributeService -->
<ObjectProvider qualifiedName="saml2md:AttributeService">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.AttributeServiceBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.AttributeServiceMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.AttributeServiceUnmarshaller"/>
- </ObjectProvider>
-
- <!-- ArtifactResolutionService -->
- <ObjectProvider qualifiedName="saml2md:ArtifactResolutionService">
- <BuilderClass className="org.opensaml.saml.saml2.metadata.impl.ArtifactResolutionServiceBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.ArtifactResolutionServiceMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.ArtifactResolutionServiceUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointUnmarshaller"/>
</ObjectProvider>
<!-- AuthnAuthorityDescriptor -->
@@ -115,22 +115,22 @@
<!-- AuthnQueryService -->
<ObjectProvider qualifiedName="saml2md:AuthnQueryService">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.AuthnQueryServiceBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.AuthnQueryServiceMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.AuthnQueryServiceUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointUnmarshaller"/>
</ObjectProvider>
<!-- AuthzService -->
<ObjectProvider qualifiedName="saml2md:AuthzService">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.AuthzServiceBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.AuthzServiceMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.AuthzServiceUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointUnmarshaller"/>
</ObjectProvider>
<!-- Company -->
<ObjectProvider qualifiedName="saml2md:Company">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.CompanyBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.CompanyMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.CompanyUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
</ObjectProvider>
<!-- ContactPerson -->
@@ -149,15 +149,15 @@
<!-- EmailAddress -->
<ObjectProvider qualifiedName="saml2md:EmailAddress">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.EmailAddressBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EmailAddressMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EmailAddressUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIUnmarshaller"/>
</ObjectProvider>
<!-- EncryptionMethod -->
<ObjectProvider qualifiedName="saml2md:EncryptionMethod">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.EncryptionMethodBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EncryptionMethodMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EncryptionMethodUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.xmlsec.encryption.impl.EncryptionMethodMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.xmlsec.encryption.impl.EncryptionMethodUnmarshaller"/>
</ObjectProvider>
<!-- EntitiesDescriptor -->
@@ -202,8 +202,8 @@
<!-- GivenName -->
<ObjectProvider qualifiedName="saml2md:GivenName">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.GivenNameBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.GivenNameMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.GivenNameUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
</ObjectProvider>
<!-- IDPSSODescriptor -->
@@ -235,22 +235,22 @@
<!-- ManageNameIDService -->
<ObjectProvider qualifiedName="saml2md:ManageNameIDService">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.ManageNameIDServiceBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.ManageNameIDServiceMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.ManageNameIDServiceUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointUnmarshaller"/>
</ObjectProvider>
<!-- NameIDFormat -->
<ObjectProvider qualifiedName="saml2md:NameIDFormat">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.NameIDFormatBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.NameIDFormatMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.NameIDFormatUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIUnmarshaller"/>
</ObjectProvider>
<!-- NameIDMappingService -->
<ObjectProvider qualifiedName="saml2md:NameIDMappingService">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.NameIDMappingServiceBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.NameIDMappingServiceMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.NameIDMappingServiceUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointUnmarshaller"/>
</ObjectProvider>
<!-- Organization -->
@@ -269,22 +269,22 @@
<!-- OrganizationDisplayName -->
<ObjectProvider qualifiedName="saml2md:OrganizationDisplayName">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.OrganizationDisplayNameBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.OrganizationDisplayNameMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.OrganizationDisplayNameUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedNameMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedNameUnmarshaller"/>
</ObjectProvider>
<!-- OrganizationName -->
<ObjectProvider qualifiedName="saml2md:OrganizationName">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.OrganizationNameBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.OrganizationNameMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.OrganizationNameUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedNameMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedNameUnmarshaller"/>
</ObjectProvider>
<!-- OrganizationURL -->
<ObjectProvider qualifiedName="saml2md:OrganizationURL">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.OrganizationURLBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.OrganizationURLMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.OrganizationURLUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedURIUnmarshaller"/>
</ObjectProvider>
<!-- PDPDescriptor -->
@@ -316,29 +316,29 @@
<!-- ServiceDescription -->
<ObjectProvider qualifiedName="saml2md:ServiceDescription">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.ServiceDescriptionBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.ServiceDescriptionMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.ServiceDescriptionUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedNameMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedNameUnmarshaller"/>
</ObjectProvider>
<!-- ServiceName -->
<ObjectProvider qualifiedName="saml2md:ServiceName">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.ServiceNameBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.ServiceNameMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.ServiceNameUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedNameMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedNameUnmarshaller"/>
</ObjectProvider>
<!-- SingleLogoutService -->
<ObjectProvider qualifiedName="saml2md:SingleLogoutService">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.SingleLogoutServiceBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.SingleLogoutServiceMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.SingleLogoutServiceUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointUnmarshaller"/>
</ObjectProvider>
<!-- SingleSignOnService -->
<ObjectProvider qualifiedName="saml2md:SingleSignOnService">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.SingleSignOnServiceBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.SingleSignOnServiceMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.SingleSignOnServiceUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointUnmarshaller"/>
</ObjectProvider>
<!-- SPSSODescriptor -->
@@ -357,15 +357,15 @@
<!-- SurName -->
<ObjectProvider qualifiedName="saml2md:SurName">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.SurNameBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.SurNameMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.SurNameUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
</ObjectProvider>
<!-- TelephoneNumber -->
<ObjectProvider qualifiedName="saml2md:TelephoneNumber">
<BuilderClass className="org.opensaml.saml.saml2.metadata.impl.TelephoneNumberBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.TelephoneNumberMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.TelephoneNumberUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
</ObjectProvider>
</ObjectProviders>
diff --git a/opensaml-saml-impl/src/main/resources/saml2-metadata-idp-discovery-config.xml b/opensaml-saml-impl/src/main/resources/saml2-metadata-idp-discovery-config.xml
index bb195bd..f993d27 100644
--- a/opensaml-saml-impl/src/main/resources/saml2-metadata-idp-discovery-config.xml
+++ b/opensaml-saml-impl/src/main/resources/saml2-metadata-idp-discovery-config.xml
@@ -7,8 +7,8 @@
<!-- DiscoveryResponse provider -->
<ObjectProvider qualifiedName="idpdisco:DiscoveryResponse">
<BuilderClass className=" org.opensaml.saml.ext.idpdisco.impl.DiscoveryResponseBuilder"/>
- <MarshallingClass className="org.opensaml.saml.ext.idpdisco.impl.DiscoveryResponseMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.ext.idpdisco.impl.DiscoveryResponseUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.IndexedEndpointMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.IndexedEndpointUnmarshaller"/>
</ObjectProvider>
</ObjectProviders>
diff --git a/opensaml-saml-impl/src/main/resources/saml2-metadata-query-config.xml b/opensaml-saml-impl/src/main/resources/saml2-metadata-query-config.xml
index b1cbfa0..19cf59a 100644
--- a/opensaml-saml-impl/src/main/resources/saml2-metadata-query-config.xml
+++ b/opensaml-saml-impl/src/main/resources/saml2-metadata-query-config.xml
@@ -7,8 +7,8 @@
<!-- ActionNamespace provider -->
<ObjectProvider qualifiedName="query:ActionNamespace">
<BuilderClass className="org.opensaml.saml.ext.saml2mdquery.impl.ActionNamespaceBuilder"/>
- <MarshallingClass className="org.opensaml.saml.ext.saml2mdquery.impl.ActionNamespaceMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.ext.saml2mdquery.impl.ActionNamespaceUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIUnmarshaller"/>
</ObjectProvider>
<!-- AttributeQueryDescriptorType provider -->
diff --git a/opensaml-saml-impl/src/main/resources/saml2-metadata-reqinit-config.xml b/opensaml-saml-impl/src/main/resources/saml2-metadata-reqinit-config.xml
index 53f4720..6518a3a 100644
--- a/opensaml-saml-impl/src/main/resources/saml2-metadata-reqinit-config.xml
+++ b/opensaml-saml-impl/src/main/resources/saml2-metadata-reqinit-config.xml
@@ -7,8 +7,8 @@
<!-- RequestInitiator provider -->
<ObjectProvider qualifiedName="init:RequestInitiator">
<BuilderClass className="org.opensaml.saml.ext.saml2mdreqinit.impl.RequestInitiatorBuilder"/>
- <MarshallingClass className="org.opensaml.saml.ext.saml2mdreqinit.impl.RequestInitiatorMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.ext.saml2mdreqinit.impl.RequestInitiatorUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.EndpointUnmarshaller"/>
</ObjectProvider>
</ObjectProviders>
diff --git a/opensaml-saml-impl/src/main/resources/saml2-metadata-rpi-config.xml b/opensaml-saml-impl/src/main/resources/saml2-metadata-rpi-config.xml
index 45465ad..1311233 100644
--- a/opensaml-saml-impl/src/main/resources/saml2-metadata-rpi-config.xml
+++ b/opensaml-saml-impl/src/main/resources/saml2-metadata-rpi-config.xml
@@ -48,15 +48,15 @@
<!-- UsagePolicy provider -->
<ObjectProvider qualifiedName="mdrpi:UsagePolicy">
<BuilderClass className="org.opensaml.saml.ext.saml2mdrpi.impl.UsagePolicyBuilder" />
- <MarshallingClass className="org.opensaml.saml.ext.saml2mdrpi.impl.UsagePolicyMarshaller" />
- <UnmarshallingClass className="org.opensaml.saml.ext.saml2mdrpi.impl.UsagePolicyUnmarshaller" />
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedURIUnmarshaller"/>
</ObjectProvider>
<!-- RegistrationPolicy provider -->
<ObjectProvider qualifiedName="mdrpi:RegistrationPolicy">
<BuilderClass className="org.opensaml.saml.ext.saml2mdrpi.impl.RegistrationPolicyBuilder" />
- <MarshallingClass className="org.opensaml.saml.ext.saml2mdrpi.impl.RegistrationPolicyMarshaller" />
- <UnmarshallingClass className="org.opensaml.saml.ext.saml2mdrpi.impl.RegistrationPolicyUnmarshaller" />
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedURIUnmarshaller"/>
</ObjectProvider>
<!-- RegistrationInfo provider -->
diff --git a/opensaml-saml-impl/src/main/resources/saml2-metadata-ui-config.xml b/opensaml-saml-impl/src/main/resources/saml2-metadata-ui-config.xml
index 5a5e421..f4969c3 100644
--- a/opensaml-saml-impl/src/main/resources/saml2-metadata-ui-config.xml
+++ b/opensaml-saml-impl/src/main/resources/saml2-metadata-ui-config.xml
@@ -7,8 +7,8 @@
<!-- Description provider -->
<ObjectProvider qualifiedName="mdui:Description">
<BuilderClass className="org.opensaml.saml.ext.saml2mdui.impl.DescriptionBuilder"/>
- <MarshallingClass className="org.opensaml.saml.ext.saml2mdui.impl.DescriptionMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.ext.saml2mdui.impl.DescriptionUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedNameMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedNameUnmarshaller"/>
</ObjectProvider>
<!-- DiscoHints provider -->
@@ -40,36 +40,36 @@
<!-- DisplayName provider -->
<ObjectProvider qualifiedName="mdui:DisplayName">
<BuilderClass className="org.opensaml.saml.ext.saml2mdui.impl.DisplayNameBuilder"/>
- <MarshallingClass className="org.opensaml.saml.ext.saml2mdui.impl.DisplayNameMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.ext.saml2mdui.impl.DisplayNameUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedNameMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedNameUnmarshaller"/>
</ObjectProvider>
<!-- DomainHint provider -->
<ObjectProvider qualifiedName="mdui:DomainHint">
<BuilderClass className="org.opensaml.saml.ext.saml2mdui.impl.DomainHintBuilder"/>
- <MarshallingClass className="org.opensaml.saml.ext.saml2mdui.impl.DomainHintMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.ext.saml2mdui.impl.DomainHintUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
</ObjectProvider>
<!-- GeolocationHint provider -->
<ObjectProvider qualifiedName="mdui:GeolocationHint">
<BuilderClass className="org.opensaml.saml.ext.saml2mdui.impl.GeolocationHintBuilder"/>
- <MarshallingClass className="org.opensaml.saml.ext.saml2mdui.impl.GeolocationHintMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.ext.saml2mdui.impl.GeolocationHintUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIUnmarshaller"/>
</ObjectProvider>
<!-- InformationURL provider -->
<ObjectProvider qualifiedName="mdui:InformationURL">
<BuilderClass className="org.opensaml.saml.ext.saml2mdui.impl.InformationURLBuilder"/>
- <MarshallingClass className="org.opensaml.saml.ext.saml2mdui.impl.InformationURLMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.ext.saml2mdui.impl.InformationURLUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedURIUnmarshaller"/>
</ObjectProvider>
<!-- IPHint provider -->
<ObjectProvider qualifiedName="mdui:IPHint">
<BuilderClass className="org.opensaml.saml.ext.saml2mdui.impl.IPHintBuilder"/>
- <MarshallingClass className="org.opensaml.saml.ext.saml2mdui.impl.IPHintMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.ext.saml2mdui.impl.IPHintUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
</ObjectProvider>
<!-- Logo provider -->
@@ -88,8 +88,8 @@
<!-- PrivacyStatementURL provider -->
<ObjectProvider qualifiedName="mdui:PrivacyStatementURL">
<BuilderClass className="org.opensaml.saml.ext.saml2mdui.impl.PrivacyStatementURLBuilder"/>
- <MarshallingClass className="org.opensaml.saml.ext.saml2mdui.impl.PrivacyStatementURLMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.ext.saml2mdui.impl.PrivacyStatementURLUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.metadata.impl.LocalizedURIUnmarshaller"/>
</ObjectProvider>
<!-- UIInfo provider -->
diff --git a/opensaml-saml-impl/src/main/resources/saml2-protocol-config.xml b/opensaml-saml-impl/src/main/resources/saml2-protocol-config.xml
index 798f897..59c66a1 100644
--- a/opensaml-saml-impl/src/main/resources/saml2-protocol-config.xml
+++ b/opensaml-saml-impl/src/main/resources/saml2-protocol-config.xml
@@ -7,8 +7,8 @@
<!-- Artifact provider -->
<ObjectProvider qualifiedName="saml2p:Artifact">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.ArtifactBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.core.impl.ArtifactMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.ArtifactUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
</ObjectProvider>
<!-- ArtifactResolve provider -->
@@ -118,8 +118,8 @@
<!-- GetComplete provider -->
<ObjectProvider qualifiedName="saml2p:GetComplete">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.GetCompleteBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.core.impl.GetCompleteMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.GetCompleteUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIUnmarshaller"/>
</ObjectProvider>
<!-- IDPEntry provider -->
@@ -249,8 +249,8 @@
<!-- NewID provider -->
<ObjectProvider qualifiedName="saml2p:NewID">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.NewIDBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.core.impl.NewIDMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.NewIDUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
</ObjectProvider>
<!-- RequestedAuthnContext provider -->
@@ -269,8 +269,8 @@
<!-- RequesterID -->
<ObjectProvider qualifiedName="saml2p:RequesterID">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.RequesterIDBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.core.impl.RequesterIDMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.RequesterIDUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSURIUnmarshaller"/>
</ObjectProvider>
<!-- Response provider -->
@@ -296,8 +296,8 @@
<!-- SessionIndex provider -->
<ObjectProvider qualifiedName="saml2p:SessionIndex">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.SessionIndexBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.core.impl.SessionIndexMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.SessionIndexUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
</ObjectProvider>
<!-- Status -->
@@ -342,8 +342,8 @@
<!-- StatusMessage -->
<ObjectProvider qualifiedName="saml2p:StatusMessage">
<BuilderClass className="org.opensaml.saml.saml2.core.impl.StatusMessageBuilder"/>
- <MarshallingClass className="org.opensaml.saml.saml2.core.impl.StatusMessageMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.StatusMessageUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
</ObjectProvider>
<!-- Terminate provider -->
diff --git a/opensaml-saml-impl/src/main/resources/saml2-protocol-thirdparty-config.xml b/opensaml-saml-impl/src/main/resources/saml2-protocol-thirdparty-config.xml
index 0fa3ddb..11f25af 100644
--- a/opensaml-saml-impl/src/main/resources/saml2-protocol-thirdparty-config.xml
+++ b/opensaml-saml-impl/src/main/resources/saml2-protocol-thirdparty-config.xml
@@ -7,8 +7,8 @@
<!-- RespondTo provider -->
<ObjectProvider qualifiedName="thrpty:RespondTo">
<BuilderClass className="org.opensaml.saml.ext.samlpthrpty.impl.RespondToBuilder"/>
- <MarshallingClass className="org.opensaml.saml.ext.samlpthrpty.impl.RespondToMarshaller"/>
- <UnmarshallingClass className="org.opensaml.saml.ext.samlpthrpty.impl.RespondToUnmarshaller"/>
+ <MarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDTypeMarshaller"/>
+ <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDTypeUnmarshaller"/>
</ObjectProvider>
</ObjectProviders>
</XMLTooling>
diff --git a/opensaml-saml-impl/src/main/resources/saml2-req-attr-config.xml b/opensaml-saml-impl/src/main/resources/saml2-req-attr-config.xml
index e77fcef..381ad6f 100644
--- a/opensaml-saml-impl/src/main/resources/saml2-req-attr-config.xml
+++ b/opensaml-saml-impl/src/main/resources/saml2-req-attr-config.xml
@@ -6,12 +6,18 @@
<!-- SAML 2.0 SAML V2.0 Protocol Extension For Requesting Attributes Per Request -->
<ObjectProviders>
- <!-- Publication provider -->
+ <!-- RequestedAttributes -->
<ObjectProvider qualifiedName="req-attr:RequestedAttributes">
<BuilderClass className="org.opensaml.saml.ext.reqattr.impl.RequestedAttributesBuilder" />
<MarshallingClass className="org.opensaml.saml.ext.reqattr.impl.RequestedAttributesMarshaller" />
<UnmarshallingClass className="org.opensaml.saml.ext.reqattr.impl.RequestedAttributesUnmarshaller" />
</ObjectProvider>
+
+ <ObjectProvider qualifiedName="req-attr:RequestedAttributesType">
+ <BuilderClass className="org.opensaml.saml.ext.reqattr.impl.RequestedAttributesBuilder" />
+ <MarshallingClass className="org.opensaml.saml.ext.reqattr.impl.RequestedAttributesMarshaller" />
+ <UnmarshallingClass className="org.opensaml.saml.ext.reqattr.impl.RequestedAttributesUnmarshaller" />
+ </ObjectProvider>
</ObjectProviders>
</XMLTooling>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list