You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/02/09 11:52:16 UTC
[1/2] cxf-fediz git commit: Removing dual license
Repository: cxf-fediz
Updated Branches:
refs/heads/1.2.x-fixes 9c4189275 -> a150c26cc
Removing dual license
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/d36f6223
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/d36f6223
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/d36f6223
Branch: refs/heads/1.2.x-fixes
Commit: d36f622351b529b397ed25609be0b63a9f9ef97f
Parents: 9c41892
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Feb 9 10:38:46 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Feb 9 10:40:03 2016 +0000
----------------------------------------------------------------------
systests/spring/pom.xml | 18 ------------------
1 file changed, 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d36f6223/systests/spring/pom.xml
----------------------------------------------------------------------
diff --git a/systests/spring/pom.xml b/systests/spring/pom.xml
index 1d9e457..4292da8 100644
--- a/systests/spring/pom.xml
+++ b/systests/spring/pom.xml
@@ -17,24 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-<!--
- 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
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- 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.
--->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
[2/2] cxf-fediz git commit: Switching Spring systests to use Tomcat
instead of Jetty
Posted by co...@apache.org.
Switching Spring systests to use Tomcat instead of Jetty
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/a150c26c
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/a150c26c
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/a150c26c
Branch: refs/heads/1.2.x-fixes
Commit: a150c26ccbb0e8e7285ec7dd77ca47443c9e2d9d
Parents: d36f622
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Feb 9 10:51:55 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Feb 9 10:51:55 2016 +0000
----------------------------------------------------------------------
systests/spring/pom.xml | 37 ++--
.../cxf/fediz/integrationtests/JettyUtils.java | 100 ----------
.../cxf/fediz/integrationtests/Spring2Test.java | 185 +++++++++++++++++--
.../cxf/fediz/integrationtests/SpringTest.java | 110 ++++++++++-
4 files changed, 291 insertions(+), 141 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a150c26c/systests/spring/pom.xml
----------------------------------------------------------------------
diff --git a/systests/spring/pom.xml b/systests/spring/pom.xml
index 4292da8..bed9262 100644
--- a/systests/spring/pom.xml
+++ b/systests/spring/pom.xml
@@ -35,31 +35,27 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- <version>${jetty.version}</version>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-xml</artifactId>
- <version>${jetty.version}</version>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-logging-juli</artifactId>
+ <version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
+ <version>${ecj.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jsp</artifactId>
- <version>${jetty.version}</version>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-jasper</artifactId>
+ <version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -132,7 +128,7 @@
<id>copy-idp-sts</id>
<phase>generate-resources</phase>
<goals>
- <goal>copy</goal>
+ <goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
@@ -142,6 +138,7 @@
<version>${project.version}</version>
<type>war</type>
<overWrite>true</overWrite>
+ <outputDirectory>target/tomcat/idp/webapps/fediz-idp</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.cxf.fediz</groupId>
@@ -149,6 +146,7 @@
<version>${project.version}</version>
<type>war</type>
<overWrite>true</overWrite>
+ <outputDirectory>target/tomcat/idp/webapps/fediz-idp-sts</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.cxf.fediz.systests.webapps</groupId>
@@ -156,6 +154,7 @@
<version>${project.version}</version>
<type>war</type>
<overWrite>true</overWrite>
+ <outputDirectory>target/tomcat/rp/webapps/fediz-systests-webapps-spring</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.cxf.fediz.systests.webapps</groupId>
@@ -163,6 +162,7 @@
<version>${project.version}</version>
<type>war</type>
<overWrite>true</overWrite>
+ <outputDirectory>target/tomcat/rp/webapps/fediz-systests-webapps-spring2</outputDirectory>
</artifactItem>
</artifactItems>
<outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
@@ -219,3 +219,4 @@
</plugins>
</build>
</project>
+
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a150c26c/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/JettyUtils.java
----------------------------------------------------------------------
diff --git a/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/JettyUtils.java b/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/JettyUtils.java
deleted file mode 100644
index 521bcc5..0000000
--- a/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/JettyUtils.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.cxf.fediz.integrationtests;
-
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.util.resource.Resource;
-import org.eclipse.jetty.xml.XmlConfiguration;
-
-public final class JettyUtils {
-
- private static Server idpServer;
- private static Server rpServer;
-
- private JettyUtils() {
- }
-
- public static void initIdpServer() {
- if (idpServer == null) {
- try {
- Resource testServerConfig = Resource.newSystemResource("idp-server.xml");
- XmlConfiguration configuration = new XmlConfiguration(testServerConfig.getInputStream());
- idpServer = (Server)configuration.configure();
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- public static void startIdpServer() {
- if (idpServer != null && !idpServer.isStarted()) {
- try {
- idpServer.start();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- public static void stopIdpServer() {
- if (idpServer != null && idpServer.isStarted()) {
- try {
- idpServer.stop();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- public static void initRpServer() {
- if (rpServer == null) {
- try {
- Resource testServerConfig = Resource.newSystemResource("rp-server.xml");
- XmlConfiguration configuration = new XmlConfiguration(testServerConfig.getInputStream());
- rpServer = (Server)configuration.configure();
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- public static void startRpServer() {
- if (rpServer != null && !rpServer.isStarted()) {
- try {
- rpServer.start();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- public static void stopRpServer() {
- if (rpServer != null && rpServer.isStarted()) {
- try {
- rpServer.stop();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a150c26c/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring2Test.java
----------------------------------------------------------------------
diff --git a/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring2Test.java b/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring2Test.java
index ed1acfe..86a928f 100644
--- a/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring2Test.java
+++ b/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring2Test.java
@@ -20,18 +20,37 @@
package org.apache.cxf.fediz.integrationtests;
+import java.io.File;
+
+import com.gargoylesoftware.htmlunit.CookieManager;
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.DomElement;
+import com.gargoylesoftware.htmlunit.html.DomNodeList;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+
+
+import org.apache.catalina.LifecycleState;
+import org.apache.catalina.connector.Connector;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-
public class Spring2Test extends AbstractTests {
static String idpHttpsPort;
static String rpHttpsPort;
+ private static Tomcat idpServer;
+ private static Tomcat rpServer;
+
@BeforeClass
public static void init() {
System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog");
@@ -47,16 +66,106 @@ public class Spring2Test extends AbstractTests {
rpHttpsPort = System.getProperty("rp.https.port");
Assert.assertNotNull("Property 'rp.https.port' null", rpHttpsPort);
- JettyUtils.initIdpServer();
- JettyUtils.startIdpServer();
- JettyUtils.initRpServer();
- JettyUtils.startRpServer();
+ initIdp();
+ initRp();
}
@AfterClass
public static void cleanup() {
- JettyUtils.stopIdpServer();
- JettyUtils.stopRpServer();
+ try {
+ if (idpServer.getServer() != null
+ && idpServer.getServer().getState() != LifecycleState.DESTROYED) {
+ if (idpServer.getServer().getState() != LifecycleState.STOPPED) {
+ idpServer.stop();
+ }
+ idpServer.destroy();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ try {
+ if (rpServer.getServer() != null
+ && rpServer.getServer().getState() != LifecycleState.DESTROYED) {
+ if (rpServer.getServer().getState() != LifecycleState.STOPPED) {
+ rpServer.stop();
+ }
+ rpServer.destroy();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ private static void initIdp() {
+ try {
+ idpServer = new Tomcat();
+ idpServer.setPort(0);
+ String currentDir = new File(".").getCanonicalPath();
+ idpServer.setBaseDir(currentDir + File.separator + "target");
+
+ idpServer.getHost().setAppBase("tomcat/idp/webapps");
+ idpServer.getHost().setAutoDeploy(true);
+ idpServer.getHost().setDeployOnStartup(true);
+
+ Connector httpsConnector = new Connector();
+ httpsConnector.setPort(Integer.parseInt(idpHttpsPort));
+ httpsConnector.setSecure(true);
+ httpsConnector.setScheme("https");
+ //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keystorePass", "tompass");
+ httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setAttribute("truststorePass", "tompass");
+ httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setAttribute("clientAuth", "want");
+ // httpsConnector.setAttribute("clientAuth", "false");
+ httpsConnector.setAttribute("sslProtocol", "TLS");
+ httpsConnector.setAttribute("SSLEnabled", true);
+
+ idpServer.getService().addConnector(httpsConnector);
+
+ idpServer.addWebapp("/fediz-idp-sts", "fediz-idp-sts");
+ idpServer.addWebapp("/fediz-idp", "fediz-idp");
+
+ idpServer.start();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ private static void initRp() {
+ try {
+ rpServer = new Tomcat();
+ rpServer.setPort(0);
+ String currentDir = new File(".").getCanonicalPath();
+ rpServer.setBaseDir(currentDir + File.separator + "target");
+
+ rpServer.getHost().setAppBase("tomcat/rp/webapps");
+ rpServer.getHost().setAutoDeploy(true);
+ rpServer.getHost().setDeployOnStartup(true);
+
+ Connector httpsConnector = new Connector();
+ httpsConnector.setPort(Integer.parseInt(rpHttpsPort));
+ httpsConnector.setSecure(true);
+ httpsConnector.setScheme("https");
+ //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keystorePass", "tompass");
+ httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setAttribute("truststorePass", "tompass");
+ httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
+ // httpsConnector.setAttribute("clientAuth", "false");
+ httpsConnector.setAttribute("clientAuth", "want");
+ httpsConnector.setAttribute("sslProtocol", "TLS");
+ httpsConnector.setAttribute("SSLEnabled", true);
+
+ rpServer.getService().addConnector(httpsConnector);
+
+ rpServer.addWebapp("/fedizhelloworld_spring2", "fediz-systests-webapps-spring2");
+
+ rpServer.start();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
@Override
@@ -81,31 +190,75 @@ public class Spring2Test extends AbstractTests {
}
@Test
- @Ignore("This tests is currently failing on Spring")
+ @Ignore("Logout not supported with Spring2")
@Override
- public void testAliceModifiedSignature() throws Exception {
+ public void testIdPLogout() throws Exception {
}
@Test
- @Ignore("This tests is currently failing on Spring")
+ @Ignore("Logout not supported with Spring2")
@Override
- public void testIdPLogout() throws Exception {
+ public void testIdPLogoutCleanup() throws Exception {
}
@Test
- @Ignore("This tests is currently failing on Spring")
+ @Ignore("Logout not supported with Spring2")
@Override
- public void testIdPLogoutCleanup() throws Exception {
+ public void testRPLogout() throws Exception {
}
- @Test
- @Ignore("This tests is currently failing on Spring")
@Override
- public void testRPLogout() throws Exception {
+ @Test
+ public void testAliceModifiedSignature() throws Exception {
+ String url = "https://localhost:" + getRpHttpsPort() + "/" + getServletContextName()
+ + "/secure/fedservlet";
+ String user = "alice";
+ String password = "ecila";
+
+ // Get the initial token
+ CookieManager cookieManager = new CookieManager();
+ final WebClient webClient = new WebClient();
+ webClient.setCookieManager(cookieManager);
+ webClient.getOptions().setUseInsecureSSL(true);
+ webClient.getCredentialsProvider().setCredentials(
+ new AuthScope("localhost", Integer.parseInt(getIdpHttpsPort())),
+ new UsernamePasswordCredentials(user, password));
+
+ webClient.getOptions().setJavaScriptEnabled(false);
+ final HtmlPage idpPage = webClient.getPage(url);
+ webClient.getOptions().setJavaScriptEnabled(true);
+ Assert.assertEquals("IDP SignIn Response Form", idpPage.getTitleText());
+
+ // Parse the form to get the token (wresult)
+ DomNodeList<DomElement> results = idpPage.getElementsByTagName("input");
+
+ for (DomElement result : results) {
+ if ("wresult".equals(result.getAttributeNS(null, "name"))) {
+ // Now modify the Signature
+ String value = result.getAttributeNS(null, "value");
+ value = value.replace("alice", "bob");
+ result.setAttributeNS(null, "value", value);
+ }
+ }
+
+ // Invoke back on the RP
+ final HtmlForm form = idpPage.getFormByName("signinresponseform");
+ final HtmlSubmitInput button = form.getInputByName("_eventId_submit");
+
+ try {
+ button.click();
+ Assert.fail("Failure expected on a modified signature");
+ } catch (FailingHttpStatusCodeException ex) {
+ // expected
+ //Assert.assertTrue(ex.getMessage().contains("401 Unauthorized")
+ // || ex.getMessage().contains("401 Authentication Failed")
+ // || ex.getMessage().contains("403 Forbidden"));
+ }
+
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a150c26c/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/SpringTest.java
----------------------------------------------------------------------
diff --git a/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/SpringTest.java b/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/SpringTest.java
index e50e4db..5e100c8 100644
--- a/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/SpringTest.java
+++ b/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/SpringTest.java
@@ -19,18 +19,24 @@
package org.apache.cxf.fediz.integrationtests;
+import java.io.File;
+import org.apache.catalina.LifecycleState;
+import org.apache.catalina.connector.Connector;
+import org.apache.catalina.startup.Tomcat;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Ignore;
-
public class SpringTest extends AbstractTests {
static String idpHttpsPort;
static String rpHttpsPort;
+ private static Tomcat idpServer;
+ private static Tomcat rpServer;
+
@BeforeClass
public static void init() {
System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog");
@@ -46,16 +52,106 @@ public class SpringTest extends AbstractTests {
rpHttpsPort = System.getProperty("rp.https.port");
Assert.assertNotNull("Property 'rp.https.port' null", rpHttpsPort);
- JettyUtils.initIdpServer();
- JettyUtils.startIdpServer();
- JettyUtils.initRpServer();
- JettyUtils.startRpServer();
+ initIdp();
+ initRp();
}
@AfterClass
public static void cleanup() {
- JettyUtils.stopIdpServer();
- JettyUtils.stopRpServer();
+ try {
+ if (idpServer.getServer() != null
+ && idpServer.getServer().getState() != LifecycleState.DESTROYED) {
+ if (idpServer.getServer().getState() != LifecycleState.STOPPED) {
+ idpServer.stop();
+ }
+ idpServer.destroy();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ try {
+ if (rpServer.getServer() != null
+ && rpServer.getServer().getState() != LifecycleState.DESTROYED) {
+ if (rpServer.getServer().getState() != LifecycleState.STOPPED) {
+ rpServer.stop();
+ }
+ rpServer.destroy();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ private static void initIdp() {
+ try {
+ idpServer = new Tomcat();
+ idpServer.setPort(0);
+ String currentDir = new File(".").getCanonicalPath();
+ idpServer.setBaseDir(currentDir + File.separator + "target");
+
+ idpServer.getHost().setAppBase("tomcat/idp/webapps");
+ idpServer.getHost().setAutoDeploy(true);
+ idpServer.getHost().setDeployOnStartup(true);
+
+ Connector httpsConnector = new Connector();
+ httpsConnector.setPort(Integer.parseInt(idpHttpsPort));
+ httpsConnector.setSecure(true);
+ httpsConnector.setScheme("https");
+ //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keystorePass", "tompass");
+ httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setAttribute("truststorePass", "tompass");
+ httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
+ httpsConnector.setAttribute("clientAuth", "want");
+ // httpsConnector.setAttribute("clientAuth", "false");
+ httpsConnector.setAttribute("sslProtocol", "TLS");
+ httpsConnector.setAttribute("SSLEnabled", true);
+
+ idpServer.getService().addConnector(httpsConnector);
+
+ idpServer.addWebapp("/fediz-idp-sts", "fediz-idp-sts");
+ idpServer.addWebapp("/fediz-idp", "fediz-idp");
+
+ idpServer.start();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ private static void initRp() {
+ try {
+ rpServer = new Tomcat();
+ rpServer.setPort(0);
+ String currentDir = new File(".").getCanonicalPath();
+ rpServer.setBaseDir(currentDir + File.separator + "target");
+
+ rpServer.getHost().setAppBase("tomcat/rp/webapps");
+ rpServer.getHost().setAutoDeploy(true);
+ rpServer.getHost().setDeployOnStartup(true);
+
+ Connector httpsConnector = new Connector();
+ httpsConnector.setPort(Integer.parseInt(rpHttpsPort));
+ httpsConnector.setSecure(true);
+ httpsConnector.setScheme("https");
+ //httpsConnector.setAttribute("keyAlias", keyAlias);
+ httpsConnector.setAttribute("keystorePass", "tompass");
+ httpsConnector.setAttribute("keystoreFile", "test-classes/server.jks");
+ httpsConnector.setAttribute("truststorePass", "tompass");
+ httpsConnector.setAttribute("truststoreFile", "test-classes/server.jks");
+ // httpsConnector.setAttribute("clientAuth", "false");
+ httpsConnector.setAttribute("clientAuth", "want");
+ httpsConnector.setAttribute("sslProtocol", "TLS");
+ httpsConnector.setAttribute("SSLEnabled", true);
+
+ rpServer.getService().addConnector(httpsConnector);
+
+ rpServer.addWebapp("/fedizhelloworld", "fediz-systests-webapps-spring");
+
+ rpServer.start();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
@Override