Attachment 238006 Details for Bug 421863 – Fix list of osgi.bundles in config.ini

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix list of osgi.bundles in config.ini

0001-Set-correct-list-of-bundles-fragments-in-config.ini.patch (text/plain), 3.60 KB, created by Markus Knauer

on 2013-12-04 09:03:32 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Knauer

Created: 2013-12-04 09:03:32 EST

Size: 3.60 KB

patch

obsolete

>From 74f557876dd5e52d3668e5ceabc7a68471e33424 Mon Sep 17 00:00:00 2001
>From: Markus Knauer <mknauer@eclipsesource.com>
>Date: Wed, 4 Dec 2013 15:00:06 +0100
>Subject: [PATCH] Set correct list of bundles/fragments in config.ini
>
>Bug 421863 - [releng] Wars created by maven build don't work
>https://bugs.eclipse.org/bugs/show_bug.cgi?id=421863
>
>- Do not add start level to servletbridge.extensionbundle fragment
>  in config.ini
>- Remove javax.servlet from config.ini
>
>Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
>---
> .../org.eclipse.rap.examples.build/controlsdemo/product/pom.xml   | 8 ++++++--
> releng/org.eclipse.rap.examples.build/rapdemo/product/pom.xml     | 8 ++++++--
> .../org.eclipse.rap.examples.build/workbenchdemo/product/pom.xml  | 8 ++++++--
> 3 files changed, 18 insertions(+), 6 deletions(-)
>
>diff --git a/releng/org.eclipse.rap.examples.build/controlsdemo/product/pom.xml b/releng/org.eclipse.rap.examples.build/controlsdemo/product/pom.xml
>index c9c3323..4534a01 100644
>--- a/releng/org.eclipse.rap.examples.build/controlsdemo/product/pom.xml
>+++ b/releng/org.eclipse.rap.examples.build/controlsdemo/product/pom.xml
>@@ -60,8 +60,12 @@
>           <replacements>
>             <replacement>
>               <token>osgi.bundles=</token>
>-              <value>osgi.bundles=org.eclipse.equinox.servletbridge.extensionbundle@4:start,</value>
>-             </replacement>
>+              <value>osgi.bundles=org.eclipse.equinox.servletbridge.extensionbundle,</value>
>+            </replacement>
>+            <replacement>
>+              <token>reference\\:file\\:javax.servlet.*?jar@4,</token>
>+              <value></value>
>+            </replacement>
>           </replacements>
>           <regexFlags>
>             <regexFlag>CASE_INSENSITIVE</regexFlag>
>diff --git a/releng/org.eclipse.rap.examples.build/rapdemo/product/pom.xml b/releng/org.eclipse.rap.examples.build/rapdemo/product/pom.xml
>index e0043cc..92a5bb8 100644
>--- a/releng/org.eclipse.rap.examples.build/rapdemo/product/pom.xml
>+++ b/releng/org.eclipse.rap.examples.build/rapdemo/product/pom.xml
>@@ -60,8 +60,12 @@
>           <replacements>
>             <replacement>
>               <token>osgi.bundles=</token>
>-              <value>osgi.bundles=org.eclipse.equinox.servletbridge.extensionbundle@4:start,</value>
>-             </replacement>
>+              <value>osgi.bundles=org.eclipse.equinox.servletbridge.extensionbundle,</value>
>+            </replacement>
>+            <replacement>
>+              <token>reference\\:file\\:javax.servlet.*?jar@4,</token>
>+              <value></value>
>+            </replacement>
>           </replacements>
>           <regexFlags>
>             <regexFlag>CASE_INSENSITIVE</regexFlag>
>diff --git a/releng/org.eclipse.rap.examples.build/workbenchdemo/product/pom.xml b/releng/org.eclipse.rap.examples.build/workbenchdemo/product/pom.xml
>index 5207f97..c1ad4aa 100644
>--- a/releng/org.eclipse.rap.examples.build/workbenchdemo/product/pom.xml
>+++ b/releng/org.eclipse.rap.examples.build/workbenchdemo/product/pom.xml
>@@ -60,8 +60,12 @@
>           <replacements>
>             <replacement>
>               <token>osgi.bundles=</token>
>-              <value>osgi.bundles=org.eclipse.equinox.servletbridge.extensionbundle@4:start,</value>
>-             </replacement>
>+              <value>osgi.bundles=org.eclipse.equinox.servletbridge.extensionbundle,</value>
>+            </replacement>
>+            <replacement>
>+              <token>reference\\:file\\:javax.servlet.*?jar@4,</token>
>+              <value></value>
>+            </replacement>
>           </replacements>
>           <regexFlags>
>             <regexFlag>CASE_INSENSITIVE</regexFlag>
>-- 
>1.8.3.2
>

Flags:

rsternberg: review+
ivan: review+

Actions: View | Diff

Attachments on bug 421863: 238006