[java-opensaml] branch master updated: Refactor to eliminate no-op base class.
Scott Cantor
cantor.2 at osu.edu
Fri Jul 12 11:03:09 EDT 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=1d953e56e1a6c3069343bf659b6d45b885fec585
The following commit(s) were added to refs/heads/master by this push:
new 1d953e5 Refactor to eliminate no-op base class.
1d953e5 is described below
commit 1d953e56e1a6c3069343bf659b6d45b885fec585
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Jul 12 11:03:07 2019 -0400
Refactor to eliminate no-op base class.
---
.../opensaml/saml/common/AbstractSAMLObject.java | 58 ----------------------
.../ext/reqattr/impl/RequestedAttributesImpl.java | 7 +--
.../saml/ext/saml2alg/impl/DigestMethodImpl.java | 6 +--
.../saml/ext/saml2alg/impl/SigningMethodImpl.java | 7 ++-
.../saml/ext/saml2aslo/impl/AsynchronousImpl.java | 5 +-
.../ext/saml2delrestrict/impl/DelegateImpl.java | 6 +--
.../impl/DelegationRestrictionTypeImpl.java | 6 +--
.../ext/saml2mdattr/impl/EntityAttributesImpl.java | 4 +-
.../ext/saml2mdquery/impl/ActionNamespaceImpl.java | 4 +-
.../saml/ext/saml2mdrpi/impl/PublicationImpl.java | 4 +-
.../ext/saml2mdrpi/impl/PublicationInfoImpl.java | 4 +-
.../ext/saml2mdrpi/impl/PublicationPathImpl.java | 4 +-
.../ext/saml2mdrpi/impl/RegistrationInfoImpl.java | 4 +-
.../saml/ext/saml2mdui/impl/DiscoHintsImpl.java | 4 +-
.../saml/ext/saml2mdui/impl/DomainHintImpl.java | 4 +-
.../ext/saml2mdui/impl/GeolocationHintImpl.java | 4 +-
.../saml/ext/saml2mdui/impl/IPHintImpl.java | 4 +-
.../saml/ext/saml2mdui/impl/KeywordsImpl.java | 4 +-
.../opensaml/saml/ext/saml2mdui/impl/LogoImpl.java | 15 ++++--
.../saml/ext/saml2mdui/impl/UIInfoImpl.java | 4 +-
.../saml/ext/samlec/impl/SessionKeyImpl.java | 4 +-
.../opensaml/saml/saml1/core/impl/ActionImpl.java | 4 +-
.../opensaml/saml/saml1/core/impl/AdviceImpl.java | 4 +-
.../saml1/core/impl/AssertionArtifactImpl.java | 4 +-
.../saml1/core/impl/AssertionIDReferenceImpl.java | 4 +-
.../saml1/core/impl/AttributeDesignatorImpl.java | 4 +-
.../saml/saml1/core/impl/AudienceImpl.java | 4 +-
.../impl/AudienceRestrictionConditionImpl.java | 4 +-
.../saml/saml1/core/impl/AuthorityBindingImpl.java | 4 +-
.../saml/saml1/core/impl/ConditionsImpl.java | 4 +-
.../saml1/core/impl/ConfirmationMethodImpl.java | 4 +-
.../saml1/core/impl/DoNotCacheConditionImpl.java | 4 +-
.../saml/saml1/core/impl/EvidenceImpl.java | 4 +-
.../saml/saml1/core/impl/NameIdentifierImpl.java | 4 +-
.../saml/saml1/core/impl/RespondWithImpl.java | 4 +-
.../saml/saml1/core/impl/StatusCodeImpl.java | 4 +-
.../saml/saml1/core/impl/StatusDetailImpl.java | 4 +-
.../opensaml/saml/saml1/core/impl/StatusImpl.java | 4 +-
.../saml/saml1/core/impl/StatusMessageImpl.java | 4 +-
.../saml1/core/impl/SubjectConfirmationImpl.java | 4 +-
.../opensaml/saml/saml1/core/impl/SubjectImpl.java | 4 +-
.../saml/saml1/core/impl/SubjectLocalityImpl.java | 4 +-
.../saml/saml1/core/impl/SubjectQueryImpl.java | 4 +-
.../saml/saml1/core/impl/SubjectStatementImpl.java | 4 +-
.../saml/saml2/core/impl/AbstractNameIDType.java | 4 +-
.../opensaml/saml/saml2/core/impl/ActionImpl.java | 4 +-
.../opensaml/saml/saml2/core/impl/AdviceImpl.java | 4 +-
.../saml/saml2/core/impl/ArtifactImpl.java | 4 +-
.../saml/saml2/core/impl/AssertionIDRefImpl.java | 4 +-
.../saml/saml2/core/impl/AssertionURIRefImpl.java | 4 +-
.../saml/saml2/core/impl/AttributeImpl.java | 4 +-
.../saml2/core/impl/AttributeStatementImpl.java | 4 +-
.../saml/saml2/core/impl/AudienceImpl.java | 4 +-
.../saml2/core/impl/AudienceRestrictionImpl.java | 4 +-
.../core/impl/AuthenticatingAuthorityImpl.java | 4 +-
.../saml2/core/impl/AuthnContextClassRefImpl.java | 4 +-
.../saml/saml2/core/impl/AuthnContextDeclImpl.java | 4 +-
.../saml2/core/impl/AuthnContextDeclRefImpl.java | 4 +-
.../saml/saml2/core/impl/AuthnContextImpl.java | 4 +-
.../saml/saml2/core/impl/AuthnStatementImpl.java | 4 +-
.../core/impl/AuthzDecisionStatementImpl.java | 4 +-
.../opensaml/saml/saml2/core/impl/BaseIDImpl.java | 4 +-
.../saml/saml2/core/impl/ConditionsImpl.java | 4 +-
.../saml2/core/impl/EncryptedElementTypeImpl.java | 4 +-
.../saml/saml2/core/impl/EvidenceImpl.java | 4 +-
.../saml/saml2/core/impl/ExtensionsImpl.java | 4 +-
.../saml/saml2/core/impl/GetCompleteImpl.java | 4 +-
.../saml/saml2/core/impl/IDPEntryImpl.java | 4 +-
.../opensaml/saml/saml2/core/impl/IDPListImpl.java | 4 +-
.../saml/saml2/core/impl/NameIDPolicyImpl.java | 4 +-
.../opensaml/saml/saml2/core/impl/NewIDImpl.java | 4 +-
.../saml/saml2/core/impl/OneTimeUseImpl.java | 4 +-
.../saml/saml2/core/impl/ProxyRestrictionImpl.java | 4 +-
.../saml2/core/impl/RequestedAuthnContextImpl.java | 4 +-
.../saml/saml2/core/impl/RequesterIDImpl.java | 4 +-
.../opensaml/saml/saml2/core/impl/ScopingImpl.java | 4 +-
.../saml/saml2/core/impl/SessionIndexImpl.java | 4 +-
.../saml/saml2/core/impl/StatusCodeImpl.java | 4 +-
.../saml/saml2/core/impl/StatusDetailImpl.java | 4 +-
.../opensaml/saml/saml2/core/impl/StatusImpl.java | 4 +-
.../saml/saml2/core/impl/StatusMessageImpl.java | 4 +-
.../core/impl/SubjectConfirmationDataImpl.java | 4 +-
.../saml2/core/impl/SubjectConfirmationImpl.java | 4 +-
.../opensaml/saml/saml2/core/impl/SubjectImpl.java | 4 +-
.../saml/saml2/core/impl/SubjectLocalityImpl.java | 4 +-
.../saml/saml2/core/impl/TerminateImpl.java | 4 +-
.../saml2/ecp/impl/RequestAuthenticatedImpl.java | 4 +-
.../opensaml/saml/saml2/ecp/impl/RequestImpl.java | 4 +-
.../opensaml/saml/saml2/ecp/impl/ResponseImpl.java | 4 +-
.../saml2/ecp/impl/SubjectConfirmationImpl.java | 4 +-
.../impl/AdditionalMetadataLocationImpl.java | 4 +-
.../saml2/metadata/impl/AffiliateMemberImpl.java | 4 +-
.../impl/AttributeConsumingServiceImpl.java | 4 +-
.../saml2/metadata/impl/AttributeProfileImpl.java | 4 +-
.../saml/saml2/metadata/impl/CompanyImpl.java | 4 +-
.../saml2/metadata/impl/ContactPersonImpl.java | 4 +-
.../saml/saml2/metadata/impl/EmailAddressImpl.java | 4 +-
.../saml/saml2/metadata/impl/EndpointImpl.java | 4 +-
.../saml/saml2/metadata/impl/ExtensionsImpl.java | 4 +-
.../saml/saml2/metadata/impl/GivenNameImpl.java | 4 +-
.../saml2/metadata/impl/KeyDescriptorImpl.java | 4 +-
.../saml/saml2/metadata/impl/NameIDFormatImpl.java | 4 +-
.../saml/saml2/metadata/impl/OrganizationImpl.java | 4 +-
.../saml/saml2/metadata/impl/SurNameImpl.java | 4 +-
.../saml2/metadata/impl/TelephoneNumberImpl.java | 4 +-
.../org/opensaml/saml/saml2/core/MockBaseID.java | 4 +-
.../saml/impl/ReferencedPoliciesTypeImpl.java | 4 +-
.../impl/XACMLAuthzDecisionStatementTypeImpl.java | 4 +-
.../saml/impl/XACMLPolicyStatementTypeImpl.java | 4 +-
109 files changed, 231 insertions(+), 283 deletions(-)
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/AbstractSAMLObject.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/AbstractSAMLObject.java
deleted file mode 100644
index ce9e98e..0000000
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/AbstractSAMLObject.java
+++ /dev/null
@@ -1,58 +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.common;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.opensaml.core.xml.AbstractXMLObject;
-
-/**
- * An abstract implementation of SAMLObject.
- *
- * TODO: this is a no-op base class now
- */
-public abstract class AbstractSAMLObject extends AbstractXMLObject {
-
- /**
- * 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 AbstractSAMLObject(@Nullable final String namespaceURI, @Nonnull final String elementLocalName,
- @Nullable final String namespacePrefix) {
- super(namespaceURI, elementLocalName, namespacePrefix);
- }
-
- /** {@inheritDoc} */
- public final boolean equals(final Object obj) {
- if(obj == this){
- return true;
- }
-
- return super.equals(obj);
- }
-
- /** {@inheritDoc} */
- public int hashCode() {
- return super.hashCode();
- }
-
-}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/reqattr/impl/RequestedAttributesImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/reqattr/impl/RequestedAttributesImpl.java
index 0260a45..265ee03 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/reqattr/impl/RequestedAttributesImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/reqattr/impl/RequestedAttributesImpl.java
@@ -20,10 +20,10 @@ package org.opensaml.saml.ext.reqattr.impl;
import java.util.ArrayList;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.reqattr.RequestedAttributes;
import org.opensaml.saml.saml2.metadata.RequestedAttribute;
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.metadata.RequestedAttribute;
/**
* A concrete {@link RequestedAttributes}.
*/
-public class RequestedAttributesImpl extends AbstractSAMLObject implements RequestedAttributes {
+public class RequestedAttributesImpl extends AbstractXMLObject implements RequestedAttributes {
/** The policies. */
private XMLObjectChildrenList<RequestedAttribute> requestedAttributes;
@@ -62,4 +62,5 @@ public class RequestedAttributesImpl extends AbstractSAMLObject implements Reque
children.addAll(requestedAttributes);
return children;
}
-}
+
+}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodImpl.java
index e823e37..2aecdd5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodImpl.java
@@ -24,15 +24,15 @@ 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.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2alg.DigestMethod;
/**
* Implementation of {@link DigestMethod}.
*/
-public class DigestMethodImpl extends AbstractSAMLObject implements DigestMethod {
+public class DigestMethodImpl extends AbstractXMLObject implements DigestMethod {
/** Wildcard child elements. */
private final IndexedXMLObjectChildrenList<XMLObject> unknownChildren;
@@ -80,4 +80,4 @@ public class DigestMethodImpl extends AbstractSAMLObject implements DigestMethod
return Collections.unmodifiableList(unknownChildren);
}
-}
+}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodImpl.java
index 26bf5c6..70279d3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodImpl.java
@@ -24,15 +24,15 @@ 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.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2alg.SigningMethod;
/**
* Implementation of {@link SigningMethod}.
*/
-public class SigningMethodImpl extends AbstractSAMLObject implements SigningMethod {
+public class SigningMethodImpl extends AbstractXMLObject implements SigningMethod {
/** Wildcard child elements. */
private final IndexedXMLObjectChildrenList<XMLObject> unknownChildren;
@@ -106,5 +106,4 @@ public class SigningMethodImpl extends AbstractSAMLObject implements SigningMeth
return Collections.unmodifiableList(unknownChildren);
}
-
-}
+}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2aslo/impl/AsynchronousImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2aslo/impl/AsynchronousImpl.java
index ea9f07d..f8d8d56 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2aslo/impl/AsynchronousImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2aslo/impl/AsynchronousImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.ext.saml2aslo.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2aslo.Asynchronous;
/**
* Concrete implementation of {@link Asynchronous}.
*/
-public class AsynchronousImpl extends AbstractSAMLObject implements Asynchronous {
+public class AsynchronousImpl extends AbstractXMLObject implements Asynchronous {
/**
* Constructor.
@@ -48,4 +48,5 @@ public class AsynchronousImpl extends AbstractSAMLObject implements Asynchronous
// no children
return null;
}
+
}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateImpl.java
index a2b4577..fb161b1 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateImpl.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2delrestrict.Delegate;
import org.opensaml.saml.saml2.core.BaseID;
import org.opensaml.saml.saml2.core.EncryptedID;
@@ -32,7 +32,7 @@ import org.opensaml.saml.saml2.core.NameID;
/**
* Implementation of {@link Delegate}.
*/
-public class DelegateImpl extends AbstractSAMLObject implements Delegate {
+public class DelegateImpl extends AbstractXMLObject implements Delegate {
/** BaseID child element. */
private BaseID baseID;
@@ -126,4 +126,4 @@ public class DelegateImpl extends AbstractSAMLObject implements Delegate {
return Collections.unmodifiableList(children);
}
-}
+}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeImpl.java
index ab4ca1e..84f0af7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeImpl.java
@@ -21,16 +21,16 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2delrestrict.Delegate;
import org.opensaml.saml.ext.saml2delrestrict.DelegationRestrictionType;
/**
* Implementation of {@link DelegationRestrictionType}.
*/
-public class DelegationRestrictionTypeImpl extends AbstractSAMLObject implements DelegationRestrictionType {
+public class DelegationRestrictionTypeImpl extends AbstractXMLObject implements DelegationRestrictionType {
/** Delegate child elements. */
private XMLObjectChildrenList<Delegate> delegates;
@@ -60,4 +60,4 @@ public class DelegationRestrictionTypeImpl extends AbstractSAMLObject implements
return Collections.unmodifiableList(children);
}
-}
+}
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesImpl.java
index f258489..d6ce632 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesImpl.java
@@ -21,16 +21,16 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.ext.saml2mdattr.EntityAttributes;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.Attribute;
/** Concrete implementation of {@link EntityAttributes}. */
-public class EntityAttributesImpl extends AbstractSAMLObject implements EntityAttributes {
+public class EntityAttributesImpl extends AbstractXMLObject implements EntityAttributes {
/** Extension data. */
private final IndexedXMLObjectChildrenList<? extends SAMLObject> attributeInfo;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceImpl.java
index 20a24ac..349ff15 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceImpl.java
@@ -19,14 +19,14 @@ package org.opensaml.saml.ext.saml2mdquery.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2mdquery.ActionNamespace;
/**
* Concrete implementation of {@link ActionNamespace}.
*/
-public class ActionNamespaceImpl extends AbstractSAMLObject implements ActionNamespace {
+public class ActionNamespaceImpl extends AbstractXMLObject implements ActionNamespace {
/** Action namespace value. */
private String value;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationImpl.java
index 1d33630..8cf185a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationImpl.java
@@ -21,14 +21,14 @@ import java.time.Instant;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2mdrpi.Publication;
/**
* A concrete {@link Publication}.
*/
-public class PublicationImpl extends AbstractSAMLObject implements Publication {
+public class PublicationImpl extends AbstractXMLObject implements Publication {
/** The publisher. */
private String publisher;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoImpl.java
index 4f0d629..3fa4bcd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoImpl.java
@@ -21,17 +21,17 @@ import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2mdrpi.PublicationInfo;
import org.opensaml.saml.ext.saml2mdrpi.UsagePolicy;
/**
* Concrete {@link PublicationInfo}.
*/
-public class PublicationInfoImpl extends AbstractSAMLObject implements PublicationInfo {
+public class PublicationInfoImpl extends AbstractXMLObject implements PublicationInfo {
/** The policies. */
private XMLObjectChildrenList<UsagePolicy> usagePolicies;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathImpl.java
index 0eb904f..d3a3021 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathImpl.java
@@ -20,10 +20,10 @@ package org.opensaml.saml.ext.saml2mdrpi.impl;
import java.util.ArrayList;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2mdrpi.Publication;
import org.opensaml.saml.ext.saml2mdrpi.PublicationPath;
@@ -31,7 +31,7 @@ import org.opensaml.saml.ext.saml2mdrpi.PublicationPath;
/**
* A concrete {@link PublicationPath}.
*/
-public class PublicationPathImpl extends AbstractSAMLObject implements PublicationPath {
+public class PublicationPathImpl extends AbstractXMLObject implements PublicationPath {
/** The policies. */
private XMLObjectChildrenList<Publication> publications;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoImpl.java
index 0f87b0d..d78ca15 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoImpl.java
@@ -21,17 +21,17 @@ import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2mdrpi.RegistrationInfo;
import org.opensaml.saml.ext.saml2mdrpi.RegistrationPolicy;
/**
* Concrete Implementation of {@link RegistrationInfo}.
*/
-public class RegistrationInfoImpl extends AbstractSAMLObject implements RegistrationInfo {
+public class RegistrationInfoImpl extends AbstractXMLObject implements RegistrationInfo {
/** The policies. */
private XMLObjectChildrenList<RegistrationPolicy> registrationPolicies;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsImpl.java
index 2c09900..84ea5cf 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsImpl.java
@@ -22,16 +22,16 @@ import java.util.List;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2mdui.DiscoHints;
import org.opensaml.saml.ext.saml2mdui.DomainHint;
import org.opensaml.saml.ext.saml2mdui.GeolocationHint;
import org.opensaml.saml.ext.saml2mdui.IPHint;
/** Concrete implementation of {@link org.opensaml.saml.ext.saml2mdui.DiscoHints}. */
-public class DiscoHintsImpl extends AbstractSAMLObject implements DiscoHints {
+public class DiscoHintsImpl extends AbstractXMLObject implements DiscoHints {
/** Children of the UIInfo. */
private final IndexedXMLObjectChildrenList<XMLObject> discoHintsChildren;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintImpl.java
index 51174a0..f961131 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintImpl.java
@@ -19,14 +19,14 @@ package org.opensaml.saml.ext.saml2mdui.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2mdui.DomainHint;
/**
* Concrete implementation of {@link org.opensaml.saml.ext.saml2mdui.DomainHint}.
*/
-public class DomainHintImpl extends AbstractSAMLObject implements DomainHint{
+public class DomainHintImpl extends AbstractXMLObject implements DomainHint{
/**
* local storage.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintImpl.java
index a38e991..faae935 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintImpl.java
@@ -19,14 +19,14 @@ package org.opensaml.saml.ext.saml2mdui.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2mdui.GeolocationHint;
/**
* Concrete implementation of {@link org.opensaml.saml.ext.saml2mdui.GeolocationHint}.
*/
-public class GeolocationHintImpl extends AbstractSAMLObject implements GeolocationHint {
+public class GeolocationHintImpl extends AbstractXMLObject implements GeolocationHint {
/**
* local storage.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintImpl.java
index 72abace..3e0408e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintImpl.java
@@ -19,14 +19,14 @@ package org.opensaml.saml.ext.saml2mdui.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2mdui.IPHint;
/**
* Concrete implementation of {@link org.opensaml.saml.ext.saml2mdui.IPHint}.
*/
-public class IPHintImpl extends AbstractSAMLObject implements IPHint {
+public class IPHintImpl extends AbstractXMLObject implements IPHint {
/**
* local storage.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsImpl.java
index cce90c8..655cd59 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsImpl.java
@@ -19,9 +19,9 @@ package org.opensaml.saml.ext.saml2mdui.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.LangBearing;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2mdui.Keywords;
import com.google.common.base.Strings;
@@ -29,7 +29,7 @@ import com.google.common.base.Strings;
/**
* Concrete Implementation of {@link org.opensaml.saml.ext.saml2mdui.Keywords}.
*/
-public class KeywordsImpl extends AbstractSAMLObject implements Keywords {
+public class KeywordsImpl extends AbstractXMLObject implements Keywords {
/** The language. */
private String lang;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoImpl.java
index 6239509..e0c93c3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoImpl.java
@@ -19,9 +19,9 @@ package org.opensaml.saml.ext.saml2mdui.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.LangBearing;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2mdui.Logo;
import com.google.common.base.Strings;
@@ -30,7 +30,7 @@ import com.google.common.base.Strings;
* Concrete implementation of {@link org.opensaml.saml.ext.saml2mdui.Logo}.
* @author rod widdowson
*/
-public class LogoImpl extends AbstractSAMLObject implements Logo {
+public class LogoImpl extends AbstractXMLObject implements Logo {
/** Logo URL. */
private String url;
@@ -104,9 +104,14 @@ public class LogoImpl extends AbstractSAMLObject implements Logo {
return null;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
+ public final boolean equals(final Object obj) {
+ return super.equals(obj);
+ }
+
+ /** {@inheritDoc} */
+ @Override
public int hashCode() {
int hash = url.hashCode();
hash = hash * 31 + lang.hashCode();
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoImpl.java
index a895b38..4f5069a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoImpl.java
@@ -22,9 +22,9 @@ import java.util.List;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.saml2mdui.Description;
import org.opensaml.saml.ext.saml2mdui.DisplayName;
import org.opensaml.saml.ext.saml2mdui.InformationURL;
@@ -37,7 +37,7 @@ import org.opensaml.saml.ext.saml2mdui.UIInfo;
* Concrete implementation of {@link org.opensaml.saml.ext.saml2mdui.UIInfo}.
* @author Rod Widdowson
*/
-public class UIInfoImpl extends AbstractSAMLObject implements UIInfo {
+public class UIInfoImpl extends AbstractXMLObject implements UIInfo {
/** Children of the UIInfo. */
private final IndexedXMLObjectChildrenList<XMLObject> uiInfoChildren;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyImpl.java
index 93a48a7..ba66821 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyImpl.java
@@ -21,10 +21,10 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.schema.XSBooleanValue;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.ext.samlec.EncType;
import org.opensaml.saml.ext.samlec.SessionKey;
import org.opensaml.soap.soap11.ActorBearing;
@@ -35,7 +35,7 @@ import org.opensaml.xmlsec.signature.KeyInfo;
/**
* Concrete implementation of {@link SessionKey}.
*/
-public class SessionKeyImpl extends AbstractSAMLObject implements SessionKey {
+public class SessionKeyImpl extends AbstractXMLObject implements SessionKey {
/** soap11:actor attribute. */
private String soap11Actor;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionImpl.java
index 26ede02..5bb7f0c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionImpl.java
@@ -19,14 +19,14 @@ package org.opensaml.saml.saml1.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.Action;
/**
* Concrete implementation of {@link org.opensaml.saml.saml1.core.Action}.
*/
-public class ActionImpl extends AbstractSAMLObject implements Action {
+public class ActionImpl extends AbstractXMLObject implements Action {
/** Place to store the namespace. */
private String namespace;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AdviceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AdviceImpl.java
index 8d9beac..c2dfe9e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AdviceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AdviceImpl.java
@@ -23,9 +23,9 @@ import java.util.List;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.Advice;
import org.opensaml.saml.saml1.core.Assertion;
@@ -34,7 +34,7 @@ import org.opensaml.saml.saml1.core.AssertionIDReference;
/**
* Concrete implementation of {@link org.opensaml.saml.saml1.core.Advice}.
*/
-public class AdviceImpl extends AbstractSAMLObject implements Advice {
+public class AdviceImpl extends AbstractXMLObject implements Advice {
/** Contains all the SAML objects we have added. */
private final IndexedXMLObjectChildrenList<XMLObject> assertionChildren;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactImpl.java
index 94b09d2..26b5f18 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactImpl.java
@@ -19,14 +19,14 @@ package org.opensaml.saml.saml1.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.AssertionArtifact;
/**
* Concrete implementation if {@link org.opensaml.saml.saml1.core.AssertionArtifact}.
*/
-public class AssertionArtifactImpl extends AbstractSAMLObject implements AssertionArtifact {
+public class AssertionArtifactImpl extends AbstractXMLObject implements AssertionArtifact {
/** The assertion artifact. */
private String assertionArtifact;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceImpl.java
index eb59ca5..c4bd761 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceImpl.java
@@ -19,14 +19,14 @@ package org.opensaml.saml.saml1.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.AssertionIDReference;
/**
* Concrete Implementation of {@link org.opensaml.saml.saml1.core.AssertionIDReference} Object.
*/
-public class AssertionIDReferenceImpl extends AbstractSAMLObject implements AssertionIDReference {
+public class AssertionIDReferenceImpl extends AbstractXMLObject implements AssertionIDReference {
/** String to contain the ncName. */
private String ncName;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorImpl.java
index 384ed6d..19d72c3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml1.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.AttributeDesignator;
/**
* Concrete Implementation of the {@link org.opensaml.saml.saml1.core.AttributeDesignator} interface.
*/
-public class AttributeDesignatorImpl extends AbstractSAMLObject implements AttributeDesignator {
+public class AttributeDesignatorImpl extends AbstractXMLObject implements AttributeDesignator {
/** Contains the AttributeName. */
private String attributeName;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceImpl.java
index 84740c0..0f0f053 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceImpl.java
@@ -19,14 +19,14 @@ package org.opensaml.saml.saml1.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.Audience;
/**
* Concrete class implementation of {@link org.opensaml.saml.saml1.core.Audience}.
*/
-public class AudienceImpl extends AbstractSAMLObject implements Audience {
+public class AudienceImpl extends AbstractXMLObject implements Audience {
/** String to hold the URI. */
private String uri;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionImpl.java
index 4010f76..39861fa 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionImpl.java
@@ -21,16 +21,16 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.Audience;
import org.opensaml.saml.saml1.core.AudienceRestrictionCondition;
/**
* Concrete implementation of the org.opensaml.saml.saml1.core.AudienceRestrictionCondition.
*/
-public class AudienceRestrictionConditionImpl extends AbstractSAMLObject implements AudienceRestrictionCondition {
+public class AudienceRestrictionConditionImpl extends AbstractXMLObject implements AudienceRestrictionCondition {
/** Audiences. */
private final XMLObjectChildrenList<Audience> audiences;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingImpl.java
index fa74bb5..96361a7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingImpl.java
@@ -21,14 +21,14 @@ import java.util.List;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.AuthorityBinding;
/**
* A concrete implementation of the {@link org.opensaml.saml.saml1.core.SubjectLocality} interface.
*/
-public class AuthorityBindingImpl extends AbstractSAMLObject implements AuthorityBinding {
+public class AuthorityBindingImpl extends AbstractXMLObject implements AuthorityBinding {
/** The AuthorityKind. */
private QName authorityKind;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsImpl.java
index e210160..281a6d5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsImpl.java
@@ -24,9 +24,9 @@ import java.util.List;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.AudienceRestrictionCondition;
import org.opensaml.saml.saml1.core.Condition;
@@ -36,7 +36,7 @@ import org.opensaml.saml.saml1.core.DoNotCacheCondition;
/**
* This is a concrete implementation of the {@link org.opensaml.saml.saml1.core.Conditions} interface.
*/
-public class ConditionsImpl extends AbstractSAMLObject implements Conditions {
+public class ConditionsImpl extends AbstractXMLObject implements Conditions {
/** Value saved in the NotBefore attribute. */
private Instant notBefore;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodImpl.java
index a39c4fe..5196704 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodImpl.java
@@ -19,14 +19,14 @@ package org.opensaml.saml.saml1.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.ConfirmationMethod;
/**
* Concrete Implementation of the {@link org.opensaml.saml.saml1.core.ConfirmationMethod} interface.
*/
-public class ConfirmationMethodImpl extends AbstractSAMLObject implements ConfirmationMethod {
+public class ConfirmationMethodImpl extends AbstractXMLObject implements ConfirmationMethod {
/** Contains the content string. */
private String confirmationMethod;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionImpl.java
index de6e3d1..0324c3b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionImpl.java
@@ -19,14 +19,14 @@ package org.opensaml.saml.saml1.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.DoNotCacheCondition;
/**
* Concrete Implementation of a {@link org.opensaml.saml.saml1.core.DoNotCacheCondition} Objects.
*/
-public class DoNotCacheConditionImpl extends AbstractSAMLObject implements DoNotCacheCondition {
+public class DoNotCacheConditionImpl extends AbstractXMLObject implements DoNotCacheCondition {
/**
* Constructor.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/EvidenceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/EvidenceImpl.java
index 69a3b29..2fe8e55 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/EvidenceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/EvidenceImpl.java
@@ -23,9 +23,9 @@ import java.util.List;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.Assertion;
import org.opensaml.saml.saml1.core.AssertionIDReference;
@@ -35,7 +35,7 @@ import org.opensaml.saml.saml1.core.Evidentiary;
/**
* Concrete implementation of the {@link org.opensaml.saml.saml1.core.Evidence} interface.
*/
-public class EvidenceImpl extends AbstractSAMLObject implements Evidence {
+public class EvidenceImpl extends AbstractXMLObject implements Evidence {
/** The Evidentiary child elements. */
private final IndexedXMLObjectChildrenList<Evidentiary> evidence;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierImpl.java
index be24ec2..1ceda28 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierImpl.java
@@ -19,8 +19,8 @@ package org.opensaml.saml.saml1.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.NameIdentifier;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
@@ -29,7 +29,7 @@ import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.Object
/**
* Complete implementation of {@link org.opensaml.saml.saml1.core.NameIdentifier}.
*/
-public class NameIdentifierImpl extends AbstractSAMLObject implements NameIdentifier {
+public class NameIdentifierImpl extends AbstractXMLObject implements NameIdentifier {
/** Contents of the NameQualifierAttribute. */
private String nameQualifier;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RespondWithImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RespondWithImpl.java
index 23f07f8..78cda8b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RespondWithImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RespondWithImpl.java
@@ -21,14 +21,14 @@ import java.util.List;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.RespondWith;
/**
* Implementation of {@link RespondWith}.
*/
-public class RespondWithImpl extends AbstractSAMLObject implements RespondWith {
+public class RespondWithImpl extends AbstractXMLObject implements RespondWith {
/** Value of this element. */
private QName value;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeImpl.java
index 3d8022d..95ed38e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeImpl.java
@@ -23,14 +23,14 @@ import java.util.List;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.StatusCode;
/**
* Concrete implementation of {@link org.opensaml.saml.saml1.core.StatusCode} Object.
*/
-public class StatusCodeImpl extends AbstractSAMLObject implements StatusCode {
+public class StatusCodeImpl extends AbstractXMLObject implements StatusCode {
/** Contents of the Value attribute. */
private QName value;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusDetailImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusDetailImpl.java
index 5e95cf7..597c101 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusDetailImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusDetailImpl.java
@@ -22,15 +22,15 @@ import java.util.List;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.StatusDetail;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.StatusDetail}.
*/
-public class StatusDetailImpl extends AbstractSAMLObject implements StatusDetail {
+public class StatusDetailImpl extends AbstractXMLObject implements StatusDetail {
/** child "any" elements. */
private final IndexedXMLObjectChildrenList<XMLObject> unknownChildren;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusImpl.java
index 2062346..da98c8f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusImpl.java
@@ -21,8 +21,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.Status;
import org.opensaml.saml.saml1.core.StatusCode;
import org.opensaml.saml.saml1.core.StatusDetail;
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml1.core.StatusMessage;
/**
* Concrete Implementation {@link org.opensaml.saml.saml1.core.Status}.
*/
-public class StatusImpl extends AbstractSAMLObject implements Status {
+public class StatusImpl extends AbstractXMLObject implements Status {
/** Representation of the StatusMessage element. */
private StatusMessage statusMessage;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageImpl.java
index fe726bc..89f88ad 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageImpl.java
@@ -19,14 +19,14 @@ package org.opensaml.saml.saml1.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.StatusMessage;
/**
* Concrete implementation of org.opensaml.saml.saml1.core StatusMessage object.
*/
-public class StatusMessageImpl extends AbstractSAMLObject implements StatusMessage {
+public class StatusMessageImpl extends AbstractXMLObject implements StatusMessage {
/**
* Contents of the element.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationImpl.java
index 96f23a2..4930932 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationImpl.java
@@ -21,9 +21,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.ConfirmationMethod;
import org.opensaml.saml.saml1.core.SubjectConfirmation;
import org.opensaml.xmlsec.signature.KeyInfo;
@@ -31,7 +31,7 @@ import org.opensaml.xmlsec.signature.KeyInfo;
/**
* Concrete implementation of a <code> SubjectConfirmation </code> object.
*/
-public class SubjectConfirmationImpl extends AbstractSAMLObject implements SubjectConfirmation {
+public class SubjectConfirmationImpl extends AbstractXMLObject implements SubjectConfirmation {
/** Contains the list of ConfirmationMethods. */
private final XMLObjectChildrenList<ConfirmationMethod> confirmationMethods;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectImpl.java
index 9486d04..3fd22ad 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectImpl.java
@@ -21,8 +21,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.NameIdentifier;
import org.opensaml.saml.saml1.core.Subject;
import org.opensaml.saml.saml1.core.SubjectConfirmation;
@@ -30,7 +30,7 @@ import org.opensaml.saml.saml1.core.SubjectConfirmation;
/**
* Complete implementation of {@link org.opensaml.saml.saml1.core.Subject}.
*/
-public class SubjectImpl extends AbstractSAMLObject implements Subject {
+public class SubjectImpl extends AbstractXMLObject implements Subject {
/** Contains the NameIdentifier inside the Subject. */
private NameIdentifier nameIdentifier;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityImpl.java
index 991df42..44d9bd0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityImpl.java
@@ -19,14 +19,14 @@ package org.opensaml.saml.saml1.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.SubjectLocality;
/**
* A concrete implementation of the {@link org.opensaml.saml.saml1.core.SubjectLocality} interface.
*/
-public class SubjectLocalityImpl extends AbstractSAMLObject implements SubjectLocality {
+public class SubjectLocalityImpl extends AbstractXMLObject implements SubjectLocality {
/** The ipAddress. */
private String ipAddress;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectQueryImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectQueryImpl.java
index aea05f3..d893fff 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectQueryImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectQueryImpl.java
@@ -21,15 +21,15 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.Subject;
import org.opensaml.saml.saml1.core.SubjectQuery;
/**
* Concrete (but abstract) implementation of {@link org.opensaml.saml.saml1.core.SubjectQuery} abstract type.
*/
-public abstract class SubjectQueryImpl extends AbstractSAMLObject implements SubjectQuery {
+public abstract class SubjectQueryImpl extends AbstractXMLObject implements SubjectQuery {
/** Contains the Subject subelement. */
private Subject subject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectStatementImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectStatementImpl.java
index 13e11e3..855c8ca 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectStatementImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectStatementImpl.java
@@ -21,15 +21,15 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml1.core.Subject;
import org.opensaml.saml.saml1.core.SubjectStatement;
/**
* Abstract type to implement SubjectStatementType.
*/
-public abstract class SubjectStatementImpl extends AbstractSAMLObject implements SubjectStatement {
+public abstract class SubjectStatementImpl extends AbstractXMLObject implements SubjectStatement {
/** Contains the Subject subelement. */
private Subject subject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDType.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDType.java
index d08b9c5..f121307 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDType.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDType.java
@@ -19,14 +19,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.NameIDType;
/**
* Abstract implementation of {@link org.opensaml.saml.saml2.core.NameIDType}.
*/
-public class AbstractNameIDType extends AbstractSAMLObject implements NameIDType {
+public class AbstractNameIDType extends AbstractXMLObject implements NameIDType {
/** Name of the Name ID. */
private String name;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionImpl.java
index e6a8cc4..1aff3cf 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.Action;
/**
* A concrete implementation of {@link org.opensaml.saml.saml2.core.Action}.
*/
-public class ActionImpl extends AbstractSAMLObject implements Action {
+public class ActionImpl extends AbstractXMLObject implements Action {
/** URI of the Namespace of this Action. */
private String namespace;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AdviceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AdviceImpl.java
index bc32ad5..cca87d4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AdviceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AdviceImpl.java
@@ -27,9 +27,9 @@ import java.util.List;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.Advice;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.AssertionIDRef;
@@ -39,7 +39,7 @@ import org.opensaml.saml.saml2.core.EncryptedAssertion;
/**
* A concrete implementation of {@link org.opensaml.saml.saml2.core.Advice}.
*/
-public class AdviceImpl extends AbstractSAMLObject implements Advice {
+public class AdviceImpl extends AbstractXMLObject implements Advice {
/** Children. */
private final IndexedXMLObjectChildrenList<XMLObject> indexedChildren;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactImpl.java
index b361c50..2976bd1 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.Artifact;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.Artifact}.
*/
-public class ArtifactImpl extends AbstractSAMLObject implements Artifact {
+public class ArtifactImpl extends AbstractXMLObject implements Artifact {
/** Artifact data. */
private String artifact;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefImpl.java
index 59ed8f6..632ddb4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.AssertionIDRef;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.AssertionIDRef}.
*/
-public class AssertionIDRefImpl extends AbstractSAMLObject implements AssertionIDRef {
+public class AssertionIDRefImpl extends AbstractXMLObject implements AssertionIDRef {
/** ID Ref of the Assertion. */
private String assertionID;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefImpl.java
index 422990d..c91acdd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.AssertionURIRef;
/**
* A concrete implementation of {@link org.opensaml.saml.saml2.core.AssertionURIRef}.
*/
-public class AssertionURIRefImpl extends AbstractSAMLObject implements AssertionURIRef {
+public class AssertionURIRefImpl extends AbstractXMLObject implements AssertionURIRef {
/** URI of the Assertion. */
private String assertionURI;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeImpl.java
index 0e3c468..5f43c38 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeImpl.java
@@ -21,16 +21,16 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+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.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.Attribute;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.Attribute}.
*/
-public class AttributeImpl extends AbstractSAMLObject implements Attribute {
+public class AttributeImpl extends AbstractXMLObject implements Attribute {
/** Name of the attribute. */
private String name;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeStatementImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeStatementImpl.java
index b9698b7..34f0dd9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeStatementImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeStatementImpl.java
@@ -25,9 +25,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.Attribute;
import org.opensaml.saml.saml2.core.AttributeStatement;
import org.opensaml.saml.saml2.core.EncryptedAttribute;
@@ -35,7 +35,7 @@ import org.opensaml.saml.saml2.core.EncryptedAttribute;
/**
* A concrete implementation of {@link org.opensaml.saml.saml2.core.AttributeStatement}.
*/
-public class AttributeStatementImpl extends AbstractSAMLObject implements AttributeStatement {
+public class AttributeStatementImpl extends AbstractXMLObject implements AttributeStatement {
/** Attributes and EncryptedAttributes in this statement. */
private final IndexedXMLObjectChildrenList<XMLObject> indexedChildren;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceImpl.java
index 633b39a..ba507db 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.Audience;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.Audience}.
*/
-public class AudienceImpl extends AbstractSAMLObject implements Audience {
+public class AudienceImpl extends AbstractXMLObject implements Audience {
/** URI of this Audience. */
private String audienceURI;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionImpl.java
index cb7f82e..9f489a5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionImpl.java
@@ -25,16 +25,16 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.Audience;
import org.opensaml.saml.saml2.core.AudienceRestriction;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.AudienceRestriction}.
*/
-public class AudienceRestrictionImpl extends AbstractSAMLObject implements AudienceRestriction {
+public class AudienceRestrictionImpl extends AbstractXMLObject implements AudienceRestriction {
/** List of the audiences. */
private final XMLObjectChildrenList<Audience> audience;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityImpl.java
index 4a0d14a..252ead4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.AuthenticatingAuthority;
/**
* A concrete implementation of {@link org.opensaml.saml.saml2.core.AuthenticatingAuthority}.
*/
-public class AuthenticatingAuthorityImpl extends AbstractSAMLObject implements AuthenticatingAuthority {
+public class AuthenticatingAuthorityImpl extends AbstractXMLObject implements AuthenticatingAuthority {
/** URI of the Authenticating Authority. */
private String uri;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefImpl.java
index 56be67d..8f67526 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.AuthnContextClassRef;
/**
* A concrete implementation of {@link org.opensaml.saml.saml2.core.AuthnContextClassRef}.
*/
-public class AuthnContextClassRefImpl extends AbstractSAMLObject implements AuthnContextClassRef {
+public class AuthnContextClassRefImpl extends AbstractXMLObject implements AuthnContextClassRef {
/** URI of the Authentication Context Class. */
private String authnContextClassRef;
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 47a087b..ba87634 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
@@ -26,16 +26,16 @@ import java.util.List;
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.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.AuthnContextDecl;
/**
* A concrete implementation of {@link org.opensaml.saml.saml2.core.AuthnContextDecl}.
*/
-public class AuthnContextDeclImpl extends AbstractSAMLObject implements AuthnContextDecl {
+public class AuthnContextDeclImpl extends AbstractXMLObject implements AuthnContextDecl {
/** Child XMLObjects. */
private IndexedXMLObjectChildrenList<XMLObject> unknownXMLObjects;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefImpl.java
index b7a6d23..901763b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.AuthnContextDeclRef;
/**
* A concrete implementation of {@link org.opensaml.saml.saml2.core.AuthnContextDeclRef}.
*/
-public class AuthnContextDeclRefImpl extends AbstractSAMLObject implements AuthnContextDeclRef {
+public class AuthnContextDeclRefImpl extends AbstractXMLObject implements AuthnContextDeclRef {
/** URI of the Authentication Context Declaration. */
private String authnContextDeclRef;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextImpl.java
index 6d292b7..ee937b2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextImpl.java
@@ -25,9 +25,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.AuthenticatingAuthority;
import org.opensaml.saml.saml2.core.AuthnContext;
import org.opensaml.saml.saml2.core.AuthnContextClassRef;
@@ -37,7 +37,7 @@ import org.opensaml.saml.saml2.core.AuthnContextDeclRef;
/**
* A concrete implemenation of {@link org.opensaml.saml.saml2.core.AuthnContext}.
*/
-public class AuthnContextImpl extends AbstractSAMLObject implements AuthnContext {
+public class AuthnContextImpl extends AbstractXMLObject implements AuthnContext {
/** URI of the Context Class. */
private AuthnContextClassRef authnContextClassRef;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementImpl.java
index 8bdf389..d314990 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementImpl.java
@@ -26,8 +26,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.AuthnContext;
import org.opensaml.saml.saml2.core.AuthnStatement;
import org.opensaml.saml.saml2.core.SubjectLocality;
@@ -35,7 +35,7 @@ import org.opensaml.saml.saml2.core.SubjectLocality;
/**
* A concrete implementation of {@link org.opensaml.saml.saml2.core.AuthnStatement}.
*/
-public class AuthnStatementImpl extends AbstractSAMLObject implements AuthnStatement {
+public class AuthnStatementImpl extends AbstractXMLObject implements AuthnStatement {
/** Subject Locality of the Authentication Statement. */
private SubjectLocality subjectLocality;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementImpl.java
index 021e745..5d1a466 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementImpl.java
@@ -25,9 +25,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.Action;
import org.opensaml.saml.saml2.core.AuthzDecisionStatement;
import org.opensaml.saml.saml2.core.DecisionTypeEnumeration;
@@ -36,7 +36,7 @@ import org.opensaml.saml.saml2.core.Evidence;
/**
* A concrete implementation of {@link org.opensaml.saml.saml2.core.AuthzDecisionStatement}.
*/
-public class AuthzDecisionStatementImpl extends AbstractSAMLObject implements AuthzDecisionStatement {
+public class AuthzDecisionStatementImpl extends AbstractXMLObject implements AuthzDecisionStatement {
/** URI of the resource to which authorization is sought. */
private String resource;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/BaseIDImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/BaseIDImpl.java
index 6a875b5..da00902 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/BaseIDImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/BaseIDImpl.java
@@ -19,14 +19,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.BaseID;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.BaseID}.
*/
-public abstract class BaseIDImpl extends AbstractSAMLObject implements BaseID {
+public abstract class BaseIDImpl extends AbstractXMLObject implements BaseID {
/** Name Qualifier of BaseID. */
private String nameQualifier;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsImpl.java
index f8c6514..fe3bc96 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsImpl.java
@@ -28,9 +28,9 @@ import java.util.List;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.core.AudienceRestriction;
import org.opensaml.saml.saml2.core.Condition;
@@ -41,7 +41,7 @@ import org.opensaml.saml.saml2.core.ProxyRestriction;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.Conditions}.
*/
-public class ConditionsImpl extends AbstractSAMLObject implements Conditions {
+public class ConditionsImpl extends AbstractXMLObject implements Conditions {
/** A Condition. */
private final IndexedXMLObjectChildrenList<Condition> conditions;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedElementTypeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedElementTypeImpl.java
index 2e61bd4..f254bf9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedElementTypeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedElementTypeImpl.java
@@ -21,9 +21,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.EncryptedElementType;
import org.opensaml.xmlsec.encryption.EncryptedData;
import org.opensaml.xmlsec.encryption.EncryptedKey;
@@ -31,7 +31,7 @@ import org.opensaml.xmlsec.encryption.EncryptedKey;
/**
* A concrete implementation of {@link org.opensaml.saml.saml2.core.EncryptedElementType}.
*/
-public class EncryptedElementTypeImpl extends AbstractSAMLObject implements EncryptedElementType {
+public class EncryptedElementTypeImpl extends AbstractXMLObject implements EncryptedElementType {
/** EncryptedData child element. */
private EncryptedData encryptedData;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EvidenceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EvidenceImpl.java
index 7af1796..e296575 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EvidenceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EvidenceImpl.java
@@ -25,9 +25,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.AssertionIDRef;
import org.opensaml.saml.saml2.core.AssertionURIRef;
@@ -38,7 +38,7 @@ import org.opensaml.saml.saml2.core.Evidentiary;
/**
* A concrete implementation of {@link org.opensaml.saml.saml2.core.Evidence}.
*/
-public class EvidenceImpl extends AbstractSAMLObject implements Evidence {
+public class EvidenceImpl extends AbstractXMLObject implements Evidence {
/** Assertion of the Evidence. */
private final IndexedXMLObjectChildrenList<Evidentiary> evidence;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsImpl.java
index 8572777..e5e11c0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsImpl.java
@@ -23,15 +23,15 @@ import java.util.List;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.Extensions;
/**
* Implementation of {@link org.opensaml.saml.saml2.core.Extensions}.
*/
-public class ExtensionsImpl extends AbstractSAMLObject implements Extensions {
+public class ExtensionsImpl extends AbstractXMLObject implements Extensions {
/** "any" children. */
private final IndexedXMLObjectChildrenList<XMLObject> unknownChildren;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteImpl.java
index 379f60e..ea4a347 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.GetComplete;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.GetComplete}.
*/
-public class GetCompleteImpl extends AbstractSAMLObject implements GetComplete {
+public class GetCompleteImpl extends AbstractXMLObject implements GetComplete {
/** URI element content. */
private String getComplete;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryImpl.java
index c8efccc..40dedaa 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.IDPEntry;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.IDPEntry}.
*/
-public class IDPEntryImpl extends AbstractSAMLObject implements IDPEntry {
+public class IDPEntryImpl extends AbstractXMLObject implements IDPEntry {
/** The unique identifier of the IdP. */
private String providerID;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPListImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPListImpl.java
index ddb0e3d..af496db 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPListImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPListImpl.java
@@ -25,9 +25,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.GetComplete;
import org.opensaml.saml.saml2.core.IDPEntry;
import org.opensaml.saml.saml2.core.IDPList;
@@ -35,7 +35,7 @@ import org.opensaml.saml.saml2.core.IDPList;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.IDPList}.
*/
-public class IDPListImpl extends AbstractSAMLObject implements IDPList {
+public class IDPListImpl extends AbstractXMLObject implements IDPList {
/** List of IDPEntry's. */
private final XMLObjectChildrenList<IDPEntry> idpEntries;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyImpl.java
index 66f1260..88fa2f8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyImpl.java
@@ -23,15 +23,15 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.schema.XSBooleanValue;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.NameIDPolicy;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.NameIDPolicy}.
*/
-public class NameIDPolicyImpl extends AbstractSAMLObject implements NameIDPolicy {
+public class NameIDPolicyImpl extends AbstractXMLObject implements NameIDPolicy {
/** NameID Format URI. */
private String format;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDImpl.java
index dfffd5d..bebc4ff 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.NewID;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.NewID}.
*/
-public class NewIDImpl extends AbstractSAMLObject implements NewID {
+public class NewIDImpl extends AbstractXMLObject implements NewID {
/** The new NameID. */
private String newID;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/OneTimeUseImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/OneTimeUseImpl.java
index 9ad8737..8c7a46f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/OneTimeUseImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/OneTimeUseImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.OneTimeUse;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.OneTimeUse}.
*/
-public class OneTimeUseImpl extends AbstractSAMLObject implements OneTimeUse {
+public class OneTimeUseImpl extends AbstractXMLObject implements OneTimeUse {
/**
* Constructor.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionImpl.java
index 0cf22aa..ab8bdb7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionImpl.java
@@ -25,16 +25,16 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.Audience;
import org.opensaml.saml.saml2.core.ProxyRestriction;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.ProxyRestriction}.
*/
-public class ProxyRestrictionImpl extends AbstractSAMLObject implements ProxyRestriction {
+public class ProxyRestrictionImpl extends AbstractXMLObject implements ProxyRestriction {
/** Audiences of the Restriction. */
private final XMLObjectChildrenList<Audience> audiences;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextImpl.java
index 6f70a20..69c3efd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextImpl.java
@@ -25,9 +25,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.AuthnContextClassRef;
import org.opensaml.saml.saml2.core.AuthnContextComparisonTypeEnumeration;
import org.opensaml.saml.saml2.core.AuthnContextDeclRef;
@@ -36,7 +36,7 @@ import org.opensaml.saml.saml2.core.RequestedAuthnContext;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.RequestedAuthnContext}.
*/
-public class RequestedAuthnContextImpl extends AbstractSAMLObject implements RequestedAuthnContext {
+public class RequestedAuthnContextImpl extends AbstractXMLObject implements RequestedAuthnContext {
/** AuthnContextClassRef child elements. */
private final XMLObjectChildrenList<AuthnContextClassRef> authnContextClassRefs;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDImpl.java
index 746f5b3..db7ced7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.RequesterID;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.RequesterID}.
*/
-public class RequesterIDImpl extends AbstractSAMLObject implements RequesterID {
+public class RequesterIDImpl extends AbstractXMLObject implements RequesterID {
/** ID of the requester. */
private String requesterID;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingImpl.java
index d372de2..d108db7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingImpl.java
@@ -25,9 +25,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.IDPList;
import org.opensaml.saml.saml2.core.RequesterID;
import org.opensaml.saml.saml2.core.Scoping;
@@ -35,7 +35,7 @@ import org.opensaml.saml.saml2.core.Scoping;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.Scoping}.
*/
-public class ScopingImpl extends AbstractSAMLObject implements Scoping {
+public class ScopingImpl extends AbstractXMLObject implements Scoping {
/** IDPList child element. */
private IDPList idpList;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexImpl.java
index ac99bd4..c7dfe26 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.SessionIndex;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.SessionIndex}.
*/
-public class SessionIndexImpl extends AbstractSAMLObject implements SessionIndex {
+public class SessionIndexImpl extends AbstractXMLObject implements SessionIndex {
/** The session index value. */
private String sessionIndex;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeImpl.java
index f473c71..11a4e04 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeImpl.java
@@ -25,14 +25,14 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.StatusCode;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.StatusCode}.
*/
-public class StatusCodeImpl extends AbstractSAMLObject implements StatusCode {
+public class StatusCodeImpl extends AbstractXMLObject implements StatusCode {
/** Value attribute URI. */
private String value;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusDetailImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusDetailImpl.java
index 779e554..7351c91 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusDetailImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusDetailImpl.java
@@ -22,15 +22,15 @@ import java.util.List;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.StatusDetail;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.StatusDetail}.
*/
-public class StatusDetailImpl extends AbstractSAMLObject implements StatusDetail {
+public class StatusDetailImpl extends AbstractXMLObject implements StatusDetail {
/** child "any" elements. */
private final IndexedXMLObjectChildrenList<XMLObject> unknownChildren;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusImpl.java
index 708440f..f8043bb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusImpl.java
@@ -25,8 +25,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.Status;
import org.opensaml.saml.saml2.core.StatusCode;
import org.opensaml.saml.saml2.core.StatusDetail;
@@ -35,7 +35,7 @@ import org.opensaml.saml.saml2.core.StatusMessage;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.Status}.
*/
-public class StatusImpl extends AbstractSAMLObject implements Status {
+public class StatusImpl extends AbstractXMLObject implements Status {
/** StatusCode element. */
private StatusCode statusCode;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageImpl.java
index 009c64e..cd51e10 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.StatusMessage;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.StatusMessage}.
*/
-public class StatusMessageImpl extends AbstractSAMLObject implements StatusMessage {
+public class StatusMessageImpl extends AbstractXMLObject implements StatusMessage {
/** The message string. */
private String message;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataImpl.java
index cd6715b..1001146 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataImpl.java
@@ -27,16 +27,16 @@ import java.util.List;
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.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.SubjectConfirmationData;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.SubjectConfirmationData}.
*/
-public class SubjectConfirmationDataImpl extends AbstractSAMLObject implements SubjectConfirmationData {
+public class SubjectConfirmationDataImpl extends AbstractXMLObject implements SubjectConfirmationData {
/** NotBefore of the Confirmation Data. */
private Instant notBefore;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationImpl.java
index 70d3463..5f50c73 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationImpl.java
@@ -21,8 +21,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.BaseID;
import org.opensaml.saml.saml2.core.EncryptedID;
import org.opensaml.saml.saml2.core.NameID;
@@ -32,7 +32,7 @@ import org.opensaml.saml.saml2.core.SubjectConfirmationData;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.SubjectConfirmation}.
*/
-public class SubjectConfirmationImpl extends AbstractSAMLObject implements SubjectConfirmation {
+public class SubjectConfirmationImpl extends AbstractXMLObject implements SubjectConfirmation {
/** BaseID child element. */
private BaseID baseID;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectImpl.java
index 98de850..fc7d122 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectImpl.java
@@ -21,9 +21,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.BaseID;
import org.opensaml.saml.saml2.core.EncryptedID;
import org.opensaml.saml.saml2.core.NameID;
@@ -33,7 +33,7 @@ import org.opensaml.saml.saml2.core.SubjectConfirmation;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.Subject}.
*/
-public class SubjectImpl extends AbstractSAMLObject implements Subject {
+public class SubjectImpl extends AbstractXMLObject implements Subject {
/** BaseID child element. */
private BaseID baseID;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityImpl.java
index 4702b3c..cd5b819 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.SubjectLocality;
/**
* A concrete implementation of {@link org.opensaml.saml.saml2.core.SubjectLocality}.
*/
-public class SubjectLocalityImpl extends AbstractSAMLObject implements SubjectLocality {
+public class SubjectLocalityImpl extends AbstractXMLObject implements SubjectLocality {
/** The Address of the assertion. */
private String address;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/TerminateImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/TerminateImpl.java
index fe1502f..e6f5b1e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/TerminateImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/TerminateImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.core.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.Terminate;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.core.Terminate}.
*/
-public class TerminateImpl extends AbstractSAMLObject implements Terminate {
+public class TerminateImpl extends AbstractXMLObject implements Terminate {
/**
* Constructor.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedImpl.java
index 99b760f..71f47c7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedImpl.java
@@ -23,9 +23,9 @@ package org.opensaml.saml.saml2.ecp.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.schema.XSBooleanValue;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.ecp.RequestAuthenticated;
import org.opensaml.soap.soap11.ActorBearing;
import org.opensaml.soap.soap11.MustUnderstandBearing;
@@ -34,7 +34,7 @@ import org.opensaml.soap.soap11.MustUnderstandBearing;
/**
* Concrete implementation of {@link RequestAuthenticated}.
*/
-public class RequestAuthenticatedImpl extends AbstractSAMLObject implements RequestAuthenticated {
+public class RequestAuthenticatedImpl extends AbstractXMLObject implements RequestAuthenticated {
/** soap11:actor attribute. */
private String soap11Actor;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestImpl.java
index 2c920d5..1d8d783 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestImpl.java
@@ -21,9 +21,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.schema.XSBooleanValue;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.IDPList;
import org.opensaml.saml.saml2.core.Issuer;
import org.opensaml.saml.saml2.ecp.Request;
@@ -33,7 +33,7 @@ import org.opensaml.soap.soap11.MustUnderstandBearing;
/**
* A concrete implementation of {@link Request}.
*/
-public class RequestImpl extends AbstractSAMLObject implements Request {
+public class RequestImpl extends AbstractXMLObject implements Request {
/** IDPList child element. */
private IDPList idpList;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseImpl.java
index 210ee8a..8804a4b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseImpl.java
@@ -19,9 +19,9 @@ package org.opensaml.saml.saml2.ecp.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.schema.XSBooleanValue;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.ecp.Response;
import org.opensaml.soap.soap11.ActorBearing;
import org.opensaml.soap.soap11.MustUnderstandBearing;
@@ -29,7 +29,7 @@ import org.opensaml.soap.soap11.MustUnderstandBearing;
/**
* A concrete implementation of {@link Response}.
*/
-public class ResponseImpl extends AbstractSAMLObject implements Response {
+public class ResponseImpl extends AbstractXMLObject implements Response {
/** soap11:actor attribute. */
private String soap11Actor;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationImpl.java
index a8476e7..7228135 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationImpl.java
@@ -21,9 +21,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.schema.XSBooleanValue;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.SubjectConfirmationData;
import org.opensaml.saml.saml2.ecp.SubjectConfirmation;
import org.opensaml.soap.soap11.ActorBearing;
@@ -33,7 +33,7 @@ import org.opensaml.soap.soap11.MustUnderstandBearing;
/**
* Concrete implementation of {@link SubjectConfirmation}.
*/
-public class SubjectConfirmationImpl extends AbstractSAMLObject implements SubjectConfirmation {
+public class SubjectConfirmationImpl extends AbstractXMLObject implements SubjectConfirmation {
/** soap11:actor attribute. */
private String soap11Actor;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationImpl.java
index 49ca4ae..219db9b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationImpl.java
@@ -19,14 +19,14 @@ package org.opensaml.saml.saml2.metadata.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.metadata.AdditionalMetadataLocation;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.metadata.AdditionalMetadataLocation}.
*/
-public class AdditionalMetadataLocationImpl extends AbstractSAMLObject implements AdditionalMetadataLocation {
+public class AdditionalMetadataLocationImpl extends AbstractXMLObject implements AdditionalMetadataLocation {
/** The metadata location. */
private String location;
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 0be1ffe..436fa02 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
@@ -19,14 +19,14 @@ package org.opensaml.saml.saml2.metadata.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.metadata.AffiliateMember;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.metadata.AffiliateMember}.
*/
-public class AffiliateMemberImpl extends AbstractSAMLObject implements AffiliateMember {
+public class AffiliateMemberImpl extends AbstractXMLObject implements AffiliateMember {
/** ID of this member. */
private String id;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceImpl.java
index 3bb6e1d..aae1f88 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceImpl.java
@@ -25,10 +25,10 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.schema.XSBooleanValue;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.metadata.AttributeConsumingService;
import org.opensaml.saml.saml2.metadata.RequestedAttribute;
import org.opensaml.saml.saml2.metadata.ServiceDescription;
@@ -37,7 +37,7 @@ import org.opensaml.saml.saml2.metadata.ServiceName;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.metadata.AttributeConsumingService}.
*/
-public class AttributeConsumingServiceImpl extends AbstractSAMLObject implements AttributeConsumingService {
+public class AttributeConsumingServiceImpl extends AbstractXMLObject implements AttributeConsumingService {
/** Index of this service. */
private int index;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileImpl.java
index a19835d..c693b22 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.metadata.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.metadata.AttributeProfile;
/**
* A concrete implementation of {@link org.opensaml.saml.saml2.metadata.AttributeProfile}.
*/
-public class AttributeProfileImpl extends AbstractSAMLObject implements AttributeProfile {
+public class AttributeProfileImpl extends AbstractXMLObject implements AttributeProfile {
/** Profile URI. */
private String profileURI;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyImpl.java
index 7ac9f7f..d3883b1 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.metadata.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.metadata.Company;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.metadata.Company}.
*/
-public class CompanyImpl extends AbstractSAMLObject implements Company {
+public class CompanyImpl extends AbstractXMLObject implements Company {
/** Company name. */
private String companyName;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonImpl.java
index d6d23a4..40a9708 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonImpl.java
@@ -24,10 +24,10 @@ package org.opensaml.saml.saml2.metadata.impl;
import java.util.ArrayList;
import java.util.List;
+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.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.metadata.Extensions;
import org.opensaml.saml.saml2.metadata.Company;
import org.opensaml.saml.saml2.metadata.ContactPerson;
@@ -40,7 +40,7 @@ import org.opensaml.saml.saml2.metadata.TelephoneNumber;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.metadata.ContactPerson}.
*/
-public class ContactPersonImpl extends AbstractSAMLObject implements ContactPerson {
+public class ContactPersonImpl extends AbstractXMLObject implements ContactPerson {
/** Contact person type. */
private ContactPersonTypeEnumeration type;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressImpl.java
index 91dd1dd..d9a94ca 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.metadata.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.metadata.EmailAddress;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.metadata.EmailAddress}.
*/
-public class EmailAddressImpl extends AbstractSAMLObject implements EmailAddress {
+public class EmailAddressImpl extends AbstractXMLObject implements EmailAddress {
/** The email address. */
private String address;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EndpointImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EndpointImpl.java
index f313815..917bbcd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EndpointImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EndpointImpl.java
@@ -22,16 +22,16 @@ import java.util.List;
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.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.metadata.Endpoint;
/**
* A concrete implementation of {@link org.opensaml.saml.saml2.metadata.Endpoint}.
*/
-public abstract class EndpointImpl extends AbstractSAMLObject implements Endpoint {
+public abstract class EndpointImpl extends AbstractXMLObject implements Endpoint {
/** Binding URI. */
private String bindingId;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsImpl.java
index 9c11dea..a2b502f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsImpl.java
@@ -22,15 +22,15 @@ import java.util.List;
import javax.xml.namespace.QName;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.metadata.Extensions;
/**
* Implementation of {@link org.opensaml.saml.saml2.metadata.Extensions}.
*/
-public class ExtensionsImpl extends AbstractSAMLObject implements Extensions {
+public class ExtensionsImpl extends AbstractXMLObject implements Extensions {
/** "any" children. */
private final IndexedXMLObjectChildrenList<XMLObject> unknownChildren;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameImpl.java
index e525e91..934dc1c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.metadata.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.metadata.GivenName;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.metadata.GivenName}.
*/
-public class GivenNameImpl extends AbstractSAMLObject implements GivenName {
+public class GivenNameImpl extends AbstractXMLObject implements GivenName {
/** Given name (first name). */
private String name;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorImpl.java
index 07a8756..5914184 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorImpl.java
@@ -21,9 +21,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.metadata.EncryptionMethod;
import org.opensaml.saml.saml2.metadata.KeyDescriptor;
import org.opensaml.security.credential.UsageType;
@@ -32,7 +32,7 @@ import org.opensaml.xmlsec.signature.KeyInfo;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.metadata.KeyDescriptor}.
*/
-public class KeyDescriptorImpl extends AbstractSAMLObject implements KeyDescriptor {
+public class KeyDescriptorImpl extends AbstractXMLObject implements KeyDescriptor {
/** Key usage type. */
private UsageType keyUseType;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatImpl.java
index b9bb415..de803c9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.metadata.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.metadata.NameIDFormat;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.metadata.NameIDFormat}.
*/
-public class NameIDFormatImpl extends AbstractSAMLObject implements NameIDFormat {
+public class NameIDFormatImpl extends AbstractXMLObject implements NameIDFormat {
/** NameID format. */
private String format;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationImpl.java
index bbe5262..f2da621 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationImpl.java
@@ -24,10 +24,10 @@ package org.opensaml.saml.saml2.metadata.impl;
import java.util.ArrayList;
import java.util.List;
+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.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.metadata.Extensions;
import org.opensaml.saml.saml2.metadata.Organization;
import org.opensaml.saml.saml2.metadata.OrganizationDisplayName;
@@ -37,7 +37,7 @@ import org.opensaml.saml.saml2.metadata.OrganizationURL;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.metadata.Organization}.
*/
-public class OrganizationImpl extends AbstractSAMLObject implements Organization {
+public class OrganizationImpl extends AbstractXMLObject implements Organization {
/** element extensions. */
private Extensions extensions;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameImpl.java
index e699dfd..18509fd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.metadata.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.metadata.SurName;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.metadata.SurName}.
*/
-public class SurNameImpl extends AbstractSAMLObject implements SurName {
+public class SurNameImpl extends AbstractXMLObject implements SurName {
/** Service name. */
private String name;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberImpl.java
index fee4b10..6db3289 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberImpl.java
@@ -23,14 +23,14 @@ package org.opensaml.saml.saml2.metadata.impl;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.metadata.TelephoneNumber;
/**
* Concrete implementation of {@link org.opensaml.saml.saml2.metadata.TelephoneNumber}.
*/
-public class TelephoneNumberImpl extends AbstractSAMLObject implements TelephoneNumber {
+public class TelephoneNumberImpl extends AbstractXMLObject implements TelephoneNumber {
/** Telephone number. */
private String number;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/MockBaseID.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/MockBaseID.java
index e4199b1..d24ca3c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/MockBaseID.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/MockBaseID.java
@@ -19,15 +19,15 @@ package org.opensaml.saml.saml2.core;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.schema.XSString;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.saml.saml2.core.BaseID;
/**
* Mock BaseID class for testing purposes.
*/
-public class MockBaseID extends AbstractSAMLObject implements BaseID, XSString {
+public class MockBaseID extends AbstractXMLObject implements BaseID, XSString {
/** String content. */
private String content;
diff --git a/opensaml-xacml-saml-impl/src/main/java/org/opensaml/xacml/profile/saml/impl/ReferencedPoliciesTypeImpl.java b/opensaml-xacml-saml-impl/src/main/java/org/opensaml/xacml/profile/saml/impl/ReferencedPoliciesTypeImpl.java
index 0b9b698..4f2cbd0 100644
--- a/opensaml-xacml-saml-impl/src/main/java/org/opensaml/xacml/profile/saml/impl/ReferencedPoliciesTypeImpl.java
+++ b/opensaml-xacml-saml-impl/src/main/java/org/opensaml/xacml/profile/saml/impl/ReferencedPoliciesTypeImpl.java
@@ -21,9 +21,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.xacml.policy.PolicySetType;
import org.opensaml.xacml.policy.PolicyType;
import org.opensaml.xacml.profile.saml.ReferencedPoliciesType;
@@ -31,7 +31,7 @@ import org.opensaml.xacml.profile.saml.ReferencedPoliciesType;
/**
* Implementation of {@link ReferencedPoliciesType}.
*/
-public class ReferencedPoliciesTypeImpl extends AbstractSAMLObject implements ReferencedPoliciesType {
+public class ReferencedPoliciesTypeImpl extends AbstractXMLObject implements ReferencedPoliciesType {
/**List of policies.*/
private XMLObjectChildrenList<PolicyType> policies;
diff --git a/opensaml-xacml-saml-impl/src/main/java/org/opensaml/xacml/profile/saml/impl/XACMLAuthzDecisionStatementTypeImpl.java b/opensaml-xacml-saml-impl/src/main/java/org/opensaml/xacml/profile/saml/impl/XACMLAuthzDecisionStatementTypeImpl.java
index 42b83ed..288193f 100644
--- a/opensaml-xacml-saml-impl/src/main/java/org/opensaml/xacml/profile/saml/impl/XACMLAuthzDecisionStatementTypeImpl.java
+++ b/opensaml-xacml-saml-impl/src/main/java/org/opensaml/xacml/profile/saml/impl/XACMLAuthzDecisionStatementTypeImpl.java
@@ -21,14 +21,14 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.xacml.ctx.RequestType;
import org.opensaml.xacml.ctx.ResponseType;
import org.opensaml.xacml.profile.saml.XACMLAuthzDecisionStatementType;
/** A concrete implementation of {@link org.opensaml.xacml.profile.saml.XACMLAuthzDecisionStatementType}. */
-public class XACMLAuthzDecisionStatementTypeImpl extends AbstractSAMLObject implements XACMLAuthzDecisionStatementType {
+public class XACMLAuthzDecisionStatementTypeImpl extends AbstractXMLObject implements XACMLAuthzDecisionStatementType {
/** The request of the authorization request. */
private RequestType request;
diff --git a/opensaml-xacml-saml-impl/src/main/java/org/opensaml/xacml/profile/saml/impl/XACMLPolicyStatementTypeImpl.java b/opensaml-xacml-saml-impl/src/main/java/org/opensaml/xacml/profile/saml/impl/XACMLPolicyStatementTypeImpl.java
index 2c682f4..21be309 100644
--- a/opensaml-xacml-saml-impl/src/main/java/org/opensaml/xacml/profile/saml/impl/XACMLPolicyStatementTypeImpl.java
+++ b/opensaml-xacml-saml-impl/src/main/java/org/opensaml/xacml/profile/saml/impl/XACMLPolicyStatementTypeImpl.java
@@ -21,9 +21,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opensaml.core.xml.AbstractXMLObject;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
-import org.opensaml.saml.common.AbstractSAMLObject;
import org.opensaml.xacml.XACMLObject;
import org.opensaml.xacml.policy.PolicySetType;
import org.opensaml.xacml.policy.PolicyType;
@@ -31,7 +31,7 @@ import org.opensaml.xacml.profile.saml.ReferencedPoliciesType;
import org.opensaml.xacml.profile.saml.XACMLPolicyStatementType;
/** Concrete implementation of {@link XACMLPolicyStatementType}. */
-public class XACMLPolicyStatementTypeImpl extends AbstractSAMLObject implements XACMLPolicyStatementType {
+public class XACMLPolicyStatementTypeImpl extends AbstractXMLObject implements XACMLPolicyStatementType {
/** Choice group in element. */
private IndexedXMLObjectChildrenList<XACMLObject> choiceGroup;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list