Repository: tomee Updated Branches: refs/heads/master 7edb1be6a -> 87fbc5038
TOMEE-1890 allow to configure provider url in remote tomee adapters Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/87fbc503 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/87fbc503 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/87fbc503 Branch: refs/heads/master Commit: 87fbc5038fa30d247c5721ac1379168fba03080a Parents: 7edb1be Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Thu Jul 28 10:13:53 2016 +0200 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Thu Jul 28 10:13:53 2016 +0200 ---------------------------------------------------------------------- .../remote/RemoteTomEEConfiguration.java | 10 ++++++ .../arquillian/remote/RemoteTomEEContainer.java | 5 +++ .../openejb/arquillian/TimeoutConfigTest.java | 35 ++++++++++++++++++++ .../webapp/TomEEWebappConfiguration.java | 9 +++++ .../arquillian/webapp/TomEEWebappContainer.java | 5 +++ 5 files changed, 64 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/87fbc503/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java index 63e78f0..7baf110 100644 --- a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java +++ b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java @@ -52,6 +52,16 @@ public class RemoteTomEEConfiguration extends TomEEConfiguration { private boolean simpleLog; private String deployerProperties = ""; + private String providerUrlPattern = "%s"; + + public String getProviderUrlPattern() { + return providerUrlPattern; + } + + public void setProviderUrlPattern(String providerUrlPattern) { + this.providerUrlPattern = providerUrlPattern; + } + public String getGroupId() { return groupId; } http://git-wip-us.apache.org/repos/asf/tomee/blob/87fbc503/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java index 04ca053..fd87f53 100644 --- a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java +++ b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java @@ -71,6 +71,11 @@ public class RemoteTomEEContainer extends TomEEContainer<RemoteTomEEConfiguratio } @Override + protected String providerUrl() { + return String.format(configuration.getProviderUrlPattern(), super.providerUrl()); + } + + @Override public void start() throws LifecycleException { // see if TomEE is already running by checking the http port final int httpPort = configuration.getHttpPort(); http://git-wip-us.apache.org/repos/asf/tomee/blob/87fbc503/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TimeoutConfigTest.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TimeoutConfigTest.java b/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TimeoutConfigTest.java new file mode 100644 index 0000000..0f1f0d2 --- /dev/null +++ b/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TimeoutConfigTest.java @@ -0,0 +1,35 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.openejb.arquillian; + +import org.apache.tomee.arquillian.remote.RemoteTomEEConfiguration; +import org.apache.tomee.arquillian.remote.RemoteTomEEContainer; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class TimeoutConfigTest { + @Test + public void timeout() { + new RemoteTomEEContainer() {{ + setup(new RemoteTomEEConfiguration() {{ + setProviderUrlPattern("%s?readTimeout=30000&connectTimeout=30000"); + }}); + assertEquals("http://localhost:8080/tomee/ejb?readTimeout=30000&connectTimeout=30000", providerUrl()); + }}; + } +} http://git-wip-us.apache.org/repos/asf/tomee/blob/87fbc503/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java b/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java index 78467e5..1f91d77 100644 --- a/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java +++ b/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java @@ -35,6 +35,15 @@ public class TomEEWebappConfiguration extends TomEEConfiguration { private boolean removeUnusedWebapps = true; private boolean useInstallerServlet; private int ajpPort = 8009; + private String providerUrlPattern = "%s"; + + public String getProviderUrlPattern() { + return providerUrlPattern; + } + + public void setProviderUrlPattern(String providerUrlPattern) { + this.providerUrlPattern = providerUrlPattern; + } public String getGroupId() { return groupId; http://git-wip-us.apache.org/repos/asf/tomee/blob/87fbc503/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java b/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java index 6b2282f..95deadd 100644 --- a/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java +++ b/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java @@ -49,6 +49,11 @@ public class TomEEWebappContainer extends TomEEContainer<TomEEWebappConfiguratio private boolean wereOpenejbHomeSet = true; @Override + protected String providerUrl() { + return String.format(configuration.getProviderUrlPattern(), super.providerUrl()); + } + + @Override public void start() throws LifecycleException { // see if TomEE is already running by checking the http port final int httpPort = configuration.getHttpPort();