summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-05-24 06:41:24 (EDT)
committerEike Stepper2008-05-24 06:41:24 (EDT)
commit46a51d27d7db53246054fd258e598d0c2f30576f (patch)
treed36770630a8e3dfaf84ca0a1350f81d4b4a5a08b
parent08ab1577204f18b09ec78b60515224209903d974 (diff)
downloadcdo-46a51d27d7db53246054fd258e598d0c2f30576f.zip
cdo-46a51d27d7db53246054fd258e598d0c2f30576f.tar.gz
cdo-46a51d27d7db53246054fd258e598d0c2f30576f.tar.bz2
[232648] Provide an HTTPConnector
https://bugs.eclipse.org/bugs/show_bug.cgi?id=232648
-rw-r--r--plugins/org.eclipse.net4j.http/.options4
-rw-r--r--plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.net4j.http/plugin.xml12
3 files changed, 15 insertions, 5 deletions
diff --git a/plugins/org.eclipse.net4j.http/.options b/plugins/org.eclipse.net4j.http/.options
index 6dd14bc..d0e2ee2 100644
--- a/plugins/org.eclipse.net4j.http/.options
+++ b/plugins/org.eclipse.net4j.http/.options
@@ -1,5 +1,5 @@
# Debugging and tracing options
-org.eclipse.net4j.tcp/debug = true
+org.eclipse.net4j.http/debug = true
-org.eclipse.net4j.tcp/protocol.registration.timeout = 10000
+org.eclipse.net4j.http/protocol.registration.timeout = 10000
diff --git a/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF
index 908e440..25c1270 100644
--- a/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF
@@ -10,7 +10,9 @@ Bundle-Activator: org.eclipse.net4j.internal.http.bundle.OM$Activator
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
- org.eclipse.net4j;bundle-version="[0.8.0,0.9.0)";visibility:=reexport
+ org.eclipse.net4j;bundle-version="[0.8.0,0.9.0)";visibility:=reexport,
+ org.eclipse.equinox.http.registry;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
+ org.eclipse.equinox.http.servlet;bundle-version="[1.0.0,2.0.0)";resolution:=optional
Import-Package: javax.servlet;version="2.4.0";resolution:=optional,
javax.servlet.http;version="2.4.0";resolution:=optional,
org.apache.commons.httpclient;version="3.0.1";resolution:=optional,
diff --git a/plugins/org.eclipse.net4j.http/plugin.xml b/plugins/org.eclipse.net4j.http/plugin.xml
index 7564ee9..b82ebb4 100644
--- a/plugins/org.eclipse.net4j.http/plugin.xml
+++ b/plugins/org.eclipse.net4j.http/plugin.xml
@@ -22,11 +22,19 @@
<factory
class="org.eclipse.net4j.internal.http.HTTPAcceptorFactory"
productGroup="org.eclipse.net4j.acceptors"
- type="tcp"/>
+ type="http"/>
<factory
class="org.eclipse.net4j.internal.http.HTTPConnectorFactory"
productGroup="org.eclipse.net4j.connectors"
- type="tcp"/>
+ type="http"/>
+ </extension>
+
+ <extension
+ point="org.eclipse.equinox.http.registry.servlets">
+ <servlet
+ alias="net4j.transport"
+ class="org.eclipse.net4j.internal.http.Net4jTransportServlet">
+ </servlet>
</extension>
</plugin>