[releng] fix some release names (e.g. juno to kepler, kepler to luna)
diff --git a/bootstrapScript/getRelengTools.sh b/bootstrapScript/getRelengTools.sh
index d890526..2bfc061 100755
--- a/bootstrapScript/getRelengTools.sh
+++ b/bootstrapScript/getRelengTools.sh
@@ -8,7 +8,7 @@
# of ${BUILD_TOOLS} on the file system. If completely fresh
# (first time) install, some "sanity check" code below needs
# overriden with -f after confirming correct current directory is
-# correctly set in CC, something like /shared/juno .
+# correctly set in CC, something like /shared/simrel/luna .
# finds file on users path, before current directory
diff --git a/p2IndexFiles/mixedTypeLocations/description.txt b/p2IndexFiles/mixedTypeLocations/description.txt
index 2231ebe..da1b6bb 100644
--- a/p2IndexFiles/mixedTypeLocations/description.txt
+++ b/p2IndexFiles/mixedTypeLocations/description.txt
@@ -1,9 +1,9 @@
This p2.index files are created by recent versions of b3.aggregator,
for Kepler, but this copy is provided for reference and use in earlier
-repositories, such as subrepos under .../releases/juno/<datestamp>/
+repositories, such as subrepos under .../releases/luna/<datestamp>/
There, typically, we have one compositeArtifacts.jar but a simple content.jar.
-Note we purposely do not put p2.index file in .../releases/juno/<datestamp>/aggregate/
+Note we purposely do not put p2.index file in .../releases/luna/<datestamp>/aggregate/
since does not really help save anything in that case as there is only artifacts.jar,
which happens to be looked for first anyway.
diff --git a/runManuallyRarely/testMirroringRepo.xml b/runManuallyRarely/testMirroringRepo.xml
index 3c9f80b..61ace7e 100644
--- a/runManuallyRarely/testMirroringRepo.xml
+++ b/runManuallyRarely/testMirroringRepo.xml
@@ -1,32 +1,34 @@
<project
- default="p2Mirror"
- basedir=".">
+ default="p2Mirror"
+ basedir=".">
<!-- for misc manual tests only -->
- <property name="todir" value="/home/shared/simrel/temp" />
- <target
- name="p2Mirror">
- <p2.mirror ignoreErrors="true" log="${todir}/mirrorlog.txt">
- <repository
- location="file:/${todir}" name="A temp test repo" />
- <source>
- <repository
- location="file://home/data/httpd/download.eclipse.org/releases/juno/201303010900/" />
- </source>
- <slicingOptions platformFilter="true" />
- </p2.mirror>
-
-
-
-
- <!-- mirror from build results, comparing against previous builds that are in the composite repo -->
- <p2.mirror>
- <source location="file:${assemblyTempDir}/${buildLabel}"/>
- <destination location="file:${builder}/composite/${buildLabel}"/>
- <comparator comparator="org.eclipse.equinox.p2.repository.tools.jar.comparator" comparatorLog="${buildDirectory}/comparator.log">
- <repository location="file:${builder}/composite" />
- </comparator>
- </p2.mirror>
-
- </target>
+ <property
+ name="todir"
+ value="/shared/simrel/temp" />
+ <target name="p2Mirror">
+ <p2.mirror
+ ignoreErrors="true"
+ log="${todir}/mirrorlog.txt">
+ <repository
+ location="file:/${todir}"
+ name="A temp test repo" />
+ <source>
+ <repository location="file://home/data/httpd/download.eclipse.org/releases/luna/201308230900/" />
+ </source>
+ <slicingOptions platformFilter="true" />
+ </p2.mirror>
+
+ <!-- mirror from build results, comparing against previous builds that are in the composite repo
+ <p2.mirror>
+ <source location="file:${assemblyTempDir}/${buildLabel}" />
+ <destination location="file:${builder}/composite/${buildLabel}" />
+ <comparator
+ comparator="org.eclipse.equinox.p2.repository.tools.jar.comparator"
+ comparatorLog="${buildDirectory}/comparator.log">
+ <repository location="file:${builder}/composite" />
+ </comparator>
+ </p2.mirror>
+-->
+ </target>
</project>
diff --git a/templateFiles/maintenance/index.html b/templateFiles/maintenance/index.html
index 567f969..1ce0841 100644
--- a/templateFiles/maintenance/index.html
+++ b/templateFiles/maintenance/index.html
@@ -23,7 +23,7 @@
This software repository URL,
<code>http://download.eclipse.org/releases/maintenance/</code>
, provides temporary access to a software repository for the
- <a href="http://www.eclipse.org/juno/">Eclipse Juno</a>
+ <a href="http://www.eclipse.org/kepler/">Eclipse Kepler</a>
SR1 release.
</p>
@@ -43,7 +43,7 @@
<p>
Committers and Contributors should check the <a
- href="http://build.eclipse.org/simrel/juno/reporeports/index.html">reports</a>
+ href="http://build.eclipse.org/simrel/kepler/reporeports/index.html">reports</a>
genertated for this staging repository.
</p>
diff --git a/templateFiles/release/current/index.html b/templateFiles/release/current/index.html
index d4c6a56..3a3161f 100644
--- a/templateFiles/release/current/index.html
+++ b/templateFiles/release/current/index.html
@@ -22,11 +22,14 @@
<div id="midcolumn">
<p>
This software repository URL,<br />
- <code>http://download.eclipse.org/releases/kepler/</code>,<br />
- provides access to the software repository for the <a
- href="http://www.eclipse.org/kepler/">Eclipse Kepler
+ <code>http://download.eclipse.org/releases/luna/</code>,<br />
+ provides access to the software repository for the
+ <!--
+ <a href="http://www.eclipse.org/luna/">
+ -->
+ Eclipse Luna
release</a>. </p>
- <p>Until its released in June 2013, it will
+ <p>Until its released in June 2014, it will
contain milestone builds.
</p>
<p>This repository site URL is typically pre-populated in the
@@ -35,7 +38,7 @@
<p>
For more information about installing or updating software,
see the <a
- href="http://help.eclipse.org/juno/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-124.htm">Eclipse
+ href="http://help.eclipse.org/kepler/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-124.htm">Eclipse
Platform Help</a>.
</p>
<p>
diff --git a/templateFiles/release/maintenance/index.html b/templateFiles/release/maintenance/index.html
index 148f064..44f2874 100644
--- a/templateFiles/release/maintenance/index.html
+++ b/templateFiles/release/maintenance/index.html
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>Juno Software Repository</title>
+<title>Kepler Software Repository</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<meta name="author" content="Eclipse Foundation, Inc." />
<link rel="stylesheet" type="text/css"
@@ -22,9 +22,9 @@
<div id="midcolumn">
<p>
This software repository URL,<br />
- <code>http://download.eclipse.org/releases/juno/</code>,<br />
+ <code>http://download.eclipse.org/releases/kepler/</code>,<br />
provides access to the software repository for the <a
- href="http://www.eclipse.org/juno/">Eclipse Juno
+ href="http://www.eclipse.org/kepler/">Eclipse Kepler
release</a>. </p>
</p>
<p>This repository site URL is typically pre-populated in the
@@ -33,7 +33,7 @@
<p>
For more information about installing or updating software,
see the <a
- href="http://help.eclipse.org/juno/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-124.htm">Eclipse
+ href="http://help.eclipse.org/kepler/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-124.htm">Eclipse
Platform Help</a>.
</p>
<p>
diff --git a/templateFiles/staging/index.html b/templateFiles/staging/index.html
index 692e307..2c0ba73 100644
--- a/templateFiles/staging/index.html
+++ b/templateFiles/staging/index.html
@@ -22,8 +22,11 @@
<p>
This software repository URL,
<code>http://download.eclipse.org/releases/staging/</code>
- , provides temporary access to a software repository for the
- <a href="http://www.eclipse.org/kepler/">Eclipse Kepler</a>
+ , provides temporary access to a software repository for the
+ Eclipse Luna
+ <!--
+ <a href="http://www.eclipse.org/luna/">Eclipse Luna</a>
+ -->
release.
</p>
