Renamed files to match entityID part2

10 files changed, 10 insertions, 10 deletions

diff --git a/scripts/rename-xml.sh b/scripts/rename-xml.sh
index 9ef89ead..e82742d9 100755
--- a/scripts/rename-xml.sh
+++ b/scripts/rename-xml.sh
@@ -32,7 +32,7 @@ if test -d swamid-2.0 ; then
 fi
 
 if echo "$entityID" | grep -qE '^http://|^https://' ; then
-	metadata=`grep -il "$entityID" *`
+	metadata=`grep -il "entityID.*$entityID" *`
 else
 	echo "Missing http(s) in entityID"
 fi
diff --git a/scripts/update-and-validate.sh b/scripts/update-and-validate.sh
index 280064f9..c9a5c0f9 100755
--- a/scripts/update-and-validate.sh
+++ b/scripts/update-and-validate.sh
@@ -8,8 +8,6 @@ update()
 
 	/var/www/scripts/updateWebb.bash
 
-	make -f Makefile.validate -s
-
 	ls swamid-2.0/*.xml | sed 's@swamid-2.0/\(.*\).xml@.time/\1.validate@' > /tmp/$$.xml
 	ls .time/*.validate > /tmp/$$.time
 	comm -13 /tmp/$$.xml /tmp/$$.time | while read file; do
@@ -21,6 +19,8 @@ update()
 	if [ $(find .time/ -ctime +15 | wc -l) -ne 0 ]; then
 		rm `find .time/ -ctime +15 | tail -10`
 	fi
+
+	make -f Makefile.validate -s
 }
 
 cd /opt/swamid-metadata || exit 1
diff --git a/sp-with-simplesign b/sp-with-simplesign
index 8f766726..409f9f5a 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -64,7 +64,7 @@ kurser.math.su.se-shibboleth.xml
 kurser3.math.su.se-shibboleth.xml
 ladok3.its.umu.se-user-idp.xml
 ladok3test.its.umu.se-user-idp.xml
-lartorget.sll.se-shibbolet.xml
+lartorget.sll.se-shibboleth.xml
 local.cloudmore.com-shibboleth.xml
 login-dev.du.se-idp-shibboleth.xml
 login.du.se-idp-shibboleth.xml
@@ -121,7 +121,7 @@ swamid2.shh.se-idp-shibboleth.xml
 tcs-test.sunet.se-shibboleth.xml
 test-chalmers.pingpong.net-shibboleth.xml
 test-ki.pingpong.net-shibboleth.xml
-test.mp.uu.se-shibboleth-sso.xml
+test.mp.uu.se-Shibboleth.sso.xml
 testshib.msacademicverify.com-shibboleth-sp.xml
 tta-portal.misc.kth.se-shibboleth.xml
 umdac-stdout.umdc.umu.se-shibboleth.xml
diff --git a/swamid-2.0/lartorget.sll.se-shibbolet.xml b/swamid-2.0/lartorget.sll.se-shibboleth.xml
index 6c859771..6c859771 100644
--- a/swamid-2.0/lartorget.sll.se-shibbolet.xml
+++ b/swamid-2.0/lartorget.sll.se-shibboleth.xml
diff --git a/swamid-2.0/rkh.pingpong.net-Shibboleth.sso-Metadata.xml b/swamid-2.0/rkh.pingpong.se-Shibboleth.sso-Metadata.xml
index 0c73798b..0c73798b 100644
--- a/swamid-2.0/rkh.pingpong.net-Shibboleth.sso-Metadata.xml
+++ b/swamid-2.0/rkh.pingpong.se-Shibboleth.sso-Metadata.xml
diff --git a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml b/swamid-2.0/se.timeedit.net-lnu-employee-sp.xml
index f9771e26..f9771e26 100644
--- a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml
+++ b/swamid-2.0/se.timeedit.net-lnu-employee-sp.xml
diff --git a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml b/swamid-2.0/se.timeedit.net-lnu-student-sp.xml
index 400952e8..400952e8 100644
--- a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml
+++ b/swamid-2.0/se.timeedit.net-lnu-student-sp.xml
diff --git a/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml b/swamid-2.0/test.mp.uu.se-Shibboleth.sso.xml
index 01f833fa..01f833fa 100644
--- a/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml
+++ b/swamid-2.0/test.mp.uu.se-Shibboleth.sso.xml
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 7f6e25a4..9fa1306f 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -135,15 +135,15 @@
   <xi:include href="swamid-2.0/portalservicesutv.miun.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-ki.pingpong.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hr.su.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml"/>
-  <xi:include href="swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml"/>
+  <xi:include href="swamid-2.0/se.timeedit.net-lnu-employee-sp.xml"/>
+  <xi:include href="swamid-2.0/se.timeedit.net-lnu-student-sp.xml"/>
   <xi:include href="swamid-2.0/pingpong.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sdauth.sciencedirect.com-.xml"/>
   <xi:include href="swamid-2.0/wiki.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mp.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-  <xi:include href="swamid-2.0/lartorget.sll.se-shibbolet.xml"/>
+  <xi:include href="swamid-2.0/lartorget.sll.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hr.liu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/accounts.bils.se-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/nagios.nordu.net-8087-sp.xml"/>
@@ -373,7 +373,7 @@
   <xi:include href="swamid-2.0/urn-mace-saml2v2.no-services-com.itslearning.test.xml"/>
   <xi:include href="swamid-2.0/test-rkh.pingpong.net-Shibboleth.sso-Metadata.xml"/>
   <xi:include href="swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml"/>
-  <xi:include href="swamid-2.0/rkh.pingpong.net-Shibboleth.sso-Metadata.xml"/>
+  <xi:include href="swamid-2.0/rkh.pingpong.se-Shibboleth.sso-Metadata.xml"/>
   <xi:include href="swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.ifmsa.se-spp.xml"/>
   <xi:include href="swamid-2.0/dev.valda.uhr.se-shibboleth.xml"/>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 5e82c35c..95e62d4e 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -49,7 +49,7 @@
   <xi:include href="swamid-2.0/castest.weblogin.uu.se-cas.xml"/>
   <xi:include href="swamid-2.0/sesamutvf.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/konto.test.uu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/test.mp.uu.se-shibboleth-sso.xml"/>
+  <xi:include href="swamid-2.0/test.mp.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/urn-mace-feide.no-services-no.inspera.assessment.test.xml"/>
   <xi:include href="swamid-2.0/use-uu.sitevision.se.xml"/>
   <xi:include href="swamid-2.0/cloud-89-45-233-156.instance.cloud.sunet.se.xml"/>