Remove upstreamed components

InCommon · Apr 14, 2023 · 4516bd2 · 4516bd2
1 parent b16bcfd
commit 4516bd2
Showing 16 changed files with 9 additions and 681 deletions.
diff --git a/src/main/java/uk/org/iay/incommon/mda/dom/saml/shib/ScopeValidationStage.java b/src/main/java/uk/org/iay/incommon/mda/dom/saml/shib/ScopeValidationStage.java
@@ -26,10 +26,10 @@
 import net.shibboleth.metadata.dom.SimpleDOMTraversalContext;
 import net.shibboleth.metadata.pipeline.StageProcessingException;
 import net.shibboleth.metadata.validate.Validator;
+import net.shibboleth.metadata.validate.ValidatorSequence;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.xml.AttributeSupport;
 import net.shibboleth.shared.xml.ElementSupport;
-import uk.org.iay.incommon.mda.validate.ValidatorSequence;
 
 /**
  * Stage to apply a collection of validators to Shibboleth <code>shibmd:Scope</code>

diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/AcceptAllValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/AcceptAllValidator.java
diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/BaseAsValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/BaseAsValidator.java
@@ -22,6 +22,7 @@
 import net.shibboleth.metadata.pipeline.StageProcessingException;
 import net.shibboleth.metadata.validate.BaseValidator;
 import net.shibboleth.metadata.validate.Validator;
+import net.shibboleth.metadata.validate.ValidatorSequence;
 import net.shibboleth.shared.component.ComponentInitializationException;
 
 /**

diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/RejectAllValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/RejectAllValidator.java
diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/ValidatorSequence.java b/src/main/java/uk/org/iay/incommon/mda/validate/ValidatorSequence.java
diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/string/AcceptStringRegexValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/string/AcceptStringRegexValidator.java
diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/string/AcceptStringValueValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/string/AcceptStringValueValidator.java
diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/string/RejectStringRegexValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/string/RejectStringRegexValidator.java
diff --git a/src/main/resources/uk/org/iay/incommon/mda/beans.xml b/src/main/resources/uk/org/iay/incommon/mda/beans.xml
@@ -42,31 +42,16 @@
         Validator beans.
     -->
 
-    <bean id="inc.AcceptAllValidator" abstract="true" parent="inc.component_parent"
-        class="uk.org.iay.incommon.mda.validate.AcceptAllValidator"/>
-
-    <bean id="inc.AcceptStringRegexValidator" abstract="true" parent="inc.component_parent"
-        class="uk.org.iay.incommon.mda.validate.string.AcceptStringRegexValidator"/>
-
-    <bean id="inc.AcceptStringValueValidator" abstract="true" parent="inc.component_parent"
-        class="uk.org.iay.incommon.mda.validate.string.AcceptStringValueValidator"/>
-
     <bean id="inc.AsDomainNameStringValidator" abstract="true" parent="inc.component_parent"
         class="uk.org.iay.incommon.mda.validate.string.AsDomainNameStringValidator"/>
 
     <bean id="inc.AsLiteralTailStringValidator" abstract="true" parent="inc.component_parent"
         class="uk.org.iay.incommon.mda.validate.string.AsLiteralTailStringValidator"/>
 
-    <bean id="inc.RejectAllValidator" abstract="true" parent="inc.component_parent"
-        class="uk.org.iay.incommon.mda.validate.RejectAllValidator"/>
-
     <bean id="inc.RejectDomainNameNotUnderPublicSuffixValidator" abstract="true" parent="inc.component_parent"
         class="uk.org.iay.incommon.mda.validate.net.RejectDomainNameNotUnderPublicSuffixValidator"/>
 
     <bean id="inc.RejectDomainNamePublicSuffixValidator" abstract="true" parent="inc.component_parent"
         class="uk.org.iay.incommon.mda.validate.net.RejectDomainNamePublicSuffixValidator"/>
 
-    <bean id="inc.RejectStringRegexValidator" abstract="true" parent="inc.component_parent"
-        class="uk.org.iay.incommon.mda.validate.string.RejectStringRegexValidator"/>
-
 </beans>