Commit f06adcb6 authored by Robert Smith's avatar Robert Smith
Browse files

Merge branch 'next' of https://github.com/eclipse/ice into next

parents fb5fe8cf 299e1b92
......@@ -26,6 +26,7 @@ import org.eclipse.ice.datastructures.resource.ICEResource;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.eclipse.ui.IEditorReference;
import org.junit.Test;
......@@ -105,7 +106,7 @@ public class ICEResourcePageTester extends AbstractWorkbenchTester {
public void beforeAllTests() {
super.beforeAllTests();
// Initialize static or otherwise shared resources here.
SWTBotPreferences.PLAYBACK_DELAY = 100;
openView("Other", "Resources");
// ---- Open an ICEFormEditor with an ICEResourcePage. ---- //
......
......@@ -28,6 +28,7 @@
<packaging>pom</packaging>
<pluginRepositories>
<!-- Provide a reference to the repository containing the CBI plugins -->
<pluginRepository>
<id>eclipse-repo</id>
<url>${eclipse-repo.url}</url>
......@@ -83,6 +84,12 @@
</profile>
<profile>
<!-- Add a profile (activated using '-P eclipse-sign' that will sign the jar files using
the Eclipse jarsigner. Plugins/features must be signed to avoid a warning message
when installing. See org.eclipse.ice.product/pom.xml for executable signing and
https://www.eclipse.org/community/eclipse_newsletter/2013/august/article3.php for
more information.
-->
<id>eclipse-sign</id>
<pluginRepositories>
<pluginRepository>
......@@ -256,7 +263,11 @@
</executions> -->
</plugin>
<!-- Add build ID to about.mappings -->
<!-- Add build ID to about.mappings. This file is used to provide replacement text for the
about.properties file, which in turn is used to provide externalized strings for the
about.ini file. The about.ini file contains values for the branding specified in
the product extension, and that is displayed in the "About" dialog.
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
......
......@@ -13,6 +13,77 @@
<name>ICE Repository</name>
<artifactId>org.eclipse.ice.repository</artifactId>
<packaging>eclipse-repository</packaging>
<pluginRepositories>
<!-- Plugin repos for jboss repository-utils support -->
<pluginRepository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Repository Group</name>
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
</pluginRepository>
<pluginRepository>
<id>jboss-snapshots-repository</id>
<name>JBoss Snapshots Repository</name>
<url>http://repository.jboss.org/nexus/content/repositories/snapshots/</url>
</pluginRepository>
</pluginRepositories>
<!-- Properties used by jboss repository-utils to customize index.html -->
<properties>
<update.site.name>ICE</update.site.name>
<update.site.description>Nightly Build</update.site.description>
<package.version>${unqualifiedVersion}</package.version>
<update.site.version>${unqualifiedVersion}.${buildQualifier}</update.site.version>
<update.site.url>http://download.eclipse.org/ice/builds/${releaseName}</update.site.url>
<target.eclipse.version>Neon</target.eclipse.version>
</properties>
<build>
<plugins>
<!-- Disable xz compression as it is not supported by jboss repository-utils yet -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<xzCompress>false</xzCompress>
</configuration>
</plugin>
<!-- Configure jboss repository-utils to use our index.html and add the nebula update
site to the repository references. This shouldn't be needed once nebula is included
in the simrel repo
-->
<plugin>
<groupId>org.jboss.tools.tycho-plugins</groupId>
<artifactId>repository-utils</artifactId>
<version>0.23.3</version>
<executions>
<execution>
<id>generate-facade</id>
<phase>package</phase>
<goals>
<goal>generate-repository-facade</goal>
</goals>
<configuration>
<symbols>
<update.site.name>${update.site.name}</update.site.name>
<update.site.description>${update.site.description}</update.site.description>
<package.version>${package.version}</package.version>
<update.site.version>${update.site.version}</update.site.version>
<update.site.url>${update.site.url}</update.site.url>
<target.eclipse.version>${target.eclipse.version}</target.eclipse.version>
</symbols>
<siteTemplateFolder>siteTemplateFolder/</siteTemplateFolder>
<associateSites>
<site>http://download.eclipse.org/eavp/builds/next</site>
</associateSites>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
......
<html>
<head>
<title>${update.site.name} - ${update.site.description} Update Site: ${update.site.version}</title>
<link rel="stylesheet" type="text/css" href="web/site.css">
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
<center>
<table cellspacing="0" cellpadding="0" class="table">
<tr>
<td colspan="3" class="td_header">&nbsp;</td>
</tr>
<tr>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
</tr>
<tr>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
<td>
<h2 class="title">${update.site.name} - ${update.site.description} Download Site</h2>
<table width="100%">
<tr class="header">
<td class="sub-header" width="100%"><span>Latest Build: ${update.site.version}</span></td>
</tr>
</table>
</td>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
</tr>
<tr>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
</tr>
<tr class="light-row" style="height: 30px">
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
<td class="bodyText">This is the <b>${update.site.description}</b> download site for ${update.site.name}. You can download the ${update.site.name} packages below
or install the plugins directly into an existing Eclipse installation.</td>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
</tr>
<tr>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
</tr>
<tr>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
<td>
<table cellspacing="2" cellpadding="2" border="0">
<tr style="background-color:#DDDDDD">
<th class="column-header">Package</th>
<th class="column-header">Description</th>
</tr>
<tr style="background-color:&#xA;#EEEEEE&#xA;">
<td class="rowLine"><a href="ice-linux-gtk-x86-${package.version}.zip" style="font-size:small">ice-linux-gtk-x86-${package.version}.zip</a></td>
<td><span style="font-size:small">Linux GTK x86</span></td>
</tr>
<tr style="background-color:&#xA;#FFFFFF&#xA;">
<td class="rowLine"><a href="ice-linux-gtk-x86_64-${package.version}.zip" style="font-size:small">ice-linux-gtk-x86_64-${package.version}.zip</a></td>
<td><span style="font-size:small">Linux GTK x86_64</span></td>
</tr>
<tr style="background-color:&#xA;#EEEEEE&#xA;">
<td class="rowLine"><a href="ice-macosx-cocoa-x86_64-${package.version}.zip" style="font-size:small">ice-macosx-cocoa-x86_64-${package.version}.zip</a></td>
<td><span style="font-size:small">Mac OS X Cocoa x86_64</span></td>
</tr>
<tr style="background-color:&#xA;#FFFFFF&#xA;">
<td class="rowLine"><a href="ice-win32-x86-${package.version}.zip" style="font-size:small">ice-win32-x86-${package.version}.zip</a></td>
<td><span style="font-size:small">Windows x86</span></td>
</tr>
<tr style="background-color:&#xA;#EEEEEE&#xA;">
<td class="rowLine"><a href="ice-win32-x86_64-${package.version}.zip" style="font-size:small">ice-win32-x86_64-${package.version}.zip</a></td>
<td><span style="font-size:small">Windows x86_64</span></td>
</tr>
<tr style="background-color:&#xA;#FFFFFF&#xA;">
<td class="rowLine"><a href="ice-master-${update.site.version}.zip" style="font-size:small">ice-master-${update.site.version}.zip</a></td>
<td><span style="font-size:small">Master Repository Archive</span></td>
</tr>
</table>
</td>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
</tr>
<tr>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
</tr>
<tr>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
<td>
<blockquote class="bodyText" style="border: 1px dashed #1778be; padding: 2px">
<ol>
<li>To <a class="link"
href="${update.site.url}">install</a>
from this site, start up Eclipse ${target.eclipse.version}, then do:
<ul>
<code><strong>Help > Install New Software... ></strong></code>
</ul>
</li>
<li>Copy this site's URL into Eclipse, and hit Enter.</li>
<li>When the site loads, select the features to install,
or click the <code><strong>Select All</strong></code> button.</li>
<li>To properly resolve all dependencies, check
<ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
<li>Click <code><strong>Next</strong></code>, agree to the license
terms, and install.</li>
</ol>
</blockquote>
</td>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
</tr>
<tr>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
<td>&#160;&#160;&#160;&#160;&#160;&#160;</td>
</tr>
<tr>
<td></td>
<td>
${site.contents}
</td>
<td></td>
</tr>
</table>
</center>
</html>
<
STYLE type ="text/css">td.spacer {
padding-bottom: 10px;
padding-top: 10px;
}
.title {
font-family: sans-serif;
color: #1778be;
}
.table {
margin-top: 0px;
margin-left: 0px;
width: 920px;
}
.bodyText {
font-family: sans-serif;
font-size: 9pt;
color: #000000;
width: 100%
}
.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: #EEEEEE
}
.header {
background: #445562
}
#indent {
word-wrap: break-word;
width: 300px;
text-indent: 10px;
}
.link {
color: #187dc6;
}
.column-header {
font-size:small;
}
</
STYLE
>
......@@ -44,12 +44,9 @@
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.remoteservice.sdk.source.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ptp.fortran.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ptp.feature.group" version="0.0.0"/>
<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tcf.te.tcf.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.core.parser.upc.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.gnu.multicorevisualizer.feature.group" version="0.0.0"/>
......@@ -73,7 +70,6 @@
<unit id="org.eclipse.ecf.core.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
<unit id="org.eclipse.linuxtools.cdt.libhover.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
<unit id="org.eclipse.fx.ide.feature.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/mars/"/>
</location>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment