[jbosstools-commits] JBoss Tools SVN: r23507 - in trunk/build/aggregate/site: web and 1 other directory.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Fri Jul 16 15:54:30 EDT 2010


Author: nickboldt
Date: 2010-07-16 15:54:29 -0400 (Fri, 16 Jul 2010)
New Revision: 23507

Added:
   trunk/build/aggregate/site/associate.sites.jbosstools.properties
   trunk/build/aggregate/site/build.xml
   trunk/build/aggregate/site/index.html
   trunk/build/aggregate/site/web/
   trunk/build/aggregate/site/web/site.css
Log:
update site needs html, css, and p2 metadata needs associate sites

Added: trunk/build/aggregate/site/associate.sites.jbosstools.properties
===================================================================
--- trunk/build/aggregate/site/associate.sites.jbosstools.properties	                        (rev 0)
+++ trunk/build/aggregate/site/associate.sites.jbosstools.properties	2010-07-16 19:54:29 UTC (rev 23507)
@@ -0,0 +1,12 @@
+# associate sites to add to the resulting repo 
+associate.sites=http://download.jboss.org/jbosstools/updates/helios/,\
+http://download.eclipse.org/eclipse/updates/3.6/,\
+http://download.eclipse.org/birt/update-site/2.6/,\
+http://download.eclipse.org/tptp/updates/galileo/,\
+http://m2eclipse.sonatype.org/sites/m2e/,\
+http://m2eclipse.sonatype.org/sites/m2e-extras/,\
+http://subclipse.tigris.org/update_1.6.x/,\
+http://download.eclipse.org/technology/subversive/0.7/update-site/,\
+http://community.polarion.com/projects/subversive/download/eclipse/2.0/update-site/,\
+http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/updateSite/,\
+http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2


Property changes on: trunk/build/aggregate/site/associate.sites.jbosstools.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/build/aggregate/site/build.xml
===================================================================
--- trunk/build/aggregate/site/build.xml	                        (rev 0)
+++ trunk/build/aggregate/site/build.xml	2010-07-16 19:54:29 UTC (rev 23507)
@@ -0,0 +1,124 @@
+<project default="custom.build" name="jbosstools aggregate site build.xml">
+
+	<!-- should be set by script or in Hudson -->
+	<property name="ZIPSUFFIX" value="SNAPSHOT" />
+
+	<!-- should be set by Hudson -->
+	<!-- <property name="JOB_NAME" value="jbosstools-3.2.0.M2.continuous" /> -->
+
+	<!-- if ${WORKSPACE}/site folder exists, target that folder; else generate here. -->
+	<condition property="output.dir" value="${WORKSPACE}/results" else="${basedir}">
+		<available file="${WORKSPACE}/results" />
+	</condition>
+
+	<condition property="COMMON_TOOLS" value="/home/hudson/static_build_env/jbds/tools" else="${java.io.tmpdir}">
+		<available file="/home/hudson/static_build_env/jbds" type="dir" />
+	</condition>
+	<mkdir dir="${COMMON_TOOLS}" />
+
+	<condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml">
+		<available file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml" type="file" />
+	</condition>
+	<condition property="build.xml" value="${basedir}/../../build/build.xml">
+		<available file="${basedir}/../../build/build.xml" type="file" />
+	</condition>
+	<condition property="build.xml" value="${basedir}/../../build.xml">
+		<available file="${basedir}/../../build.xml" type="file" />
+	</condition>
+	<!-- if can't calculate where build/build.xml is located, must pass in path from parent when calling this script -->
+
+	<property name="update.site.source.dir" value="${output.dir}/target/site" />
+
+	<target name="init">
+		<ant antfile="${build.xml}" target="init" />
+		<taskdef resource="net/sf/antcontrib/antlib.xml">
+			<classpath>
+				<pathelement location="${COMMON_TOOLS}/ant-contrib.jar" />
+			</classpath>
+		</taskdef>
+	</target>
+
+	<target name="add.associate.sites">
+		<if>
+			<and>
+				<not>
+					<isset property="associate.sites" />
+				</not>
+			</and>
+			<then>
+				<!-- load associate sites from default (or alternate) properties file -->
+				<property name="associate.sites.properties" value="associate.sites.jbosstools.properties" />
+				<property file="${associate.sites.properties}" />
+			</then>
+		</if>
+
+		<if>
+			<and>
+				<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=", 
+	">
+					<sequential>
+						<var name="associate.sites.0" value="${associate.sites.0}00" />
+					</sequential>
+				</for>
+				<length property="associate.sites.length" string="${associate.sites.0}" />
+
+				<loadfile srcfile="${update.site.source.dir}/content.xml" property="content.xml">
+					<filterchain>
+						<tailfilter lines="-1" skip="1" />
+					</filterchain>
+				</loadfile>
+				<echo file="${update.site.source.dir}/content.xml" message="${content.xml}" />
+				<echo file="${update.site.source.dir}/content.xml" append="true">  &lt;references size='${associate.sites.length}'>
+</echo>
+				<for param="associate.site" list="${associate.sites}" delimiter=", 
+	">
+					<sequential>
+						<!-- insert into content.xml -->
+						<echo file="${update.site.source.dir}/content.xml" append="true">    &lt;repository uri='@{associate.site}' url='@{associate.site}' type='0' options='1'/>
+    &lt;repository uri='@{associate.site}' url='@{associate.site}' type='1' options='1'/>
+</echo>
+					</sequential>
+				</for>
+				<echo file="${update.site.source.dir}/content.xml" append="true">  &lt;/references>
+&lt;/repository>
+</echo>
+				<zip destfile="${update.site.source.dir}/content.jar" basedir="${update.site.source.dir}" includes="content.xml" />
+				<delete file="${update.site.source.dir}/content.xml" />
+			</then>
+		</if>
+	</target>
+
+	<target name="unpack.zip">
+		<unzip src="${output.dir}/target/site_assembly.zip" dest="${update.site.source.dir}" />
+	</target>
+
+	<target name="pack.zip">
+		<zip destfile="${output.dir}/target/site_assembly.zip" update="true" basedir="${update.site.source.dir}" includes="content.* index.html, web/*.css" />
+	</target>
+
+	<target name="add.web.content">
+		<!-- TODO generate correct variables in index.html -->
+		<copy todir="${update.site.source.dir}">
+			<fileset dir="${output.dir}" includes="index.html, **/*.css" />
+		</copy>
+	</target>
+
+	<!-- <target name="custom.build" description="aggregate update site extras" depends="init,unpack.zip,add.associate.sites,add.web.content,pack.zip,cleanup" /> -->
+	<target name="custom.build" description="aggregate update site extras" depends="init,add.associate.sites,add.web.content,pack.zip" />
+
+</project>


