Author: nickboldt Date: 2011-11-21 11:18:43 -0500 (Mon, 21 Nov 2011) New Revision: 36496 Added: 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 Removed: trunk/build/aggregate/bottests-site/site/aggregateSite.jbosstools.properties trunk/build/aggregate/site/aggregateSite.jbosstools.properties trunk/build/aggregate/soa-site/aggregateSite.jbosstools.properties trunk/build/aggregate/webtools-site/aggregateSite.jbosstools.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/webtools-site/build.xml Log: refactor associate sites properties file and fix refs to that file in build.xml for soa site (JBIDE-10201) Deleted: trunk/build/aggregate/bottests-site/site/aggregateSite.jbosstools.properties =================================================================== --- trunk/build/aggregate/bottests-site/site/aggregateSite.jbosstools.properties 2011-11-21 16:18:16 UTC (rev 36495) +++ trunk/build/aggregate/bottests-site/site/aggregateSite.jbosstools.properties 2011-11-21 16:18:43 UTC (rev 36496) @@ -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://dl.google.com/eclipse/plugin/3.7/ Copied: trunk/build/aggregate/bottests-site/site/associate.sites.properties (from rev 36494, trunk/build/aggregate/webtools-site/aggregateSite.jbosstools.properties) =================================================================== --- trunk/build/aggregate/bottests-site/site/associate.sites.properties (rev 0) +++ trunk/build/aggregate/bottests-site/site/associate.sites.properties 2011-11-21 16:18:43 UTC (rev 36496) @@ -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/ Modified: trunk/build/aggregate/bottests-site/site/build.xml =================================================================== --- trunk/build/aggregate/bottests-site/site/build.xml 2011-11-21 16:18:16 UTC (rev 36495) +++ trunk/build/aggregate/bottests-site/site/build.xml 2011-11-21 16:18:43 UTC (rev 36496) @@ -28,10 +28,10 @@ <property name="update.site.source.dir" value="${output.dir}/target/site" /> <!-- load properties from default (or alternate) properties file --> - <property name="aggregateSite.properties" value="aggregateSite.jbosstools.properties" /> - <property file="${aggregateSite.properties}" /> + <property name="associate.sites" value="associate.sites.properties" /> + <property file="${associate.sites}" /> - <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml"/> + <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml" /> <target name="init"> <ant antfile="${build.xml}" target="init" /> @@ -46,7 +46,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,add.associate.sites,add.web.content,pack.zip" /> + <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="get.saxon" unless="saxon.jar.exists"> <!-- or use http://downloads.sourceforge.net/saxon/saxonhe9-3-0-4j.zip ? --> @@ -345,20 +345,13 @@ <target name="add.associate.sites" if="associate.sites"> <if> <and> - <!-- Defined in aggregateSite.properties --> + <!-- Defined in associate.sites --> <isset property="associate.sites" /> <not> <equals arg1="${associate.sites}" arg2="" /> </not> </and> <then> - <if> - <available file="${update.site.source.dir}/content.jar" type="file" /> - <then> - <unzip src="${update.site.source.dir}/content.jar" dest="${update.site.source.dir}" /> - <delete file="${update.site.source.dir}/content.jar" /> - </then> - </if> <!-- counter variable --> <var name="associate.sites.0" value="" /> <for param="associate.site" list="${associate.sites}" delimiter=", @@ -391,13 +384,26 @@ </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> + <target name="unpack.content.jar"> + <if> + <available file="${update.site.source.dir}/content.jar" type="file" /> + <then> + <unzip src="${update.site.source.dir}/content.jar" dest="${update.site.source.dir}" /> + <delete file="${update.site.source.dir}/content.jar" /> + </then> + </if> + </target> + + <target name="pack.content.jar"> + <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" /> + </target> + <target name="unpack.zip"> <unzip src="${output.dir}/target/site_assembly.zip" dest="${update.site.source.dir}" /> </target> @@ -581,7 +587,7 @@ <target name="collect.metadata" description="collect svn revision info + other metadata (JOB_NAME, BUILD_ID, BUILD_NUMBER, WORKSPACE, HUDSON_SLAVE), zip file names+sizes+md5sums"> <property name="aggregate.zips.dir" value="${output.dir}/zips" /> - <mkdir dir="${aggregate.zips.dir}"/> + <mkdir dir="${aggregate.zips.dir}" /> <!-- load file properties (name, size, md5sum) --> <if> <available file="${aggregate.zips.dir}/build.properties.file.txt" type="file" /> Deleted: trunk/build/aggregate/site/aggregateSite.jbosstools.properties =================================================================== --- trunk/build/aggregate/site/aggregateSite.jbosstools.properties 2011-11-21 16:18:16 UTC (rev 36495) +++ trunk/build/aggregate/site/aggregateSite.jbosstools.properties 2011-11-21 16:18:43 UTC (rev 36496) @@ -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/ Copied: trunk/build/aggregate/site/associate.sites.properties (from rev 36494, trunk/build/aggregate/site/aggregateSite.jbosstools.properties) =================================================================== --- trunk/build/aggregate/site/associate.sites.properties (rev 0) +++ trunk/build/aggregate/site/associate.sites.properties 2011-11-21 16:18:43 UTC (rev 36496) @@ -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/ Modified: trunk/build/aggregate/site/build.xml =================================================================== --- trunk/build/aggregate/site/build.xml 2011-11-21 16:18:16 UTC (rev 36495) +++ trunk/build/aggregate/site/build.xml 2011-11-21 16:18:43 UTC (rev 36496) @@ -28,8 +28,8 @@ <property name="update.site.source.dir" value="${output.dir}/target/site" /> <!-- load properties from default (or alternate) properties file --> - <property name="aggregateSite.properties" value="aggregateSite.jbosstools.properties" /> - <property file="${aggregateSite.properties}" /> + <property name="associate.sites" value="associate.sites.properties" /> + <property file="${associate.sites}" /> <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml" /> @@ -344,7 +344,7 @@ <target name="add.associate.sites" if="associate.sites"> <if> <and> - <!-- Defined in aggregateSite.properties --> + <!-- Defined in associate.sites --> <isset property="associate.sites" /> <not> <equals arg1="${associate.sites}" arg2="" /> Deleted: trunk/build/aggregate/soa-site/aggregateSite.jbosstools.properties =================================================================== --- trunk/build/aggregate/soa-site/aggregateSite.jbosstools.properties 2011-11-21 16:18:16 UTC (rev 36495) +++ trunk/build/aggregate/soa-site/aggregateSite.jbosstools.properties 2011-11-21 16:18:43 UTC (rev 36496) @@ -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/ Copied: trunk/build/aggregate/soa-site/associate.sites.properties (from rev 36494, trunk/build/aggregate/bottests-site/site/aggregateSite.jbosstools.properties) =================================================================== --- trunk/build/aggregate/soa-site/associate.sites.properties (rev 0) +++ trunk/build/aggregate/soa-site/associate.sites.properties 2011-11-21 16:18:43 UTC (rev 36496) @@ -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/ Modified: trunk/build/aggregate/soa-site/build.xml =================================================================== --- trunk/build/aggregate/soa-site/build.xml 2011-11-21 16:18:16 UTC (rev 36495) +++ trunk/build/aggregate/soa-site/build.xml 2011-11-21 16:18:43 UTC (rev 36496) @@ -28,10 +28,10 @@ <property name="update.site.source.dir" value="${output.dir}/target/site" /> <!-- load properties from default (or alternate) properties file --> - <property name="aggregateSite.properties" value="aggregateSite.jbosstools.properties" /> - <property file="${aggregateSite.properties}" /> + <property name="associate.sites" value="associate.sites.properties" /> + <property file="${associate.sites}" /> - <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml"/> + <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml" /> <target name="init"> <ant antfile="${build.xml}" target="init" /> @@ -45,7 +45,7 @@ <antcall target="get.saxon" /> </target> - <target name="custom.build" description="aggregate update site extras" depends="init,check.target,add.associate.sites,add.web.content,pack.zip,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,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 ? --> @@ -344,20 +344,13 @@ <target name="add.associate.sites" if="associate.sites"> <if> <and> - <!-- Defined in aggregateSite.properties --> + <!-- Defined in associate.sites --> <isset property="associate.sites" /> <not> <equals arg1="${associate.sites}" arg2="" /> </not> </and> <then> - <if> - <available file="${update.site.source.dir}/content.jar" type="file" /> - <then> - <unzip src="${update.site.source.dir}/content.jar" dest="${update.site.source.dir}" /> - <delete file="${update.site.source.dir}/content.jar" /> - </then> - </if> <!-- counter variable --> <var name="associate.sites.0" value="" /> <for param="associate.site" list="${associate.sites}" delimiter=", @@ -390,13 +383,26 @@ </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> + <target name="unpack.content.jar"> + <if> + <available file="${update.site.source.dir}/content.jar" type="file" /> + <then> + <unzip src="${update.site.source.dir}/content.jar" dest="${update.site.source.dir}" /> + <delete file="${update.site.source.dir}/content.jar" /> + </then> + </if> + </target> + + <target name="pack.content.jar"> + <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" /> + </target> + <target name="unpack.zip"> <unzip src="${output.dir}/target/site_assembly.zip" dest="${update.site.source.dir}" /> </target> @@ -580,7 +586,7 @@ <target name="collect.metadata" description="collect svn revision info + other metadata (JOB_NAME, BUILD_ID, BUILD_NUMBER, WORKSPACE, HUDSON_SLAVE), zip file names+sizes+md5sums"> <property name="aggregate.zips.dir" value="${output.dir}/zips" /> - <mkdir dir="${aggregate.zips.dir}"/> + <mkdir dir="${aggregate.zips.dir}" /> <!-- load file properties (name, size, md5sum) --> <if> <available file="${aggregate.zips.dir}/build.properties.file.txt" type="file" /> Deleted: trunk/build/aggregate/webtools-site/aggregateSite.jbosstools.properties =================================================================== --- trunk/build/aggregate/webtools-site/aggregateSite.jbosstools.properties 2011-11-21 16:18:16 UTC (rev 36495) +++ trunk/build/aggregate/webtools-site/aggregateSite.jbosstools.properties 2011-11-21 16:18:43 UTC (rev 36496) @@ -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/ Copied: trunk/build/aggregate/webtools-site/associate.sites.properties (from rev 36494, trunk/build/aggregate/soa-site/aggregateSite.jbosstools.properties) =================================================================== --- trunk/build/aggregate/webtools-site/associate.sites.properties (rev 0) +++ trunk/build/aggregate/webtools-site/associate.sites.properties 2011-11-21 16:18:43 UTC (rev 36496) @@ -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/ Modified: trunk/build/aggregate/webtools-site/build.xml =================================================================== --- trunk/build/aggregate/webtools-site/build.xml 2011-11-21 16:18:16 UTC (rev 36495) +++ trunk/build/aggregate/webtools-site/build.xml 2011-11-21 16:18:43 UTC (rev 36496) @@ -28,10 +28,10 @@ <property name="update.site.source.dir" value="${output.dir}/target/site" /> <!-- load properties from default (or alternate) properties file --> - <property name="aggregateSite.properties" value="aggregateSite.jbosstools.properties" /> - <property file="${aggregateSite.properties}" /> + <property name="associate.sites" value="associate.sites.properties" /> + <property file="${associate.sites}" /> - <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml"/> + <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml" /> <target name="init"> <ant antfile="${build.xml}" target="init" /> @@ -46,7 +46,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,add.associate.sites,add.web.content,pack.zip" /> + <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="get.saxon" unless="saxon.jar.exists"> <!-- or use http://downloads.sourceforge.net/saxon/saxonhe9-3-0-4j.zip ? --> @@ -345,20 +345,13 @@ <target name="add.associate.sites" if="associate.sites"> <if> <and> - <!-- Defined in aggregateSite.properties --> + <!-- Defined in associate.sites --> <isset property="associate.sites" /> <not> <equals arg1="${associate.sites}" arg2="" /> </not> </and> <then> - <if> - <available file="${update.site.source.dir}/content.jar" type="file" /> - <then> - <unzip src="${update.site.source.dir}/content.jar" dest="${update.site.source.dir}" /> - <delete file="${update.site.source.dir}/content.jar" /> - </then> - </if> <!-- counter variable --> <var name="associate.sites.0" value="" /> <for param="associate.site" list="${associate.sites}" delimiter=", @@ -391,13 +384,26 @@ </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> + <target name="unpack.content.jar"> + <if> + <available file="${update.site.source.dir}/content.jar" type="file" /> + <then> + <unzip src="${update.site.source.dir}/content.jar" dest="${update.site.source.dir}" /> + <delete file="${update.site.source.dir}/content.jar" /> + </then> + </if> + </target> + + <target name="pack.content.jar"> + <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" /> + </target> + <target name="unpack.zip"> <unzip src="${output.dir}/target/site_assembly.zip" dest="${update.site.source.dir}" /> </target> @@ -581,7 +587,7 @@ <target name="collect.metadata" description="collect svn revision info + other metadata (JOB_NAME, BUILD_ID, BUILD_NUMBER, WORKSPACE, HUDSON_SLAVE), zip file names+sizes+md5sums"> <property name="aggregate.zips.dir" value="${output.dir}/zips" /> - <mkdir dir="${aggregate.zips.dir}"/> + <mkdir dir="${aggregate.zips.dir}" /> <!-- load file properties (name, size, md5sum) --> <if> <available file="${aggregate.zips.dir}/build.properties.file.txt" type="file" />