Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--features/org.eclipse.gmf.doc-feature/feature.xml1
-rw-r--r--features/org.eclipse.gmf.examples-feature/feature.xml2
-rw-r--r--features/org.eclipse.gmf.sdk-feature/feature.xml2
-rw-r--r--features/org.eclipse.gmf.tests-feature/feature.xml2
-rw-r--r--releng/org.eclipse.gmf.releng.builder/scripts/build.properties6
-rw-r--r--releng/org.eclipse.gmf.releng.builder/scripts/build.xml4
-rw-r--r--releng/org.eclipse.gmf.releng.builder/scripts/config.xml4
-rw-r--r--releng/org.eclipse.gmf.releng.builder/scripts/dropSiteRootFiles/index.php2
-rw-r--r--releng/org.eclipse.gmf.releng.builder/scripts/update.xml4
-rw-r--r--releng/org.eclipse.gmf.updatesite/index.html2
-rw-r--r--releng/org.eclipse.gmf.updatesite/site.xml2
-rw-r--r--releng/org.eclipse.gmf.updatesite/web/site.xsl6
-rw-r--r--releng/org.eclipse.gmf.updatesite/web/web.xml4
13 files changed, 21 insertions, 20 deletions
diff --git a/features/org.eclipse.gmf.doc-feature/feature.xml b/features/org.eclipse.gmf.doc-feature/feature.xml
index 13eb29340..9a43049ef 100644
--- a/features/org.eclipse.gmf.doc-feature/feature.xml
+++ b/features/org.eclipse.gmf.doc-feature/feature.xml
@@ -23,6 +23,7 @@ http://www.eclipse.org/legal/epl-v10.html
</license>
<url>
+ <update label="%updateSiteName" url="http://download.eclipse.org/technology/gmf/updates/site.xml"/>
<discovery label="%updateSiteName" url="http://update.eclipse.org/updates"/>
</url>
diff --git a/features/org.eclipse.gmf.examples-feature/feature.xml b/features/org.eclipse.gmf.examples-feature/feature.xml
index 84bb44a3b..13c00e9f6 100644
--- a/features/org.eclipse.gmf.examples-feature/feature.xml
+++ b/features/org.eclipse.gmf.examples-feature/feature.xml
@@ -22,7 +22,7 @@ http://www.eclipse.org/legal/epl-v10.html
</license>
<url>
- <update label="%updateSiteName" url="http://update.eclipse.org/updates"/>
+ <update label="%updateSiteName" url="http://download.eclipse.org/technology/gmf/updates/site.xml"/>
<discovery label="%updateSiteName" url="http://update.eclipse.org/updates"/>
</url>
diff --git a/features/org.eclipse.gmf.sdk-feature/feature.xml b/features/org.eclipse.gmf.sdk-feature/feature.xml
index eeb7a6fe4..976963e77 100644
--- a/features/org.eclipse.gmf.sdk-feature/feature.xml
+++ b/features/org.eclipse.gmf.sdk-feature/feature.xml
@@ -24,7 +24,7 @@ http://www.eclipse.org/legal/epl-v10.html
</license>
<url>
- <update label="%updateSiteName" url="http://update.eclipse.org/updates"/>
+ <update label="%updateSiteName" url="http://download.eclipse.org/technology/gmf/updates/site.xml"/>
<discovery label="%updateSiteName" url="http://update.eclipse.org/updates"/>
</url>
diff --git a/features/org.eclipse.gmf.tests-feature/feature.xml b/features/org.eclipse.gmf.tests-feature/feature.xml
index c35e1bd3c..a0dec3f5f 100644
--- a/features/org.eclipse.gmf.tests-feature/feature.xml
+++ b/features/org.eclipse.gmf.tests-feature/feature.xml
@@ -22,7 +22,7 @@ http://www.eclipse.org/legal/epl-v10.html
</license>
<url>
- <update label="%updateSiteName" url="http://update.eclipse.org/updates"/>
+ <update label="%updateSiteName" url="http://download.eclipse.org/technology/gmf/updates/site.xml"/>
<discovery label="%updateSiteName" url="http://update.eclipse.org/updates"/>
</url>
diff --git a/releng/org.eclipse.gmf.releng.builder/scripts/build.properties b/releng/org.eclipse.gmf.releng.builder/scripts/build.properties
index c1e16c803..60a6aa295 100644
--- a/releng/org.eclipse.gmf.releng.builder/scripts/build.properties
+++ b/releng/org.eclipse.gmf.releng.builder/scripts/build.properties
@@ -15,7 +15,7 @@ archiveType=zip
#Default build output is below the scripts folder
buildRoot=${basedir}/../../build
buildDirectory=${buildRoot}/${component}
-buildUpdateSitePath=${buildRoot}/updateSite
+buildUpdateSitePath=${buildRoot}/updates
artifacts=${buildRoot}/artifacts
scripts=${basedir}/../scripts
@@ -29,8 +29,8 @@ basearch=x86
# recommended when frequently building with clean option set to avoid
# lengthy downloads and stress on remote update site.
useMirror=true
-localUpdateSite=http://127.0.0.1/updateSite
-localUpdateSitePath=/java/Tomcat 5.5/webapps/updateSite
+localUpdateSite=http://127.0.0.1/updates
+localUpdateSitePath=/java/Tomcat 5.5/webapps/updates
###############################################################################
# CruiseControl settings
diff --git a/releng/org.eclipse.gmf.releng.builder/scripts/build.xml b/releng/org.eclipse.gmf.releng.builder/scripts/build.xml
index a4b76e0c9..1b6f2e0f1 100644
--- a/releng/org.eclipse.gmf.releng.builder/scripts/build.xml
+++ b/releng/org.eclipse.gmf.releng.builder/scripts/build.xml
@@ -32,7 +32,7 @@
<delete>
<fileset dir="${buildUpdateSitePath}" excludes="**/*.jar"/>
</delete>
- <cvs cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/technology" command="export -r HEAD -d updateSite" package="org.eclipse.gmf/releng/org.eclipse.gmf.updatesite" dest="${buildRoot}/" />
+ <cvs cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/technology" command="export -r HEAD -d updates" package="org.eclipse.gmf/releng/org.eclipse.gmf.updatesite" dest="${buildRoot}/" />
<copy todir="${localUpdateSitePath}/features">
<fileset dir="${buildUpdateSitePath}/features"/>
</copy>
@@ -45,7 +45,7 @@
changes in GMF's site.xml -->
<!-- TODO: copy css, xsl from scripts directory to the local CC web app for consistent look & feel, when modified -->
<target name="initLocalMirror">
- <cvs cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/technology" command="export -r HEAD -d updateSite" package="org.eclipse.gmf/releng/org.eclipse.gmf.updatesite" dest="${localUpdateSitePath}/../" />
+ <cvs cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/technology" command="export -r HEAD -d updates" package="org.eclipse.gmf/releng/org.eclipse.gmf.updatesite" dest="${localUpdateSitePath}/../" />
<mkdir dir="${localUpdateSitePath}/WEB-INF"/>
<move file="${localUpdateSitePath}/web/web.xml" todir="${localUpdateSitePath}/WEB-INF"/>
</target>
diff --git a/releng/org.eclipse.gmf.releng.builder/scripts/config.xml b/releng/org.eclipse.gmf.releng.builder/scripts/config.xml
index 6021bb7f4..b6adc2475 100644
--- a/releng/org.eclipse.gmf.releng.builder/scripts/config.xml
+++ b/releng/org.eclipse.gmf.releng.builder/scripts/config.xml
@@ -79,7 +79,7 @@
<!-- Publishers are run *after* a build completes -->
<publishers>
- <htmlemail subjectprefix="" buildresultsurl="${reporting.url}/buildresults/gmf"
+ <htmlemail subjectprefix="[continuous]" buildresultsurl="${reporting.url}/buildresults/gmf"
logdir="${logs}/gmf">
<always address="${always.email}" />
</htmlemail>
@@ -121,7 +121,7 @@
<!-- Publishers are run *after* a build completes -->
<publishers>
- <htmlemail subjectprefix="" buildresultsurl="${reporting.url}/buildresults/gmf"
+ <htmlemail subjectprefix="[nightly]" buildresultsurl="${reporting.url}/buildresults/gmf"
logdir="${logs}/gmf">
<always address="${always.email}" />
</htmlemail>
diff --git a/releng/org.eclipse.gmf.releng.builder/scripts/dropSiteRootFiles/index.php b/releng/org.eclipse.gmf.releng.builder/scripts/dropSiteRootFiles/index.php
index f4cab30ff..a7c159699 100644
--- a/releng/org.eclipse.gmf.releng.builder/scripts/dropSiteRootFiles/index.php
+++ b/releng/org.eclipse.gmf.releng.builder/scripts/dropSiteRootFiles/index.php
@@ -30,7 +30,7 @@ Software User Agreement</a> unless otherwise specified. </p>
about different kinds of builds read our build <a href="build_types.html">types</a> page.</p>
<p>Builds can also be installed via Update Manager, from an existing installation of Eclipse, by following these
-<a href="http://www.eclipse.org/technology/gmf/updates/site.html" target="_self">steps</a>.
+<a href="http://www.eclipse.org/technology/gmf/updates/index.html" target="_self">steps</a>.
</p></td></tr>
<tr>
diff --git a/releng/org.eclipse.gmf.releng.builder/scripts/update.xml b/releng/org.eclipse.gmf.releng.builder/scripts/update.xml
index d43800d11..1c049bb03 100644
--- a/releng/org.eclipse.gmf.releng.builder/scripts/update.xml
+++ b/releng/org.eclipse.gmf.releng.builder/scripts/update.xml
@@ -22,7 +22,7 @@
<arg value="-version"/>
<arg value="${version}"/>
<arg value="-from"/>
- <arg value="${updateSite}"/>
+ <arg value="${updates}"/>
<arg value="-to"/>
<arg value="${localUpdateSitePath}"/>
</java>
@@ -54,7 +54,7 @@
<arg value="-version"/>
<arg value="${version}"/>
<arg value="-from"/>
- <arg value="${updateSite}"/>
+ <arg value="${updates}"/>
</java>
</target>
diff --git a/releng/org.eclipse.gmf.updatesite/index.html b/releng/org.eclipse.gmf.updatesite/index.html
index cb003ebe6..409aac460 100644
--- a/releng/org.eclipse.gmf.updatesite/index.html
+++ b/releng/org.eclipse.gmf.updatesite/index.html
@@ -1,6 +1,6 @@
<html>
<head>
-<title>GMF Development Update Site</title>
+<title>GMF Update Site</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<style>@import url("web/site.css");</style>
<script type="text/javascript">
diff --git a/releng/org.eclipse.gmf.updatesite/site.xml b/releng/org.eclipse.gmf.updatesite/site.xml
index 4f0a0ced9..67fd1bd2e 100644
--- a/releng/org.eclipse.gmf.updatesite/site.xml
+++ b/releng/org.eclipse.gmf.updatesite/site.xml
@@ -17,7 +17,7 @@
</feature>
<category-def name="GMF 1.0.0" label="Graphical Modeling Framework">
<description>
- A generative framework for developing graphical applications which leverage both the Eclipse Modeling Framework (EMF) and Graphical Editing Framework (GEF).
+ A generative framework and runtime for developing graphical applications which leverage both the Eclipse Modeling Framework (EMF) and Graphical Editing Framework (GEF).
</description>
</category-def>
</site>
diff --git a/releng/org.eclipse.gmf.updatesite/web/site.xsl b/releng/org.eclipse.gmf.updatesite/web/site.xsl
index 7a903244d..0e189ce9e 100644
--- a/releng/org.eclipse.gmf.updatesite/web/site.xsl
+++ b/releng/org.eclipse.gmf.updatesite/web/site.xsl
@@ -5,7 +5,7 @@
<xsl:for-each select="site">
<html>
<head>
- <title>GMF Development Update Site</title>
+ <title>GMF Update Site</title>
<style>@import url("web/site.css");</style>
</head>
<body>
@@ -13,7 +13,7 @@
<tr valign="top">
<td width="75%">
<a name="top"> </a>
- <h2 class="title">GMF Development Update Site</h2>
+ <h2 class="title">GMF Update Site</h2>
<p class="bodyText"><xsl:copy-of select="description"/> For more on how to do this, <a href="http://eclipse.org/emf/docs.php?doc=docs/UsingUpdateManager/UsingUpdateManager.html">click here</a>.
</p>
<pre><p class="bodyText"> Help
@@ -22,7 +22,7 @@
> Search for new features to install
> New Remote Site...
* Name: <b>GMF Development Update Site</b>
- * URL: <b><a href="http://gmf-dev.borland.com/updateSite/site.xml" target="_um">http://gmf-dev.borland.com/updateSite/site.xml</a></b></p></pre>
+ * URL: <b><a href="http://download.eclipse.org/technology/gmf/updates/site.xml" target="_um">http://download.eclipse.org/technology/gmf/updates/site.xml</a></b></p></pre>
</td>
<td width="25%"><img alt="how to" src="http://eclipse.org/images/howto_banner.jpg" height="111" width="272" align="middle" /></td>
</tr>
diff --git a/releng/org.eclipse.gmf.updatesite/web/web.xml b/releng/org.eclipse.gmf.updatesite/web/web.xml
index 3aa5f8919..55db8ae0a 100644
--- a/releng/org.eclipse.gmf.updatesite/web/web.xml
+++ b/releng/org.eclipse.gmf.updatesite/web/web.xml
@@ -4,9 +4,9 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <display-name>GMF Development Update Site</display-name>
+ <display-name>GMF Update Site</display-name>
<description>
- Local update site used for builds.
+ Update site for the Eclipse Graphical Modeling Framework Project.
</description>
<welcome-file-list>
<welcome-file>index.html</welcome-file>

Back to the top