diff options
| author | Leif Johansson <leifj@sunet.se> | 2010-11-23 16:06:12 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2010-11-23 16:06:12 +0100 |
| commit | c6ef63afb44b877af279a68eb69cbc1a7d83dbe8 (patch) | |
| tree | 25ebadf518e9087803e70a12d02a018d49b14931 | |
| parent | 3783ce126b50416c723b760917f3dad9f434944c (diff) | |
new testing metadata and schema validation
| -rw-r--r-- | NewMakefile | 20 | ||||
| -rw-r--r-- | xslt/summary.xslt | 6 |
2 files changed, 16 insertions, 10 deletions
diff --git a/NewMakefile b/NewMakefile index e61d0291..41bc9cc9 100644 --- a/NewMakefile +++ b/NewMakefile @@ -11,7 +11,9 @@ update: keys: $(KEY) $(CERT) -sign: keys swamid nya swamid-compat nya-testing swamid-testing swamid-kalmar swamid-edugain-testing swamid-ki-sll +MXML=$(shell echo *.mxml) + +sign: keys swamid nya swamid-compat nya-testing old-swamid-testing swamid-testing swamid-kalmar swamid-edugain-testing swamid-ki-sll urn-mace-swami.se-swamid-test-1.0-metadata.mxml: @sed 's!http://md.swamid.se/md/swamid-1.0.xml!urn:mace:swami.se:swamid:test-1.0!g' < swamid-1.0.mxml > urn-mace-swami.se-swamid-test-1.0-metadata.mxml @@ -37,6 +39,14 @@ nya-testing: @test -s nya-1.0-testing.xml && cp nya-1.0-testing.xml $(DEST) swamid-testing: + @saml-md-tool swamid-testing-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) + @test -s swamid-testing-1.0.xml && cp swamid-testing-1.0.xml $(DEST) + +swamid-testing-idp: + @saml-md-tool swamid-testing-idp-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) + @test -s swamid-testing-idp-1.0.xml && cp swamid-testing-idp-1.0.xml $(DEST) + +old-swamid-testing: @saml-md-tool swamid-1.0-testing update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) @test -s swamid-1.0-testing.xml && cp swamid-1.0-testing.xml $(DEST) @@ -53,13 +63,7 @@ swamid-ki-sll: @test -s swamid-ki-sll-1.0.xml && cp swamid-ki-sll-1.0.xml $(DEST) test: - @xmllint --xinclude --noout --schema schema/sstc-saml-schema-metadata-2.0.xsd swamid-1.0.mxml - @xmllint --xinclude --noout --schema schema/sstc-saml-schema-metadata-2.0.xsd nya-1.0.mxml - @xmllint --xinclude --noout --schema schema/sstc-saml-schema-metadata-2.0.xsd swamid-1.0-testing.mxml - @xmllint --xinclude --noout --schema schema/sstc-saml-schema-metadata-2.0.xsd nya-1.0-testing.mxml - @xmllint --xinclude --noout --schema schema/sstc-saml-schema-metadata-2.0.xsd swamid-kalmar-1.0.mxml - @xmllint --xinclude --noout --schema schema/sstc-saml-schema-metadata-2.0.xsd swamid-ki-sll-1.0.mxml - @xmllint --xinclude --noout --schema schema/sstc-saml-schema-metadata-2.0.xsd swamid-edugain-testing-1.0.mxml + for x in $(MXML); do xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $$x; done clean: @rm -f *.xml diff --git a/xslt/summary.xslt b/xslt/summary.xslt index ed379727..05152d13 100644 --- a/xslt/summary.xslt +++ b/xslt/summary.xslt @@ -35,9 +35,11 @@ <xsl:apply-templates select="md:ContactPerson"/> <xsl:text> </xsl:text> - <xsl:apply-templates select="md:SPSSODescriptor/md:AttributeConsumingService"/> + <xsl:apply-templates select="md:SPSSODescriptor/md:AttributeConsumingService"/><xsl:text> +</xsl:text> + <xsl:text>[Supplemental documentation|</xsl:text><xsl:call-template name="entity-name"/><xsl:text>] +</xsl:text> <xsl:text> - </xsl:text> </xsl:template> |