Merge "[Releng] Fix JBoss details in index.html"
diff --git a/plugins/compare/org.eclipse.papyrus.compare.p2/pom.xml b/plugins/compare/org.eclipse.papyrus.compare.p2/pom.xml
index 517bdb0..9700e20 100644
--- a/plugins/compare/org.eclipse.papyrus.compare.p2/pom.xml
+++ b/plugins/compare/org.eclipse.papyrus.compare.p2/pom.xml
@@ -12,6 +12,13 @@
<version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
+ <properties>
+ <update.site.name>Papyrus Compare</update.site.name>
+ <update.site.description>Installable Build</update.site.description>
+ <update.site.version>0.7.0.${buildQualifier}</update.site.version>
+ <target.eclipse.version>Oxygen</target.eclipse.version>
+ </properties>
+
<pluginRepositories>
<pluginRepository>
<id>jboss-public-repository-group</id>
@@ -40,11 +47,23 @@
<version>1.0.0</version>
<executions>
<execution>
+ <id>generate-facade</id>
<phase>package</phase>
<goals>
<goal>generate-repository-facade</goal>
</goals>
<configuration>
+ <!-- Contains the template for the generated HTML index page -->
+ <siteTemplateFolder>site/template/</siteTemplateFolder>
+
+ <!-- configuration options for the generated HTML index page -->
+ <symbols>
+ <update.site.name>${update.site.name}</update.site.name>
+ <update.site.description>${update.site.description}</update.site.description>
+ <update.site.version>${update.site.version}</update.site.version>
+ <target.eclipse.version>${target.eclipse.version}</target.eclipse.version>
+ </symbols>
+
<associateSites>
<associateSite>${emf-compare.p2.repo}</associateSite>
<associateSite>${egit.p2.repo}</associateSite>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.p2/site/template/index.html b/plugins/compare/org.eclipse.papyrus.compare.p2/site/template/index.html
new file mode 100644
index 0000000..160dcea
--- /dev/null
+++ b/plugins/compare/org.eclipse.papyrus.compare.p2/site/template/index.html
@@ -0,0 +1,120 @@
+<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"> </td>
+ </tr>
+ <tr>
+ <td>      </td>
+ <td>      </td>
+ <td>      </td>
+ </tr>
+ <tr>
+ <td>      </td>
+ <td>
+ <h2 class="title">${update.site.name} - ${update.site.description} Update Site</h2>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>Latest Build: ${update.site.version}</span></td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">This is the <b>${update.site.description}</b>
+ Update Site for ${update.site.name}.
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To install 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>
+
+ <p class="bodyText">
+ You can also download Papyrus Compare as individual zips for
+ offline installation. See <a class="link" href="http://download.eclipse.org/modeling/mdt/papyrus/components/compare/">Papyrus Compare Downloads</a>.<br />
+ If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td>      </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ ${site.contents}
+ </td>
+ <td></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span> Installation
+ Types</span></td>
+ </tr>
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">Depending on how close to the bleeding edge
+ you like to be, there are several types of releases available.</p>
+ <br />
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Stable Releases</h4>
+
+ <p><a href="http://download.eclipse.org/modeling/mdt/papyrus/components/compare/updates/release/">Stable
+ releases</a> are - as indicated by their name - stable.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Integration Builds</h4>
+
+ <p><a href="http://download.eclipse.org/modeling/mdt/papyrus/components/compare/updates/integration/">Integration
+ builds</a>, published occasionally, are tested for new feature content and compatibility with dependencies,
+ but there may be some things which do not yet work.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Nightly Builds</h4>
+
+ <p>The <a
+ href="http://download.eclipse.org/modeling/mdt/papyrus/components/compare/updates/nightly/">bleeding
+ edge</a> contains the latest and greatest new features, but nothing is
+ stable or guaranteed - yet. If you're using an Integration build and need a
+ fix, you can update to the latest Nightly, or wait for the next Integration build.</p><br/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</center>
+</html>
\ No newline at end of file
diff --git a/plugins/compare/org.eclipse.papyrus.compare.p2/site/template/web/site.css b/plugins/compare/org.eclipse.papyrus.compare.p2/site/template/web/site.css
new file mode 100644
index 0000000..393f757
--- /dev/null
+++ b/plugins/compare/org.eclipse.papyrus.compare.p2/site/template/web/site.css
@@ -0,0 +1,80 @@
+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;
+}
+
+/*
+.td_header {
+ background: url("https://www.eclipse.org/papyrus/papyrus-banner.png") 0 no-repeat;
+ height: 100px;
+}
+*/
+
+.column-header {
+ font-size:small;
+}
