From b8eb2a799a89c410a74b2f9943e184d57d76365b Mon Sep 17 00:00:00 2001
From: diego <diego.pardo.martin@gmail.com>
Date: Thu, 1 Sep 2016 23:50:24 +0200
Subject: [PATCH] Removed unnecessary configuration.

---
 wicket-intro/WicketIntro/pom.xml              |   9 ----
 .../WicketIntro/src/test/jetty/jetty-http.xml |  38 ---------------
 .../src/test/jetty/jetty-https.xml            |  45 ------------------
 .../WicketIntro/src/test/jetty/jetty-ssl.xml  |  36 --------------
 .../WicketIntro/src/test/jetty/jetty.xml      |  23 ---------
 .../WicketIntro/src/test/resources/keystore   | Bin 1481 -> 0 bytes
 6 files changed, 151 deletions(-)
 delete mode 100644 wicket-intro/WicketIntro/src/test/jetty/jetty-http.xml
 delete mode 100644 wicket-intro/WicketIntro/src/test/jetty/jetty-https.xml
 delete mode 100644 wicket-intro/WicketIntro/src/test/jetty/jetty-ssl.xml
 delete mode 100644 wicket-intro/WicketIntro/src/test/jetty/jetty.xml
 delete mode 100644 wicket-intro/WicketIntro/src/test/resources/keystore

diff --git a/wicket-intro/WicketIntro/pom.xml b/wicket-intro/WicketIntro/pom.xml
index c6a1a4985d..f4b1d0e11c 100644
--- a/wicket-intro/WicketIntro/pom.xml
+++ b/wicket-intro/WicketIntro/pom.xml
@@ -107,15 +107,6 @@
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
                 <version>${jetty9.version}</version>
