diff options
| author | Jan Bartel | 2015-04-30 00:44:44 +0000 |
|---|---|---|
| committer | Jan Bartel | 2015-04-30 00:44:44 +0000 |
| commit | e30c05cc2b3ad9dc9c17ab99f746f67af12f3e20 (patch) | |
| tree | 1fda04005b28a8d7ee1f4d86fc6e540bd2f30582 /tests/test-integration | |
| parent | 15eb1081e90c10267a8c9cdac1756e8ddeca98bf (diff) | |
| parent | 25474ff7ab41a93d3c89de7ddc3f04b384c51762 (diff) | |
| download | org.eclipse.jetty.project-e30c05cc2b3ad9dc9c17ab99f746f67af12f3e20.tar.gz org.eclipse.jetty.project-e30c05cc2b3ad9dc9c17ab99f746f67af12f3e20.tar.xz org.eclipse.jetty.project-e30c05cc2b3ad9dc9c17ab99f746f67af12f3e20.zip | |
Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
tests/test-integration/src/test/java/org/eclipse/jetty/test/support/TestableJettyServer.java
tests/test-integration/src/test/resources/BIOHttp.xml
tests/test-integration/src/test/resources/BIOHttps.xml
tests/test-integration/src/test/resources/NIOHttp.xml
tests/test-integration/src/test/resources/NIOHttps.xml
Diffstat (limited to 'tests/test-integration')
3 files changed, 2 insertions, 51 deletions
diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/TestableJettyServer.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/TestableJettyServer.java index 7b9567fc3a..495f0cdea6 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/TestableJettyServer.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/TestableJettyServer.java @@ -33,6 +33,7 @@ import java.util.Map; import java.util.Properties; import org.eclipse.jetty.http.HttpScheme; +import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.xml.XmlConfiguration; @@ -119,7 +120,7 @@ public class TestableJettyServer for (int i = 0; i < this._xmlConfigurations.size(); i++) { URL configURL = this._xmlConfigurations.get(i); - // System.err.println("configuring: "+configURL); + System.err.println("configuring: "+configURL); XmlConfiguration configuration = new XmlConfiguration(configURL); if (last != null) { @@ -177,7 +178,6 @@ public class TestableJettyServer // Find the active server port. this._serverPort = ((NetworkConnector)_server.getConnectors()[0]).getLocalPort(); - // System.err.println("Server Port="+_serverPort); Assert.assertTrue("Server Port is between 1 and 65535. Actually <" + _serverPort + ">",(1 <= this._serverPort) && (this._serverPort <= 65535)); } diff --git a/tests/test-integration/src/test/resources/BIOHttp.xml b/tests/test-integration/src/test/resources/BIOHttp.xml deleted file mode 100644 index 6702f2dd32..0000000000 --- a/tests/test-integration/src/test/resources/BIOHttp.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> - -<Configure id="Server" class="org.eclipse.jetty.server.Server"> - - <!-- =========================================================== --> - <!-- Set connectors --> - <!-- =========================================================== --> - - <Call name="addConnector"> - <Arg> - <New class="org.eclipse.jetty.server.bio.SocketConnector"> - <Set name="host"><SystemProperty name="jetty.http.host" /></Set> - <Set name="idleTimeout">300000</Set> - <Set name="Acceptors">2</Set> - <Set name="statsOn">false</Set> - </New> - </Arg> - </Call> - -</Configure> diff --git a/tests/test-integration/src/test/resources/BIOHttps.xml b/tests/test-integration/src/test/resources/BIOHttps.xml deleted file mode 100644 index d9f94b7d20..0000000000 --- a/tests/test-integration/src/test/resources/BIOHttps.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> - -<Configure id="Server" class="org.eclipse.jetty.server.Server"> - - <!-- =========================================================== --> - <!-- Set connectors --> - <!-- =========================================================== --> - - <Call name="addConnector"> - <Arg> - <New class="org.eclipse.jetty.server.ssl.SslSocketConnector"> - <Set name="host"><SystemProperty name="jetty.http.host" /></Set> - <Set name="idleTimeout">300000</Set> - <Set name="Acceptors">2</Set> - <Set name="statsOn">false</Set> - <Set name="keystore"><Property name="test.resourcesdir" default="src/test/resources" />/keystore</Set> - <Set name="password">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set> - <Set name="keyPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set> - <!-- - <Set name="truststore"><Property name="test.resourcesdir" default="src/test/resources" />/keystore</Set> - <Set name="trustPassword">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set> - --> - </New> - </Arg> - </Call> - -</Configure> |