Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Knauer2017-06-06 15:56:43 +0000
committerMarkus Knauer2017-06-07 07:39:42 +0000
commit20765cf9941fc94f1f1e88e0d808b528160b7c97 (patch)
tree72e4d3651e7ee5f36ac6ec4fe33a7280c3b03361 /bundles
parent952fdc52290c584e71da79d314b0ba347a07ca1d (diff)
downloadorg.eclipse.rap-20765cf9941fc94f1f1e88e0d808b528160b7c97.tar.gz
org.eclipse.rap-20765cf9941fc94f1f1e88e0d808b528160b7c97.tar.xz
org.eclipse.rap-20765cf9941fc94f1f1e88e0d808b528160b7c97.zip
Prepare RAP e4 components for release and increment version3.2.0-RC3
- Increment version to 3.2.0 for migrated RAP e4 components - Harmonize RAP e4 features (include legal files, order and content of feature.xml, p2.inf, ...) - Externalize strings, fix copyright. - Prepend version qualifier of forked bundles with 'rap-' Change-Id: Iefa8bcbb199a985cafc44ae9a20a98627a3221b5 Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.e4.core.commands/pom.xml27
-rw-r--r--bundles/org.eclipse.e4.ui.bindings/pom.xml27
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.addons.swt/pom.xml27
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml27
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.swt/pom.xml27
-rw-r--r--bundles/org.eclipse.e4.ui.workbench/pom.xml27
-rw-r--r--bundles/org.eclipse.rap.e4/META-INF/MANIFEST.MF15
-rw-r--r--bundles/org.eclipse.rap.e4/about.html28
-rw-r--r--bundles/org.eclipse.rap.e4/build.properties22
-rw-r--r--bundles/org.eclipse.rap.e4/plugin.properties14
-rw-r--r--bundles/org.eclipse.rap.e4/pom.xml19
11 files changed, 168 insertions, 92 deletions
diff --git a/bundles/org.eclipse.e4.core.commands/pom.xml b/bundles/org.eclipse.e4.core.commands/pom.xml
index 1570bde96a..d69eb586db 100644
--- a/bundles/org.eclipse.e4.core.commands/pom.xml
+++ b/bundles/org.eclipse.e4.core.commands/pom.xml
@@ -25,26 +25,27 @@
</includes>
</resource>
</resources>
+
<plugins>
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
</plugin>
+
+ <!-- Configure qualifier replacement prepended by 'rap-' -->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <archiveSite>true</archiveSite>
+ <format>'rap-'yyyyMMdd-HHmm</format>
+ </configuration>
+ </plugin>
+
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <archiveSite>true</archiveSite>
- <format>'rap-'yyyyMMdd-HHmm</format>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
diff --git a/bundles/org.eclipse.e4.ui.bindings/pom.xml b/bundles/org.eclipse.e4.ui.bindings/pom.xml
index 2ce7cf0505..5a6387e387 100644
--- a/bundles/org.eclipse.e4.ui.bindings/pom.xml
+++ b/bundles/org.eclipse.e4.ui.bindings/pom.xml
@@ -25,26 +25,27 @@
</includes>
</resource>
</resources>
+
<plugins>
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
</plugin>
+
+ <!-- Configure qualifier replacement prepended by 'rap-' -->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <archiveSite>true</archiveSite>
+ <format>'rap-'yyyyMMdd-HHmm</format>
+ </configuration>
+ </plugin>
+
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <archiveSite>true</archiveSite>
- <format>'rap-'yyyyMMdd-HHmm</format>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/pom.xml b/bundles/org.eclipse.e4.ui.workbench.addons.swt/pom.xml
index 289a28467e..2418477642 100644
--- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/pom.xml
+++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/pom.xml
@@ -25,26 +25,27 @@
</includes>
</resource>
</resources>
+
<plugins>
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
</plugin>
+
+ <!-- Configure qualifier replacement prepended by 'rap-' -->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <archiveSite>true</archiveSite>
+ <format>'rap-'yyyyMMdd-HHmm</format>
+ </configuration>
+ </plugin>
+
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <archiveSite>true</archiveSite>
- <format>'rap-'yyyyMMdd-HHmm</format>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml
index 645e97dc5d..c64d463f55 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml
@@ -25,26 +25,27 @@
</includes>
</resource>
</resources>
+
<plugins>
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
</plugin>
+
+ <!-- Configure qualifier replacement prepended by 'rap-' -->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <archiveSite>true</archiveSite>
+ <format>'rap-'yyyyMMdd-HHmm</format>
+ </configuration>
+ </plugin>
+
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <archiveSite>true</archiveSite>
- <format>'rap-'yyyyMMdd-HHmm</format>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/pom.xml b/bundles/org.eclipse.e4.ui.workbench.swt/pom.xml
index bfd8632072..03badc2ba8 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/pom.xml
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/pom.xml
@@ -25,26 +25,27 @@
</includes>
</resource>
</resources>
+
<plugins>
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
</plugin>
+
+ <!-- Configure qualifier replacement prepended by 'rap-' -->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <archiveSite>true</archiveSite>
+ <format>'rap-'yyyyMMdd-HHmm</format>
+ </configuration>
+ </plugin>
+
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <archiveSite>true</archiveSite>
- <format>'rap-'yyyyMMdd-HHmm</format>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
diff --git a/bundles/org.eclipse.e4.ui.workbench/pom.xml b/bundles/org.eclipse.e4.ui.workbench/pom.xml
index 5d7a66d470..83d2da4409 100644
--- a/bundles/org.eclipse.e4.ui.workbench/pom.xml
+++ b/bundles/org.eclipse.e4.ui.workbench/pom.xml
@@ -25,26 +25,27 @@
</includes>
</resource>
</resources>
+
<plugins>
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
</plugin>
+
+ <!-- Configure qualifier replacement prepended by 'rap-' -->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <archiveSite>true</archiveSite>
+ <format>'rap-'yyyyMMdd-HHmm</format>
+ </configuration>
+ </plugin>
+
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <archiveSite>true</archiveSite>
- <format>'rap-'yyyyMMdd-HHmm</format>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
diff --git a/bundles/org.eclipse.rap.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.e4/META-INF/MANIFEST.MF
index 98578df824..f0505c7eeb 100644
--- a/bundles/org.eclipse.rap.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.e4/META-INF/MANIFEST.MF
@@ -1,8 +1,13 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: E4
+Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.rap.e4
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 3.2.0.qualifier
+Bundle-ClassPath: .
+Bundle-Localization: plugin
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.rap.e4.internal.Activator
Require-Bundle: org.eclipse.rap.rwt,
org.eclipse.e4.ui.workbench.swt;bundle-version="0.12.100",
org.eclipse.e4.ui.workbench,
@@ -18,12 +23,10 @@ Require-Bundle: org.eclipse.rap.rwt,
org.eclipse.e4.core.di.extensions.supplier;bundle-version="0.15.0",
org.eclipse.equinox.preferences,
org.eclipse.equinox.common;bundle-version="3.6.200"
-Export-Package: org.eclipse.rap.e4,
- org.eclipse.rap.e4.preferences
Import-Package: javax.annotation;version="1.2.0",
javax.inject;version="1.0.0"
+Export-Package: org.eclipse.rap.e4;version="3.2.0",
+ org.eclipse.rap.e4.preferences;version="3.2.0"
Service-Component: OSGI-INF/rapeventbroker.xml,OSGI-INF/rapeventobjectsupplier.xml,OSGI-INF/rapuieventobjectsupplier.xml,OSGI-INF/rappreferenceobjectsupplier.xml,
OSGI-INF/preferenceserviceCF.xml
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.rap.e4.internal.Activator
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.rap.e4/about.html b/bundles/org.eclipse.rap.e4/about.html
new file mode 100644
index 0000000000..c258ef55d8
--- /dev/null
+++ b/bundles/org.eclipse.rap.e4/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2006</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html> \ No newline at end of file
diff --git a/bundles/org.eclipse.rap.e4/build.properties b/bundles/org.eclipse.rap.e4/build.properties
index 4df56f6a96..2b43bc982d 100644
--- a/bundles/org.eclipse.rap.e4/build.properties
+++ b/bundles/org.eclipse.rap.e4/build.properties
@@ -1,7 +1,21 @@
-output.. = bin/
+###############################################################################
+# Copyright (c) 2017 Innoopract Informationssysteme GmbH and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Innoopract Informationssysteme GmbH - initial API and implementation
+# EclipseSource - ongoing development
+################################################################################
+
bin.includes = META-INF/,\
.,\
- OSGI-INF/,\
- OSGI-INF/rappreferenceobjectsupplier.xml,\
- OSGI-INF/preferenceserviceCF.xml
+ plugin.properties,\
+ about.html,\
+ OSGI-INF/
+jars.compile.order = .
source.. = src/
+output.. = bin/
+src.includes = about.html
diff --git a/bundles/org.eclipse.rap.e4/plugin.properties b/bundles/org.eclipse.rap.e4/plugin.properties
new file mode 100644
index 0000000000..e1b084d155
--- /dev/null
+++ b/bundles/org.eclipse.rap.e4/plugin.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2017 Innoopract Informationssysteme GmbH.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Innoopract Informationssysteme GmbH - initial API and implementation
+# EclipseSource - ongoing development
+################################################################################
+
+Bundle-Name = RAP Widget Toolkit (RWT) e4
+Bundle-Vendor = Eclipse.org - RAP
diff --git a/bundles/org.eclipse.rap.e4/pom.xml b/bundles/org.eclipse.rap.e4/pom.xml
index 4510084fd6..dc17118912 100644
--- a/bundles/org.eclipse.rap.e4/pom.xml
+++ b/bundles/org.eclipse.rap.e4/pom.xml
@@ -1,13 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2017 EclipseSource and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ EclipseSource - initial implementation
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>org.eclipse.rap.e4</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
<parent>
<groupId>org.eclipse.rap</groupId>
<artifactId>org.eclipse.rap.runtime-parent</artifactId>
@@ -15,6 +22,10 @@
<relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
</parent>
+ <artifactId>org.eclipse.rap.e4</artifactId>
+ <packaging>eclipse-plugin</packaging>
+ <version>3.2.0-SNAPSHOT</version>
+
<build>
<resources>
<!-- to ensure that the feature lookup of the ui test works -->

Back to the top