Merge branch 'master' of ssh://git.eclipse.org:29418/www.eclipse.org/stem
diff --git a/STEM-ProjectPlan.xml b/STEM-ProjectPlan.xml
index 9562526..8bb4553 100644
--- a/STEM-ProjectPlan.xml
+++ b/STEM-ProjectPlan.xml
@@ -91,7 +91,7 @@
<html:div>4.0.0M1 (milestone complete)</html:div>
</milestone>
<milestone date="01/15/2019" milestone="4.0.0">
- <html:div>Release 4.0.0 (planned release)</html:div>
+ <html:div>Release 4.0.0 (release complete)</html:div>
</milestone>
</release_milestones>
<target_environments>
diff --git a/data/scenarios.xml b/data/scenarios.xml
index b63a54c..1c1a421 100644
--- a/data/scenarios.xml
+++ b/data/scenarios.xml
@@ -13,6 +13,11 @@
<link>http://wiki.eclipse.org/Sample_Projects_available_for_Download</link>
</item>
<item>
+ <title>(new) African Swine Fever</title>
+ <other>This single archive contains several models and scenarios for African Swine Fever (ASF).</other>
+ <link>http://www.eclipse.org/stem/download_sample.php?file=ASF_models.zip</link>
+ </item>
+ <item>
<title>(new) Importing Shape Files</title>
<other>This single archive contains an example of how to import and create a STEM graph from a shape file (.shp) in your workspace. If uses STEM's pajek graph generator.</other>
<link>http://www.eclipse.org/stem/download_sample.php?file=ShapefilePajekImport.zip</link>
diff --git a/downloads.php b/downloads.php
index b338aa1..6bada86 100644
--- a/downloads.php
+++ b/downloads.php
@@ -179,7 +179,7 @@
// $size = $buildData['size'] . " MB";
- $buildPath = "http://www.eclipse.org/downloads/download.php?file=/stem/" . $key;
+ $buildPath = "http://www.eclipse.org/downloads/download.php?file=/stem/" . $key ;
?>
@@ -203,34 +203,34 @@
<ul>
- <li><a
- href="<?php echo $buildPath?>/STEM-<?php echo $version ?>-win32.win32.x86.zip"><img
- border=0 src="images/icon-save.gif"></a> <a
- href="<?php echo $buildPath?>/STEM-<?php echo $version ?>-win32.win32.x86.zip">Windows
- (x86)</a></li>
-
- <li><a
- href="<?php echo $buildPath?>/STEM-<?php echo $version ?>-win32.win32.x86_64.zip"><img
- border=0 src="images/icon-save.gif"></a> <a
- href="<?php echo $buildPath?>/STEM-<?php echo $version ?>-win32.win32.x86_64.zip">Windows
- (x86_64)</a></li>
-
- <li><a
- href="<?php echo $buildPath?>/STEM-<?php echo $version ?>-linux.gtk.x86.zip"><img
- border=0 src="images/icon-save.gif"></a> <a
- href="<?php echo $buildPath?>/STEM-<?php echo $version ?>-linux.gtk.x86.zip">Linux
- (x86/GTK 2)</a></li>
-
- <li><a
- href="<?php echo $buildPath?>/STEM-<?php echo $version ?>-linux.gtk.x86_64.zip"><img
- border=0 src="images/icon-save.gif"></a> <a
- href="<?php echo $buildPath?>/STEM-<?php echo $version ?>-linux.gtk.x86_64.zip">Linux
- (x86_64/GTK 2)</a></li>
-
- <li><a
- href="<?php echo $buildPath?>/STEM-<?php echo $version ?>-macosx.cocoa.x86_64.zip"><img
- border=0 src="images/icon-save.gif"></a> <a
- href="<?php echo $buildPath?>/STEM-<?php echo $version ?>-macosx.cocoa.x86_64.zip">Mac
+ <li><a
+ href="<?php echo $buildPath?>/org.eclipse.stem.tycho.product-win32.win32.x86.zip"><img
+ border=0 src="images/icon-save.gif"></a> <a
+ href="<?php echo $buildPath?>/org.eclipse.stem.tycho.product-win32.win32.x86.zip">Windows
+ (x86)</a></li>
+
+ <li><a
+ href="<?php echo $buildPath?>/org.eclipse.stem.tycho.product-win32.win32.x86_64.zip"><img
+ border=0 src="images/icon-save.gif"></a> <a
+ href="<?php echo $buildPath?>/org.eclipse.stem.tycho.product-win32.win32.x86_64.zip">Windows
+ (x86_64)</a></li>
+
+ <li><a
+ href="<?php echo $buildPath?>/org.eclipse.stem.tycho.product-linux.gtk.x86.zip"><img
+ border=0 src="images/icon-save.gif"></a> <a
+ href="<?php echo $buildPath?>/org.eclipse.stem.tycho.product-linux.gtk.x86.zip">Linux
+ (x86/GTK 2)</a></li>
+
+ <li><a
+ href="<?php echo $buildPath?>/org.eclipse.stem.tycho.product-linux.gtk.x86_64.zip"><img
+ border=0 src="images/icon-save.gif"></a> <a
+ href="<?php echo $buildPath?>/org.eclipse.stem.tycho.product-linux.gtk.x86_64.zip">Linux
+ (x86_64/GTK 2)</a></li>
+
+ <li><a
+ href="<?php echo $buildPath?>/org.eclipse.stem.tycho.product-macosx.cocoa.x86_64.zip"><img
+ border=0 src="images/icon-save.gif"></a> <a
+ href="<?php echo $buildPath?>/org.eclipse.stem.tycho.product-macosx.cocoa.x86_64.zip">Mac
OS X (x86_64/Cocoa)</a></li>
</ul>
@@ -245,7 +245,7 @@
function displayBuildForStem4($title, $type, $builds)
{
- $version = "4.0.0 M1";
+ $version = "Release V4.0.0";
// $date = $buildData['date'];
@@ -253,7 +253,7 @@
// $size = $buildData['size'] . " MB";
- $buildPath = "http://www.eclipse.org/downloads/download.php?file=/stem/";
+ $buildPath = "http://www.eclipse.org/downloads/download.php?file=/stem/release/";
?>
@@ -361,9 +361,7 @@
</div>
- <?php displayBuildForStem4("STEM", "", ""); ?>
- <?php displayBuild("Release", "Release", $versions); ?>
- <?php displayBuild("Milestone", "Stable", $versions); ?>
+ <?php displayBuildForStem4("STEM", "", ""); ?>
<?php displayBuild("Weekly Integration Build", "Integration", $versions); ?>
diff --git a/psf.php b/psf.php
index 8e6e700..99d916e 100644
--- a/psf.php
+++ b/psf.php
@@ -13,14 +13,14 @@
'STEM-ModelGen' => 'org.eclipse.stem.git',
'STEM-Distributed' => 'org.eclipse.stem.git',
'STEM-Tests' => 'org.eclipse.stem.git',
- 'STEM-Data-EarthScience' => 'org.eclipse.stem.data.earthscience.git',
- 'STEM-Data' => 'org.eclipse.stem.data.git',
+ 'STEM-Data-EarthScience' => 'org.eclipse.stem.git',
+ 'STEM-Data' => 'org.eclipse.stem.git',
'STEM-Releng' => 'org.eclipse.stem.git',
);
-define('DATA_BUILD_MAP_PATH', 'releng/org.eclipse.stem.releng/maps/stem.data.map');
-define('BUILD_MAP_PATH', 'releng/org.eclipse.stem.releng/maps/stem.map');
-define('BUILD_MAP_DIRECTORY_PATH', 'releng/org.eclipse.stem.releng/maps/directories.properties');
+define('DATA_BUILD_MAP_PATH', 'org.eclipse.stem/releng/org.eclipse.stem.releng/maps/stem.data.map');
+define('BUILD_MAP_PATH', 'org.eclipse.stem/releng/org.eclipse.stem.releng/maps/stem.map');
+define('BUILD_MAP_DIRECTORY_PATH', 'org.eclipse.stem/releng/org.eclipse.stem.releng/maps/directories.properties');
define('WORKING_SET_MATCH', '!WS:');
define('MAP_ENTRY_REGEX', '(.*)@(.*)=(.*)');
diff --git a/samples/ASF_models.zip b/samples/ASF_models.zip
new file mode 100644
index 0000000..3071814
--- /dev/null
+++ b/samples/ASF_models.zip
Binary files differ
