JBoss Tools SVN: r34878 - trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-20 07:31:16 -0400 (Tue, 20 Sep 2011)
New Revision: 34878
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/JsonSanitizerTest.java
Log:
[JBIDE-9748] added tests for JsonSanitizer
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/JsonSanitizerTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/JsonSanitizerTest.java 2011-09-20 11:27:35 UTC (rev 34877)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/JsonSanitizerTest.java 2011-09-20 11:31:16 UTC (rev 34878)
@@ -49,6 +49,20 @@
@Test
public void doesNotRemoveEscapedQuoteInStringValue() throws OpenshiftException {
String quotedJsonObject =
+ "\"{"
+ + "\\\"property\\\":"
+ + "\\\"stringWithA\\\\\"Quote\""
+ + "}\"";
+
+ String sanitizedJson = JsonSanitizer.sanitize(quotedJsonObject);
+ assertEquals("{\"property\":\"stringWithA\\\"Quote\"}", sanitizedJson);
+ ModelNode node = ModelNode.fromJSONString(sanitizedJson);
+ assertEquals("stringWithA\"Quote", node.get("property").asString());
+ }
+
+ @Test
+ public void doesNotRemoveEscapedQuoteInStringValueWithinValidJsonObject() throws OpenshiftException {
+ String quotedJsonObject =
"{"
+ "\"property\":"
+ "\"stringWithA\\\"Quote\""
@@ -59,5 +73,5 @@
ModelNode node = ModelNode.fromJSONString(sanitizedJson);
assertEquals("stringWithA\"Quote", node.get("property").asString());
}
-
+
}
14 years, 6 months
- 1
- 0
JBoss Tools SVN: r34877 - trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-20 07:27:35 -0400 (Tue, 20 Sep 2011)
New Revision: 34877
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/JsonSanitizerTest.java
Log:
[JBIDE-9748] added tests for JsonSanitizer
Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/JsonSanitizerTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/JsonSanitizerTest.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/JsonSanitizerTest.java 2011-09-20 11:27:35 UTC (rev 34877)
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.openshift.test.internal.core;
+
+import static org.junit.Assert.assertEquals;
+
+import org.jboss.dmr.ModelNode;
+import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
+import org.jboss.ide.eclipse.as.openshift.core.internal.response.JsonSanitizer;
+import org.junit.Test;
+
+/**
+ * @author André Dietisheim
+ */
+public class JsonSanitizerTest {
+
+ @Test
+ public void canSanitizeQuotedJsonObject() throws OpenshiftException {
+ String quotedJsonObject =
+ "\"{"
+ + "\\\"carts\\\":"
+ + "\\\"perl-5.10\\\""
+ + "}\"";
+
+ String sanitizedJson = JsonSanitizer.sanitize(quotedJsonObject);
+ assertEquals("{\"carts\":\"perl-5.10\"}", sanitizedJson);
+ }
+
+ @Test
+ public void doesNotTuchValidJson() throws OpenshiftException {
+ String quotedJsonObject =
+ "{"
+ + "\"carts\":"
+ + "\"perl-5.10\""
+ + "}";
+
+ String sanitizedJson = JsonSanitizer.sanitize(quotedJsonObject);
+ assertEquals("{\"carts\":\"perl-5.10\"}", sanitizedJson);
+ }
+
+ @Test
+ public void doesNotRemoveEscapedQuoteInStringValue() throws OpenshiftException {
+ String quotedJsonObject =
+ "{"
+ + "\"property\":"
+ + "\"stringWithA\\\"Quote\""
+ + "}";
+
+ String sanitizedJson = JsonSanitizer.sanitize(quotedJsonObject);
+ assertEquals("{\"property\":\"stringWithA\\\"Quote\"}", sanitizedJson);
+ ModelNode node = ModelNode.fromJSONString(sanitizedJson);
+ assertEquals("stringWithA\"Quote", node.get("property").asString());
+ }
+
+}
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/JsonSanitizerTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 6 months
- 1
- 0
JBoss Tools SVN: r34876 - trunk/as/plugins.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-20 04:22:56 -0400 (Tue, 20 Sep 2011)
New Revision: 34876
Modified:
trunk/as/plugins/pom.xml
Log:
added org.jboss.ide.eclipse.as.egit.ui in as/plugins/pom.xml to fix compilation errors
Modified: trunk/as/plugins/pom.xml
===================================================================
--- trunk/as/plugins/pom.xml 2011-09-20 07:44:39 UTC (rev 34875)
+++ trunk/as/plugins/pom.xml 2011-09-20 08:22:56 UTC (rev 34876)
@@ -25,6 +25,7 @@
<module>org.jboss.ide.eclipse.as.jmx.integration</module>
<module>org.jboss.ide.eclipse.as.management.as7</module>
<module>org.jboss.ide.eclipse.as.egit.core</module>
+ <module>org.jboss.ide.eclipse.as.egit.ui</module>
<module>org.jboss.ide.eclipse.as.openshift.core</module>
<module>org.jboss.ide.eclipse.as.openshift.ui</module>
14 years, 6 months
- 1
- 0
JBoss Tools SVN: r34875 - in trunk/forge/plugins: org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-09-20 03:44:39 -0400 (Tue, 20 Sep 2011)
New Revision: 34875
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeAnsiCommandFilter.java
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeLaunchHelper.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeDocument.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
Log:
JBIDE-9530
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeAnsiCommandFilter.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeAnsiCommandFilter.java 2011-09-20 05:20:00 UTC (rev 34874)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeAnsiCommandFilter.java 2011-09-20 07:44:39 UTC (rev 34875)
@@ -49,7 +49,8 @@
private boolean isAnsiEnd(char c) {
return c == 'G' ||
- c == 'K';
+ c == 'K' ||
+ c == 'm';
}
}
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeLaunchHelper.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeLaunchHelper.java 2011-09-20 05:20:00 UTC (rev 34874)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeLaunchHelper.java 2011-09-20 07:44:39 UTC (rev 34875)
@@ -114,7 +114,7 @@
private static String createVmArguments(String location) {
StringBuffer buffer = new StringBuffer();
buffer.append("-Dforge.home=").append(location).append(' ');
- buffer.append("-DDforge.shell.colorEnabled=true").append(' ');
+ buffer.append("-Dforge.shell.colorEnabled=true").append(' ');
buffer.append("-Dforge.compatibility.IDE=true").append(' ');
buffer.append("-cp ").append(location).append("/jboss-modules.jar ");
return buffer.toString();
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeDocument.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeDocument.java 2011-09-20 05:20:00 UTC (rev 34874)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeDocument.java 2011-09-20 07:44:39 UTC (rev 34875)
@@ -2,14 +2,13 @@
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.Document;
-import org.eclipse.swt.widgets.Display;
public class ForgeDocument extends Document {
public void appendString(final String str) {
- Display.getDefault().asyncExec(new Runnable() {
- @Override
- public void run() {
+// Display.getDefault().asyncExec(new Runnable() {
+// @Override
+// public void run() {
try {
for (int i = 0; i < str.length(); i++) {
char c = str.charAt(i);
@@ -21,8 +20,8 @@
}
}
} catch (BadLocationException e) {}
- }
- });
+// }
+// });
}
}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2011-09-20 05:20:00 UTC (rev 34874)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2011-09-20 07:44:39 UTC (rev 34875)
@@ -9,10 +9,12 @@
import org.eclipse.jface.text.IDocumentListener;
import org.eclipse.jface.text.TextViewer;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.VerifyEvent;
+import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.jboss.tools.forge.core.io.ForgeAnsiCommandFilter;
@@ -40,9 +42,6 @@
private class ConsoleKeyListener implements KeyListener {
@Override
public void keyPressed(KeyEvent e) {
- }
- @Override
- public void keyReleased(KeyEvent e) {
if (e.keyCode == SWT.BS) {
handleBackspace();
} else if (e.keyCode == SWT.ARROW_UP) {
@@ -52,6 +51,9 @@
} else if (e.keyCode == SWT.F1) {
handleF1Down();
}
+ }
+ @Override
+ public void keyReleased(KeyEvent e) {
}
}
@@ -104,8 +106,14 @@
StyledText textWidget = getTextWidget();
textWidget.setFont(JFaceResources.getFont(JFaceResources.TEXT_FONT));
textWidget.addKeyListener(new ConsoleKeyListener());
+ currentStyleRange = new StyleRange(0, 0, getColor(SWT.COLOR_BLACK), null);
+ textWidget.setStyleRange(currentStyleRange);
}
+ private Color getColor(int colorCode) {
+ return Display.getDefault().getSystemColor(colorCode);
+ }
+
private void initCommandRecorder() {
getDocument().addDocumentListener(new CommandRecorder());
}
@@ -113,8 +121,17 @@
private void initOutputListener() {
ForgeOutputListener target = new ForgeOutputListener() {
@Override
- public void outputAvailable(String output) {
- document.appendString(output);
+ public void outputAvailable(final String output) {
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ document.appendString(output);
+ if (currentStyleRange != null) {
+ currentStyleRange.length = currentStyleRange.length + output.length();
+ getTextWidget().setStyleRange(currentStyleRange);
+ }
+ }
+ });
}
};
ForgeAnsiCommandFilter ansiCommandFilter = new ForgeAnsiCommandFilter(target) {
@@ -173,6 +190,8 @@
switch (c) {
case 'G' : moveCursorAbsolute(command); break;
case 'K' : clearCurrentLine(command); break;
+ case 'm' : changeColor(command); break;
+ default : ForgeUIPlugin.log(new RuntimeException("Unhandled Ansi control sequence in ForgeTextViewer: "+ command));
}
}
});
@@ -197,4 +216,33 @@
}
}
+ private StyleRange currentStyleRange = null;
+
+ private void changeColor(String command) {
+ String str = command.substring(2, command.length() - 1);
+ Color newColor = null;
+ if ("30".equals(str)) {
+ newColor = getColor(SWT.COLOR_BLACK);
+ } else if ("31".equals(str)) {
+ newColor = getColor(SWT.COLOR_RED);
+ } else if ("32".equals(str)) {
+ newColor = getColor(SWT.COLOR_GREEN);
+ } else if ("33".equals(str)) {
+ newColor = getColor(SWT.COLOR_DARK_YELLOW);
+ } else if ("34".equals(str)) {
+ newColor = getColor(SWT.COLOR_BLUE);
+ } else if ("35".equals(str)) {
+ newColor = getColor(SWT.COLOR_MAGENTA);
+ } else if ("36".equals(str)) {
+ newColor = getColor(SWT.COLOR_CYAN);
+ } else if ("37".equals(str)) {
+ newColor = getColor(SWT.COLOR_GRAY);
+ }
+ if (newColor != null) {
+ currentStyleRange = new StyleRange(getTextWidget().getCharCount(), 0, newColor, null);
+ } else {
+ currentStyleRange = null;
+ }
+ }
+
}
14 years, 6 months
- 1
- 0
JBoss Tools SVN: r34874 - in trunk/build/aggregate: site and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-20 01:20:00 -0400 (Tue, 20 Sep 2011)
New Revision: 34874
Added:
trunk/build/aggregate/bottests-site/site/site.xsl
trunk/build/aggregate/webtools-site/site.xsl
Modified:
trunk/build/aggregate/bottests-site/site/build.xml
trunk/build/aggregate/bottests-site/site/index-template.html
trunk/build/aggregate/site/index-template.html
trunk/build/aggregate/soa-site/index-template.html
trunk/build/aggregate/webtools-site/build.xml
trunk/build/aggregate/webtools-site/index-template.html
Log:
https://issues.jboss.org/browse/JBIDE-9743 add xslt to bottests and webtools sites; fix fonts for soa and core sites
Modified: trunk/build/aggregate/bottests-site/site/build.xml
===================================================================
--- trunk/build/aggregate/bottests-site/site/build.xml 2011-09-20 05:12:36 UTC (rev 34873)
+++ trunk/build/aggregate/bottests-site/site/build.xml 2011-09-20 05:20:00 UTC (rev 34874)
@@ -40,10 +40,23 @@
<pathelement location="${COMMON_TOOLS}/ant-contrib.jar" />
</classpath>
</taskdef>
+
+ <available file="${COMMON_TOOLS}/saxon.jar" type="file" property="saxon.jar.exists" />
+ <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="get.saxon" unless="saxon.jar.exists">
+ <!-- or use http://downloads.sourceforge.net/saxon/saxonhe9-3-0-4j.zip ? -->
+ <property name="SAXON_MIRROR" value="http://downloads.sourceforge.net/project/saxon/Saxon-HE/9.3/saxonhe9-3-0-..." />
+ <get usetimestamp="true" dest="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" src="${SAXON_MIRROR}" />
+ <mkdir dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" />
+ <unzip src="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" dest="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" overwrite="true" />
+ <copy file="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_/saxon9he.jar" tofile="${COMMON_TOOLS}/saxon.jar" failonerror="true" />
+ <delete dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" includeemptydirs="true" quiet="true" />
+ </target>
+
<!-- = = = = = = = = = = = = = = = = =
macrodef: fetchZipsFromList - given a list of zips in zip.list.txt, fetch those zips
= = = = = = = = = = = = = = = = = -->
@@ -283,11 +296,11 @@
<for param="location" list="${repository.children.child.location}">
<sequential>
<var name="counter" value="${counter}0" />
- <var name="i" unset="true"/>
+ <var name="i" unset="true" />
<length property="i" string="${counter}" />
<if>
<not>
- <contains string="@{location}" substring="/staging.previous/"/>
+ <contains string="@{location}" substring="/staging.previous/" />
</not>
<then>
<if>
@@ -317,7 +330,7 @@
</sequential>
</for>
<var name="counter" unset="true" />
- <var name="i" unset="true"/>
+ <var name="i" unset="true" />
<delete file="${aggregate.zips.dir}/compositeArtifacts.xml" quiet="true" />
</then>
@@ -444,6 +457,9 @@
</else>
</if>
+ <!-- get site.xml as HTML, then load into ${site.contents} in order to merge into index.html -->
+ <antcallback target="transform.site.xml" return="site.contents" />
+
<copy todir="${output.dir}" overwrite="true">
<fileset file="index-template.html" />
<mapper type="merge" to="index.html" />
@@ -457,6 +473,18 @@
</copy>
</target>
+ <target name="transform.site.xml">
+ <!-- turn site.xml into site.html via site.xsl -->
+ <delete quiet="true" file="${update.site.source.dir}/site.html" />
+ <xslt style="site.xsl" in="${update.site.source.dir}/site.xml" out="${update.site.source.dir}/site.html" force="true">
+ <classpath location="${COMMON_TOOLS}/saxon.jar" />
+ </xslt>
+ <!-- merge contents of site.html into index.html, then remove site.html -->
+ <loadfile property="site.contents" srcfile="${update.site.source.dir}/site.html" failonerror="false" />
+ <property name="site.contents" value="" />
+ <delete file="${update.site.source.dir}/site.html" quiet="true" />
+ </target>
+
<!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2.0.M2.c...;
if found, load file and use ${ALL_ZIPS} to get list of relative path zips to fetch -->
<target name="collect.zips" description="collect zips from the sites we aggregated">
Modified: trunk/build/aggregate/bottests-site/site/index-template.html
===================================================================
--- trunk/build/aggregate/bottests-site/site/index-template.html 2011-09-20 05:12:36 UTC (rev 34873)
+++ trunk/build/aggregate/bottests-site/site/index-template.html 2011-09-20 05:20:00 UTC (rev 34874)
@@ -6,17 +6,20 @@
</style>
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<center>
<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0">
+ cellspacing="0" cellpadding="0" width="920" class="bodyText">
<tr>
- <td colspan="2"><img
+ <td colspan="3"><img
src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
</tr>
<tr>
- <td>  </td>
+ <td>      </td>
+ <td>      </td>
+ <td>      </td>
</tr>
<tr>
- <td>  </td>
+ <td>      </td>
<td>
<h2 class="title">JBoss Tools - Bot Tests - ${update.site.description} Update Site</h2>
<table width="100%">
@@ -28,7 +31,7 @@
<td class="bodyText">
<p class="bodyText">This is the <b>${update.site.description}</b>
Update Site for JBoss Tools - Bot Tests. See <a class="link"
- href="http://www.jboss.org/tools/download/update">Installation
+ href="http://www.jboss.org/tools/download/installation/update_3_3">Installation
Instructions</a>.</p>
</td>
</tr>
@@ -53,29 +56,26 @@
<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
+ Downloads</a>.<br/>
+ If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <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>
+ <td>      </td>
</tr>
<tr>
<td></td>
<td>
+ ${site.contents}
+ </td>
+ <td></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
<table width="100%">
<tr class="header">
<td class="sub-header" width="100%"><span> Installation
@@ -131,4 +131,5 @@
</td>
</tr>
</table>
+</center>
</html>
Added: trunk/build/aggregate/bottests-site/site/site.xsl
===================================================================
--- trunk/build/aggregate/bottests-site/site/site.xsl (rev 0)
+++ trunk/build/aggregate/bottests-site/site/site.xsl 2011-09-20 05:20:00 UTC (rev 34874)
@@ -0,0 +1,118 @@
+<xsl:stylesheet version="2.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xalan="http://xml.apache.org/xalan"
+ xmlns:saxon="http://saxon.sf.net/" xmlns="http://www.w3.org/1999/xhtml"
+ extension-element-prefixes="saxon">
+ <xsl:output method="html" indent="yes" />
+ <xsl:template match="/site">
+ <br />
+ <table cellspacing="2" cellpadding="0" border="0">
+ <tr style="background-color:#DDDDDD">
+ <th style="font-size:small">Feature</th>
+ <th style="font-size:small">Version</th>
+ <th style="font-size:small">
+ Feature Categor(ies)
+ </th>
+ </tr>
+ <!-- JBoss features -->
+ <xsl:for-each select="feature[contains(@id,'jboss')]">
+ <xsl:sort select="@id" />
+ <xsl:variable name="rowCol">
+ <xsl:if test="position() mod 2 = 1">
+ #EEEEEE
+ </xsl:if>
+ <xsl:if test="position() mod 2 = 0">
+ #FFFFFF
+ </xsl:if>
+ </xsl:variable>
+
+ <tr style="background-color:{$rowCol}">
+ <td class="rowLine">
+ <a href="{@url}" style="font-size:x-small">
+ <xsl:value-of select="@id" />
+ </a>
+ </td>
+ <td>
+ <span style="font-size:x-small">
+ <xsl:value-of select="@version" />
+ </span>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="category">
+ <xsl:for-each select="category">
+ <span style="font-size:x-small">
+ |
+ <xsl:value-of select="@name" />
+ </span>
+ </xsl:for-each>
+ </xsl:when>
+ </xsl:choose>
+ </td>
+ </tr>
+ </xsl:for-each>
+ <tr style="background-color:#DDDDDD">
+ <th style="font-size:small">Feature</th>
+ <th style="font-size:small">Version</th>
+ <th style="font-size:small">
+ Feature Categor(ies)
+ </th>
+ </tr>
+ <!-- other features -->
+ <xsl:for-each select="feature[not(contains(@id,'jboss'))]">
+ <xsl:sort select="@id" />
+ <xsl:variable name="rowCol">
+ <xsl:if test="position() mod 2 = 1">
+ #EEEEEE
+ </xsl:if>
+ <xsl:if test="position() mod 2 = 0">
+ #FFFFFF
+ </xsl:if>
+ </xsl:variable>
+
+ <tr style="background-color:{$rowCol}">
+ <td class="rowLine">
+ <a href="{@url}" style="font-size:x-small">
+ <xsl:value-of select="@id" />
+ </a>
+ </td>
+ <td>
+ <span style="font-size:x-small">
+ <xsl:value-of select="@version" />
+ </span>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="category">
+ <xsl:for-each select="category">
+ <span style="font-size:x-small">
+ |
+ <xsl:value-of select="@name" />
+ </span>
+ </xsl:for-each>
+ </xsl:when>
+ </xsl:choose>
+ </td>
+ </tr>
+ </xsl:for-each>
+ <tr style="background-color:#DDDDDD">
+ <th colspan="1" style="font-size:small">Metadata</th>
+ <th colspan="1" style="font-size:small"></th>
+ <th colspan="1" style="font-size:small"></th>
+ </tr>
+ <tr style="background-color:#EEEEEE">
+ <td class="rowLine">
+ <a href="site.xml" style="font-size:x-small">site.xml</a>
+ ::
+ <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a>
+ ::
+ <a href="content.jar" style="font-size:x-small">content.jar</a>
+ </td>
+ <td class="rowLine">
+ </td>
+ <td class="rowLine">
+ </td>
+ </tr>
+ </table>
+ <br />
+ </xsl:template>
+</xsl:stylesheet>
Modified: trunk/build/aggregate/site/index-template.html
===================================================================
--- trunk/build/aggregate/site/index-template.html 2011-09-20 05:12:36 UTC (rev 34873)
+++ trunk/build/aggregate/site/index-template.html 2011-09-20 05:20:00 UTC (rev 34874)
@@ -8,7 +8,7 @@
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
<center>
<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0" width="920">
+ cellspacing="0" cellpadding="0" width="920" class="bodyText">
<tr>
<td colspan="3"><img
src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
Modified: trunk/build/aggregate/soa-site/index-template.html
===================================================================
--- trunk/build/aggregate/soa-site/index-template.html 2011-09-20 05:12:36 UTC (rev 34873)
+++ trunk/build/aggregate/soa-site/index-template.html 2011-09-20 05:20:00 UTC (rev 34874)
@@ -8,7 +8,7 @@
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
<center>
<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0" width="920">
+ cellspacing="0" cellpadding="0" width="920" class="bodyText">
<tr>
<td colspan="3"><img
src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
Modified: trunk/build/aggregate/webtools-site/build.xml
===================================================================
--- trunk/build/aggregate/webtools-site/build.xml 2011-09-20 05:12:36 UTC (rev 34873)
+++ trunk/build/aggregate/webtools-site/build.xml 2011-09-20 05:20:00 UTC (rev 34874)
@@ -40,10 +40,23 @@
<pathelement location="${COMMON_TOOLS}/ant-contrib.jar" />
</classpath>
</taskdef>
+
+ <available file="${COMMON_TOOLS}/saxon.jar" type="file" property="saxon.jar.exists" />
+ <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="get.saxon" unless="saxon.jar.exists">
+ <!-- or use http://downloads.sourceforge.net/saxon/saxonhe9-3-0-4j.zip ? -->
+ <property name="SAXON_MIRROR" value="http://downloads.sourceforge.net/project/saxon/Saxon-HE/9.3/saxonhe9-3-0-..." />
+ <get usetimestamp="true" dest="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" src="${SAXON_MIRROR}" />
+ <mkdir dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" />
+ <unzip src="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" dest="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" overwrite="true" />
+ <copy file="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_/saxon9he.jar" tofile="${COMMON_TOOLS}/saxon.jar" failonerror="true" />
+ <delete dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" includeemptydirs="true" quiet="true" />
+ </target>
+
<!-- = = = = = = = = = = = = = = = = =
macrodef: fetchZipsFromList - given a list of zips in zip.list.txt, fetch those zips
= = = = = = = = = = = = = = = = = -->
@@ -283,11 +296,11 @@
<for param="location" list="${repository.children.child.location}">
<sequential>
<var name="counter" value="${counter}0" />
- <var name="i" unset="true"/>
+ <var name="i" unset="true" />
<length property="i" string="${counter}" />
<if>
<not>
- <contains string="@{location}" substring="/staging.previous/"/>
+ <contains string="@{location}" substring="/staging.previous/" />
</not>
<then>
<if>
@@ -317,7 +330,7 @@
</sequential>
</for>
<var name="counter" unset="true" />
- <var name="i" unset="true"/>
+ <var name="i" unset="true" />
<delete file="${aggregate.zips.dir}/compositeArtifacts.xml" quiet="true" />
</then>
@@ -444,6 +457,9 @@
</else>
</if>
+ <!-- get site.xml as HTML, then load into ${site.contents} in order to merge into index.html -->
+ <antcallback target="transform.site.xml" return="site.contents" />
+
<copy todir="${output.dir}" overwrite="true">
<fileset file="index-template.html" />
<mapper type="merge" to="index.html" />
@@ -457,6 +473,18 @@
</copy>
</target>
+ <target name="transform.site.xml">
+ <!-- turn site.xml into site.html via site.xsl -->
+ <delete quiet="true" file="${update.site.source.dir}/site.html" />
+ <xslt style="site.xsl" in="${update.site.source.dir}/site.xml" out="${update.site.source.dir}/site.html" force="true">
+ <classpath location="${COMMON_TOOLS}/saxon.jar" />
+ </xslt>
+ <!-- merge contents of site.html into index.html, then remove site.html -->
+ <loadfile property="site.contents" srcfile="${update.site.source.dir}/site.html" failonerror="false" />
+ <property name="site.contents" value="" />
+ <delete file="${update.site.source.dir}/site.html" quiet="true" />
+ </target>
+
<!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2.0.M2.c...;
if found, load file and use ${ALL_ZIPS} to get list of relative path zips to fetch -->
<target name="collect.zips" description="collect zips from the sites we aggregated">
Modified: trunk/build/aggregate/webtools-site/index-template.html
===================================================================
--- trunk/build/aggregate/webtools-site/index-template.html 2011-09-20 05:12:36 UTC (rev 34873)
+++ trunk/build/aggregate/webtools-site/index-template.html 2011-09-20 05:20:00 UTC (rev 34874)
@@ -6,17 +6,20 @@
</style>
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<center>
<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0">
+ cellspacing="0" cellpadding="0" width="920" class="bodyText">
<tr>
- <td colspan="2"><img
+ <td colspan="3"><img
src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
</tr>
<tr>
- <td>  </td>
+ <td>      </td>
+ <td>      </td>
+ <td>      </td>
</tr>
<tr>
- <td>  </td>
+ <td>      </td>
<td>
<h2 class="title">JBoss Tools - Web Tools - ${update.site.description} Update Site</h2>
<table width="100%">
@@ -28,7 +31,7 @@
<td class="bodyText">
<p class="bodyText">This is the <b>${update.site.description}</b>
Update Site for JBoss Tools - Web Tools. See <a class="link"
- href="http://www.jboss.org/tools/download/update">Installation
+ href="http://www.jboss.org/tools/download/installation/update_3_3">Installation
Instructions</a>.</p>
</td>
</tr>
@@ -52,29 +55,26 @@
<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
+ Downloads</a>.<br/>
+ If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <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>
+ <td>      </td>
</tr>
<tr>
<td></td>
<td>
+ ${site.contents}
+ </td>
+ <td></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
<table width="100%">
<tr class="header">
<td class="sub-header" width="100%"><span> Installation
@@ -130,4 +130,5 @@
</td>
</tr>
</table>
+</center>
</html>
Added: trunk/build/aggregate/webtools-site/site.xsl
===================================================================
--- trunk/build/aggregate/webtools-site/site.xsl (rev 0)
+++ trunk/build/aggregate/webtools-site/site.xsl 2011-09-20 05:20:00 UTC (rev 34874)
@@ -0,0 +1,118 @@
+<xsl:stylesheet version="2.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xalan="http://xml.apache.org/xalan"
+ xmlns:saxon="http://saxon.sf.net/" xmlns="http://www.w3.org/1999/xhtml"
+ extension-element-prefixes="saxon">
+ <xsl:output method="html" indent="yes" />
+ <xsl:template match="/site">
+ <br />
+ <table cellspacing="2" cellpadding="0" border="0">
+ <tr style="background-color:#DDDDDD">
+ <th style="font-size:small">Feature</th>
+ <th style="font-size:small">Version</th>
+ <th style="font-size:small">
+ Feature Categor(ies)
+ </th>
+ </tr>
+ <!-- JBoss features -->
+ <xsl:for-each select="feature[contains(@id,'jboss')]">
+ <xsl:sort select="@id" />
+ <xsl:variable name="rowCol">
+ <xsl:if test="position() mod 2 = 1">
+ #EEEEEE
+ </xsl:if>
+ <xsl:if test="position() mod 2 = 0">
+ #FFFFFF
+ </xsl:if>
+ </xsl:variable>
+
+ <tr style="background-color:{$rowCol}">
+ <td class="rowLine">
+ <a href="{@url}" style="font-size:x-small">
+ <xsl:value-of select="@id" />
+ </a>
+ </td>
+ <td>
+ <span style="font-size:x-small">
+ <xsl:value-of select="@version" />
+ </span>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="category">
+ <xsl:for-each select="category">
+ <span style="font-size:x-small">
+ |
+ <xsl:value-of select="@name" />
+ </span>
+ </xsl:for-each>
+ </xsl:when>
+ </xsl:choose>
+ </td>
+ </tr>
+ </xsl:for-each>
+ <tr style="background-color:#DDDDDD">
+ <th style="font-size:small">Feature</th>
+ <th style="font-size:small">Version</th>
+ <th style="font-size:small">
+ Feature Categor(ies)
+ </th>
+ </tr>
+ <!-- other features -->
+ <xsl:for-each select="feature[not(contains(@id,'jboss'))]">
+ <xsl:sort select="@id" />
+ <xsl:variable name="rowCol">
+ <xsl:if test="position() mod 2 = 1">
+ #EEEEEE
+ </xsl:if>
+ <xsl:if test="position() mod 2 = 0">
+ #FFFFFF
+ </xsl:if>
+ </xsl:variable>
+
+ <tr style="background-color:{$rowCol}">
+ <td class="rowLine">
+ <a href="{@url}" style="font-size:x-small">
+ <xsl:value-of select="@id" />
+ </a>
+ </td>
+ <td>
+ <span style="font-size:x-small">
+ <xsl:value-of select="@version" />
+ </span>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="category">
+ <xsl:for-each select="category">
+ <span style="font-size:x-small">
+ |
+ <xsl:value-of select="@name" />
+ </span>
+ </xsl:for-each>
+ </xsl:when>
+ </xsl:choose>
+ </td>
+ </tr>
+ </xsl:for-each>
+ <tr style="background-color:#DDDDDD">
+ <th colspan="1" style="font-size:small">Metadata</th>
+ <th colspan="1" style="font-size:small"></th>
+ <th colspan="1" style="font-size:small"></th>
+ </tr>
+ <tr style="background-color:#EEEEEE">
+ <td class="rowLine">
+ <a href="site.xml" style="font-size:x-small">site.xml</a>
+ ::
+ <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a>
+ ::
+ <a href="content.jar" style="font-size:x-small">content.jar</a>
+ </td>
+ <td class="rowLine">
+ </td>
+ <td class="rowLine">
+ </td>
+ </tr>
+ </table>
+ <br />
+ </xsl:template>
+</xsl:stylesheet>
14 years, 6 months
- 1
- 0
JBoss Tools SVN: r34873 - in branches/jbosstools-3.2.x/build/aggregate: webtools-site and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-20 01:12:36 -0400 (Tue, 20 Sep 2011)
New Revision: 34873
Added:
branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xsl
Modified:
branches/jbosstools-3.2.x/build/aggregate/site/index-template.html
branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml
branches/jbosstools-3.2.x/build/aggregate/webtools-site/index-template.html
Log:
https://issues.jboss.org/browse/JBIDE-9743 fix fonts in JBT sites; implement directory listing for JBT 3.2.x Web Tools site too
Modified: branches/jbosstools-3.2.x/build/aggregate/site/index-template.html
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/site/index-template.html 2011-09-20 02:58:44 UTC (rev 34872)
+++ branches/jbosstools-3.2.x/build/aggregate/site/index-template.html 2011-09-20 05:12:36 UTC (rev 34873)
@@ -8,7 +8,7 @@
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
<center>
<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0" width="920">
+ cellspacing="0" cellpadding="0" width="920" class="bodyText">
<tr>
<td colspan="3"><img
src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
Modified: branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml 2011-09-20 02:58:44 UTC (rev 34872)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml 2011-09-20 05:12:36 UTC (rev 34873)
@@ -40,10 +40,23 @@
<pathelement location="${COMMON_TOOLS}/ant-contrib.jar" />
</classpath>
</taskdef>
+
+ <available file="${COMMON_TOOLS}/saxon.jar" type="file" property="saxon.jar.exists" />
+ <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="get.saxon" unless="saxon.jar.exists">
+ <!-- or use http://downloads.sourceforge.net/saxon/saxonhe9-3-0-4j.zip ? -->
+ <property name="SAXON_MIRROR" value="http://downloads.sourceforge.net/project/saxon/Saxon-HE/9.3/saxonhe9-3-0-..." />
+ <get usetimestamp="true" dest="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" src="${SAXON_MIRROR}" />
+ <mkdir dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" />
+ <unzip src="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" dest="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" overwrite="true" />
+ <copy file="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_/saxon9he.jar" tofile="${COMMON_TOOLS}/saxon.jar" failonerror="true" />
+ <delete dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" includeemptydirs="true" quiet="true" />
+ </target>
+
<!-- = = = = = = = = = = = = = = = = =
macrodef: fetchZipsFromList - given a list of zips in zip.list.txt, fetch those zips
= = = = = = = = = = = = = = = = = -->
@@ -283,11 +296,11 @@
<for param="location" list="${repository.children.child.location}">
<sequential>
<var name="counter" value="${counter}0" />
- <var name="i" unset="true"/>
+ <var name="i" unset="true" />
<length property="i" string="${counter}" />
<if>
<not>
- <contains string="@{location}" substring="/staging.previous/"/>
+ <contains string="@{location}" substring="/staging.previous/" />
</not>
<then>
<if>
@@ -317,7 +330,7 @@
</sequential>
</for>
<var name="counter" unset="true" />
- <var name="i" unset="true"/>
+ <var name="i" unset="true" />
<delete file="${aggregate.zips.dir}/compositeArtifacts.xml" quiet="true" />
</then>
@@ -444,6 +457,9 @@
</else>
</if>
+ <!-- get site.xml as HTML, then load into ${site.contents} in order to merge into index.html -->
+ <antcallback target="transform.site.xml" return="site.contents" />
+
<copy todir="${output.dir}" overwrite="true">
<fileset file="index-template.html" />
<mapper type="merge" to="index.html" />
@@ -457,6 +473,18 @@
</copy>
</target>
+ <target name="transform.site.xml">
+ <!-- turn site.xml into site.html via site.xsl -->
+ <delete quiet="true" file="${update.site.source.dir}/site.html" />
+ <xslt style="site.xsl" in="${update.site.source.dir}/site.xml" out="${update.site.source.dir}/site.html" force="true">
+ <classpath location="${COMMON_TOOLS}/saxon.jar" />
+ </xslt>
+ <!-- merge contents of site.html into index.html, then remove site.html -->
+ <loadfile property="site.contents" srcfile="${update.site.source.dir}/site.html" failonerror="false" />
+ <property name="site.contents" value="" />
+ <delete file="${update.site.source.dir}/site.html" quiet="true" />
+ </target>
+
<!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2.0.M2.c...;
if found, load file and use ${ALL_ZIPS} to get list of relative path zips to fetch -->
<target name="collect.zips" description="collect zips from the sites we aggregated">
Modified: branches/jbosstools-3.2.x/build/aggregate/webtools-site/index-template.html
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/index-template.html 2011-09-20 02:58:44 UTC (rev 34872)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/index-template.html 2011-09-20 05:12:36 UTC (rev 34873)
@@ -6,17 +6,20 @@
</style>
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<center>
<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0">
+ cellspacing="0" cellpadding="0" width="920" class="bodyText">
<tr>
- <td colspan="2"><img
+ <td colspan="3"><img
src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
</tr>
<tr>
- <td>  </td>
+ <td>      </td>
+ <td>      </td>
+ <td>      </td>
</tr>
<tr>
- <td>  </td>
+ <td>      </td>
<td>
<h2 class="title">JBoss Tools - Web Tools - ${update.site.description} Update Site</h2>
<table width="100%">
@@ -28,7 +31,7 @@
<td class="bodyText">
<p class="bodyText">This is the <b>${update.site.description}</b>
Update Site for JBoss Tools - Web Tools. See <a class="link"
- href="http://www.jboss.org/tools/download/update">Installation
+ href="http://www.jboss.org/tools/download/installation/update_3_2">Installation
Instructions</a>.</p>
</td>
</tr>
@@ -52,29 +55,26 @@
<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
+ Downloads</a>.<br/>
+ If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <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>
+ <td>      </td>
</tr>
<tr>
<td></td>
<td>
+ ${site.contents}
+ </td>
+ <td></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
<table width="100%">
<tr class="header">
<td class="sub-header" width="100%"><span> Installation
@@ -130,4 +130,5 @@
</td>
</tr>
</table>
+</center>
</html>
Added: branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xsl
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xsl (rev 0)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xsl 2011-09-20 05:12:36 UTC (rev 34873)
@@ -0,0 +1,118 @@
+<xsl:stylesheet version="2.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xalan="http://xml.apache.org/xalan"
+ xmlns:saxon="http://saxon.sf.net/" xmlns="http://www.w3.org/1999/xhtml"
+ extension-element-prefixes="saxon">
+ <xsl:output method="html" indent="yes" />
+ <xsl:template match="/site">
+ <br />
+ <table cellspacing="2" cellpadding="0" border="0">
+ <tr style="background-color:#DDDDDD">
+ <th style="font-size:small">Feature</th>
+ <th style="font-size:small">Version</th>
+ <th style="font-size:small">
+ Feature Categor(ies)
+ </th>
+ </tr>
+ <!-- JBoss features -->
+ <xsl:for-each select="feature[contains(@id,'jboss')]">
+ <xsl:sort select="@id" />
+ <xsl:variable name="rowCol">
+ <xsl:if test="position() mod 2 = 1">
+ #EEEEEE
+ </xsl:if>
+ <xsl:if test="position() mod 2 = 0">
+ #FFFFFF
+ </xsl:if>
+ </xsl:variable>
+
+ <tr style="background-color:{$rowCol}">
+ <td class="rowLine">
+ <a href="{@url}" style="font-size:x-small">
+ <xsl:value-of select="@id" />
+ </a>
+ </td>
+ <td>
+ <span style="font-size:x-small">
+ <xsl:value-of select="@version" />
+ </span>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="category">
+ <xsl:for-each select="category">
+ <span style="font-size:x-small">
+ |
+ <xsl:value-of select="@name" />
+ </span>
+ </xsl:for-each>
+ </xsl:when>
+ </xsl:choose>
+ </td>
+ </tr>
+ </xsl:for-each>
+ <tr style="background-color:#DDDDDD">
+ <th style="font-size:small">Feature</th>
+ <th style="font-size:small">Version</th>
+ <th style="font-size:small">
+ Feature Categor(ies)
+ </th>
+ </tr>
+ <!-- other features -->
+ <xsl:for-each select="feature[not(contains(@id,'jboss'))]">
+ <xsl:sort select="@id" />
+ <xsl:variable name="rowCol">
+ <xsl:if test="position() mod 2 = 1">
+ #EEEEEE
+ </xsl:if>
+ <xsl:if test="position() mod 2 = 0">
+ #FFFFFF
+ </xsl:if>
+ </xsl:variable>
+
+ <tr style="background-color:{$rowCol}">
+ <td class="rowLine">
+ <a href="{@url}" style="font-size:x-small">
+ <xsl:value-of select="@id" />
+ </a>
+ </td>
+ <td>
+ <span style="font-size:x-small">
+ <xsl:value-of select="@version" />
+ </span>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="category">
+ <xsl:for-each select="category">
+ <span style="font-size:x-small">
+ |
+ <xsl:value-of select="@name" />
+ </span>
+ </xsl:for-each>
+ </xsl:when>
+ </xsl:choose>
+ </td>
+ </tr>
+ </xsl:for-each>
+ <tr style="background-color:#DDDDDD">
+ <th colspan="1" style="font-size:small">Metadata</th>
+ <th colspan="1" style="font-size:small"></th>
+ <th colspan="1" style="font-size:small"></th>
+ </tr>
+ <tr style="background-color:#EEEEEE">
+ <td class="rowLine">
+ <a href="site.xml" style="font-size:x-small">site.xml</a>
+ ::
+ <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a>
+ ::
+ <a href="content.jar" style="font-size:x-small">content.jar</a>
+ </td>
+ <td class="rowLine">
+ </td>
+ <td class="rowLine">
+ </td>
+ </tr>
+ </table>
+ <br />
+ </xsl:template>
+</xsl:stylesheet>
14 years, 6 months
- 1
- 0
JBoss Tools SVN: r34872 - branches/jbosstools-3.2.x/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-19 22:58:44 -0400 (Mon, 19 Sep 2011)
New Revision: 34872
Modified:
branches/jbosstools-3.2.x/build/publish.sh
Log:
use a unique tmpdir (mktmp -d) instead of just /tmp to avoid collisions
Modified: branches/jbosstools-3.2.x/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.x/build/publish.sh 2011-09-20 02:58:38 UTC (rev 34871)
+++ branches/jbosstools-3.2.x/build/publish.sh 2011-09-20 02:58:44 UTC (rev 34872)
@@ -5,6 +5,10 @@
# to use timestamp when naming dirs instead of ${BUILD_ID}-H${BUILD_NUMBER}, use:
# BUILD_ID=2010-08-31_19-16-10; timestamp=$(echo $BUILD_ID | tr -d "_-"); timestamp=${timestamp:0:12}; echo $timestamp; # 201008311916
+#set up tmpdir
+tmpdir=`mktemp -d`
+mkdir -p $tmpdir
+
# where to create the stuff to publish
STAGINGDIR=${WORKSPACE}/results/${JOB_NAME}
@@ -261,21 +265,21 @@
# if an aggregate build, put output elsewhere on disk
if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
- echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > /tmp/latestBuild.html
+ echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > $tmpdir/latestBuild.html
if [[ ${PUBLISHPATHSUFFIX} ]]; then
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/
# sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead
# echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${PUBLISHPATHSUFFIX}/
- pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null
- date; rsync -arzq --protocol=28 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/
+ pushd $tmpdir >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null
+ date; rsync -arzq --protocol=28 --delete $tmpdir/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/
else
- date; rsync -arzq --protocol=28 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/
+ date; rsync -arzq --protocol=28 --delete $tmpdir/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/
# sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead
# echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${JOBNAMEREDUX}/
- pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/; rm -f latest; popd >/dev/null
+ pushd $tmpdir >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/; rm -f latest; popd >/dev/null
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/
fi
- rm -f /tmp/latestBuild.html
+ rm -f $tmpdir/latestBuild.html
#else
# COMMENTED OUT as this uses too much disk space
# if a release build, create a named dir
@@ -291,11 +295,11 @@
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}.next
# 1. To recursively purge contents of .../staging.previous/foobar/ folder:
- # mkdir -p /tmp/foobar;
- # rsync -aPrz --delete /tmp/foobar tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/staging.previous/
+ # mkdir -p $tmpdir/foobar;
+ # rsync -aPrz --delete $tmpdir/foobar tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/staging.previous/
# 2. To then remove entire .../staging.previous/foobar/ folder:
# echo -e "rmdir foobar" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/staging.previous/
- # rmdir /tmp/foobar
+ # rmdir $tmpdir/foobar
# JBIDE-8667 move current to previous; move next to current
if [[ ${DESTINATION##*@*:*} == "" ]]; then # user@server, do remote op
@@ -305,16 +309,16 @@
# IF using .2 folders, purge contents of /builds/staging.previous/${JOB_NAME}.2 and remove empty dir
# NOTE: comment out next section - should only purge one staging.previous/* folder
- #mkdir -p /tmp/${JOB_NAME}.2
- #rsync -arzq --delete --protocol=28 /tmp/${JOB_NAME}.2 $DESTINATION/builds/staging.previous/
+ #mkdir -p $tmpdir/${JOB_NAME}.2
+ #rsync -arzq --delete --protocol=28 $tmpdir/${JOB_NAME}.2 $DESTINATION/builds/staging.previous/
#echo -e "rmdir ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
- #rmdir /tmp/${JOB_NAME}.2
+ #rmdir $tmpdir/${JOB_NAME}.2
# OR, purge contents of /builds/staging.previous/${JOB_NAME} and remove empty dir
- mkdir -p /tmp/${JOB_NAME}
- rsync -arzq --protocol=28 --delete /tmp/${JOB_NAME} $DESTINATION/builds/staging.previous/
+ mkdir -p $tmpdir/${JOB_NAME}
+ rsync -arzq --protocol=28 --delete $tmpdir/${JOB_NAME} $DESTINATION/builds/staging.previous/
echo -e "rmdir ${JOB_NAME}" | sftp $DESTINATION/builds/staging.previous/
- rmdir /tmp/${JOB_NAME}
+ rmdir $tmpdir/${JOB_NAME}
# move contents of /builds/staging.previous/${JOB_NAME} into /builds/staging.previous/${JOB_NAME}.2
#echo -e "rename ${JOB_NAME} ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
@@ -392,3 +396,6 @@
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/logs $DESTINATION/builds/staging/${JOB_NAME}/
date; rsync -arzq --delete ${STAGINGDIR}/logs $INTRNALDEST/builds/staging/${JOB_NAME}/
+# purge tmpdir
+rm -fr $tmpdir
+
14 years, 6 months
- 1
- 0
JBoss Tools SVN: r34871 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-19 22:58:38 -0400 (Mon, 19 Sep 2011)
New Revision: 34871
Modified:
trunk/build/publish.sh
Log:
remove empty line
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-09-20 02:56:25 UTC (rev 34870)
+++ trunk/build/publish.sh 2011-09-20 02:58:38 UTC (rev 34871)
@@ -270,7 +270,6 @@
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/
# sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead
# echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${PUBLISHPATHSUFFIX}/
-
pushd $tmpdir >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null
date; rsync -arzq --protocol=28 --delete $tmpdir/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/
else
14 years, 6 months
- 1
- 0
JBoss Tools SVN: r34870 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-19 22:56:25 -0400 (Mon, 19 Sep 2011)
New Revision: 34870
Modified:
trunk/build/publish.sh
Log:
use a unique tmpdir (mktmp -d) instead of just /tmp to avoid collisions
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-09-20 02:27:37 UTC (rev 34869)
+++ trunk/build/publish.sh 2011-09-20 02:56:25 UTC (rev 34870)
@@ -5,6 +5,10 @@
# to use timestamp when naming dirs instead of ${BUILD_ID}-H${BUILD_NUMBER}, use:
# BUILD_ID=2010-08-31_19-16-10; timestamp=$(echo $BUILD_ID | tr -d "_-"); timestamp=${timestamp:0:12}; echo $timestamp; # 201008311916
+#set up tmpdir
+tmpdir=`mktemp -d`
+mkdir -p $tmpdir
+
# where to create the stuff to publish
STAGINGDIR=${WORKSPACE}/results/${JOB_NAME}
@@ -261,21 +265,22 @@
# if an aggregate build, put output elsewhere on disk
if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
- echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > /tmp/latestBuild.html
+ echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > $tmpdir/latestBuild.html
if [[ ${PUBLISHPATHSUFFIX} ]]; then
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/
# sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead
# echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${PUBLISHPATHSUFFIX}/
- pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null
- date; rsync -arzq --protocol=28 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/
+
+ pushd $tmpdir >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null
+ date; rsync -arzq --protocol=28 --delete $tmpdir/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/
else
- date; rsync -arzq --protocol=28 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/
+ date; rsync -arzq --protocol=28 --delete $tmpdir/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/
# sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead
# echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${JOBNAMEREDUX}/
- pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/; rm -f latest; popd >/dev/null
+ pushd $tmpdir >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/; rm -f latest; popd >/dev/null
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/
fi
- rm -f /tmp/latestBuild.html
+ rm -f $tmpdir/latestBuild.html
#else
# COMMENTED OUT as this uses too much disk space
# if a release build, create a named dir
@@ -291,11 +296,11 @@
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}.next
# 1. To recursively purge contents of .../staging.previous/foobar/ folder:
- # mkdir -p /tmp/foobar;
- # rsync -aPrz --delete /tmp/foobar tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/staging.previous/
+ # mkdir -p $tmpdir/foobar;
+ # rsync -aPrz --delete $tmpdir/foobar tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/staging.previous/
# 2. To then remove entire .../staging.previous/foobar/ folder:
# echo -e "rmdir foobar" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/staging.previous/
- # rmdir /tmp/foobar
+ # rmdir $tmpdir/foobar
# JBIDE-8667 move current to previous; move next to current
if [[ ${DESTINATION##*@*:*} == "" ]]; then # user@server, do remote op
@@ -305,16 +310,16 @@
# IF using .2 folders, purge contents of /builds/staging.previous/${JOB_NAME}.2 and remove empty dir
# NOTE: comment out next section - should only purge one staging.previous/* folder
- #mkdir -p /tmp/${JOB_NAME}.2
- #rsync -arzq --delete --protocol=28 /tmp/${JOB_NAME}.2 $DESTINATION/builds/staging.previous/
+ #mkdir -p $tmpdir/${JOB_NAME}.2
+ #rsync -arzq --delete --protocol=28 $tmpdir/${JOB_NAME}.2 $DESTINATION/builds/staging.previous/
#echo -e "rmdir ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
- #rmdir /tmp/${JOB_NAME}.2
+ #rmdir $tmpdir/${JOB_NAME}.2
# OR, purge contents of /builds/staging.previous/${JOB_NAME} and remove empty dir
- mkdir -p /tmp/${JOB_NAME}
- rsync -arzq --protocol=28 --delete /tmp/${JOB_NAME} $DESTINATION/builds/staging.previous/
+ mkdir -p $tmpdir/${JOB_NAME}
+ rsync -arzq --protocol=28 --delete $tmpdir/${JOB_NAME} $DESTINATION/builds/staging.previous/
echo -e "rmdir ${JOB_NAME}" | sftp $DESTINATION/builds/staging.previous/
- rmdir /tmp/${JOB_NAME}
+ rmdir $tmpdir/${JOB_NAME}
# move contents of /builds/staging.previous/${JOB_NAME} into /builds/staging.previous/${JOB_NAME}.2
#echo -e "rename ${JOB_NAME} ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
@@ -392,3 +397,6 @@
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/logs $DESTINATION/builds/staging/${JOB_NAME}/
date; rsync -arzq --delete ${STAGINGDIR}/logs $INTRNALDEST/builds/staging/${JOB_NAME}/
+# purge tmpdir
+rm -fr $tmpdir
+
14 years, 6 months
- 1
- 0
JBoss Tools SVN: r34869 - branches/jbosstools-3.2.x/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-19 22:27:37 -0400 (Mon, 19 Sep 2011)
New Revision: 34869
Added:
branches/jbosstools-3.2.x/build/aggregate/site/site.xsl
Modified:
branches/jbosstools-3.2.x/build/aggregate/site/build.xml
branches/jbosstools-3.2.x/build/aggregate/site/index-template.html
branches/jbosstools-3.2.x/build/aggregate/site/index.html
Log:
https://issues.jboss.org/browse/JBIDE-9743 add links to site.xml and content.jar/artifacts.jar where available for extras, product, product-soa, installer sites.
Modified: branches/jbosstools-3.2.x/build/aggregate/site/build.xml
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/site/build.xml 2011-09-20 02:23:47 UTC (rev 34868)
+++ branches/jbosstools-3.2.x/build/aggregate/site/build.xml 2011-09-20 02:27:37 UTC (rev 34869)
@@ -4,8 +4,6 @@
-DJOB_NAME=${JOB_NAME}
-DBUILD_ID=${BUILD_ID}
-DBUILD_NUMBER=${BUILD_NUMBER}
- eg.,
- -DJOB_NAME=jbosstools-3.2_stable_branch.aggregate -DBUILD_ID=2011-05-12_06-03-43 -DBUILD_NUMBER=81
-->
<!-- if ${WORKSPACE}/site folder exists, target that folder; else generate here. -->
@@ -42,10 +40,23 @@
<pathelement location="${COMMON_TOOLS}/ant-contrib.jar" />
</classpath>
</taskdef>
+
+ <available file="${COMMON_TOOLS}/saxon.jar" type="file" property="saxon.jar.exists" />
+ <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="get.saxon" unless="saxon.jar.exists">
+ <!-- or use http://downloads.sourceforge.net/saxon/saxonhe9-3-0-4j.zip ? -->
+ <property name="SAXON_MIRROR" value="http://downloads.sourceforge.net/project/saxon/Saxon-HE/9.3/saxonhe9-3-0-..." />
+ <get usetimestamp="true" dest="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" src="${SAXON_MIRROR}" />
+ <mkdir dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" />
+ <unzip src="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" dest="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" overwrite="true" />
+ <copy file="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_/saxon9he.jar" tofile="${COMMON_TOOLS}/saxon.jar" failonerror="true" />
+ <delete dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" includeemptydirs="true" quiet="true" />
+ </target>
+
<!-- = = = = = = = = = = = = = = = = =
macrodef: fetchZipsFromList - given a list of zips in zip.list.txt, fetch those zips
= = = = = = = = = = = = = = = = = -->
@@ -278,30 +289,49 @@
<echo level="verbose">Got ${aggregate.zips.dir}/compositeArtifacts.xml</echo>
<xmlproperty file="${aggregate.zips.dir}/compositeArtifacts.xml" validate="false" collapseAttributes="true" />
<echo level="verbose">Found ${repository.children.size} contained repos to search</echo>
+
+ <!-- counter variable -->
+ <var name="counter" value="" />
<!-- foreach entry repository.children.child.location -->
<for param="location" list="${repository.children.child.location}">
<sequential>
+ <var name="counter" value="${counter}0" />
+ <var name="i" unset="true" />
+ <length property="i" string="${counter}" />
<if>
- <available file="/home/hudson/static_build_env/jbds/builds/staging" type="dir" />
+ <not>
+ <contains string="@{location}" substring="/staging.previous/" />
+ </not>
<then>
- <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="/home/hudson/static_build_env/jbds/builds/staging/" />
<if>
- <not>
- <available file="${location.cleaned}" />
- </not>
+ <available file="/home/hudson/static_build_env/jbds/builds/staging" type="dir" />
<then>
+ <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="/home/hudson/static_build_env/jbds/builds/staging/" />
+ <if>
+ <not>
+ <available file="${location.cleaned}" />
+ </not>
+ <then>
+ <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" />
+ </then>
+ </if>
+ </then>
+ <else>
<propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" />
- </then>
+ </else>
</if>
+ <echo level="error">[${i}/${repository.children.size}] Site URL = ${location.cleaned} (@{location})</echo>
+ <fetchZipsFromList repo="${location.cleaned}" />
</then>
<else>
- <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" />
+ <echo level="error">[${i}/${repository.children.size}] Skip @{location}</echo>
</else>
</if>
- <echo level="error">Site URL = ${location.cleaned} (@{location})</echo>
- <fetchZipsFromList repo="${location.cleaned}" />
</sequential>
</for>
+ <var name="counter" unset="true" />
+ <var name="i" unset="true" />
+
<delete file="${aggregate.zips.dir}/compositeArtifacts.xml" quiet="true" />
</then>
<else>
@@ -427,6 +457,9 @@
</else>
</if>
+ <!-- get site.xml as HTML, then load into ${site.contents} in order to merge into index.html -->
+ <antcallback target="transform.site.xml" return="site.contents" />
+
<copy todir="${output.dir}" overwrite="true">
<fileset file="index-template.html" />
<mapper type="merge" to="index.html" />
@@ -440,6 +473,18 @@
</copy>
</target>
+ <target name="transform.site.xml">
+ <!-- turn site.xml into site.html via site.xsl -->
+ <delete quiet="true" file="${update.site.source.dir}/site.html" />
+ <xslt style="site.xsl" in="${update.site.source.dir}/site.xml" out="${update.site.source.dir}/site.html" force="true">
+ <classpath location="${COMMON_TOOLS}/saxon.jar" />
+ </xslt>
+ <!-- merge contents of site.html into index.html, then remove site.html -->
+ <loadfile property="site.contents" srcfile="${update.site.source.dir}/site.html" failonerror="false" />
+ <property name="site.contents" value="" />
+ <delete file="${update.site.source.dir}/site.html" quiet="true" />
+ </target>
+
<!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2.0.M2.c...;
if found, load file and use ${ALL_ZIPS} to get list of relative path zips to fetch -->
<target name="collect.zips" description="collect zips from the sites we aggregated">
Modified: branches/jbosstools-3.2.x/build/aggregate/site/index-template.html
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/site/index-template.html 2011-09-20 02:23:47 UTC (rev 34868)
+++ branches/jbosstools-3.2.x/build/aggregate/site/index-template.html 2011-09-20 02:27:37 UTC (rev 34869)
@@ -6,17 +6,20 @@
</style>
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<center>
<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0">
+ cellspacing="0" cellpadding="0" width="920">
<tr>
- <td colspan="2"><img
+ <td colspan="3"><img
src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
</tr>
<tr>
- <td>  </td>
+ <td>      </td>
+ <td>      </td>
+ <td>      </td>
</tr>
<tr>
- <td>  </td>
+ <td>      </td>
<td>
<h2 class="title">JBoss Tools ${update.site.description} Update Site</h2>
<table width="100%">
@@ -28,7 +31,7 @@
<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
+ href="http://www.jboss.org/tools/download/installation/update_3_2">Installation
Instructions</a>.</p>
</td>
</tr>
@@ -51,29 +54,26 @@
<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
+ Downloads</a>.<br/>
+ If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <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>
+ <td>      </td>
</tr>
<tr>
<td></td>
<td>
+ ${site.contents}
+ </td>
+ <td></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
<table width="100%">
<tr class="header">
<td class="sub-header" width="100%"><span> Installation
@@ -129,4 +129,5 @@
</td>
</tr>
</table>
+</center>
</html>
Modified: branches/jbosstools-3.2.x/build/aggregate/site/index.html
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/site/index.html 2011-09-20 02:23:47 UTC (rev 34868)
+++ branches/jbosstools-3.2.x/build/aggregate/site/index.html 2011-09-20 02:27:37 UTC (rev 34869)
@@ -6,17 +6,20 @@
</style>
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<center>
<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0">
+ cellspacing="0" cellpadding="0" width="920">
<tr>
- <td colspan="2"><img
+ <td colspan="3"><img
src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
</tr>
<tr>
- <td>  </td>
+ <td>      </td>
+ <td>      </td>
+ <td>      </td>
</tr>
<tr>
- <td>  </td>
+ <td>      </td>
<td>
<h2 class="title">JBoss Tools Nightly Build Update Site</h2>
<table width="100%">
@@ -28,7 +31,7 @@
<td class="bodyText">
<p class="bodyText">This is the <b>Nightly Build</b>
Update Site for JBoss Tools. See <a class="link"
- href="http://www.jboss.org/tools/download/update">Installation
+ href="http://www.jboss.org/tools/download/installation/update_3_2">Installation
Instructions</a>.</p>
</td>
</tr>
@@ -51,29 +54,431 @@
<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
+ Downloads</a>.<br/>
+ If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <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>
+ <td>      </td>
</tr>
<tr>
<td></td>
<td>
+ <br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br><table xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan" cellspacing="2" cellpadding="0" border="0">
+ <tr style="background-color:#DDDDDD">
+ <th style="font-size:small">Feature</th>
+ <th style="font-size:small">Version</th>
+ <th style="font-size:small">
+ Feature Categor(ies)
+
+ </th>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.0.v20110729-1930-H160-Final.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
+ <td><span style="font-size:x-small">3.2.0.v20110729-1930-H160-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ GeneralTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.2.0.v20110729-2006-H221-Final.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
+ <td><span style="font-size:x-small">2.2.0.v20110729-2006-H221-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ WebTools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.freemarker.feature_1.2.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.ide.eclipse.freemarker.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ GeneralTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.savara.tools.feature_1.1.0.Final.jar" style="font-size:x-small">org.jboss.savara.tools.feature</a></td>
+ <td><span style="font-size:x-small">1.1.0.Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ SOATools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.birt.feature_1.3.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.birt.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ ReportTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.bpel.feature_1.1.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.bpel.feature</a></td>
+ <td><span style="font-size:x-small">1.1.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ SOATools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.cdi.feature_1.1.1.v20110729-2123-H143-Final.jar" style="font-size:x-small">org.jboss.tools.cdi.feature</a></td>
+ <td><span style="font-size:x-small">1.1.1.v20110729-2123-H143-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ WebTools</span><span style="font-size:x-small">
+ |
+ GeneralTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.community.project.examples.feature_1.2.1.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.community.project.examples.feature</a></td>
+ <td><span style="font-size:x-small">1.2.1.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ GeneralTools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.deltacloud.feature_0.0.1.v20110729-2026-H248-Final.jar" style="font-size:x-small">org.jboss.tools.deltacloud.feature</a></td>
+ <td><span style="font-size:x-small">0.0.1.v20110729-2026-H248-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ CloudTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.esb.feature_1.5.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.esb.feature</a></td>
+ <td><span style="font-size:x-small">1.5.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ SOATools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.gwt.feature_1.0.0.v20110729-1921-H119-Final.jar" style="font-size:x-small">org.jboss.tools.gwt.feature</a></td>
+ <td><span style="font-size:x-small">1.0.0.v20110729-1921-H119-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ GeneralTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.jbpm.common.feature_4.4.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.jbpm.common.feature</a></td>
+ <td><span style="font-size:x-small">4.4.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ SOATools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.jbpm.convert.feature_1.0.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.jbpm.convert.feature</a></td>
+ <td><span style="font-size:x-small">1.0.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ SOATools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.jbpm3.feature_3.2.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.jbpm3.feature</a></td>
+ <td><span style="font-size:x-small">3.2.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ SOATools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.jbpm4.feature_4.0.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.jbpm4.feature</a></td>
+ <td><span style="font-size:x-small">4.0.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ SOATools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.1.0.v20110729-1935-H124-Final.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
+ <td><span style="font-size:x-small">1.1.0.v20110729-1935-H124-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ GeneralTools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.cdi.feature_1.3.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.maven.cdi.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ MavenTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.feature_1.3.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.maven.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ MavenTools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.hibernate.feature_1.3.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.maven.hibernate.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ MavenTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.jsf.feature_1.2.0.v20110730-1431-H209-Final.jar" style="font-size:x-small">org.jboss.tools.maven.jsf.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20110730-1431-H209-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ MavenTools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.portlet.feature_1.3.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.maven.portlet.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ MavenTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.project.examples.feature_1.3.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.maven.project.examples.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ MavenTools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.seam.feature_1.3.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.maven.seam.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ MavenTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.modeshape.rest.feature_1.1.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.modeshape.rest.feature</a></td>
+ <td><span style="font-size:x-small">1.1.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ GeneralTools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.portlet.feature_1.2.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.portlet.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ WebTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.project.examples.feature_1.2.1.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.project.examples.feature</a></td>
+ <td><span style="font-size:x-small">1.2.1.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ GeneralTools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.richfaces.feature_3.2.1.v20110730-1214-H169-Final.jar" style="font-size:x-small">org.jboss.tools.richfaces.feature</a></td>
+ <td><span style="font-size:x-small">3.2.1.v20110730-1214-H169-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ WebTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.runtime.core.feature_1.3.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.runtime.core.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.runtime.feature_1.2.0.v20110801-1251-H353-Final.jar" style="font-size:x-small">org.jboss.tools.runtime.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20110801-1251-H353-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.seam.feature_3.2.1.v20110730-1321-H261-Final.jar" style="font-size:x-small">org.jboss.tools.seam.feature</a></td>
+ <td><span style="font-size:x-small">3.2.1.v20110730-1321-H261-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ WebTools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.smooks.feature_1.3.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.smooks.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ SOATools</span><span style="font-size:x-small">
+ |
+ DataTools</span><span style="font-size:x-small">
+ |
+ GeneralTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.struts.feature_3.1.1.v20110729-2243-H165-Final.jar" style="font-size:x-small">org.jboss.tools.struts.feature</a></td>
+ <td><span style="font-size:x-small">3.1.1.v20110729-2243-H165-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ WebTools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.tptp.feature_1.2.0.v20110729-1952-H156-Final.jar" style="font-size:x-small">org.jboss.tools.tptp.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20110729-1952-H156-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ TestPerfTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.usage.feature_1.1.0.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.usage.feature</a></td>
+ <td><span style="font-size:x-small">1.1.0.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.ws.feature_1.2.2.v20110808-0046-M3.jar" style="font-size:x-small">org.jboss.tools.ws.feature</a></td>
+ <td><span style="font-size:x-small">1.2.2.v20110808-0046-M3</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ SOATools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.xulrunner.feature_1.9.12.v20110729-2146-H157-Final.jar" style="font-size:x-small">org.jboss.tools.xulrunner.feature</a></td>
+ <td><span style="font-size:x-small">1.9.12.v20110729-2146-H157-Final</span></td>
+ <td></td>
+ </tr>
+ <tr style="background-color:#DDDDDD">
+ <th style="font-size:small">Feature</th>
+ <th style="font-size:small">Version</th>
+ <th style="font-size:small">
+ Feature Categor(ies)
+
+ </th>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.drools.eclipse.feature_5.2.0.Final.jar" style="font-size:x-small">org.drools.eclipse.feature</a></td>
+ <td><span style="font-size:x-small">5.2.0.Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ SOATools</span><span style="font-size:x-small">
+ |
+ GeneralTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.drools.eclipse.task.feature_5.2.0.Final.jar" style="font-size:x-small">org.drools.eclipse.task.feature</a></td>
+ <td><span style="font-size:x-small">5.2.0.Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ SOATools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.guvnor.tools.feature_5.2.0.Final.jar" style="font-size:x-small">org.guvnor.tools.feature</a></td>
+ <td><span style="font-size:x-small">5.2.0.Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ SOATools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.hibernate.eclipse.feature_3.4.0.v20110729-2006-H171-Final.jar" style="font-size:x-small">org.hibernate.eclipse.feature</a></td>
+ <td><span style="font-size:x-small">3.4.0.v20110729-2006-H171-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllTools</span><span style="font-size:x-small">
+ |
+ WebTools</span><span style="font-size:x-small">
+ |
+ DataTools</span><span style="font-size:x-small">
+ |
+ GeneralTools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.mozilla.xulrunner.feature_1.9.12.v20110706-1605-H39-CR2.jar" style="font-size:x-small">org.mozilla.xulrunner.feature</a></td>
+ <td><span style="font-size:x-small">1.9.12.v20110706-1605-H39-CR2</span></td>
+ <td></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.pi4soa.core.feature_3.1.0.v20110729-1949-H171-Final.jar" style="font-size:x-small">org.pi4soa.core.feature</a></td>
+ <td><span style="font-size:x-small">3.1.0.v20110729-1949-H171-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ SOATools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.scribble.protocol.feature_1.1.0.Final.jar" style="font-size:x-small">org.scribble.protocol.feature</a></td>
+ <td><span style="font-size:x-small">1.1.0.Final</span></td>
+ <td></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.teiid.datatools.connectivity.feature_7.4.1.v20110801-1554-H590-Final.jar" style="font-size:x-small">org.teiid.datatools.connectivity.feature</a></td>
+ <td><span style="font-size:x-small">7.4.1.v20110801-1554-H590-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ DataTools</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.teiid.designer.feature_7.4.1.v20110801-1554-H590-Final.jar" style="font-size:x-small">org.teiid.designer.feature</a></td>
+ <td><span style="font-size:x-small">7.4.1.v20110801-1554-H590-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ DataTools</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.teiid.designer.runtime.feature_7.4.1.v20110801-1554-H590-Final.jar" style="font-size:x-small">org.teiid.designer.runtime.feature</a></td>
+ <td><span style="font-size:x-small">7.4.1.v20110801-1554-H590-Final</span></td>
+ <td><span style="font-size:x-small">
+ |
+ DataTools</span></td>
+ </tr>
+ <tr style="background-color:#DDDDDD">
+ <th colspan="1" style="font-size:small">Metadata</th>
+ <th colspan="1" style="font-size:small"></th>
+ <th colspan="1" style="font-size:small"></th>
+ </tr>
+ <tr style="background-color:#EEEEEE">
+ <td class="rowLine"><a href="site.xml" style="font-size:x-small">site.xml</a>
+ ::
+ <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a>
+ ::
+ <a href="content.jar" style="font-size:x-small">content.jar</a></td>
+ <td class="rowLine"></td>
+ <td class="rowLine"></td>
+ </tr>
+</table><br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br>
+ </td>
+ <td></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
<table width="100%">
<tr class="header">
<td class="sub-header" width="100%"><span> Installation
@@ -129,4 +534,5 @@
</td>
</tr>
</table>
+</center>
</html>
Added: branches/jbosstools-3.2.x/build/aggregate/site/site.xsl
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/site/site.xsl (rev 0)
+++ branches/jbosstools-3.2.x/build/aggregate/site/site.xsl 2011-09-20 02:27:37 UTC (rev 34869)
@@ -0,0 +1,118 @@
+<xsl:stylesheet version="2.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xalan="http://xml.apache.org/xalan"
+ xmlns:saxon="http://saxon.sf.net/" xmlns="http://www.w3.org/1999/xhtml"
+ extension-element-prefixes="saxon">
+ <xsl:output method="html" indent="yes" />
+ <xsl:template match="/site">
+ <br />
+ <table cellspacing="2" cellpadding="0" border="0">
+ <tr style="background-color:#DDDDDD">
+ <th style="font-size:small">Feature</th>
+ <th style="font-size:small">Version</th>
+ <th style="font-size:small">
+ Feature Categor(ies)
+ </th>
+ </tr>
+ <!-- JBoss features -->
+ <xsl:for-each select="feature[contains(@id,'jboss')]">
+ <xsl:sort select="@id" />
+ <xsl:variable name="rowCol">
+ <xsl:if test="position() mod 2 = 1">
+ #EEEEEE
+ </xsl:if>
+ <xsl:if test="position() mod 2 = 0">
+ #FFFFFF
+ </xsl:if>
+ </xsl:variable>
+
+ <tr style="background-color:{$rowCol}">
+ <td class="rowLine">
+ <a href="{@url}" style="font-size:x-small">
+ <xsl:value-of select="@id" />
+ </a>
+ </td>
+ <td>
+ <span style="font-size:x-small">
+ <xsl:value-of select="@version" />
+ </span>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="category">
+ <xsl:for-each select="category">
+ <span style="font-size:x-small">
+ |
+ <xsl:value-of select="@name" />
+ </span>
+ </xsl:for-each>
+ </xsl:when>
+ </xsl:choose>
+ </td>
+ </tr>
+ </xsl:for-each>
+ <tr style="background-color:#DDDDDD">
+ <th style="font-size:small">Feature</th>
+ <th style="font-size:small">Version</th>
+ <th style="font-size:small">
+ Feature Categor(ies)
+ </th>
+ </tr>
+ <!-- other features -->
+ <xsl:for-each select="feature[not(contains(@id,'jboss'))]">
+ <xsl:sort select="@id" />
+ <xsl:variable name="rowCol">
+ <xsl:if test="position() mod 2 = 1">
+ #EEEEEE
+ </xsl:if>
+ <xsl:if test="position() mod 2 = 0">
+ #FFFFFF
+ </xsl:if>
+ </xsl:variable>
+
+ <tr style="background-color:{$rowCol}">
+ <td class="rowLine">
+ <a href="{@url}" style="font-size:x-small">
+ <xsl:value-of select="@id" />
+ </a>
+ </td>
+ <td>
+ <span style="font-size:x-small">
+ <xsl:value-of select="@version" />
+ </span>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="category">
+ <xsl:for-each select="category">
+ <span style="font-size:x-small">
+ |
+ <xsl:value-of select="@name" />
+ </span>
+ </xsl:for-each>
+ </xsl:when>
+ </xsl:choose>
+ </td>
+ </tr>
+ </xsl:for-each>
+ <tr style="background-color:#DDDDDD">
+ <th colspan="1" style="font-size:small">Metadata</th>
+ <th colspan="1" style="font-size:small"></th>
+ <th colspan="1" style="font-size:small"></th>
+ </tr>
+ <tr style="background-color:#EEEEEE">
+ <td class="rowLine">
+ <a href="site.xml" style="font-size:x-small">site.xml</a>
+ ::
+ <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a>
+ ::
+ <a href="content.jar" style="font-size:x-small">content.jar</a>
+ </td>
+ <td class="rowLine">
+ </td>
+ <td class="rowLine">
+ </td>
+ </tr>
+ </table>
+ <br />
+ </xsl:template>
+</xsl:stylesheet>
14 years, 6 months
- 1
- 0