Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2012-06-06 13:27:56 +0000
committerGreg Wilkins2012-06-06 13:27:56 +0000
commit792509d45970209805840b90772eeafb429e56db (patch)
treec9bd7352be14fb3b04f828340804152fdc5515fa /jetty-deploy/src/test
parent98a7f19ff977f485738ade0ab8d70c0af4ac53e0 (diff)
downloadorg.eclipse.jetty.project-792509d45970209805840b90772eeafb429e56db.tar.gz
org.eclipse.jetty.project-792509d45970209805840b90772eeafb429e56db.tar.xz
org.eclipse.jetty.project-792509d45970209805840b90772eeafb429e56db.zip
jetty-9 jetty-deployer passing tests
Diffstat (limited to 'jetty-deploy/src/test')
-rw-r--r--jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java16
-rw-r--r--jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml3
-rw-r--r--jetty-deploy/src/test/resources/jetty.xml6
3 files changed, 10 insertions, 15 deletions
diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
index 270b9fbcd8..395805c151 100644
--- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
+++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
@@ -33,7 +33,7 @@ import java.util.Map;
import java.util.Properties;
import org.eclipse.jetty.deploy.DeploymentManager;
-import org.eclipse.jetty.http.HttpSchemes;
+import org.eclipse.jetty.http.HttpScheme;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
@@ -56,7 +56,7 @@ public class XmlConfiguredJetty
private Map<String,String> _properties = new HashMap<String,String>();
private Server _server;
private int _serverPort;
- private String _scheme = HttpSchemes.HTTP;
+ private String _scheme = HttpScheme.HTTP.asString();
private File _jettyHome;
public XmlConfiguredJetty(TestingDir testdir) throws IOException
@@ -408,15 +408,15 @@ public class XmlConfiguredJetty
_server.start();
// Find the active server port.
- this._serverPort = (-1);
+ _serverPort = -1;
Connector connectors[] = _server.getConnectors();
- for (int i = 0; i < connectors.length; i++)
+ for (int i = 0; _serverPort<0 && i < connectors.length; i++)
{
- Connector connector = connectors[i];
- if (connector.getLocalPort() > 0)
+ if (connectors[i] instanceof Connector.NetConnector)
{
- this._serverPort = connector.getLocalPort();
- break;
+ int port = ((Connector.NetConnector)connectors[i]).getLocalPort();
+ if (port>0)
+ _serverPort=port;
}
}
diff --git a/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml b/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml
index c542672b85..9442aab418 100644
--- a/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml
+++ b/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml
@@ -2,8 +2,7 @@
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <Call name="addLifeCycle">
+ <Call name="addBean">
<Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts">
diff --git a/jetty-deploy/src/test/resources/jetty.xml b/jetty-deploy/src/test/resources/jetty.xml
index 4340e7ab25..e910dc38d8 100644
--- a/jetty-deploy/src/test/resources/jetty.xml
+++ b/jetty-deploy/src/test/resources/jetty.xml
@@ -18,8 +18,8 @@
<!-- Default queued blocking threadpool
-->
<New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
- <Set name="minThreads">10</Set>
<Set name="maxThreads">200</Set>
+ <Set name="minThreads">10</Set>
</New>
<!-- Optional Java 5 bounded threadpool with job queue
@@ -40,11 +40,7 @@
<Set name="host"></Set>
<Set name="port">0</Set>
<Set name="maxIdleTime">300000</Set>
- <Set name="Acceptors">2</Set>
- <Set name="statsOn">false</Set>
<Set name="confidentialPort">8443</Set>
- <Set name="lowResourcesConnections">20000</Set>
- <Set name="lowResourcesMaxIdleTime">5000</Set>
</New>
</Arg>
</Call>

Back to the top