You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/01/14 19:08:07 UTC
svn commit: r1778820 - in
/axis/axis2/java/rampart/trunk/modules/rampart-integration/src:
main/java/org/apache/axis2/integration/JettyServer.java
main/java/org/apache/rahas/TestClient.java
test/java/org/apache/rampart/RampartTest.java
Author: veithen
Date: Sat Jan 14 19:08:07 2017
New Revision: 1778820
URL: http://svn.apache.org/viewvc?rev=1778820&view=rev
Log:
Disallow usage of static ports.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java?rev=1778820&r1=1778819&r2=1778820&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java Sat Jan 14 19:08:07 2017
@@ -73,7 +73,6 @@ public class JettyServer extends Externa
private static final Logger logger = LoggerFactory.getLogger(JettyServer.class);
private final String repository;
- private final int port;
private final boolean secure;
private Server server;
private boolean systemPropertiesSet;
@@ -86,17 +85,14 @@ public class JettyServer extends Externa
*
* @param repository
* The path to the Axis2 repository to use. Must not be null or empty.
- * @param port
- * The port to use. Set to <code>0</code> to enable dynamic port allocation.
* @param secure
* Whether to enable HTTPS.
*/
- public JettyServer(String repository, int port, boolean secure) {
+ public JettyServer(String repository, boolean secure) {
if (repository == null || repository.trim().length() == 0) {
throw new IllegalArgumentException("Axis2 repository must not be null or empty");
}
this.repository = repository;
- this.port = port;
this.secure = secure;
}
@@ -106,7 +102,6 @@ public class JettyServer extends Externa
if (!secure) {
SelectChannelConnector connector = new SelectChannelConnector();
- connector.setPort(port);
server.addConnector(connector);
} else {
SslContextFactory sslContextFactory = new SslContextFactory();
@@ -118,7 +113,6 @@ public class JettyServer extends Externa
sslContextFactory.setCertAlias(CERT_ALIAS);
SslSelectChannelConnector sslConnector = new SslSelectChannelConnector(sslContextFactory);
- sslConnector.setPort(port);
server.addConnector(sslConnector);
savedTrustStore = System.getProperty("javax.net.ssl.trustStore");
Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java?rev=1778820&r1=1778819&r2=1778820&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java Sat Jan 14 19:08:07 2017
@@ -24,7 +24,6 @@ import org.apache.axiom.om.OMXMLBuilderF
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
@@ -39,10 +38,8 @@ import org.junit.Test;
public abstract class TestClient {
- protected int port = 5555;
-
@Rule
- public final JettyServer server = new JettyServer(Constants.TESTING_PATH + getServiceRepo(), port, false);
+ public final JettyServer server = new JettyServer(Constants.TESTING_PATH + getServiceRepo(), false);
/**
*/
@@ -62,7 +59,7 @@ public abstract class TestClient {
System.setProperty("javax.net.ssl.trustStorePassword", "password");
System.setProperty("javax.net.ssl.trustStoreType","JKS");
- options.setTo(new EndpointReference("http://127.0.0.1:" + port + "/axis2/services/SecureService"));
+ options.setTo(server.getEndpointReference("SecureService"));
// options.setTo(new EndpointReference("http://127.0.0.1:" + 9090 + "/axis2/services/UTSAMLHoK"));
// options.setTo(new EndpointReference("https://www-lk.wso2.com:8443/axis2/services/UTSAMLHoK"));
// options.setTo(new EndpointReference("https://192.18.49.133:2343/jaxws-s1-sts/sts"));
Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java?rev=1778820&r1=1778819&r2=1778820&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java Sat Jan 14 19:08:07 2017
@@ -46,10 +46,10 @@ public class RampartTest {
private static ResourceBundle resources;
@Rule
- public final JettyServer server = new JettyServer(Constants.TESTING_PATH + "rampart_service_repo", 0, false);
+ public final JettyServer server = new JettyServer(Constants.TESTING_PATH + "rampart_service_repo", false);
@Rule
- public final JettyServer secureServer = new JettyServer(Constants.TESTING_PATH + "rampart_service_repo", 0, true);
+ public final JettyServer secureServer = new JettyServer(Constants.TESTING_PATH + "rampart_service_repo", true);
static {
try {