diff --git a/org.eclipse.wtp.releng.webupdatesite/.classpath b/org.eclipse.wtp.releng.webupdatesite/.classpath
index f06d57589f63d12fc229b96de54bb9490e3515f0..fbbd08222cda1ea7daae95e3481a2db30d3f1106 100644
--- a/org.eclipse.wtp.releng.webupdatesite/.classpath
+++ b/org.eclipse.wtp.releng.webupdatesite/.classpath
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="var" path="JRE_LIB"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/j2sdk1.4.2_11"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.wtp.releng.webupdatesite/.settings/org.eclipse.jst.common.project.facet.core.prefs b/org.eclipse.wtp.releng.webupdatesite/.settings/org.eclipse.jst.common.project.facet.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..0118b88f264f8cae2607bc1e3aacac60d036919b
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/.settings/org.eclipse.jst.common.project.facet.core.prefs
@@ -0,0 +1,4 @@
+#Sun Oct 29 12:11:52 EST 2006
+classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:j2sdk1.4.2_11/owners=jst.java\:1.4
+classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.0/owners=jst.web\:2.4
+eclipse.preferences.version=1
diff --git a/org.eclipse.wtp.releng.webupdatesite/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.wtp.releng.webupdatesite/.settings/org.eclipse.wst.common.project.facet.core.xml
index 2e568f10c0e6395516b025ead99f9e2fd67574b0..33a7eff64dea00967a97d9bfc416395e4535cda9 100644
--- a/org.eclipse.wtp.releng.webupdatesite/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
+ <runtime name="Apache Tomcat v5.0"/>
<fixed facet="jst.java"/>
<fixed facet="jst.web"/>
- <installed facet="jst.java" version="1.4"/>
<installed facet="jst.web" version="2.4"/>
+ <installed facet="jst.java" version="1.4"/>
</faceted-project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/index.html b/org.eclipse.wtp.releng.webupdatesite/WebContent/index.html
index 63616f764bea53d3066e8ce4cd8ebc4de7a468be..d68c2552e66f20728e0c0dff9d1a5a9ffd2dc744 100644
--- a/org.eclipse.wtp.releng.webupdatesite/WebContent/index.html
+++ b/org.eclipse.wtp.releng.webupdatesite/WebContent/index.html
@@ -1,14 +1,14 @@
+
<html>
<head>
<title>WTP Updates</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<style type="">@import url("web/site.css");</style>
+
</head>
<body>
<div align="right" width="400">
-<p><img
- src="wtplogosmall.jpg" alt="WTP Logo"></p>
+<p><img src="wtplogosmall.jpg" alt="WTP Logo"></p>
</div>
<h1 class="title">Eclipse Update Site for <br />
@@ -16,68 +16,21 @@ Web Tools Platform (WTP)</h1>
<p>This update site provides the features of the Eclipse Web Tools
Platform (WTP).</p>
-<p>It not only provides the data for WTP updates, it also provides
-"pointers" to the prerequisite projects (JDT, EMF, GEF, and JEM).</p>
-<p>It does assume, however, that at least the Eclipse 3.1.2 Platform
-Feature is installed. For example, to start with minimum foot-print, you
-can use the <a
- href="http://download.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/index.php">Platform
-Runtime Binary</a> appropriate for your operating system. (The Platform
-Runtime Binary section is about half way down that page.)</p>
-
-<p>Note, if you are starting with Eclipse 3.1.0, there are some
-separate and <a
- href="http://www.eclipse.org/eclipse/platform-releng/updatesfor3.1.1.html">specific
-instructions</a> for updating the base platform to the 3.1.1 or 3.1.2 level.</p>
-
-
+<p>If you are just getting started with Eclipse or Eclipse Web
+Tools, you may want to first install from the <a
+ href="http://www.eclipse.org/callisto/"> Callisto</a> update site, as
+it would have everything you need to get started.</p>
+<p>This Web Tools Platform update site does assume you have all the
+pre-reqs installed.</p>
+<p>Beyond the basic Web Tools Platform, this site offeres the SDK
+version of Web Tools, the JSF preview and the Dali (JPA) preview.</p>
<p>To use this update site in your existing installation of Eclipse,
-add the following URL as a remote update site in your update manager, if it does not already have it.</p>
+add the following URL as a remote update site in your update manager, if
+it does not already have it.</p>
<p> <b> <code>http://download.eclipse.org/webtools/updates/</code></b></p>
-<p><b>Tip: </b>any time you get a chance, export your bookmark files
-from the "add a site" dialog. Having them saved away in a safe place
-makes it much easier to re-create another development environment.</p>
<p>See <a
- href="http://help.eclipse.org/help31/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-34.htm">Eclipse
+ href="http://help.eclipse.org/help32/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-34.htm">Eclipse
Help</a> for general information about using Update Manager.</p>
-<p><b>Tip: </b>To lessen download time (by installing the minimum
-number of features), first select the desired WTP feature in the Eclipse
-update install dialog, then use the 'select required' button to select
-only the minimum required prerequisite features.</p>
-<p><b>Tip: </b>If you are able, it may be easiest to start a fresh
-development environment based on 3.1.2 and then update to use WTP 1.0.1
-and its pre-reqs. And, since the workbench may have to shutdown and
-restart several times (if updating several features), you can you do the
-upgrade with an empty workspace and once satisfied all is well, then use
-the -data option on the Eclipse command line (or shortcut) to point to
-your workspace of interest.</p>
-<p><b>Tip: </b>Both before and <i>after</i> installing "new"
-features, you may want to use update manager to "check for updates to
-currently installed features". In some scenarios just installing WTP
-will not necessarily upgrade all components, such as EMF, to the highest
-available level.</p>
-<p><b>Tip: </b>After you install WTP 1.0.1, you can enjoy using
-Update Manager again to "Search for New Features to Install". You'll
-notice that once WTP is installed, we (in WTP) add BIRT and TPTP <i>discovery
-sites</i> to your Update Manager sites, since there is some cool
-applications that use WTP, BIRT and TPTP together.</p>
-
-<h3>Known Problems and Issues</h3>
-
-
-<p><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=123191">bug
-123191:</a> If you check "Filter features included in other
-features on the list", then even using the 'select required' button may
-not "find" all the features required. Similar for the 'show only the
-latest version of the feature'.</p>
-<p><b>Workaround: </b>do not check that box! :)</p>
-<p>As always, open bugs you find or open feature requests, to help
-the project improve. Thanks for your help.</p>
-<h3>Example of Update Dialog</h3>
-<p>Here is an example screen shot highlighting the areas discussed
-in the tips and workarounds. The example is from having started with
-just the base 3.1.2 Platform Feature installed.</p>
-<img alt"example view of update dialog" src="update2.gif" />
</body>
</html>
diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/web/site.css b/org.eclipse.wtp.releng.webupdatesite/WebContent/web/site.css
deleted file mode 100644
index 425134ee313a29c4b3a3ed92069a036c46d5519c..0000000000000000000000000000000000000000
--- a/org.eclipse.wtp.releng.webupdatesite/WebContent/web/site.css
+++ /dev/null
@@ -1,12 +0,0 @@
-<STYLE type="text/css">
-td.spacer {padding-bottom: 10px; padding-top: 10px;}
-.title { font-family: sans-serif; color: #99AACC;}
-.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:#EEEEFF}
-.header {background:#99AADD}
-#indent {word-wrap : break-word;width :300px;text-indent:10px;}
-</STYLE>
diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/web/site.xsl b/org.eclipse.wtp.releng.webupdatesite/WebContent/web/site.xsl
deleted file mode 100644
index 83a6d2cbcd527d1b08ad0bf9bd92f868c07301e0..0000000000000000000000000000000000000000
--- a/org.eclipse.wtp.releng.webupdatesite/WebContent/web/site.xsl
+++ /dev/null
@@ -1,495 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
- version='1.0'
- xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
- xmlns:msxsl="urn:schemas-microsoft-com:xslt">
- <xsl:output
- method="html"
- encoding="UTF-8" />
- <xsl:key
- name="cat"
- match="category"
- use="@name" />
- <xsl:template match="/">
- <xsl:for-each select="site">
- <html>
- <head>
- <title>
- Eclipse Web Tools Project (WTP) Update Site
- </title>
- <style>@import url("web/site.css");</style>
- </head>
- <body>
- <h2 class="title">WTP Update Features</h2>
- <p class="bodyText">
- <xsl:value-of select="description" />
- </p>
- <table
- width="100%"
- border="0"
- cellspacing="1"
- cellpadding="2">
- <xsl:for-each select="category-def">
-
- <xsl:sort
- select="@label"
- order="ascending"
- case-order="upper-first" />
- <xsl:sort
- select="@name"
- order="ascending"
- case-order="upper-first" />
-
-
-
-
-
-
-
- <xsl:if
- test="count(key('cat',@name)) != 0">
-
-
- <tr class="header">
- <td
- class="sub-header"
- width="30%">
- <xsl:value-of select="@name" />
- </td>
- <td
- class="sub-header"
- width="70%">
- <xsl:value-of select="@label" />
- </td>
- </tr>
- <xsl:for-each
- select="key('cat',@name)">
- <xsl:sort
- select="ancestor::feature//@version"
- order="ascending" />
- <xsl:sort
- select="ancestor::feature//@id"
- order="ascending"
- case-order="upper-first" />
- <tr>
- <xsl:choose>
- <xsl:when
- test="(position() mod 2 = 1)">
- <xsl:attribute
- name="class">
- dark-row
- </xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute
- name="class">
- light-row
- </xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- <td
- class="log-text"
- id="indent">
- <xsl:choose>
- <xsl:when
- test="ancestor::feature//@label">
- <p
- href="{ancestor::feature//@url}">
- <xsl:value-of
- select="ancestor::feature//@label" />
- </p>
- <br />
- <div id="indent">
- (
- <xsl:value-of
- select="ancestor::feature//@id" />
- -
- <xsl:value-of
- select="ancestor::feature//@version" />
- )
- </div>
- </xsl:when>
- <xsl:otherwise>
- <p
- href="{ancestor::feature//@url}">
- <xsl:value-of
- select="ancestor::feature//@id" />
- -
- <xsl:value-of
- select="ancestor::feature//@version" />
- </p>
- </xsl:otherwise>
- </xsl:choose>
- <br />
- </td>
- <td>
- <table>
- <xsl:if
- test="ancestor::feature//@os">
- <tr>
- <td
- class="log-text"
- id="indent">
- Operating
- Systems:
- </td>
- <td
- class="log-text"
- id="indent">
- <xsl:value-of
- select="ancestor::feature//@os" />
- </td>
- </tr>
- </xsl:if>
- <xsl:if
- test="ancestor::feature//@ws">
- <tr>
- <td
- class="log-text"
- id="indent">
- Windows
- Systems:
- </td>
- <td
- class="log-text"
- id="indent">
- <xsl:value-of
- select="ancestor::feature//@ws" />
- </td>
- </tr>
- </xsl:if>
- <xsl:if
- test="ancestor::feature//@nl">
- <tr>
- <td
- class="log-text"
- id="indent">
- Languages:
- </td>
- <td
- class="log-text"
- id="indent">
- <xsl:value-of
- select="ancestor::feature//@nl" />
- </td>
- </tr>
- </xsl:if>
- <xsl:if
- test="ancestor::feature//@arch">
- <tr>
- <td
- class="log-text"
- id="indent">
- Architecture:
- </td>
- <td
- class="log-text"
- id="indent">
- <xsl:value-of
- select="ancestor::feature//@arch" />
- </td>
- </tr>
- </xsl:if>
- </table>
- </td>
- </tr>
- </xsl:for-each>
- <tr>
- <td class="spacer">
- <br />
- </td>
- <td class="spacer">
- <br />
- </td>
- </tr>
-
-
-
- </xsl:if>
- </xsl:for-each>
- <xsl:if
- test="count(feature) > count(feature/category)">
- <tr class="header">
- <td
- class="sub-header"
- colspan="2">
- Uncategorized
- </td>
- </tr>
- </xsl:if>
- <xsl:choose>
- <xsl:when
- test="function-available('msxsl:node-set')">
- <xsl:variable name="rtf-nodes">
- <xsl:for-each
- select="feature[not(category)]">
- <xsl:sort
- select="@id"
- order="ascending"
- case-order="upper-first" />
- <xsl:sort
- select="@version"
- order="ascending" />
- <xsl:value-of select="." />
- <xsl:copy-of select="." />
- </xsl:for-each>
- </xsl:variable>
- <xsl:variable
- name="myNodeSet"
- select="msxsl:node-set($rtf-nodes)/*" />
- <xsl:for-each select="$myNodeSet">
- <tr>
- <xsl:choose>
- <xsl:when
- test="position() mod 2 = 1">
- <xsl:attribute
- name="class">
- dark-row
- </xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute
- name="class">
- light-row
- </xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- <td
- class="log-text"
- id="indent">
- <xsl:choose>
- <xsl:when
- test="@label">
- <p href="{@url}">
- <xsl:value-of
- select="@label" />
- </p>
- <br />
- <div id="indent">
- (
- <xsl:value-of
- select="@id" />
- -
- <xsl:value-of
- select="@version" />
- )
- </div>
- </xsl:when>
- <xsl:otherwise>
- <p href="{@url}">
- <xsl:value-of
- select="@id" />
- -
- <xsl:value-of
- select="@version" />
- </p>
- </xsl:otherwise>
- </xsl:choose>
- <br />
- <br />
- </td>
- <td>
- <table>
- <xsl:if test="@os">
- <tr>
- <td
- class="log-text"
- id="indent">
- Operating
- Systems:
- </td>
- <td
- class="log-text"
- id="indent">
- <xsl:value-of
- select="@os" />
- </td>
- </tr>
- </xsl:if>
- <xsl:if test="@ws">
- <tr>
- <td
- class="log-text"
- id="indent">
- Windows
- Systems:
- </td>
- <td
- class="log-text"
- id="indent">
- <xsl:value-of
- select="@ws" />
- </td>
- </tr>
- </xsl:if>
- <xsl:if test="@nl">
- <tr>
- <td
- class="log-text"
- id="indent">
- Languages:
- </td>
- <td
- class="log-text"
- id="indent">
- <xsl:value-of
- select="@nl" />
- </td>
- </tr>
- </xsl:if>
- <xsl:if test="@arch">
- <tr>
- <td
- class="log-text"
- id="indent">
- Architecture:
- </td>
- <td
- class="log-text"
- id="indent">
- <xsl:value-of
- select="@arch" />
- </td>
- </tr>
- </xsl:if>
- </table>
- </td>
- </tr>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- <xsl:for-each
- select="feature[not(category)]">
- <xsl:sort
- select="@id"
- order="ascending"
- case-order="upper-first" />
- <xsl:sort
- select="@version"
- order="ascending" />
- <tr>
- <xsl:choose>
- <xsl:when
- test="count(preceding-sibling::feature[not(category)]) mod 2 = 1">
- <xsl:attribute
- name="class">
- dark-row
- </xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute
- name="class">
- light-row
- </xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- <td
- class="log-text"
- id="indent">
- <xsl:choose>
- <xsl:when
- test="@label">
- <p href="{@url}">
- <xsl:value-of
- select="@label" />
- </p>
- <br />
- <div id="indent">
- (
- <xsl:value-of
- select="@id" />
- -
- <xsl:value-of
- select="@version" />
- )
- </div>
- </xsl:when>
- <xsl:otherwise>
- <p href="{@url}">
- <xsl:value-of
- select="@id" />
- -
- <xsl:value-of
- select="@version" />
- </p>
- </xsl:otherwise>
- </xsl:choose>
- <br />
- <br />
- </td>
- <td>
- <table>
- <xsl:if test="@os">
- <tr>
- <td
- class="log-text"
- id="indent">
- Operating
- Systems:
- </td>
- <td
- class="log-text"
- id="indent">
- <xsl:value-of
- select="@os" />
- </td>
- </tr>
- </xsl:if>
- <xsl:if test="@ws">
- <tr>
- <td
- class="log-text"
- id="indent">
- Windows
- Systems:
- </td>
- <td
- class="log-text"
- id="indent">
- <xsl:value-of
- select="@ws" />
- </td>
- </tr>
- </xsl:if>
- <xsl:if test="@nl">
- <tr>
- <td
- class="log-text"
- id="indent">
- Languages:
- </td>
- <td
- class="log-text"
- id="indent">
- <xsl:value-of
- select="@nl" />
- </td>
- </tr>
- </xsl:if>
- <xsl:if test="@arch">
- <tr>
- <td
- class="log-text"
- id="indent">
- Architecture:
- </td>
- <td
- class="log-text"
- id="indent">
- <xsl:value-of
- select="@arch" />
- </td>
- </tr>
- </xsl:if>
- </table>
- </td>
- </tr>
- </xsl:for-each>
- </xsl:otherwise>
- </xsl:choose>
- </table>
- </body>
- </html>
- </xsl:for-each>
- </xsl:template>
-</xsl:stylesheet>