Property changes on: trunk/build/aggregate/site/build.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/build/aggregate/site/index.html
===================================================================
--- trunk/build/aggregate/site/index.html	                        (rev 0)
+++ trunk/build/aggregate/site/index.html	2010-07-16 19:54:29 UTC (rev 23507)
@@ -0,0 +1,136 @@
+<html>
+<head>
+<title>JBoss Tools ${update.site.description} Update Site: ${product.versionTag}</title>
+<style>
+ at import url("web/site.css");
+</style>
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+	cellspacing="0" cellpadding="0">
+	<tr>
+		<td colspan="2"><img
+			src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
+	</tr>
+	<tr>
+		<td>&#160;&#160;</td>
+	</tr>
+	<tr>
+		<td>&#160;&#160;</td>
+		<td>
+		<h2 class="title">JBoss Tools ${update.site.description} Update Site</h2>
+		<table width="100%">
+			<tr class="header">
+				<td class="sub-header" width="100%"><span>Latest Build:
+				${product.versionTag}</span></td>
+			</tr>
+
+			<tr class="light-row" style="height: 30px">
+				<td class="bodyText">
+				<p class="bodyText">This is the <b>${update.site.description}</b>
+				Update Site for JBoss Tools. See <a class="link"
+					href="http://www.jboss.org/tools/download/update">Installation
+				Instructions</a>.</p>
+				</td>
+			</tr>
+
+			<tr class="dark-row" style="height: 90px">
+				<td class="bodyText">
+				<p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b> Some
+				features (such as BIRT and Maven) require additional third-party
+				prerequisites not available from Eclipse.org or JBoss.org. These can
+				be installed from the following update sites, which may already be
+				listed - but not enabled - in your Eclipse's list of Available
+				Software Sites:</p>
+				<ul>
+			<li><a class="link" href="http://download.eclipse.org/birt/update-site/2.6/">BIRT 2.6 Update Site</a></li>
+			<li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li>
+			<li><a href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2eclipse Extras 0.10 Release</a></li>
+				</ul>
+				</td>
+			</tr>
+
+			<tr class="light-row" style="height: 30px">
+				<td class="bodyText">
+				<p class="bodyText">You can also download JBoss Tools as
+				individual zips for offline installation. See <a class="link"
+					href="http://www.jboss.org/tools/download">JBoss Tools
+				Downloads</a>.</p>
+				</td>
+			</tr>
+
+			<tr class="dark-row" style="height: 30px">
+				<td class="bodyText">
+				<p class="bodyText">For more information, see <a
+					href="http://www.jboss.org/tools/download/installation">Installation
+				methods</a>.</p>
+				</td>
+			</tr>
+			<tr>
+				<td class="spacer"><br />
+				</td>
+				<td class="spacer"><br />
+				</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr>
+		<td></td>
+		<td>
+		<table width="100%">
+			<tr class="header">
+				<td class="sub-header" width="100%"><span> Installation
+				Types</span></td>
+			</tr>
+			<tr class="light-row" style="height: 30px">
+				<td class="bodyText">
+				<p class="bodyText">Depending on how close to the bleeding edge
+				you like to be, there are several types of releases available.</p>
+				<br />
+
+				</td>
+			</tr>
+
+			<tr class="dark-row" style="height: 30px">
+				<td class="bodyText">
+				<h4>Stable Releases</h4>
+
+				<p><a href="https://www.jboss.org/tools/download/stable.html">Stable
+				releases</a> are - as indicated by their name - stable.</p><br/>
+
+				</td>
+			</tr>
+
+			<tr class="light-row" style="height: 30px">
+				<td class="bodyText">
+				<h4>Development Milestones</h4>
+
+				<p><a href="https://www.jboss.org/tools/download/dev.html">Development
+				builds</a>, released once per milestone and only a few times a year, are
+				fairly stable, but there may be some things which do not yet work.
+				If you would like to try one of these milestones, we'd greatly
+				appreciate the assistance in testing and <a
+					href="https://jira.jboss.org/jira/browse/JBIDE">reporting of
+				issues in our issue tracker</a>.</p><br/>
+
+				</td>
+			</tr>
+
+			<tr class="dark-row" style="height: 30px">
+				<td class="bodyText">
+				<h4>Nightly Builds</h4>
+
+				<p>The <a
+					href="https://www.jboss.org/tools/download/nightly.html">bleeding
+				edge</a> contains the latest and greatest new features, but nothing is
+				stable or guaranteed - yet. If you're using a Milestone and need a
+				fix, you can update to the latest Nightly, or wait for the next
+				Milestone.</p><br/>
+				</td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+</table>
+</html>


