Author: nickboldt Date: 2011-11-21 17:21:34 -0500 (Mon, 21 Nov 2011) New Revision: 36513 Added: trunk/build/aggregate/bottests-site/site/associate.properties trunk/build/aggregate/bottests-site/site/remove-references.xsl trunk/build/aggregate/site/associate.properties trunk/build/aggregate/site/remove-references.xsl trunk/build/aggregate/soa-site/associate.properties trunk/build/aggregate/soa-site/remove-references.xsl trunk/build/aggregate/webtools-site/associate.properties trunk/build/aggregate/webtools-site/remove-references.xsl Removed: trunk/build/aggregate/bottests-site/site/associate.sites.properties trunk/build/aggregate/site/associate.sites.properties trunk/build/aggregate/soa-site/associate.sites.properties trunk/build/aggregate/webtools-site/associate.sites.properties Modified: trunk/build/aggregate/bottests-site/site/build.xml trunk/build/aggregate/site/build.xml trunk/build/aggregate/soa-site/build.xml trunk/build/aggregate/soa-site/pom.xml trunk/build/aggregate/webtools-site/build.xml Log: refactor and port use of remove-references.xsl from JBDS to JBT Copied: trunk/build/aggregate/bottests-site/site/associate.properties (from rev 36511, trunk/build/aggregate/bottests-site/site/associate.sites.properties) =================================================================== --- trunk/build/aggregate/bottests-site/site/associate.properties (rev 0) +++ trunk/build/aggregate/bottests-site/site/associate.properties 2011-11-21 22:21:34 UTC (rev 36513) @@ -0,0 +1,7 @@ +# options: Nightly Build (default), Development Milestone, Stable Release +#update.site.description=Nightly Build +#update.site.description=Development Milestone +#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 + +# associate sites to add to the resulting repo +associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://download.eclipse.org/bpel/update-site/,http://dl.google.com/eclipse/plugin/3.7/ Deleted: trunk/build/aggregate/bottests-site/site/associate.sites.properties =================================================================== --- trunk/build/aggregate/bottests-site/site/associate.sites.properties 2011-11-21 21:58:54 UTC (rev 36512) +++ trunk/build/aggregate/bottests-site/site/associate.sites.properties 2011-11-21 22:21:34 UTC (rev 36513) @@ -1,7 +0,0 @@ -# options: Nightly Build (default), Development Milestone, Stable Release -#update.site.description=Nightly Build -#update.site.description=Development Milestone -#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 - -# associate sites to add to the resulting repo -associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://download.eclipse.org/bpel/update-site/,http://dl.google.com/eclipse/plugin/3.7/ Modified: trunk/build/aggregate/bottests-site/site/build.xml =================================================================== --- trunk/build/aggregate/bottests-site/site/build.xml 2011-11-21 21:58:54 UTC (rev 36512) +++ trunk/build/aggregate/bottests-site/site/build.xml 2011-11-21 22:21:34 UTC (rev 36513) @@ -27,10 +27,9 @@ <property name="update.site.source.dir" value="${output.dir}/target/site" /> - <!-- load properties from default (or alternate) properties file --> - <property name="associate.sites.properties" value="associate.sites.properties" /> - <property file="${associate.sites.properties}" /> - + <!-- load properties from file --> + <property name="associate.properties" value="associate.properties" /> + <property file="${associate.properties}" /> <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml" /> <target name="init"> @@ -46,7 +45,7 @@ </target> <!-- don't do collect.zips,collect.metadata,create.summary.file --> - <target name="custom.build" description="aggregate update site extras" depends="init,check.target,unpack.content.jar,add.associate.sites,add.web.content,pack.content.jar,pack.zip" /> + <target name="custom.build" description="JBT aggregate update site extra processing steps" depends="init,check.target,unpack.content.jar,remove.references,add.associate.sites,remove.uncategorized.category,add.web.content,pack.content.jar,pack.zip" /> <target name="get.saxon" unless="saxon.jar.exists"> <!-- or use http://downloads.sourceforge.net/saxon/saxonhe9-3-0-4j.zip ? --> @@ -382,12 +381,20 @@ <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" /> </then> </if> </target> + <target name="remove.references"> + <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" /> + <xslt style="remove-references.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" /> + </target> + + <target name="remove.uncategorized.category"> + <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" /> + </target> + <target name="unpack.content.jar"> <if> <available file="${update.site.source.dir}/content.jar" type="file" /> Added: trunk/build/aggregate/bottests-site/site/remove-references.xsl =================================================================== --- trunk/build/aggregate/bottests-site/site/remove-references.xsl (rev 0) +++ trunk/build/aggregate/bottests-site/site/remove-references.xsl 2011-11-21 22:21:34 UTC (rev 36513) @@ -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="references" /> + +</xsl:stylesheet> \ No newline at end of file Copied: trunk/build/aggregate/site/associate.properties (from rev 36511, trunk/build/aggregate/site/associate.sites.properties) =================================================================== --- trunk/build/aggregate/site/associate.properties (rev 0) +++ trunk/build/aggregate/site/associate.properties 2011-11-21 22:21:34 UTC (rev 36513) @@ -0,0 +1,7 @@ +# options: Nightly Build (default), Development Milestone, Stable Release +#update.site.description=Nightly Build +#update.site.description=Development Milestone +#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 + +# associate sites to add to the resulting repo +associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://dl.google.com/eclipse/plugin/3.7/ Deleted: trunk/build/aggregate/site/associate.sites.properties =================================================================== --- trunk/build/aggregate/site/associate.sites.properties 2011-11-21 21:58:54 UTC (rev 36512) +++ trunk/build/aggregate/site/associate.sites.properties 2011-11-21 22:21:34 UTC (rev 36513) @@ -1,7 +0,0 @@ -# options: Nightly Build (default), Development Milestone, Stable Release -#update.site.description=Nightly Build -#update.site.description=Development Milestone -#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 - -# associate sites to add to the resulting repo -associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://dl.google.com/eclipse/plugin/3.7/ Modified: trunk/build/aggregate/site/build.xml =================================================================== --- trunk/build/aggregate/site/build.xml 2011-11-21 21:58:54 UTC (rev 36512) +++ trunk/build/aggregate/site/build.xml 2011-11-21 22:21:34 UTC (rev 36513) @@ -27,10 +27,9 @@ <property name="update.site.source.dir" value="${output.dir}/target/site" /> - <!-- load properties from default (or alternate) properties file --> - <property name="associate.sites.properties" value="associate.sites.properties" /> - <property file="${associate.sites.properties}" /> - + <!-- load properties from file --> + <property name="associate.properties" value="associate.properties" /> + <property file="${associate.properties}" /> <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml" /> <target name="init"> @@ -45,7 +44,7 @@ <antcall target="get.saxon" /> </target> - <target name="custom.build" description="aggregate update site extras" depends="init,check.target,unpack.content.jar,add.associate.sites,add.web.content,pack.content.jar,pack.zip,collect.zips,collect.metadata,create.summary.file" /> + <target name="custom.build" description="JBT aggregate update site extra processing steps" depends="init,check.target,unpack.content.jar,remove.references,add.associate.sites,remove.uncategorized.category,add.web.content,pack.content.jar,pack.zip,collect.zips,collect.metadata,create.summary.file" /> <target name="get.saxon" unless="saxon.jar.exists"> <!-- or use http://downloads.sourceforge.net/saxon/saxonhe9-3-0-4j.zip ? --> @@ -381,12 +380,20 @@ <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" /> </then> </if> </target> + <target name="remove.references"> + <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" /> + <xslt style="remove-references.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" /> + </target> + + <target name="remove.uncategorized.category"> + <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" /> + </target> + <target name="unpack.content.jar"> <if> <available file="${update.site.source.dir}/content.jar" type="file" /> Added: trunk/build/aggregate/site/remove-references.xsl =================================================================== --- trunk/build/aggregate/site/remove-references.xsl (rev 0) +++ trunk/build/aggregate/site/remove-references.xsl 2011-11-21 22:21:34 UTC (rev 36513) @@ -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="references" /> + +</xsl:stylesheet> \ No newline at end of file Copied: trunk/build/aggregate/soa-site/associate.properties (from rev 36511, trunk/build/aggregate/soa-site/associate.sites.properties) =================================================================== --- trunk/build/aggregate/soa-site/associate.properties (rev 0) +++ trunk/build/aggregate/soa-site/associate.properties 2011-11-21 22:21:34 UTC (rev 36513) @@ -0,0 +1,7 @@ +# options: Nightly Build (default), Development Milestone, Stable Release +#update.site.description=Nightly Build +#update.site.description=Development Milestone +#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 + +# associate sites to add to the resulting repo +associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://download.eclipse.org/bpel/update-site/ Deleted: trunk/build/aggregate/soa-site/associate.sites.properties =================================================================== --- trunk/build/aggregate/soa-site/associate.sites.properties 2011-11-21 21:58:54 UTC (rev 36512) +++ trunk/build/aggregate/soa-site/associate.sites.properties 2011-11-21 22:21:34 UTC (rev 36513) @@ -1,7 +0,0 @@ -# options: Nightly Build (default), Development Milestone, Stable Release -#update.site.description=Nightly Build -#update.site.description=Development Milestone -#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 - -# associate sites to add to the resulting repo -associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://download.eclipse.org/bpel/update-site/ Modified: trunk/build/aggregate/soa-site/build.xml =================================================================== --- trunk/build/aggregate/soa-site/build.xml 2011-11-21 21:58:54 UTC (rev 36512) +++ trunk/build/aggregate/soa-site/build.xml 2011-11-21 22:21:34 UTC (rev 36513) @@ -27,10 +27,9 @@ <property name="update.site.source.dir" value="${output.dir}/target/site" /> - <!-- load properties from default (or alternate) properties file --> - <property name="associate.sites.properties" value="associate.sites.properties" /> - <property file="${associate.sites.properties}" /> - + <!-- load properties from file --> + <property name="associate.properties" value="associate.properties" /> + <property file="${associate.properties}" /> <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml" /> <target name="init"> @@ -45,7 +44,7 @@ <antcall target="get.saxon" /> </target> - <target name="custom.build" description="aggregate update site extras" depends="init,check.target,unpack.content.jar,add.associate.sites,add.web.content,pack.content.jar,pack.zip,collect.zips,collect.metadata,create.summary.file" /> + <target name="custom.build" description="JBT aggregate update site extra processing steps" depends="init,check.target,unpack.content.jar,remove.references,add.associate.sites,remove.uncategorized.category,add.web.content,pack.content.jar,pack.zip,collect.zips,collect.metadata,create.summary.file" /> <target name="get.saxon" unless="saxon.jar.exists"> <!-- or use http://downloads.sourceforge.net/saxon/saxonhe9-3-0-4j.zip ? --> @@ -381,12 +380,20 @@ <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" /> </then> </if> </target> + <target name="remove.references"> + <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" /> + <xslt style="remove-references.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" /> + </target> + + <target name="remove.uncategorized.category"> + <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" /> + </target> + <target name="unpack.content.jar"> <if> <available file="${update.site.source.dir}/content.jar" type="file" /> Modified: trunk/build/aggregate/soa-site/pom.xml =================================================================== --- trunk/build/aggregate/soa-site/pom.xml 2011-11-21 21:58:54 UTC (rev 36512) +++ trunk/build/aggregate/soa-site/pom.xml 2011-11-21 22:21:34 UTC (rev 36513) @@ -93,6 +93,17 @@ </releases> </repository> <repository> + <id>jbosstools-target-site</id> + <url>${jbosstools-target-site}</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> <id>jboss-requirements-composite-mirror</id> <url>${jboss-requirements-composite-mirror}</url> <layout>p2</layout> Added: trunk/build/aggregate/soa-site/remove-references.xsl =================================================================== --- trunk/build/aggregate/soa-site/remove-references.xsl (rev 0) +++ trunk/build/aggregate/soa-site/remove-references.xsl 2011-11-21 22:21:34 UTC (rev 36513) @@ -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="references" /> + +</xsl:stylesheet> \ No newline at end of file Copied: trunk/build/aggregate/webtools-site/associate.properties (from rev 36511, trunk/build/aggregate/webtools-site/associate.sites.properties) =================================================================== --- trunk/build/aggregate/webtools-site/associate.properties (rev 0) +++ trunk/build/aggregate/webtools-site/associate.properties 2011-11-21 22:21:34 UTC (rev 36513) @@ -0,0 +1,7 @@ +# options: Nightly Build (default), Development Milestone, Stable Release +#update.site.description=Nightly Build +#update.site.description=Development Milestone +#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 + +# associate sites to add to the resulting repo +associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/ Deleted: trunk/build/aggregate/webtools-site/associate.sites.properties =================================================================== --- trunk/build/aggregate/webtools-site/associate.sites.properties 2011-11-21 21:58:54 UTC (rev 36512) +++ trunk/build/aggregate/webtools-site/associate.sites.properties 2011-11-21 22:21:34 UTC (rev 36513) @@ -1,7 +0,0 @@ -# options: Nightly Build (default), Development Milestone, Stable Release -#update.site.description=Nightly Build -#update.site.description=Development Milestone -#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 - -# associate sites to add to the resulting repo -associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/ Modified: trunk/build/aggregate/webtools-site/build.xml =================================================================== --- trunk/build/aggregate/webtools-site/build.xml 2011-11-21 21:58:54 UTC (rev 36512) +++ trunk/build/aggregate/webtools-site/build.xml 2011-11-21 22:21:34 UTC (rev 36513) @@ -27,10 +27,9 @@ <property name="update.site.source.dir" value="${output.dir}/target/site" /> - <!-- load properties from default (or alternate) properties file --> - <property name="associate.sites.properties" value="associate.sites.properties" /> - <property file="${associate.sites.properties}" /> - + <!-- load properties from file --> + <property name="associate.properties" value="associate.properties" /> + <property file="${associate.properties}" /> <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml" /> <target name="init"> @@ -46,7 +45,7 @@ </target> <!-- don't do collect.zips,collect.metadata,create.summary.file --> - <target name="custom.build" description="aggregate update site extras" depends="init,check.target,unpack.content.jar,add.associate.sites,add.web.content,pack.content.jar,pack.zip" /> + <target name="custom.build" description="JBT aggregate update site extra processing steps" depends="init,check.target,unpack.content.jar,remove.references,add.associate.sites,remove.uncategorized.category,add.web.content,pack.content.jar,pack.zip" /> <target name="get.saxon" unless="saxon.jar.exists"> <!-- or use http://downloads.sourceforge.net/saxon/saxonhe9-3-0-4j.zip ? --> @@ -382,12 +381,20 @@ <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" /> </then> </if> </target> + <target name="remove.references"> + <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" /> + <xslt style="remove-references.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" /> + </target> + + <target name="remove.uncategorized.category"> + <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" /> + </target> + <target name="unpack.content.jar"> <if> <available file="${update.site.source.dir}/content.jar" type="file" /> Added: trunk/build/aggregate/webtools-site/remove-references.xsl =================================================================== --- trunk/build/aggregate/webtools-site/remove-references.xsl (rev 0) +++ trunk/build/aggregate/webtools-site/remove-references.xsl 2011-11-21 22:21:34 UTC (rev 36513) @@ -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="references" /> + +</xsl:stylesheet> \ No newline at end of file