Reverse the filtering for uklabel namespace elements. Instead of excl…

…uding only uklabel:Software, exclude everything *except* a list of specific elements. This means that we can deploy new elements internally and have them hidden from publication by default.
InCommon · Sep 11, 2009 · 33aff17 · 33aff17
1 parent 3aeaa28
commit 33aff17
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 8 deletions.
diff --git a/build/uk_master_back.xsl b/build/uk_master_back.xsl
@@ -65,9 +65,20 @@
 	</xsl:template>
 
 	<!--
-		Strip uklabel:Software elements entirely.
+		Pass through certain uklabel namespace elements.
 	-->
-	<xsl:template match="uklabel:Software|uklabel:Software">
+	<xsl:template match="uklabel:UKFederationMember |
+		uklabel:SDSSPolicy |
+		uklabel:AccountableUsers">
+		<xsl:copy>
+			<xsl:apply-templates select="node()|@*"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<!--
+		Strip all other uklabel namespace elements entirely.
+	-->
+	<xsl:template match="uklabel:*">
 		<!-- do nothing -->
 	</xsl:template>
 

diff --git a/build/uk_master_export.xsl b/build/uk_master_export.xsl
@@ -45,9 +45,20 @@
 	</xsl:template>
 
 	<!--
-		Strip uklabel:Software elements entirely.
+		Pass through certain uklabel namespace elements.
 	-->
-	<xsl:template match="uklabel:Software|uklabel:Software">
+	<xsl:template match="uklabel:UKFederationMember |
+		uklabel:SDSSPolicy |
+		uklabel:AccountableUsers">
+		<xsl:copy>
+			<xsl:apply-templates select="node()|@*"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<!--
+		Strip all other uklabel namespace elements entirely.
+	-->
+	<xsl:template match="uklabel:*">
 		<!-- do nothing -->
 	</xsl:template>
 

diff --git a/build/uk_master_test.xsl b/build/uk_master_test.xsl
@@ -86,9 +86,20 @@
 	</xsl:template>
 
 	<!--
-		Strip uklabel:Software elements entirely.
+		Pass through certain uklabel namespace elements.
 	-->
-	<xsl:template match="uklabel:Software|uklabel:Software">
+	<xsl:template match="uklabel:UKFederationMember |
+		uklabel:SDSSPolicy |
+		uklabel:AccountableUsers">
+		<xsl:copy>
+			<xsl:apply-templates select="node()|@*"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<!--
+		Strip all other uklabel namespace elements entirely.
+	-->
+	<xsl:template match="uklabel:*">
 		<!-- do nothing -->
 	</xsl:template>
 

diff --git a/build/uk_master_unsigned.xsl b/build/uk_master_unsigned.xsl
@@ -81,9 +81,20 @@
 	</xsl:template>
 
 	<!--
-		Strip uklabel:Software elements entirely.
+		Pass through certain uklabel namespace elements.
 	-->
-	<xsl:template match="uklabel:Software|uklabel:Software">
+	<xsl:template match="uklabel:UKFederationMember |
+		uklabel:SDSSPolicy |
+		uklabel:AccountableUsers">
+		<xsl:copy>
+			<xsl:apply-templates select="node()|@*"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<!--
+		Strip all other uklabel namespace elements entirely.
+	-->
+	<xsl:template match="uklabel:*">
 		<!-- do nothing -->
 	</xsl:template>