Bug 546603 - Discontinue Virgo RAP
This commit is part of the Virgo Spring-Cleaning 2019 to focus on the
main deliverables of Eclipse Virgo.
diff --git a/BUILD.md b/BUILD.md
index b1dcf6d..1118402 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -26,11 +26,11 @@
To build distributable zipped files run:
- $ ./gradlew clean jar build distZip fullDistZip rapDistZip
+ $ ./gradlew clean jar build distZip fullDistZip
There is an additional task to install the zips, too. This comes quite handy to quickly check the distributables:
- $ ./gradlew installDist installFullDist installRapDist
+ $ ./gradlew installDist installFullDist
To speed up local builds you can skip some time-consuming processes like follows:
* `-Dskip.normalize.bundles=true`
diff --git a/build.gradle b/build.gradle
index b18f9d2..db5ee9e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -311,10 +311,6 @@
'JAVAX.XML.RPC' : javaxXmlRpcVersion,
'JETTY.VERSION' : jettyVersion,
- 'RAP.RWT.VERSION' : rapRwtVersion,
- 'RAP.RWT.OSGI.VERSION' : rapRwtOsgiVersion,
- 'RAP.JFACE.VERSION' : rapJfaceVersion,
- 'RAP.JFACE.DATABINDING.VERSION': rapJfaceDatabindingVersion,
'P2.A.R.VERSION' : p2ArtifactRepositoryVersion,
'P2.CONSOLE.VERSION' : p2ConsoleVersion,
diff --git a/ebr/gradle.properties b/ebr/gradle.properties
index 7293e53..1fde8d9 100644
--- a/ebr/gradle.properties
+++ b/ebr/gradle.properties
@@ -250,7 +250,6 @@
aspectjVersion = 1.8.10
-# Delivered with RAP 2.3.2
jettyVersion = 8.1.16.v20140903
# TODO move forward to latest release (as of April 8th 2016)
#jettyVersion = 8.1.18.v20150929
@@ -265,19 +264,6 @@
hibernateValidatorVersion = 4.3.2.Final
hibernateVersion = 5.2.10.Final
-# RAP 2.3.2
-eclipseCoreCommandsVersion = 3.6.100.v20140528-1422
-eclipseCoreDatabindingObservableVersion = 1.4.1.v20140210-1835
-eclipseCoreDatabindingPropertyVersion = 1.4.200.v20140214-0004
-eclipseCoreDatabindingVersion = 1.4.2.v20140729-1044
-icuBaseVersion = 52.1.1.v201501240615
-
-rapRwtVersion = 2.3.2.20150128-1013
-rapRwtOsgiVersion = 2.3.2.20150119-1706
-rapJfaceVersion = 2.3.2.20150119-1706
-rapJfaceDatabindingVersion = 2.3.2.20150119-1706
-rapUiVersion = 2.3.2.20150119-1706
-
# performance-tests
# jwebunitVersion = 2.2.0
# TODO create CQ for version 3.2?
diff --git a/gradle.properties b/gradle.properties
index b751559..813a05b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -300,7 +300,6 @@
aspectjVersion = 1.8.10
aspectjHash = 1a14fe9e912f6e8bdbb5429b78b4090d8b47bc1
-# Delivered with RAP 2.3.2
jettyVersion = 8.1.16.v20140903
# TODO move forward to latest release (as of April 8th 2016)
#jettyVersion = 8.1.18.v20150929
@@ -314,19 +313,6 @@
# TODO - upgrade to 4.3.2.Final used in spring-context
hibernateVersion = 4.1.0.Final
-# RAP 2.3.2
-eclipseCoreCommandsVersion = 3.6.100.v20140528-1422
-eclipseCoreDatabindingObservableVersion = 1.4.1.v20140210-1835
-eclipseCoreDatabindingPropertyVersion = 1.4.200.v20140214-0004
-eclipseCoreDatabindingVersion = 1.4.2.v20140729-1044
-icuBaseVersion = 52.1.1.v201501240615
-
-rapRwtVersion = 2.3.2.20150128-1013
-rapRwtOsgiVersion = 2.3.2.20150119-1706
-rapJfaceVersion = 2.3.2.20150119-1706
-rapJfaceDatabindingVersion = 2.3.2.20150119-1706
-rapUiVersion = 2.3.2.20150119-1706
-
# integration-tests
hsqldbVersion = 2.3.4
diff --git a/org.eclipse.virgo.site/build.gradle b/org.eclipse.virgo.site/build.gradle
index cbfb079..94afbd8 100644
--- a/org.eclipse.virgo.site/build.gradle
+++ b/org.eclipse.virgo.site/build.gradle
@@ -150,20 +150,6 @@
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.servlet", version: javaxServletVersion, configuration: "runtime", ext: "jar"
- localFeature project(':org.eclipse.virgo.site:org.eclipse.rap')
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.rap.rwt", version: rapRwtVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.rap.rwt.osgi", version: rapRwtOsgiVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.core.commands", version: eclipseCoreCommandsVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.rap.jface", version: rapJfaceVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "com.ibm.icu.base", version: icuBaseVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.core.databinding", version: eclipseCoreDatabindingVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.core.databinding.property", version: eclipseCoreDatabindingPropertyVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.core.databinding.observable", version: eclipseCoreDatabindingObservableVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.rap.jface.databinding", version: rapJfaceDatabindingVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.rap.ui", version: rapUiVersion, configuration: "compile", ext: "jar"
-
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.servlet", version: javaxServletVersion, configuration: "runtime", ext: "jar"
-
localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.kernel.springintegration')
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.expression", version: springframeworkVersion, ext: "jar"
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/META-INF/ECLIPSE_.RSA b/org.eclipse.virgo.site/org.eclipse.rap/META-INF/ECLIPSE_.RSA
deleted file mode 100755
index ddb5866..0000000
--- a/org.eclipse.virgo.site/org.eclipse.rap/META-INF/ECLIPSE_.RSA
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/META-INF/ECLIPSE_.SF b/org.eclipse.virgo.site/org.eclipse.rap/META-INF/ECLIPSE_.SF
deleted file mode 100755
index 488a09a..0000000
--- a/org.eclipse.virgo.site/org.eclipse.rap/META-INF/ECLIPSE_.SF
+++ /dev/null
@@ -1,27 +0,0 @@
-Signature-Version: 1.0
-SHA1-Digest-Manifest: NlvNW+IFdOxPX0MLSELjWJj64OY=
-Created-By: 1.6.0 (IBM Corporation)
-SHA1-Digest-Manifest-Main-Attributes: ITZ414UJvchvI155VLrDHd0wXW0=
-
-Name: epl-v10.html
-SHA1-Digest: 5M5yOPanU8Bh0NNt4hucpomfnos=
-
-Name: META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.prope
- rties
-SHA1-Digest: XDRL1tpjtbc0U+yqGpGLBi7Mf5U=
-
-Name: p2.inf
-SHA1-Digest: jAH9XhnRBXKzC16znblEaBFv1xI=
-
-Name: META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.xml
-SHA1-Digest: uAw8vyh/XWOKERX5WwTo9ZnoxLw=
-
-Name: license.html
-SHA1-Digest: leexLIIUuWA4wkAPsn1Q3CxJw/0=
-
-Name: feature.properties
-SHA1-Digest: +QqioQiSPCYao6tvRN4Pz1La7yo=
-
-Name: feature.xml
-SHA1-Digest: 93mEAHMH6F3xvQpECKwSrs4FMVg=
-
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/META-INF/MANIFEST.MF b/org.eclipse.virgo.site/org.eclipse.rap/META-INF/MANIFEST.MF
deleted file mode 100755
index fe53df8..0000000
--- a/org.eclipse.virgo.site/org.eclipse.rap/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Build-Jdk: 1.6.0_45
-Built-By: genie.rt.rap
-Archiver-Version: Plexus Archiver
-Created-By: Apache Maven
-
-Name: epl-v10.html
-SHA1-Digest: NWZsVPJAYSVwfmPtqxLykU2FynY=
-
-Name: META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.prope
- rties
-SHA1-Digest: F8wm9360y8wEsjC325GUrUEFA5U=
-
-Name: p2.inf
-SHA1-Digest: 8jNlA+t4uBa/ntDwzpl09daVYcA=
-
-Name: META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.xml
-SHA1-Digest: n0UEh5h6S0kW/Eev3Eb+DOeMpG8=
-
-Name: license.html
-SHA1-Digest: Z5WKoRSIDCgQNswUpOU/oSPE2a0=
-
-Name: feature.properties
-SHA1-Digest: JCUqinpGTwQuT94B6PNLFK0iE6s=
-
-Name: feature.xml
-SHA1-Digest: 9/Hc/lXeIU53a9klFaWKRFro2OU=
-
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.properties b/org.eclipse.virgo.site/org.eclipse.rap/META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.properties
deleted file mode 100755
index 72509ad..0000000
--- a/org.eclipse.virgo.site/org.eclipse.rap/META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Tue Feb 10 13:07:33 EST 2015
-version=2.3.2-SNAPSHOT
-groupId=org.eclipse.rap
-artifactId=org.eclipse.rap.feature
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.xml b/org.eclipse.virgo.site/org.eclipse.rap/META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.xml
deleted file mode 100755
index 87cf0e4..0000000
--- a/org.eclipse.virgo.site/org.eclipse.rap/META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, 2015 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>
-
- <parent>
- <groupId>org.eclipse.rap</groupId>
- <artifactId>org.eclipse.rap.runtime-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.rap.feature</artifactId>
- <packaging>eclipse-feature</packaging>
-
-</project>
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/build.gradle b/org.eclipse.virgo.site/org.eclipse.rap/build.gradle
deleted file mode 100644
index 32bcbb5..0000000
--- a/org.eclipse.virgo.site/org.eclipse.rap/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/build.properties b/org.eclipse.virgo.site/org.eclipse.rap/build.properties
deleted file mode 100644
index a13e18b..0000000
--- a/org.eclipse.virgo.site/org.eclipse.rap/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- feature.properties,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- p2.inf
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.rap/epl-v10.html
deleted file mode 100755
index 3998fce..0000000
--- a/org.eclipse.virgo.site/org.eclipse.rap/epl-v10.html
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
- body {
- size: 8.5in 11.0in;
- margin: 0.25in 0.5in 0.25in 0.5in;
- tab-interval: 0.5in;
- }
- p {
- margin-left: auto;
- margin-top: 0.5em;
- margin-bottom: 0.5em;
- }
- p.list {
- margin-left: 0.5in;
- margin-top: 0.05em;
- margin-bottom: 0.05em;
- }
- </style>
-
-</head>
-
-<body lang="EN-US">
-
-<h2>Eclipse Public License - v 1.0</h2>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/feature.properties b/org.eclipse.virgo.site/org.eclipse.rap/feature.properties
deleted file mode 100755
index 2779a2d..0000000
--- a/org.eclipse.virgo.site/org.eclipse.rap/feature.properties
+++ /dev/null
@@ -1,158 +0,0 @@
-################################################################################
-# Copyright (c) 2007, 2015 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
-################################################################################
-
-description = \
-Contains the RAP Runtime bundles.\n\
-Include it in your target platform to develop RAP applications.\n\
-*** DO NOT INSTALL IN YOUR IDE ***
-
-copyright = \
-Copyright (c) 2007, 2015 Innoopract Informationssysteme GmbH and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- Innoopract Informationssysteme GmbH - initial API and implementation\n\
- EclipseSource - ongoing development
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 9, 2014\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/feature.xml b/org.eclipse.virgo.site/org.eclipse.rap/feature.xml
deleted file mode 100755
index e98b944..0000000
--- a/org.eclipse.virgo.site/org.eclipse.rap/feature.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.rap"
- label="Virgo RAP Server components"
- version="2.3.2.20150128-1013"
- provider-name="Eclipse.org - Virgo RAP Server components">
-
- <description url="http://www.eclipse.org/rap/">
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="RAP 2.3 Repository" url="http://download.eclipse.org/rt/rap/2.3/"/>
- </url>
-
- <plugin
- id="org.eclipse.rap.rwt"
- download-size="2813"
- install-size="7126"
- version="2.3.2.20150128-1013"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.rap.rwt.osgi"
- download-size="35"
- install-size="78"
- version="2.3.2.20150119-1706"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.rap.jface"
- download-size="994"
- install-size="1978"
- version="2.3.2.20150119-1706"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.rap.jface.databinding"
- download-size="266"
- install-size="535"
- version="2.3.2.20150119-1706"
- unpack="false"/>
-
- <!--
- <plugin
- id="org.eclipse.rap.ui"
- download-size="155"
- install-size="274"
- version="2.3.2.20150119-1706"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.rap.ui.forms"
- download-size="285"
- install-size="575"
- version="2.3.2.20150119-1706"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.rap.ui.views"
- download-size="76"
- install-size="142"
- version="2.3.2.20150119-1706"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.rap.ui.workbench"
- download-size="3473"
- install-size="7209"
- version="2.3.2.20150119-1706"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.rap.ui.cheatsheets"
- download-size="310"
- install-size="634"
- version="2.3.2.20150119-1706"
- unpack="false"/>
--->
-
-</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/license.html b/org.eclipse.virgo.site/org.eclipse.rap/license.html
deleted file mode 100755
index c3d34c3..0000000
--- a/org.eclipse.virgo.site/org.eclipse.rap/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 9, 2014</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also 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, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/p2.inf b/org.eclipse.virgo.site/org.eclipse.rap/p2.inf
deleted file mode 100755
index e57a5b9..0000000
--- a/org.eclipse.virgo.site/org.eclipse.rap/p2.inf
+++ /dev/null
@@ -1,41 +0,0 @@
-# Prevent installation if other IUs are already installed with a negative requirement.
-
-requires.0.name = org.eclipse.jface
-requires.0.namespace = org.eclipse.equinox.p2.iu
-requires.0.min = 0
-requires.0.max = 0
-
-requires.1.name = org.eclipse.jface.databinding
-requires.1.namespace = org.eclipse.equinox.p2.iu
-requires.1.min = 0
-requires.1.max = 0
-
-requires.2.name = org.eclipse.swt
-requires.2.namespace = org.eclipse.equinox.p2.iu
-requires.2.min = 0
-requires.2.max = 0
-
-requires.3.name = org.eclipse.ui
-requires.3.namespace = org.eclipse.equinox.p2.iu
-requires.3.min = 0
-requires.3.max = 0
-
-requires.4.name = org.eclipse.ui.cheatsheets
-requires.4.namespace = org.eclipse.equinox.p2.iu
-requires.4.min = 0
-requires.4.max = 0
-
-requires.5.name = org.eclipse.ui.forms
-requires.5.namespace = org.eclipse.equinox.p2.iu
-requires.5.min = 0
-requires.5.max = 0
-
-requires.6.name = org.eclipse.ui.views
-requires.6.namespace = org.eclipse.equinox.p2.iu
-requires.6.min = 0
-requires.6.max = 0
-
-requires.7.name = org.eclipse.ui.workbench
-requires.7.namespace = org.eclipse.equinox.p2.iu
-requires.7.min = 0
-requires.7.max = 0
diff --git a/packaging/nano/build.gradle b/packaging/nano/build.gradle
index 111cf0c..e50a2ac 100644
--- a/packaging/nano/build.gradle
+++ b/packaging/nano/build.gradle
@@ -53,42 +53,17 @@
from ( "${buildDir}/common_resources/" )
}
}
- rap {
- baseName = 'virgo-nano-rap'
- contents {
- from ( 'src/main/filtered' ) {
- include ( '**/*.properties' )
- include ( '**/.version' )
- filter(ReplaceTokens, tokens: tokenMap) // tokens are used in e.g. oev.kernel.userregion.properties
- }
- from ( 'src/main/filtered' ) {
- include ( 'bin/*.sh' )
- fileMode 0755
- }
- from ( 'src/main/dist' ) {
- }
- from ( "${buildDir}/VNR/nano-rap/" ) {
- exclude ( 'Eclipse.app' )
- // Remove unwanted *kernel* bundles from nano deliverable
- exclude('plugins/*.kernel.*')
- }
- from ( "${buildDir}/common_resources/" )
- }
- }
}
task ('assembleNano', dependsOn: [
'installProductNano',
'installProductNanoFull',
- 'installProductNanoRap',
'packageResourcesAndProducts'
]) {
installDist.dependsOn(['assembleNano'])
installFullDist.dependsOn(['assembleNano'])
- installRapDist.dependsOn(['installProductNanoRap'])
distZip.dependsOn(['assembleNano'])
fullDistZip.dependsOn(['assembleNano'])
- rapDistZip.dependsOn(['installProductNanoRap'])
}
task ('packageResourcesAndProducts', dependsOn: [
@@ -117,7 +92,6 @@
switch (taskName.toString() - 'publish') {
case 'Nano': product = 'nano'; break
case 'NanoFull': product = 'nano-full'; break
- case 'NanoRap': product = 'nano-rap'; break
}
description = "Publishes a product to a p2 repository. The publishing uses ANY environment configurations."
@@ -136,7 +110,6 @@
':org.eclipse.virgo.site:publishNanoBase',
'publishNano',
'publishNanoFull',
- 'publishNanoRap',
]){ }
tasks.addRule("Pattern: installProduct<ID>") { String taskName ->
@@ -147,7 +120,6 @@
switch (taskName.toString() - 'installProduct') {
case 'Nano': product = 'nano'; shortProduct = "VN"; break;
case 'NanoFull': product = 'nano-full'; shortProduct = "VNF"; break;
- case 'NanoRap': product = 'nano-rap'; shortProduct = "VNR"; break;
}
description = "Installs a Virgo product to a desired destination. Default profile(roaming) is VIRGOProfile, the environment cofigurations are ANY."
@@ -164,5 +136,4 @@
task ('groupInstall', dependsOn: [
'installProductNano',
'installProductNanoFull',
- 'installProductNanoRap',
]){ }
diff --git a/run_local_smoketest.sh b/run_local_smoketest.sh
index 98b8654..d8bc63a 100755
--- a/run_local_smoketest.sh
+++ b/run_local_smoketest.sh
@@ -1,2 +1,2 @@
-./gradlew -Dci.build=true -Dskip.normalize.bundles=true -Dskip.local.signing=true -Dskip.compress.bundles=true --stacktrace clean jar build distZip fullDistZip rapDistZip installDist installFullDist installRapDist smokeTest -x test -x findBugsMain -x findBugsTest
+./gradlew -Dci.build=true -Dskip.normalize.bundles=true -Dskip.local.signing=true -Dskip.compress.bundles=true --stacktrace clean jar build distZip fullDistZip installDist installFullDist smokeTest -x test -x findBugsMain -x findBugsTest
diff --git a/settings.gradle b/settings.gradle
index fdbb2f0..7fe5ab0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -93,7 +93,6 @@
// TODO - rename feature to region'_'
include ':org.eclipse.virgo.site:org.eclipse.equinox.regions'
include ':org.eclipse.virgo.site:org.eclipse.equinox.http.jetty'
-include ':org.eclipse.virgo.site:org.eclipse.rap'
include ':org.eclipse.virgo.site:org.eclipse.virgo.core'
include ':org.eclipse.virgo.site:org.eclipse.virgo.ds'
include ':org.eclipse.virgo.site:org.eclipse.virgo.kernel'
