Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Lindberg2009-05-14 10:20:21 -0400
committerHenrik Lindberg2009-05-14 10:20:21 -0400
commitb876cf396ed3e1851ecca44458d142023fdf3871 (patch)
treefd7b01f5bc3349c2ace170650ba05a9871a89b21 /bundles/org.eclipse.equinox.p2.testserver
parent0f385fe56e0b5eb4a426b9d74b5fb6da5eb7e0c9 (diff)
downloadrt.equinox.p2-b876cf396ed3e1851ecca44458d142023fdf3871.tar.gz
rt.equinox.p2-b876cf396ed3e1851ecca44458d142023fdf3871.tar.xz
rt.equinox.p2-b876cf396ed3e1851ecca44458d142023fdf3871.zip
Adds a read timeout for proxies.
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.testserver')
-rw-r--r--bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/Activator.java5
-rw-r--r--bundles/org.eclipse.equinox.p2.testserver/webfiles/index.html4
2 files changed, 9 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/Activator.java b/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/Activator.java
index c24de60a5..277f0afb8 100644
--- a/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/Activator.java
@@ -79,6 +79,10 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
addProxyServices(httpService, SITE, "/proxy/"); //$NON-NLS-1$
addProxyServices(httpService, SITE2, "/proxy2/"); //$NON-NLS-1$
+ httpService.registerServlet("/proxy3/aprivate/plugins", new BasicResourceDelivery("/proxy3/aprivate/plugins", URI.create(SITE2 + "/plugins")), null, secureHttpContext); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ httpService.registerServlet("/proxy3/aprivate/features", new BasicResourceDelivery("/proxy3/aprivate/features", URI.create(SITE2 + "/features")), null, secureHttpContext); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ httpService.registerServlet("/proxy3/aprivate", new BasicResourceDelivery("/proxy3/aprivate", URI.create(SITE2)), null, null); //$NON-NLS-1$//$NON-NLS-2$
+
} catch (NamespaceException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -105,6 +109,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
httpService.registerServlet(root + "molested", new FileMolester(root + "molested", URI.create(site), 40), null, null); //$NON-NLS-1$//$NON-NLS-2$
httpService.registerServlet(root + "decelerate", new ChopAndDelay(root + "decelerate", URI.create(site), 3, 0, new LinearChange(0, 5, 100, 0)), null, null); //$NON-NLS-1$//$NON-NLS-2$
httpService.registerServlet(root + "decelerate2", new ChopAndDelay(root + "decelerate2", URI.create(site), 3, 80, new LinearChange(100, 5, 105, 0)), null, null); //$NON-NLS-1$//$NON-NLS-2$
+ httpService.registerServlet(root + "readtimeout", new ChopAndDelay(root + "readtimeout", URI.create(site), 3, 10, new LinearChange(10 * 60 * 1000, 5, 5 + 10 * 60 * 1000, 0)), null, null); //$NON-NLS-1$//$NON-NLS-2$
// lie about modified time
httpService.registerServlet(root + "modified/zero", new LastModifiedLier(root + "modified/zero", URI.create(site), LastModifiedLier.TYPE_ZERO), null, null); //$NON-NLS-1$//$NON-NLS-2$
diff --git a/bundles/org.eclipse.equinox.p2.testserver/webfiles/index.html b/bundles/org.eclipse.equinox.p2.testserver/webfiles/index.html
index d4230716a..c07f8d265 100644
--- a/bundles/org.eclipse.equinox.p2.testserver/webfiles/index.html
+++ b/bundles/org.eclipse.equinox.p2.testserver/webfiles/index.html
@@ -16,6 +16,7 @@ log in. The credentials are: user: <b>Aladdin</b>, password: <b>open sesame</b>.
<li>/proxy/molested - goes to updates/3.4, but generates gibberish for all files</li>
<li>/proxy/decelerate - goes to updates/3.4, but delivers files in very small delayed packets - delay increases.</li>
<li>/proxy/decelerate2 - like /proxy/decelerate, but does not start delay until 80% of file has been processed. Good for progress bar testing.</li>
+<li>/proxy/readtimeout - When 10% of file has been processed, it delays deliver 10 minutes. Good for progress bar/cancel testing.</li>
<li>/proxy/modified/... - goes to updates/3.4, but delivers various errors in "last modified" (see below)
<ul><li>.../zero - all times are returned as 0</li>
<li>.../old - all times are very old</li>
@@ -33,6 +34,9 @@ log in. The credentials are: user: <b>Aladdin</b>, password: <b>open sesame</b>.
</li>/proxy2/... - goes to http://www.eclipse.org/equinox/p2/testing/updateSite - the same
paths as for /proxy/... are available.
</li>
+</li>/proxy3/aprivate/... - goes to http://www.eclipse.org/equinox/p2/testing/updateSite. This proxy makes
+the subpaths .../plugins, and .../features, private.
+</li>
</ul>
<p>The content listed below is also available and can be accessed under:
<ul><li>/public</li>

Back to the top