Renamed discovery2.php to discovery.php. In the process, killed original discovery.php.
diff --git a/discovery.php b/discovery.php
index dd35087..98b1666 100644
--- a/discovery.php
+++ b/discovery.php
@@ -31,52 +31,36 @@
// that the file renders properly (i.e. testing using) "/index.php",
// and "/home/index.php" both work.
+ require_once("links.php");
+
# Paste your HTML content between the EOHTML markers!
$html = <<<EOHTML
<div id="maincontent">
<div id="midcolumn">
<h1>$pageTitle</h1>
<img src="callisto_slice.jpg">
- <h2>What is this?</h2>
- <p>This page is to help users discover and download the projects and features which
- are part of the
- <a href="http://www.eclipse.org/projects/callisto.php">Eclipse Callisto Simulantaneous Release</a> (henceforth referred to as "Callisto").
- Callisto is the name of the effort to simultaneously release ten Eclipse projects at the same time. The goal of Callisto is to help Eclipse adopters by simultaneously releasing ten Eclipse projects.
- Organizations who are building products and applications using Eclipse frameworks and tools
- will benefit from having synchronized project releases.<br/><br/>
- But it is also important to understand what Callisto is <b>not</b>.<br/>
- <ul>
- <li>Callisto is not a product or project itself, nor the bundling or integration of multiple projects.
- It is the co-ordinating the timing of releases.
- It's not that we don't think bundling or integration are good ideas, maybe in a future simultaneous release
- we will have the opportunity to do more along those lines.</li><br/><br/>
- <li>Downloading mutiple projects in Callisto is still going to take some effort. Doing what we can to simplify
- the experience is what this page is about. In previous Eclipse releases, adopters would typically download
- the Eclipse SDK or Runtime Binary and then use the UpdateManager to download the other Eclipse projects they
- needed as they became available. We're making all ten projects available on the same day, but the download
- and installation process remains fundamentally the same.
- This is an area where we may look at improving in the future.</li>
- </ul>
- </p>
- <h2>What is a Callisto Release Candidate (RC)? Is it the same as an Eclipse RC?</h2>
- <p>As we are entering the end-game for Callisto, it is important that you recognize that each of the projects are still at varying degrees of completion and stability. So, for example, as of the end of April, the Java Development Tools are at RC1 level, which for them means they're pretty solid. Other projects such as CDT are at RC0, which is their first feature freeze release. So don't be surprised by varying degrees of completion and polish. But regardless, we are hoping that you will take the time to try out as many of the Callisto projects as possible and give us your feedback.</p>
- <h2>How can I, as an early user of Callisto, help make it better? </h2>
- <p>Shipping ten projects at the same time is a big job. Everyone in the Eclipse community can help - and that includes you. We're asking everyone who downloads any part of Callisto to help us with finding and <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi">reporting bugs</a>. No matter how big or small, we are asking that if you notice anything that's not quite right that you report a bug to us. Everyone who reports a bug has an opportunity of having their bug nominated to participate in the <a href="http://www.eclipse.org/projects/callisto-files/callisto-bug-contest.php">Callisto Bug Finding Contest</a>. The author of every nominated bug gets a cool Eclipse Callisto t-shirt, and there are draws for iPods and a grand prize of an <a href="http://www.eclipsebicycles.com/en/">Eclipse mountain bike</a>.<br/><br/>
- When you're reporting your bug, we ask that you please make an effort to determine which project is the source of the bug. But if all else fails, we have defined a Callisto component, so you can report your bug via the Eclipse Foundation. Just go <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?classification=Eclipse%20Foundation">here</a>, select "Callisto" from the Component list and enter your bug. If you need any help with figuring out Eclipse's bug reporting system, you can find some <a href="https://bugs.eclipse.org/bugzilla.html">here</a>.
- </p>
- <h2>Ok, I'm convinced. How can I get started using Callisto Release Candidates?</h2>
+
+ <h2>Using Callisto Discovery Site</h2>
<p>
- <b>The Latest Callisto release is now available for download and testing.</b><br/><br/>
- To access the Latest Callisto projects, you must first download the latest <a href="http://download.eclipse.org/eclipse/downloads/drops/M20060609-1217/callisto.php">Eclipse Platform Runtime Binary (RC7)</a> and use the update manager to load Callisto projects. To obtain this release, please visit <a href="http://download.eclipse.org/eclipse/downloads/drops/M20060609-1217/callisto.php">download.eclipse.org</a>. Remember that the <a href="/projects/callisto-files/callisto-bug-contest.php">Callisto Great Bug Hunt </a> is still on. Your feedback is required!
- <br/><br/>
- See Eclipse Help for general information about using Update Manager. For most distributions of Eclipse, there should already be a "Callisto Discovery Site" defined in its Update Manager. But, if you do not see it you can try adding the following URL as a remote update site in your update manager.
- <a href="http://download.eclipse.org/callisto/releases/">http://download.eclipse.org/callisto/releases/</a>
- <br/> <br/>Alternatively, if you would like to view the list or projects by their Eclipse Project (PMC) organization, you can define a new remote update site, and specify a site-byProject.xml file. In other words,
- <a href="http://download.eclipse.org/callisto/releases/site-byProject.xml">http://download.eclipse.org/callisto/releases/site-byProject.xml</a>
- <br/><br/>Tip: To lessen download time (by installing the minimum number of features), first select the desired feature in the Eclipse update install dialog, then use the 'select required' button to select only the minimum required prerequisite features.
- <br/><br/>Tip: 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.
- <br/><br/>Tip: Since the workbench will have to shutdown and restart you can you do the upgrade and installs 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.
- <br/><br/>Tip: Both before and after installing "new" features, you may want to use update manager to "check for updates to currently installed features". In some cases, just installing a feature will not necessarily upgrade all of its prerequisites to the highest available level.
+ To access the Callisto projects via the Callisto Discovery Site, you must first download either the <a href="$eclipse_sdk">Eclipse SDK</a> or
+ the <a href="$platform_runtime_binaries">Eclipse Platform Runtime Binaries</a>.
+ You then need to use the update manager to load Callisto projects. See <a href="http://help.eclipse.org/help31/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-34.htm">Eclipse Help</a> for general information about using Update Manager.
+ You can also view a <a href="$install_callisto">screencam demonstration</a> of using the Callisto Discovery Site.</p>
+ <p> For most distributions of Eclipse, there should already be a "Callisto Discovery Site" defined in its
+ Update Manager. If you do not see it you can try adding the following URL as a remote update site in your
+ update manager. <a href="http://download.eclipse.org/callisto/releases/">http://download.eclipse.org/callisto/releases/</a>
+ </p>
+ <p>Alternatively, if you would like to view the list or projects by their Eclipse Project (PMC)
+ organization, you can define a new remote update site, and specify a site-byProject.xml file. In other
+ words, <a href="http://download.eclipse.org/callisto/releases/site-byProject.xml">http://download.eclipse.org/callisto/releases/site-byProject.xml</a>
+ </p>
+ <p>
+ <ul>
+ <li>Tip: To lessen download time (by installing the minimum number of features), first select the desired feature in the Eclipse update install dialog, then use the 'select required' button to select only the minimum required prerequisite features.
+ <li>Tip: 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.
+ <li>Tip: Since the workbench will have to shutdown and restart you can you do the upgrade and installs 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.
+ <li>Tip: Both before and after installing "new" features, you may want to use update manager to "check for updates to currently installed features". In some cases, just installing a feature will not necessarily upgrade all of its prerequisites to the highest available level.
+ </ul>
<h4>Example of Update Dialog</h4>
Here is an example screen shot highlighting. The example is from having started with just the Eclipse Platform Feature installed.
<br/><br/>
diff --git a/discovery2.php b/discovery2.php
deleted file mode 100644
index 98b1666..0000000
--- a/discovery2.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); $App = new App(); $Nav = new Nav(); $Menu = new Menu(); include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop'
-
- #*****************************************************************************
- #
- # template.php
- #
- # Author: Denis Roy
- # Date: 2005-06-16
- #
- # Description: Type your page comments here - these are not sent to the browser
- #
- #
- #****************************************************************************
-
- #
- # Begin: page-specific settings. Change these.
- $pageTitle = "Eclipse Callisto Discovery Site";
- $pageKeywords = "eclipse callisto release download what is";
- $pageAuthor = "Nathan Gervais";
-
- # Add page-specific Nav bars here
- # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
- # $Nav->addNavSeparator("My Page Links", "downloads.php");
- # $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
- # $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
-
- # End: page-specific settings
- #
- // This file is linked to from lots of different places.
- // Use absolute paths to make sure that we can actually test
- // that the file renders properly (i.e. testing using) "/index.php",
- // and "/home/index.php" both work.
-
- require_once("links.php");
-
- # Paste your HTML content between the EOHTML markers!
- $html = <<<EOHTML
-<div id="maincontent">
- <div id="midcolumn">
- <h1>$pageTitle</h1>
- <img src="callisto_slice.jpg">
-
- <h2>Using Callisto Discovery Site</h2>
- <p>
- To access the Callisto projects via the Callisto Discovery Site, you must first download either the <a href="$eclipse_sdk">Eclipse SDK</a> or
- the <a href="$platform_runtime_binaries">Eclipse Platform Runtime Binaries</a>.
- You then need to use the update manager to load Callisto projects. See <a href="http://help.eclipse.org/help31/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-34.htm">Eclipse Help</a> for general information about using Update Manager.
- You can also view a <a href="$install_callisto">screencam demonstration</a> of using the Callisto Discovery Site.</p>
- <p> For most distributions of Eclipse, there should already be a "Callisto Discovery Site" defined in its
- Update Manager. If you do not see it you can try adding the following URL as a remote update site in your
- update manager. <a href="http://download.eclipse.org/callisto/releases/">http://download.eclipse.org/callisto/releases/</a>
- </p>
- <p>Alternatively, if you would like to view the list or projects by their Eclipse Project (PMC)
- organization, you can define a new remote update site, and specify a site-byProject.xml file. In other
- words, <a href="http://download.eclipse.org/callisto/releases/site-byProject.xml">http://download.eclipse.org/callisto/releases/site-byProject.xml</a>
- </p>
- <p>
- <ul>
- <li>Tip: To lessen download time (by installing the minimum number of features), first select the desired feature in the Eclipse update install dialog, then use the 'select required' button to select only the minimum required prerequisite features.
- <li>Tip: 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.
- <li>Tip: Since the workbench will have to shutdown and restart you can you do the upgrade and installs 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.
- <li>Tip: Both before and after installing "new" features, you may want to use update manager to "check for updates to currently installed features". In some cases, just installing a feature will not necessarily upgrade all of its prerequisites to the highest available level.
- </ul>
- <h4>Example of Update Dialog</h4>
- Here is an example screen shot highlighting. The example is from having started with just the Eclipse Platform Feature installed.
- <br/><br/>
- <img src="ExampleDialog.gif"><br/><br/>
- </p>
-
- </div>
-</div>
-
-
-EOHTML;
-
-
- # Generate the web page
- $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
\ No newline at end of file
