diff options
| author |   Fiachra Corcoran <fiachra.corcoran@ericsson.com> | 2018-08-27 15:04:05 +0100 |
|---|---|---|
| committer | Fiachra Corcoran <fiachra.corcoran@ericsson.com> | 2018-08-27 15:25:06 +0100 |
| commit | 1bd9bbb8e02495e85bc7bdc5aee20b714ed9ce3d (patch) | |
| tree | 4705702033d09e02bdc06bb2765f1a22c1f70796 /datarouter-prov/src | |
| parent | 9e6a53e27dee9ed6a303e61e3d62603bbc6b2581 (diff) | |
Downgrade Jetty to 9.3.8.RC0
Issue-ID: DMAAP-557
Change-Id: I0f595d9bc092c3a7a0821a8587bcb3660f550bfe
Signed-off-by: Fiachra Corcoran <fiachra.corcoran@ericsson.com>
Diffstat (limited to 'datarouter-prov/src')
4 files changed, 4 insertions, 4 deletions
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java index 3afce990..87979be6 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java @@ -127,7 +127,6 @@ public class Main { httpConfiguration.setSecurePort(httpsPort); httpConfiguration.setOutputBufferSize(32768); httpConfiguration.setRequestHeaderSize(2048); - httpConfiguration.setIdleTimeout(300000); httpConfiguration.setSendServerVersion(true); httpConfiguration.setSendDateHeader(false); @@ -146,6 +145,7 @@ public class Main { new HttpConnectionFactory(httpConfiguration))) { httpServerConnector.setPort(httpPort); httpServerConnector.setAcceptQueueSize(2); + httpServerConnector.setIdleTimeout(300000); // HTTPS configuration HttpConfiguration httpsConfiguration = new HttpConfiguration(httpConfiguration); diff --git a/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties b/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties index 383bce31..7758a64d 100644 --- a/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties +++ b/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties @@ -40,7 +40,7 @@ org.onap.dmaap.datarouter.provserver.logretention = 30 #DMAAP-597 (Tech Dept) REST request source IP auth # relaxation to accommodate OOM kubernetes deploy -org.onap.dmaap.datarouter.provserver.isaddressauthenabled = true +org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false # Database access org.onap.dmaap.datarouter.db.driver = org.mariadb.jdbc.Driver diff --git a/datarouter-prov/src/main/resources/provserver.properties b/datarouter-prov/src/main/resources/provserver.properties index 383bce31..7758a64d 100644 --- a/datarouter-prov/src/main/resources/provserver.properties +++ b/datarouter-prov/src/main/resources/provserver.properties @@ -40,7 +40,7 @@ org.onap.dmaap.datarouter.provserver.logretention = 30 #DMAAP-597 (Tech Dept) REST request source IP auth # relaxation to accommodate OOM kubernetes deploy -org.onap.dmaap.datarouter.provserver.isaddressauthenabled = true +org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false # Database access org.onap.dmaap.datarouter.db.driver = org.mariadb.jdbc.Driver diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestInternalMisc.java b/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestInternalMisc.java index fd00ea51..bc724079 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestInternalMisc.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestInternalMisc.java @@ -69,7 +69,7 @@ public class IntegrationTestInternalMisc extends IntegrationTestBase { @Test public void testInternalHalt() { - String url = props.getProperty("test.host") + "/internal/halt"; + String url = props.getProperty("test.host") + "/halt"; HttpGet httpPost = new HttpGet(url); try { httpPost.addHeader(FeedServlet.BEHALF_HEADER, "JUnit"); |