Attachment 226057 Details for Bug 398996 – Proposed patch

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

[patch] Proposed patch

Update-WAR-product-configs.patch (text/plain), 20.19 KB, created by Ivan Furnadjiev

on 2013-01-24 12:22:02 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2013-01-24 12:22:02 EST

Size: 20.19 KB

patch

obsolete

>diff --git a/examples/org.eclipse.rap.demo/WEB-INF/launch.ini b/examples/org.eclipse.rap.demo/WEB-INF/launch.ini
>new file mode 100644
>index 0000000..a96f99e
>--- /dev/null
>+++ b/examples/org.eclipse.rap.demo/WEB-INF/launch.ini
>@@ -0,0 +1,11 @@
>+# Eclipse Runtime Configuration Overrides
>+# These properties are loaded prior to starting the framework and can also be used to override System Properties
>+# @null is a special value used to override and clear the framework's copy of a System Property prior to starting the framework
>+# "*" can be used together with @null to clear System Properties that match a prefix name. 
>+
>+osgi.*=@null
>+org.osgi.*=@null
>+eclipse.*=@null
>+
>+osgi.parentClassloader=app
>+osgi.contextClassLoaderParent=app
>diff --git a/examples/org.eclipse.rap.demo/WEB-INF/web.xml b/examples/org.eclipse.rap.demo/WEB-INF/web.xml
>new file mode 100644
>index 0000000..8d8301b
>--- /dev/null
>+++ b/examples/org.eclipse.rap.demo/WEB-INF/web.xml
>@@ -0,0 +1,34 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
>+<web-app id="WebApp">
>+  <servlet id="bridge">  
>+    <servlet-name>equinoxbridgeservlet</servlet-name>
>+    <display-name>Equinox Bridge Servlet</display-name>
>+    <description>Equinox Bridge Servlet</description>
>+    <servlet-class>org.eclipse.equinox.servletbridge.BridgeServlet</servlet-class>
>+
>+    
>+    <init-param>
>+      <param-name>enableFrameworkControls</param-name>
>+      <param-value>false</param-value>      
>+    </init-param>
>+    
>+    
>+    
>+    <init-param>
>+      <param-name>commandline</param-name>
>+      <param-value>-registryMultiLanguage  -ws rap</param-value>     
>+    </init-param>
>+
>+    <load-on-startup>1</load-on-startup>    
>+  </servlet>
>+  
>+  <servlet-mapping>
>+    <servlet-name>equinoxbridgeservlet</servlet-name>
>+    <url-pattern>/*</url-pattern>
>+  </servlet-mapping>
>+
>+</web-app>
>diff --git a/examples/org.eclipse.rap.demo/workbench.warproduct b/examples/org.eclipse.rap.demo/workbench.warproduct
>new file mode 100644
>index 0000000..a3f2487
>--- /dev/null
>+++ b/examples/org.eclipse.rap.demo/workbench.warproduct
>@@ -0,0 +1,83 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<?pde version="3.5"?>
>+
>+<product name="RAP Workbench Demo" uid="org.eclipse.rap.demo" version="1.0.0" useFeatures="false" includeLaunchers="false">
>+   <plugins>
>+      <plugin id="com.ibm.icu.base"/>
>+      <plugin id="org.apache.felix.gogo.command"/>
>+      <plugin id="org.apache.felix.gogo.runtime"/>
>+      <plugin id="org.apache.felix.gogo.shell"/>
>+      <plugin id="org.eclipse.core.commands"/>
>+      <plugin id="org.eclipse.core.contenttype"/>
>+      <plugin id="org.eclipse.core.databinding"/>
>+      <plugin id="org.eclipse.core.databinding.observable"/>
>+      <plugin id="org.eclipse.core.databinding.property"/>
>+      <plugin id="org.eclipse.core.expressions"/>
>+      <plugin id="org.eclipse.core.jobs"/>
>+      <plugin id="org.eclipse.core.runtime"/>
>+      <plugin id="org.eclipse.equinox.app"/>
>+      <plugin id="org.eclipse.equinox.common"/>
>+      <plugin id="org.eclipse.equinox.console"/>
>+      <plugin id="org.eclipse.equinox.http.registry"/>
>+      <plugin id="org.eclipse.equinox.http.servlet"/>
>+      <plugin id="org.eclipse.equinox.http.servletbridge"/>
>+      <plugin id="org.eclipse.equinox.preferences"/>
>+      <plugin id="org.eclipse.equinox.registry"/>
>+      <plugin id="org.eclipse.equinox.servletbridge"/>
>+      <plugin id="org.eclipse.equinox.servletbridge.extensionbundle" fragment="true"/>
>+      <plugin id="org.eclipse.help"/>
>+      <plugin id="org.eclipse.osgi"/>
>+      <plugin id="org.eclipse.osgi.services"/>
>+      <plugin id="org.eclipse.rap.demo"/>
>+      <plugin id="org.eclipse.rap.jface"/>
>+      <plugin id="org.eclipse.rap.jface.databinding"/>
>+      <plugin id="org.eclipse.rap.rwt"/>
>+      <plugin id="org.eclipse.rap.rwt.osgi"/>
>+      <plugin id="org.eclipse.rap.ui"/>
>+      <plugin id="org.eclipse.rap.ui.forms"/>
>+      <plugin id="org.eclipse.rap.ui.views"/>
>+      <plugin id="org.eclipse.rap.ui.workbench"/>
>+   </plugins>
>+
>+   <configurations>
>+      <plugin id="com.ibm.icu.base" autoStart="true" startLevel="0" />
>+      <plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" />
>+      <plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" />
>+      <plugin id="org.apache.felix.gogo.shell" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.core.commands" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.core.contenttype" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.core.databinding" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.core.databinding.observable" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.core.databinding.property" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.core.expressions" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.core.jobs" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.app" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.console" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.http.servlet" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.http.servletbridge" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.preferences" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.registry" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.servletbridge" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.help" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.osgi" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.rap.demo" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.rap.jface" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.rap.jface.databinding" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.rap.rwt" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.rap.rwt.osgi" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.rap.ui" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.rap.ui.forms" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.rap.ui.views" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.rap.ui.workbench" autoStart="true" startLevel="0" />
>+   </configurations>
>+
>+   <warConfiguration webXml="/org.eclipse.rap.demo/WEB-INF/web.xml" launchIni="/org.eclipse.rap.demo/WEB-INF/launch.ini">
>+   <libraries>
>+      <library path="org.eclipse.equinox.servletbridge_1.2.200.v20120522-2049.jar" fromTarget="true"/>
>+   </libraries>
>+   </warConfiguration>
>+</product>
>diff --git a/examples/org.eclipse.rap.examples/WEB-INF/launch.ini b/examples/org.eclipse.rap.examples/WEB-INF/launch.ini
>new file mode 100644
>index 0000000..a96f99e
>--- /dev/null
>+++ b/examples/org.eclipse.rap.examples/WEB-INF/launch.ini
>@@ -0,0 +1,11 @@
>+# Eclipse Runtime Configuration Overrides
>+# These properties are loaded prior to starting the framework and can also be used to override System Properties
>+# @null is a special value used to override and clear the framework's copy of a System Property prior to starting the framework
>+# "*" can be used together with @null to clear System Properties that match a prefix name. 
>+
>+osgi.*=@null
>+org.osgi.*=@null
>+eclipse.*=@null
>+
>+osgi.parentClassloader=app
>+osgi.contextClassLoaderParent=app
>diff --git a/examples/org.eclipse.rap.examples/WEB-INF/web.xml b/examples/org.eclipse.rap.examples/WEB-INF/web.xml
>new file mode 100644
>index 0000000..8d8301b
>--- /dev/null
>+++ b/examples/org.eclipse.rap.examples/WEB-INF/web.xml
>@@ -0,0 +1,34 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
>+<web-app id="WebApp">
>+  <servlet id="bridge">  
>+    <servlet-name>equinoxbridgeservlet</servlet-name>
>+    <display-name>Equinox Bridge Servlet</display-name>
>+    <description>Equinox Bridge Servlet</description>
>+    <servlet-class>org.eclipse.equinox.servletbridge.BridgeServlet</servlet-class>
>+
>+    
>+    <init-param>
>+      <param-name>enableFrameworkControls</param-name>
>+      <param-value>false</param-value>      
>+    </init-param>
>+    
>+    
>+    
>+    <init-param>
>+      <param-name>commandline</param-name>
>+      <param-value>-registryMultiLanguage  -ws rap</param-value>     
>+    </init-param>
>+
>+    <load-on-startup>1</load-on-startup>    
>+  </servlet>
>+  
>+  <servlet-mapping>
>+    <servlet-name>equinoxbridgeservlet</servlet-name>
>+    <url-pattern>/*</url-pattern>
>+  </servlet-mapping>
>+
>+</web-app>
>diff --git a/examples/org.eclipse.rap.examples/examples.warproduct b/examples/org.eclipse.rap.examples/examples.warproduct
>index b97a81c..230d32a 100644
>--- a/examples/org.eclipse.rap.examples/examples.warproduct
>+++ b/examples/org.eclipse.rap.examples/examples.warproduct
>@@ -1,105 +1,63 @@
>-<?xml version="1.0" encoding="UTF-8"?>
>-<?pde version="3.5"?>
>-
>-<product name="Examples" uid="examples" useFeatures="false" includeLaunchers="false">
>-   <plugins>
>-      <plugin id="com.eclipsesource.oscilloscope"/>
>-      <plugin id="com.eclipsesource.widgets.gmaps"/>
>-      <plugin id="com.ibm.icu.base"/>
>-      <plugin id="org.apache.commons.fileupload"/>
>-      <plugin id="org.apache.commons.io"/>
>-      <plugin id="org.eclipse.core.commands"/>
>-      <plugin id="org.eclipse.core.contenttype"/>
>-      <plugin id="org.eclipse.core.databinding"/>
>-      <plugin id="org.eclipse.core.databinding.beans"/>
>-      <plugin id="org.eclipse.core.databinding.observable"/>
>-      <plugin id="org.eclipse.core.databinding.property"/>
>-      <plugin id="org.eclipse.core.expressions"/>
>-      <plugin id="org.eclipse.core.jobs"/>
>-      <plugin id="org.eclipse.core.runtime"/>
>-      <plugin id="org.eclipse.equinox.app"/>
>-      <plugin id="org.eclipse.equinox.common"/>
>-      <plugin id="org.eclipse.equinox.http.registry"/>
>-      <plugin id="org.eclipse.equinox.http.servlet"/>
>-      <plugin id="org.eclipse.equinox.http.servletbridge"/>
>-      <plugin id="org.eclipse.equinox.preferences"/>
>-      <plugin id="org.eclipse.equinox.registry"/>
>-      <plugin id="org.eclipse.equinox.servletbridge.extensionbundle" fragment="true"/>
>-      <plugin id="org.eclipse.help"/>
>-      <plugin id="org.eclipse.osgi"/>
>-      <plugin id="org.eclipse.osgi.services"/>
>-      <plugin id="org.eclipse.rap.demo"/>
>-      <plugin id="org.eclipse.rap.demo.carousel"/>
>-      <plugin id="org.eclipse.rap.demo.databinding"/>
>-      <plugin id="org.eclipse.rap.demo.enrondata"/>
>-      <plugin id="org.eclipse.rap.demo.gmaps"/>
>-      <plugin id="org.eclipse.rap.demo.oscilloscope"/>
>-      <plugin id="org.eclipse.rap.design.example"/>
>-      <plugin id="org.eclipse.rap.examples"/>
>-      <plugin id="org.eclipse.rap.examples.pages"/>
>-      <plugin id="org.eclipse.rap.jface"/>
>-      <plugin id="org.eclipse.rap.jface.databinding"/>
>-      <plugin id="org.eclipse.rap.rwt"/>
>-      <plugin id="org.eclipse.rap.rwt.osgi"/>
>-      <plugin id="org.eclipse.rap.rwt.supplemental.filedialog"/>
>-      <plugin id="org.eclipse.rap.rwt.supplemental.fileupload"/>
>-      <plugin id="org.eclipse.rap.ui"/>
>-      <plugin id="org.eclipse.rap.ui.forms"/>
>-      <plugin id="org.eclipse.rap.ui.views"/>
>-      <plugin id="org.eclipse.rap.ui.workbench"/>
>-      <plugin id="org.eclipse.rap.widget.carousel"/>
>-   </plugins>
>-
>-   <configurations>
>-      <plugin id="com.eclipsesource.oscilloscope" autoStart="true" startLevel="0" />
>-      <plugin id="com.eclipsesource.widgets.gmaps" autoStart="true" startLevel="0" />
>-      <plugin id="com.ibm.icu.base" autoStart="true" startLevel="0" />
>-      <plugin id="org.apache.commons.fileupload" autoStart="true" startLevel="0" />
>-      <plugin id="org.apache.commons.io" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.core.commands" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.core.contenttype" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.core.databinding" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.core.databinding.beans" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.core.databinding.observable" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.core.databinding.property" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.core.expressions" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.core.jobs" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.equinox.app" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.equinox.http.servlet" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.equinox.http.servletbridge" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.equinox.preferences" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.equinox.registry" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.help" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.osgi" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.demo" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.demo.carousel" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.demo.databinding" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.demo.enrondata" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.demo.gmaps" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.demo.oscilloscope" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.design.example" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.examples" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.examples.pages" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.jface" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.jface.databinding" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.rwt" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.rwt.osgi" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.rwt.supplemental.filedialog" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.rwt.supplemental.fileupload" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.ui" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.ui.forms" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.ui.views" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.ui.workbench" autoStart="true" startLevel="0" />
>-      <plugin id="org.eclipse.rap.widget.carousel" autoStart="true" startLevel="0" />
>-   </configurations>
>-
>-   <warConfiguration webXml="/target/WEB-INF/web.xml" launchIni="/target/WEB-INF/launch.ini">
>-   <libraries>
>-      <library path="org.eclipse.equinox.servletbridge_1.2.100.v20110502.jar" fromTarget="true"/>
>-   </libraries>
>-   </warConfiguration>
>-</product>
>+<?xml version="1.0" encoding="UTF-8"?>
>+<?pde version="3.5"?>
>+
>+<product name="RAP Examples Demo" uid="org.eclipse.rap.examples" version="1.0.0" useFeatures="false" includeLaunchers="false">
>+   <plugins>
>+      <plugin id="org.apache.felix.gogo.command"/>
>+      <plugin id="org.apache.felix.gogo.runtime"/>
>+      <plugin id="org.apache.felix.gogo.shell"/>
>+      <plugin id="org.eclipse.core.commands"/>
>+      <plugin id="org.eclipse.core.contenttype"/>
>+      <plugin id="org.eclipse.core.jobs"/>
>+      <plugin id="org.eclipse.core.runtime"/>
>+      <plugin id="org.eclipse.equinox.app"/>
>+      <plugin id="org.eclipse.equinox.common"/>
>+      <plugin id="org.eclipse.equinox.console"/>
>+      <plugin id="org.eclipse.equinox.http.registry"/>
>+      <plugin id="org.eclipse.equinox.http.servlet"/>
>+      <plugin id="org.eclipse.equinox.http.servletbridge"/>
>+      <plugin id="org.eclipse.equinox.preferences"/>
>+      <plugin id="org.eclipse.equinox.registry"/>
>+      <plugin id="org.eclipse.equinox.servletbridge"/>
>+      <plugin id="org.eclipse.equinox.servletbridge.extensionbundle" fragment="true"/>
>+      <plugin id="org.eclipse.osgi"/>
>+      <plugin id="org.eclipse.osgi.services"/>
>+      <plugin id="org.eclipse.rap.examples"/>
>+      <plugin id="org.eclipse.rap.examples.pages"/>
>+      <plugin id="org.eclipse.rap.jface"/>
>+      <plugin id="org.eclipse.rap.rwt"/>
>+      <plugin id="org.eclipse.rap.rwt.osgi"/>
>+   </plugins>
>+
>+   <configurations>
>+      <plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" />
>+      <plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" />
>+      <plugin id="org.apache.felix.gogo.shell" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.core.commands" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.core.contenttype" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.core.jobs" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.app" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.console" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.http.servlet" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.http.servletbridge" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.preferences" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.registry" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.equinox.servletbridge" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.osgi" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.rap.examples" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.rap.examples.pages" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.rap.jface" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.rap.rwt" autoStart="true" startLevel="0" />
>+      <plugin id="org.eclipse.rap.rwt.osgi" autoStart="true" startLevel="0" />
>+   </configurations>
>+
>+   <warConfiguration webXml="/org.eclipse.rap.examples/WEB-INF/web.xml" launchIni="/org.eclipse.rap.examples/WEB-INF/launch.ini">
>+   <libraries>
>+      <library path="org.eclipse.equinox.servletbridge_1.2.200.v20120522-2049.jar" fromTarget="true"/>
>+   </libraries>
>+   </warConfiguration>
>+</product>

Flags:

ivan: review?

Actions: View | Diff

Attachments on bug 398996: 226057