diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-12-01 13:10:55 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-12-01 13:10:55 +0100 |
| commit | ba159a996ea105e4f1dc03647fe0bf22039ff472 (patch) | |
| tree | e4736c22a3a126e6cf1653a533225580d381d5cf | |
| parent | ee5313ec12f581d7ff175132e3d3816d40090155 (diff) | |
make org optional
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | xslt/normalize.xsl | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -9,6 +9,7 @@ DATE=$(shell perl scripts/expiration_date.pl $(DAYS)) RPI=false CONTACTS=false TOU=true +ORG=true TRANSFORM=xslt/normalize.xsl XSLTDEFS := --stringparam tou $(TOU) --stringparam rpi $(RPI) --stringparam defaultContact $(CONTACTS) --stringparam date $(DATE) @@ -43,7 +44,7 @@ edugain: $(MAKE) RPI=true CONTACTS=true swamid-edugain-testing-1.0.pub swamid-edugain-1.0.pub projects: - $(MAKE) RPI=false CONTACTS=false TOU=false swamid-fiv-test.pub + $(MAKE) RPI=false CONTACTS=false TOU=false ORG=false swamid-fiv-test.pub swamid-externals: swamid-externals1 swamid-externals2 diff --git a/xslt/normalize.xsl b/xslt/normalize.xsl index 7de5a90f..1abe4e05 100644 --- a/xslt/normalize.xsl +++ b/xslt/normalize.xsl @@ -64,7 +64,7 @@ If You do not accept these Terms, then You must not continue to use this Metadat <md:Extensions><xsl:call-template name="add-swamid-rpi"/></md:Extensions> </xsl:if> <xsl:apply-templates select="text()|comment()|md:Extensions|md:RoleDescriptor|md:IDPSSODescriptor|md:SPSSODescriptor|md:AuthnAuthorityDescriptor|md:AttributeAuthorityDescriptor|md:PDPDescriptor|md:AffiliationDescriptor"/> - <xsl:if test="not(md:Organization)"> + <xsl:if test="$org='true' and not(md:Organization)"> <xsl:apply-templates select="document($orginfo)"/> </xsl:if> <xsl:if test="$defaultContact='true' and not(md:ContactPerson)"> |