[jbosstools-commits] JBoss Tools SVN: r28450 - trunk/build/aggregate/site.

Author: nickboldt Date: 2011-01-20 19:28:48 -0500 (Thu, 20 Jan 2011) New Revision: 28450 Added: trunk/build/aggregate/site/remove-uncategorized.xsl Modified: trunk/build/aggregate/site/build.xml trunk/build/aggregate/site/pom.xml Log: merge from CR1 branch to trunk Modified: trunk/build/aggregate/site/build.xml =================================================================== --- trunk/build/aggregate/site/build.xml 2011-01-21 00:16:42 UTC (rev 28449) +++ trunk/build/aggregate/site/build.xml 2011-01-21 00:28:48 UTC (rev 28450) @@ -283,8 +283,11 @@ <echo file="${update.site.source.dir}/content.xml" append="true"> &lt;/references> &lt;/repository> </echo> + <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" /> + <xslt style="remove-uncategorized.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" /> <zip destfile="${update.site.source.dir}/content.jar" basedir="${update.site.source.dir}" includes="content.xml" /> <delete file="${update.site.source.dir}/content.xml" /> + <delete file="${update.site.source.dir}/content.old.xml" /> </then> </if> </target> Modified: trunk/build/aggregate/site/pom.xml =================================================================== --- trunk/build/aggregate/site/pom.xml 2011-01-21 00:16:42 UTC (rev 28449) +++ trunk/build/aggregate/site/pom.xml 2011-01-21 00:28:48 UTC (rev 28450) @@ -1,6 +1,6 @@ -<project +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> @@ -25,7 +25,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> + <version>${maven.antrun.plugin.version}</version> <executions> <execution> <id>install</id> @@ -33,11 +33,11 @@ <configuration> <quiet>true</quiet> <tasks> - <property name="inputRepo1" value="${inputRepo1}" /> - <property name="inputRepos" value="${inputRepos}" /> + <property name="inputRepo1" value="${inputRepo1}"/> + <property name="inputRepos" value="${inputRepos}"/> <!-- called AFTER generating update site + zip to add in extra content --> - <ant antfile="build.xml" /> + <ant antfile="build.xml"/> </tasks> </configuration> @@ -54,6 +54,16 @@ </dependency> <dependency> <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-trax</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> <artifactId>ant-commons-net</artifactId> <version>1.7.1</version> </dependency> @@ -95,4 +105,4 @@ </releases> </repository> </repositories> -</project> +</project> \ No newline at end of file Added: trunk/build/aggregate/site/remove-uncategorized.xsl =================================================================== --- trunk/build/aggregate/site/remove-uncategorized.xsl (rev 0) +++ trunk/build/aggregate/site/remove-uncategorized.xsl 2011-01-21 00:28:48 UTC (rev 28450) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"> + +<xsl:template match="/"> + <xsl:apply-templates select="*"/> +</xsl:template> + + +<xsl:template match="*"> + <xsl:copy > + <xsl:for-each select="@*"> + <xsl:copy /> + </xsl:for-each> + <xsl:apply-templates /> + </xsl:copy> +</xsl:template> + +<xsl:template match=&quot;unit[contains((a)id,&#39;site.xml.Default&#39;)]&quot; /> + +</xsl:stylesheet> \ No newline at end of file