diff options
| -rw-r--r-- | examples/org.eclipse.equinox.server.examples.servletbridge.product/.project | 6 | ||||
| -rw-r--r-- | examples/org.eclipse.equinox.server.examples.servletbridge.product/build.properties | 2 | ||||
| -rw-r--r-- | features/org.eclipse.equinox.server.servletbridge/rootfiles/launch.ini | 1 | ||||
| -rw-r--r-- | features/org.eclipse.equinox.server.servletbridge/rootfiles/lib/org.eclipse.equinox.servletbridge_1.2.0.v20091026.jar | bin | 0 -> 39796 bytes | |||
| -rw-r--r-- | features/org.eclipse.equinox.server.servletbridge/rootfiles/web.xml | 65 | ||||
| -rw-r--r-- | features/org.eclipse.equinox.server.simple/.project | 17 | ||||
| -rw-r--r-- | features/org.eclipse.equinox.server.simple/build.properties | 1 | ||||
| -rw-r--r-- | features/org.eclipse.equinox.server.simple/feature.xml (renamed from examples/org.eclipse.equinox.server.examples.servletbridge.product/feature.xml) | 18 |
8 files changed, 100 insertions, 10 deletions
diff --git a/examples/org.eclipse.equinox.server.examples.servletbridge.product/.project b/examples/org.eclipse.equinox.server.examples.servletbridge.product/.project index 49c7befc5..a35656538 100644 --- a/examples/org.eclipse.equinox.server.examples.servletbridge.product/.project +++ b/examples/org.eclipse.equinox.server.examples.servletbridge.product/.project @@ -5,13 +5,7 @@ <projects> </projects> <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> </buildSpec> <natures> - <nature>org.eclipse.pde.FeatureNature</nature> </natures> </projectDescription> diff --git a/examples/org.eclipse.equinox.server.examples.servletbridge.product/build.properties b/examples/org.eclipse.equinox.server.examples.servletbridge.product/build.properties deleted file mode 100644 index f48100673..000000000 --- a/examples/org.eclipse.equinox.server.examples.servletbridge.product/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -bin.includes = feature.xml,\ - products/ diff --git a/features/org.eclipse.equinox.server.servletbridge/rootfiles/launch.ini b/features/org.eclipse.equinox.server.servletbridge/rootfiles/launch.ini index a96f99e95..b4dd51e43 100644 --- a/features/org.eclipse.equinox.server.servletbridge/rootfiles/launch.ini +++ b/features/org.eclipse.equinox.server.servletbridge/rootfiles/launch.ini @@ -6,6 +6,7 @@ osgi.*=@null org.osgi.*=@null eclipse.*=@null +org.eclipse.*=@null osgi.parentClassloader=app osgi.contextClassLoaderParent=app diff --git a/features/org.eclipse.equinox.server.servletbridge/rootfiles/lib/org.eclipse.equinox.servletbridge_1.2.0.v20091026.jar b/features/org.eclipse.equinox.server.servletbridge/rootfiles/lib/org.eclipse.equinox.servletbridge_1.2.0.v20091026.jar Binary files differnew file mode 100644 index 000000000..c6ebb4a76 --- /dev/null +++ b/features/org.eclipse.equinox.server.servletbridge/rootfiles/lib/org.eclipse.equinox.servletbridge_1.2.0.v20091026.jar diff --git a/features/org.eclipse.equinox.server.servletbridge/rootfiles/web.xml b/features/org.eclipse.equinox.server.servletbridge/rootfiles/web.xml new file mode 100644 index 000000000..e5dbb96e2 --- /dev/null +++ b/features/org.eclipse.equinox.server.servletbridge/rootfiles/web.xml @@ -0,0 +1,65 @@ +<?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>commandline</param-name> + <param-value>-console</param-value> + </init-param> + <init-param> + <param-name>enableFrameworkControls</param-name> + <param-value>true</param-value> + </init-param> + <!-- + You can specify your own framework launcher here. + The default is: org.eclipse.equinox.servletbridge.FrameworkLauncher + <init-param> + <param-name>frameworkLauncherClass</param-name> + <param-value>org.eclipse.equinox.servletbridge.FrameworkLauncher</param-value> + </init-param> + --> + <!-- + When the framework is deployed, an extension bundle must be present to allow the Servlet API to + be exported by the container. Typically, this extension bundle is created at deploy time by the + FrameworkLauncher. If, however, an extension bundle (with id 'org.eclipse.equinox.servletbridge.extensionbundle') is + already present in the 'plugins' area, then preference is given to the existing bundle. + If this param is set to 'true', then the existing extension bundle with be *overridden* and + the one created by the FrameworkLauncher will replace any existing one. The default is 'false' + (giving preference to the existing extension bundle if present). + + default: false + <init-param> + <param-name>overrideAndReplaceExtensionBundle</param-name> + <param-value>false</param-value> + </init-param> + --> + <!-- + org.eclipse.equinox.servletbridge and the Servlet API are exported automatically to the underlying OSGi framework. + The extendedFrameworkExports parameter allows the specification of additional java package exports. + The format is a comma separated list of exports as specified by the "Export-Package" bundle manifest header. + For example: com.mycompany.exports; version=1.0.0, com.mycompany.otherexports; version=1.0.0 + + NOTE: This property is ignored by default and is only processed if overrideAndReplaceExtensionBundle is true. + <init-param> + <param-name>extendedFrameworkExports</param-name> + <param-value></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> + <!-- + This is required if your application bundles expose JSPs. + --> + <servlet-mapping> + <servlet-name>equinoxbridgeservlet</servlet-name> + <url-pattern>*.jsp</url-pattern> + </servlet-mapping> +</web-app> diff --git a/features/org.eclipse.equinox.server.simple/.project b/features/org.eclipse.equinox.server.simple/.project new file mode 100644 index 000000000..fd87847cf --- /dev/null +++ b/features/org.eclipse.equinox.server.simple/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.equinox.server.simple</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + </natures> +</projectDescription> diff --git a/features/org.eclipse.equinox.server.simple/build.properties b/features/org.eclipse.equinox.server.simple/build.properties new file mode 100644 index 000000000..64f93a9f0 --- /dev/null +++ b/features/org.eclipse.equinox.server.simple/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/examples/org.eclipse.equinox.server.examples.servletbridge.product/feature.xml b/features/org.eclipse.equinox.server.simple/feature.xml index f7763eaa1..1ad6313e2 100644 --- a/examples/org.eclipse.equinox.server.examples.servletbridge.product/feature.xml +++ b/features/org.eclipse.equinox.server.simple/feature.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <feature - id="org.eclipse.equinox.server.examples.servletbridge.product" - label="Servletbridge Product Feature" + id="org.eclipse.equinox.server.simple" + label="Simple Http Server Feature" version="1.0.0.qualifier" provider-name="Eclipse Foundation"> @@ -17,4 +17,18 @@ [Enter License Description here.] </license> + <plugin + id="javax.servlet" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.equinox.http" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> |