-                <configuration>
-                    <systemProperties>
-                        <systemProperty>
-                            <name>maven.project.build.directory.test-classes</name>
-                            <value>${project.build.directory}/test-classes</value>
-                        </systemProperty>
-                    </systemProperties>
-                    <jettyXml>${project.basedir}/src/test/jetty/jetty.xml,${project.basedir}/src/test/jetty/jetty-ssl.xml,${project.basedir}/src/test/jetty/jetty-http.xml,${project.basedir}/src/test/jetty/jetty-https.xml</jettyXml>
-                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/wicket-intro/WicketIntro/src/test/jetty/jetty-http.xml b/wicket-intro/WicketIntro/src/test/jetty/jetty-http.xml
deleted file mode 100644
index 9f3256b15c..0000000000
--- a/wicket-intro/WicketIntro/src/test/jetty/jetty-http.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-<!-- ============================================================= -->
-<!-- Configure the Jetty Server instance with an ID "Server"       -->
-<!-- by adding a HTTP connector.                                   -->
-<!-- This configuration must be used in conjunction with jetty.xml -->
-<!-- ============================================================= -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-  <!-- =========================================================== -->
-  <!-- Add a HTTP Connector.                                       -->
-  <!-- Configure an o.e.j.server.ServerConnector with a single     -->
-  <!-- HttpConnectionFactory instance using the common httpConfig  -->
-  <!-- instance defined in jetty.xml                               -->
-  <!--                                                             -->
-  <!-- Consult the javadoc of o.e.j.server.ServerConnector and     -->
-  <!-- o.e.j.server.HttpConnectionFactory for all configuration    -->
-  <!-- that may be set here.                                       -->
-  <!-- =========================================================== -->
-  <Call name="addConnector">
-    <Arg>
-      <New class="org.eclipse.jetty.server.ServerConnector">
-        <Arg name="server"><Ref refid="Server" /></Arg>
-        <Arg name="factories">
-          <Array type="org.eclipse.jetty.server.ConnectionFactory">
-            <Item>
-              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-                <Arg name="config"><Ref refid="httpConfig" /></Arg>
-              </New>
-            </Item>
-          </Array>
-        </Arg>
-        <Set name="host"><Property name="jetty.host" /></Set>
-        <Set name="port"><Property name="jetty.port" default="8080" /></Set>
-        <Set name="idleTimeout"><Property name="http.timeout" default="30000"/></Set>
-      </New>
-    </Arg>
-  </Call>
-</Configure>
\ No newline at end of file
diff --git a/wicket-intro/WicketIntro/src/test/jetty/jetty-https.xml b/wicket-intro/WicketIntro/src/test/jetty/jetty-https.xml
deleted file mode 100644
index 58f7d53d2d..0000000000
--- a/wicket-intro/WicketIntro/src/test/jetty/jetty-https.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-<!-- ============================================================= -->
-<!-- Configure a HTTPS connector.                                  -->
-<!-- This configuration must be used in conjunction with jetty.xml -->
-<!-- and jetty-ssl.xml.                                            -->
-<!-- ============================================================= -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-  <!-- =========================================================== -->
-  <!-- Add a HTTPS Connector.                                      -->
-  <!-- Configure an o.e.j.server.ServerConnector with connection   -->
-  <!-- factories for TLS (aka SSL) and HTTP to provide HTTPS.      -->
-  <!-- All accepted TLS connections are wired to a HTTP connection.-->
-  <!--                                                             -->
-  <!-- Consult the javadoc of o.e.j.server.ServerConnector,        -->
-  <!-- o.e.j.server.SslConnectionFactory and                       -->
-  <!-- o.e.j.server.HttpConnectionFactory for all configuration    -->
-  <!-- that may be set here.                                       -->
-  <!-- =========================================================== -->
-  <Call id="httpsConnector" name="addConnector">
-    <Arg>
-      <New class="org.eclipse.jetty.server.ServerConnector">
-        <Arg name="server"><Ref refid="Server" /></Arg>
-          <Arg name="factories">
-            <Array type="org.eclipse.jetty.server.ConnectionFactory">
-              <Item>
-                <New class="org.eclipse.jetty.server.SslConnectionFactory">
-                  <Arg name="next">http/1.1</Arg>
-                  <Arg name="sslContextFactory"><Ref refid="sslContextFactory"/></Arg>
-                </New>
-              </Item>
-              <Item>
-                <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-                  <Arg name="config"><Ref refid="sslHttpConfig"/></Arg>
-                </New>
-              </Item>
-            </Array>
-          </Arg>
-          <Set name="host"><Property name="jetty.host" /></Set>
-          <Set name="port"><Property name="jetty.https.port" default="8443" /></Set>
-          <Set name="idleTimeout">30000</Set>
-        </New>
-    </Arg>
-  </Call>
-</Configure>
\ No newline at end of file
diff --git a/wicket-intro/WicketIntro/src/test/jetty/jetty-ssl.xml b/wicket-intro/WicketIntro/src/test/jetty/jetty-ssl.xml
deleted file mode 100644
index 49e558bb47..0000000000
--- a/wicket-intro/WicketIntro/src/test/jetty/jetty-ssl.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-<!-- ============================================================= -->
-<!-- Configure a TLS (SSL) Context Factory                         -->
-<!-- This configuration must be used in conjunction with jetty.xml -->
-<!-- and either jetty-https.xml or jetty-spdy.xml (but not both)   -->
-<!-- ============================================================= -->
-<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-  <Set name="KeyStorePath"><Property name="maven.project.build.directory.test-classes" default="." />/<Property name="jetty.keystore" default="keystore"/></Set>
-  <Set name="KeyStorePassword"><Property name="jetty.keystore.password" default="wicket"/></Set>
-  <Set name="KeyManagerPassword"><Property name="jetty.keymanager.password" default="wicket"/></Set>
-  <Set name="EndpointIdentificationAlgorithm"></Set>
-  <Set name="ExcludeCipherSuites">
-    <Array type="String">
-      <Item>SSL_RSA_WITH_DES_CBC_SHA</Item>
-      <Item>SSL_DHE_RSA_WITH_DES_CBC_SHA</Item>
-      <Item>SSL_DHE_DSS_WITH_DES_CBC_SHA</Item>
-      <Item>SSL_RSA_EXPORT_WITH_RC4_40_MD5</Item>
-      <Item>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
-      <Item>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
-      <Item>SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</Item>
-    </Array>
-  </Set>
-  <!-- =========================================================== -->
-  <!-- Create a TLS specific HttpConfiguration based on the        -->
-  <!-- common HttpConfiguration defined in jetty.xml               -->
-  <!-- Add a SecureRequestCustomizer to extract certificate and    -->
-  <!-- session information                                         -->
-  <!-- =========================================================== -->
-  <New id="sslHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-    <Arg><Ref refid="httpConfig"/></Arg>
-    <Call name="addCustomizer">
-      <Arg><New class="org.eclipse.jetty.server.SecureRequestCustomizer"/></Arg>
-    </Call>
-  </New>
-</Configure>
\ No newline at end of file
diff --git a/wicket-intro/WicketIntro/src/test/jetty/jetty.xml b/wicket-intro/WicketIntro/src/test/jetty/jetty.xml
deleted file mode 100644
index 1a6293b405..0000000000
--- a/wicket-intro/WicketIntro/src/test/jetty/jetty.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-<!-- ============================================================= -->
-<!-- Configure a HTTP connector.                                  -->
-<!-- ============================================================= -->
-<Configure>
-	<New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-		<Set name="secureScheme">https</Set>
-		<Set name="securePort">
-			<Property name="jetty.secure.port" default="8443" />
-		</Set>
-		<Set name="outputBufferSize">32768</Set>
-		<Set name="requestHeaderSize">8192</Set>
-		<Set name="responseHeaderSize">8192</Set>
-		<Set name="sendServerVersion">true</Set>
-		<Set name="sendDateHeader">false</Set>
-		<Set name="headerCacheSize">512</Set>
-
-		<!-- Uncomment to enable handling of X-Forwarded- style headers <Call name="addCustomizer"> -->
-		<!-- <Arg><New class="org.eclipse.jetty.server.ForwardedRequestCustomizer"/></Arg> -->
-		<!-- </Call> -->
-	</New>
-</Configure>
\ No newline at end of file
diff --git a/wicket-intro/WicketIntro/src/test/resources/keystore b/wicket-intro/WicketIntro/src/test/resources/keystore
deleted file mode 100644
index 30bbc90ccffcc2745adf09077df16fc3db9c0b47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1481
zcmezO_TO6u1_mY|W&~r_tkjZ{N+8cDIXV0qP-d4w6Vo;WJ~l3GHbxdkEha%mMpg!v
zCZ<Ineb;9(Zo2$C{b0g`PqXVks($)gBy_HcNxpQMXH7!%Q$K^YIlUp#9M=x4Nc$77
z?YHw$knfe0?M<2rTMza`|G#XrQSpcNu9_1)>XF+L+yeb(_D>eh5NdK;{zR}$;>(o{
zE3dg|o8B)~5ILLXvtIl5>N#JOOd1Wnqs3o|CH&_3)%k6yk>9%q<*Th*+pP{h`8MfJ
zi<W9kXv|hI+mMAk3@6)bc{EBiy(_(}m@P|LUv1ZkI8<gDDtNDcyIsnMB|)kz^US4t
zIkr5A;}lSuoNseJ%e$m?f7ut$D>*YvUmF+Z?t0^x!WMEPBj(9H=gC$Rl(ii9d&)j3
zbTLZUo^$C9pTUfx#bzsWYP%dfFaJ7`%~pJY<=Y|t;J>bqocFORJ8`)y%bsft`MuQV
z>{(ffqGR9Jv){6}VE@M8vig|blV9STFXpbA!u05_iEyhlhqkKZ;q9M!rpxs*tJ<*3
zhiWIa`fr}ezEJ&I{N<JL=O%By?zqS`>D#6cX8iNm8;zH2RodQ=n#@<so$Hg99T9Qw
z+c9RV+zVIIx6S{foA*-l=e*~;qwDgvDCru98ok@_Tqh`2@7Rp_lZ($)?>cCC<oS`{
z51Xx5_&WJ8GkH5^KHQzY^o!iu&QPP-xA#0zUiWDFpYo5h8WXhj?^K^P&fsNh*>Or|
zTXCYzlEX`7T5ANh+?d0qlI6dJ@sW+nZle@FF~#KRKmX0;w|%=dD0Q*hi_hY5Y{CW4
zrOJiNd#@bdbya1dHCyZRTmE&^ii4i-IJn9!!^(ZV)t=3cyTYEANN&*o!@WvnMVp(G
z{s(U^qqZe`enoqQPhO)mduP<X^-1A#zHc(Da{0KO>*#-L_kTKzrv7mI-@Dg3P;OV0
z+>^?;+IITpTAR2zDn5LAd`IV(R$N{5^Homy`Hv1=mC|&FB<Kh|Qv*w2LOuyh$VY)#
zZvitCBNG#gUw-LS170>xtu~Lg@4UcN&B|cVxXe%hnAVv?S=fZxL-Vrp^2_sJA{-bZ
z><AHc167bNE@8Qlj8p~3g2ZGX6`Y?|Ql40ps^FGinwOGTl9``pC}to6QphdL3sn@J
znVg+kVyJ7N4H9P-RzVS02rLE47ndX!l_)r;7L{bCWhN(<q#DSH^BNi&SQ;7|ni`oH
zm_~{78iBY5Q0~z2NaK9uH~<zc%#FRkc<5wmY-E_Xvj2D3|NE)$^%=XX9K+|Io1nn?
zXlitY!^BHm$KFU~`N}Q7_2%$Ad)qSJ)RY-%FS6LrFDenv654U;m~ey{`-#0v)@u3~
zu9GjhkhQYJL-))d)B9$L4c{NXi#)~fU5Qic^5w1%Ya9bTybQz_uMhq&bHU(p+2>z>
zKgGsI?`g4Czs|(W$iRr~JYW)G2D&RF+G&cYMyt~S#qC>9<X1-Db9g>Yo8yjfwPfwA
z__FOSvwctPaoU&=rO7Hf`?L)EoW48GpSg3HG`N>Wh@H&bQ>GZp6P=NEzJCF4QTtMF
zyCu^XE;=4q;eAoe&u6Fp<&$m~Ic0x)r`Sfd8H?)QbE`9U3bGFi_@iY1?tkt><A6HZ
Z+rBwcor(9jMYJRnHf=I>-^;Q{1ps`KMkD|L