Property changes on: trunk/build/aggregate/site/index.html
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/build/aggregate/site/web/site.css
===================================================================
--- trunk/build/aggregate/site/web/site.css	                        (rev 0)
+++ trunk/build/aggregate/site/web/site.css	2010-07-16 19:54:29 UTC (rev 23507)
@@ -0,0 +1,66 @@
+<
+STYLE type ="text/css">td.spacer {
+	padding-bottom: 10px;
+	padding-top: 10px;
+}
+
+.title {
+	font-family: sans-serif;
+	color: #1778be;
+}
+
+.bodyText {
+	font-family: sans-serif;
+	font-size: 9pt;
+	color: #000000;
+}
+
+.sub-header {
+	font-family: sans-serif;
+	font-style: normal;
+	font-weight: bold;
+	font-size: 9pt;
+	color: white;
+}
+
+.log-text {
+	font-family: sans-serif;
+	font-style: normal;
+	font-weight: lighter;
+	font-size: 8pt;
+	color: black;
+}
+
+.big-header {
+	font-family: sans-serif;
+	font-style: normal;
+	font-weight: bold;
+	font-size: 9pt;
+	color: white;
+	border-top: 10px solid white;
+}
+
+.light-row {
+	background: #FFFFFF
+}
+
+.dark-row {
+	background: #EEEEEE
+}
+
+.header {
+	background: #445562
+}
+
+#indent {
+	word-wrap: break-word;
+	width: 300px;
+	text-indent: 10px;
+}
+
+.link {
+	color: #187dc6;
+}
+</
+STYLE
+>
\ No newline at end of file


Property changes on: trunk/build/aggregate/site/web/site.css
___________________________________________________________________
Name: svn:mime-type
   + text/plain



More information about the jbosstools-commits mailing list