SWAMID externals is obsolete

4 files changed, 2 insertions, 29 deletions

diff --git a/.gitignore b/.gitignore
index 5958c660..43def0be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 swamid-sp-1.0.xml
 swamid-idp-1.0.xml
-swamid-externals-sp-2.0.xml
 swamid-interfederations-1.0
 swamid-interfederations-2.0
 swamid-interfederations-idp-2.0.xml
@@ -8,8 +7,6 @@ swamid-interfederations-sp-2.0.xml
 *.tbs
 *.n
 .cache
-swamid-externals-1.0*
-swamid-externals-2.0*
 swamid-interfederations-1.0*
 swamid-interfederations-2.0*
 .time/*
diff --git a/Makefile b/Makefile
index 6300c101..428fb78e 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,6 @@ sign: swamid upstream
 %.pub: %.sig
 	mkdir -p $(DEST) && xmllint --nowarning --noout --path schema --schema schema.xsd $< && mv $< $(DEST)/$*.xml
 
-#dependencies: swamid-externals-sp-2.0.xml swamid-interfederations-idp-2.0.xml swamid-interfederations-sp-2.0.xml
 dependencies:  swamid-interfederations-idp-2.0.xml swamid-interfederations-sp-2.0.xml
 
 # kalmar obsolete
@@ -53,17 +52,8 @@ kalmar:
 edugain:
 	env SWAMID_MK_CONFIG=$(SWAMID_MK_CONFIG) $(MAKE) RPI=true CONTACTS=true swamid-edugain-testing-1.0.pub swamid-edugain-1.0.pub
 
-#aggregate: swamid-externals swamid-interfederations
 aggregate: swamid-interfederations
 
-swamid-externals: swamid-externals1 swamid-externals2
-
-swamid-externals1:
-	scripts/aggregate.sh swamid-externals-1.0
-
-swamid-externals2:
-	scripts/aggregate.sh swamid-externals-2.0
-
 # kalmar obsolete
 #swamid-interfederations: swamid-interfederations1 swamid-interfederations2
 swamid-interfederations: swamid-interfederations2
@@ -105,9 +95,6 @@ swamid-interfederations-idp-2.0.xml: swamid-interfederations-2.0.mxml
 swamid-interfederations-sp-2.0.xml: swamid-interfederations-2.0.mxml
 	@xsltproc --xinclude xslt/extract-sp.xslt swamid-interfederations-2.0.mxml > swamid-interfederations-sp-2.0.xml
 
-swamid-externals-sp-2.0.xml: swamid-externals-2.0.mxml
-	@xsltproc --xinclude xslt/extract-non-idp.xslt swamid-externals-2.0.mxml > swamid-externals-sp-2.0.xml
-
 syntaxtest: clean dependencies schematest
 
 pedantic: clean dependencies schematest testRefedsRnS testGeantCoCo testEduGAINchecks
@@ -205,11 +192,11 @@ testMDUI:
 
 testIdPinSP:
 	@echo "Check that SP:s does not define IDPSSODescriptor"
-	@for spfile in `cat swamid-sp-2.0.mxml swamid-externals-sp-2.0.xml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}'` ; do grep -q IDPSSODescriptor $$spfile && echo "  $$spfile" | sed 's/.*/&/' ; done | grep . && exit 1 || exit 0
+	@for spfile in `cat swamid-sp-2.0.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}'` ; do grep -q IDPSSODescriptor $$spfile && echo "  $$spfile" | sed 's/.*/&/' ; done | grep . && exit 1 || exit 0
 
 testMDUIreach:
 	@echo "Check that MDUI URLs are reachable"
-	@cat swamid-idp-2.0.mxml swamid-sp-2.0.mxml swamid-externals-sp-2.0.xml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}' | \
+	@cat swamid-idp-2.0.mxml swamid-sp-2.0.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}' | \
 	xargs -n1 -P 10 scripts/verify-uiinfo-urls.sh
 
 testOrgData:
diff --git a/swamid-externals-1.0/metadata.lst b/swamid-externals-1.0/metadata.lst
deleted file mode 100644
index 9caba967..00000000
--- a/swamid-externals-1.0/metadata.lst
+++ /dev/null
@@ -1,10 +0,0 @@
-http://spaces.internet2.edu/Shibboleth.sso/Metadata
-# spaces.internet2.edu.crt
-#http://discovery.shibboleth.net/shibboleth.net-metadata.xml
-#https://www.dreamspark.com/policies/dreamspark_metadata.xml
-
-# Old OpenSSL at md1/md2
-#https://login.terena.org/wayf/module.php/saml/sp/metadata.php/default-sp?output=xml
-# Already in eduGAIN via http://mds.edugain.org
-#https://ladok3.its.umu.se/swamid-md/terena.org-sp.xml
-
diff --git a/swamid-externals-2.0/metadata.lst b/swamid-externals-2.0/metadata.lst
deleted file mode 100644
index 93e5b069..00000000
--- a/swamid-externals-2.0/metadata.lst
+++ /dev/null
@@ -1 +0,0 @@
-http://spaces.internet2.edu/Shibboleth.sso/Metadata