summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile10
-rw-r--r--swamid-2.0/idp.esh.se-idp-shibboleth.xml3
2 files changed, 12 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1ef64d19..debab7fc 100644
--- a/Makefile
+++ b/Makefile
@@ -243,7 +243,7 @@ testAttributeInIdP:
test: syntaxtest testMDUI testOrgData testEntCat testSimpleSign testALlevel testEduGAINchecks testRefedsRnS testGeantCoCo testMetadataUsage testBadStrings testIdPinSP testRoleDescriptor testAttributeInIdP testValidContact
-test2: $(SWAMIDXML) testMDUI testOrgData testEntCat testSimpleSign testALlevel testEduGAINchecks testRefedsRnS testGeantCoCo testMetadataUsage testBadStrings testIdPinSP testRoleDescriptor testAttributeInIdP testValidContact
+test2: $(SWAMIDXML) schematest testMDUI testOrgData testEntCat testSimpleSign testALlevel testEduGAINchecks testRefedsRnS testGeantCoCo testMetadataUsage testBadStrings testIdPinSP testRoleDescriptor testAttributeInIdP testValidContact
.time/%.time: swamid-2.0/%.xml
@# make tidy
@@ -275,6 +275,14 @@ test2: $(SWAMIDXML) testMDUI testOrgData testEntCat testSimpleSign testALlevel t
deeptest: test testMDUIreach
+commit2: test2
+ @git diff --color || true
+ @echo ; echo -n "Run 'git commit -a'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -a ;; s|skip) ;; *) exit 1 ;; esac
+ @git status -u
+ @echo "Checking for not committed files in swamid-2.0/" ; if git status --porcelain --ignored | awk '{print $$2}' | grep "^swamid-2.0/" | sed 's/^/ /' | grep . ; then echo "Not committed files in swamid-2.0/, aborting" ; exit 1 ; fi
+ @echo ; echo -n "Run 'git push'? [Y/n] " ; read x ; case $$x in "Y"|"y"|"") ;; *) exit 1 ;; esac
+ @git push
+
commit: tidy test
@git diff --color || true
@echo ; echo -n "Run 'git commit -a'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -a ;; s|skip) ;; *) exit 1 ;; esac
diff --git a/swamid-2.0/idp.esh.se-idp-shibboleth.xml b/swamid-2.0/idp.esh.se-idp-shibboleth.xml
index 6773dac4..f3635f4e 100644
--- a/swamid-2.0/idp.esh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.esh.se-idp-shibboleth.xml
@@ -90,4 +90,7 @@ geGI3bNTbXj3Fgu9lanUQE7DbWETQEnrqI2QH+8tr4vVnhG7jaET+qP/ya+XXPJ1
<OrganizationURL xml:lang="sv">http://www.esh.se/</OrganizationURL>
<OrganizationURL xml:lang="en">http://www.esh.se/in-english/ersta-skondal-hogskola---english.html</OrganizationURL>
</Organization>
+ <ContactPerson contactType="technical">
+ <EmailAddress>mailto:klas.eriksson@esh.se</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>