Switched Spring systests to use Tomcat instead of Jetty so that we can run them with JDK8
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/c953c811 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/c953c811 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/c953c811 Branch: refs/heads/master Commit: c953c8117505864577c1334de8e5f5413f4328c1 Parents: a579f4e Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Sep 21 17:01:22 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Sep 21 17:01:22 2015 +0100 ---------------------------------------------------------------------- systests/spring/pom.xml | 36 ++-- .../cxf/fediz/integrationtests/JettyUtils.java | 100 ----------- .../cxf/fediz/integrationtests/Spring2Test.java | 175 ++++++++++++++++++- .../cxf/fediz/integrationtests/SpringTest.java | 110 +++++++++++- .../spring/src/test/resources/idp-server.xml | 80 --------- .../spring/src/test/resources/rp-server.xml | 69 -------- 6 files changed, 289 insertions(+), 281 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c953c811/systests/spring/pom.xml ---------------------------------------------------------------------- diff --git a/systests/spring/pom.xml b/systests/spring/pom.xml index 1856b84..9cb2940 100644 --- a/systests/spring/pom.xml +++ b/systests/spring/pom.xml @@ -53,31 +53,27 @@ </properties> <dependencies> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>${jetty8.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - <version>${jetty8.version}</version> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + <version>${tomcat7.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-xml</artifactId> - <version>${jetty8.version}</version> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-logging-juli</artifactId> + <version>${tomcat7.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <version>${jetty8.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>${jetty8.version}</version> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-jasper</artifactId> + <version>${tomcat7.version}</version> <scope>test</scope> </dependency> <dependency> @@ -149,7 +145,7 @@ <id>copy-idp-sts</id> <phase>generate-resources</phase> <goals> - <goal>copy</goal> + <goal>unpack</goal> </goals> <configuration> <artifactItems> @@ -159,6 +155,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> @@ -166,6 +163,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> @@ -173,6 +171,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> @@ -180,6 +179,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> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c953c811/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/c953c811/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 f057b26..8d52ffc 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 @@ -100,4 +209,56 @@ public class Spring2Test extends AbstractTests { public void testRPLogout() throws Exception { } + + // Getting 500 error code here + @Override + @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")); + } + + } } http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c953c811/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 http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c953c811/systests/spring/src/test/resources/idp-server.xml ---------------------------------------------------------------------- diff --git a/systests/spring/src/test/resources/idp-server.xml b/systests/spring/src/test/resources/idp-server.xml deleted file mode 100644 index 984d16a..0000000 --- a/systests/spring/src/test/resources/idp-server.xml +++ /dev/null @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd";> - -<Configure id="IdpServer" class="org.eclipse.jetty.server.Server"> - <Call class="java.lang.System" name="setProperty"> - <Arg>org.apache.jasper.compiler.disablejsr199</Arg> - <Arg>true</Arg> - </Call> - - <Call class="org.eclipse.jetty.util.log.Log" name="getRootLogger"> - <Call name="setDebugEnabled"> - <Arg type="boolean">true</Arg> - </Call> - </Call> - - <Call name="addConnector"> - <Arg> - <New - class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector"> - <Arg> - <New class="org.eclipse.jetty.http.ssl.SslContextFactory"> - <Set name="keyStore">./target/test-classes/server.jks - </Set> - <Set name="keyStorePassword">tompass</Set> - <Set name="keyManagerPassword">tompass</Set> - <Set name="trustStore">./target/test-classes/server.jks</Set> - <Set name="trustStorePassword">tompass</Set> - <Set name="wantClientAuth">true</Set> - </New> - </Arg> - <Set name="port">${idp.https.port}</Set> - <Set name="maxIdleTime">30000</Set> - </New> - </Arg> - </Call> - - <Set name="handler"> - <New class="org.eclipse.jetty.server.handler.HandlerList"> - <Set name="handlers"> - <Array type="org.eclipse.jetty.server.Handler"> - <Item> - <New class="org.eclipse.jetty.webapp.WebAppContext"> - <Set name="contextPath">/fediz-idp</Set> - <Set name="war">./target/fediz-idp.war</Set> - <!--Set name="war">./target/jetty/idp/webapps/fediz-idp</Set--> - <Set name="throwUnavailableOnStartupException">true</Set> - </New> - </Item> - <Item> - <New class="org.eclipse.jetty.webapp.WebAppContext"> - <Set name="contextPath">/fediz-idp-sts</Set> - <!--<Set name="war">./target/jetty/idp/webapps/fediz-idp-sts</Set>--> - <Set name="war">./target/fediz-idp-sts.war</Set> - <Set name="throwUnavailableOnStartupException">true</Set> - </New> - </Item> - </Array> - </Set> - </New> - </Set> - -</Configure> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c953c811/systests/spring/src/test/resources/rp-server.xml ---------------------------------------------------------------------- diff --git a/systests/spring/src/test/resources/rp-server.xml b/systests/spring/src/test/resources/rp-server.xml deleted file mode 100644 index f61c3c4..0000000 --- a/systests/spring/src/test/resources/rp-server.xml +++ /dev/null @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd";> - -<Configure id="RPServer" class="org.eclipse.jetty.server.Server"> - - <Call class="org.eclipse.jetty.util.log.Log" name="getRootLogger"> - <Call name="setDebugEnabled"> - <Arg type="boolean">true</Arg> - </Call> - </Call> - - <Call name="addConnector"> - <Arg> - <New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector"> - <Arg> - <New class="org.eclipse.jetty.http.ssl.SslContextFactory"> - <Set name="keyStore">./target/test-classes/server.jks</Set> - <Set name="keyStorePassword">tompass</Set> - <Set name="keyManagerPassword">tompass</Set> - </New> - </Arg> - <Set name="port">${rp.https.port}</Set> - <Set name="maxIdleTime">30000</Set> - </New> - </Arg> - </Call> - - <Set name="handler"> - <New class="org.eclipse.jetty.server.handler.HandlerList"> - <Set name="handlers"> - <Array type="org.eclipse.jetty.server.Handler"> - <Item> - <New class="org.eclipse.jetty.webapp.WebAppContext"> - <Set name="contextPath">/fedizhelloworld</Set> - <Set name="war">./target/fediz-systests-webapps-spring.war</Set> - <Set name="throwUnavailableOnStartupException">true</Set> - </New> - </Item> - <Item> - <New class="org.eclipse.jetty.webapp.WebAppContext"> - <Set name="contextPath">/fedizhelloworld_spring2</Set> - <Set name="war">./target/fediz-systests-webapps-spring2.war</Set> - <Set name="throwUnavailableOnStartupException">true</Set> - </New> - </Item> - </Array> - </Set> - </New> - </Set> - -</Configure>
