Updated Branches: refs/heads/master 048489860 -> 171f01703
WICKET-5412 Move jetty-xyz.xml to src/test/jetty folder Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/171f0170 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/171f0170 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/171f0170 Branch: refs/heads/master Commit: 171f01703fe48bbe39e7703eb1bb00e30856155f Parents: 0af9723 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Nov 11 10:50:35 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Nov 11 11:26:11 2013 +0200 ---------------------------------------------------------------------- .../archetype-resources/jetty-http.xml | 38 ----------------- .../archetype-resources/jetty-https.xml | 45 -------------------- .../resources/archetype-resources/jetty-ssl.xml | 36 ---------------- .../main/resources/archetype-resources/pom.xml | 2 +- 4 files changed, 1 insertion(+), 120 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/171f0170/archetypes/quickstart/src/main/resources/archetype-resources/jetty-http.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/jetty-http.xml b/archetypes/quickstart/src/main/resources/archetype-resources/jetty-http.xml deleted file mode 100644 index 9f3256b..0000000 --- a/archetypes/quickstart/src/main/resources/archetype-resources/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 http://git-wip-us.apache.org/repos/asf/wicket/blob/171f0170/archetypes/quickstart/src/main/resources/archetype-resources/jetty-https.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/jetty-https.xml b/archetypes/quickstart/src/main/resources/archetype-resources/jetty-https.xml deleted file mode 100644 index 58f7d53..0000000 --- a/archetypes/quickstart/src/main/resources/archetype-resources/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 http://git-wip-us.apache.org/repos/asf/wicket/blob/171f0170/archetypes/quickstart/src/main/resources/archetype-resources/jetty-ssl.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/jetty-ssl.xml b/archetypes/quickstart/src/main/resources/archetype-resources/jetty-ssl.xml deleted file mode 100644 index 682a2e8..0000000 --- a/archetypes/quickstart/src/main/resources/archetype-resources/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 http://git-wip-us.apache.org/repos/asf/wicket/blob/171f0170/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml index e4ecc59..bfd8d58 100644 --- a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml @@ -168,7 +168,7 @@ <value>${project.build.directory}/test-classes</value> </systemProperty> </systemProperties> - <jettyXml>${project.basedir}/jetty.xml,${project.basedir}/jetty-ssl.xml,${project.basedir}/jetty-http.xml,${project.basedir}/jetty-https.xml</jettyXml> + <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> <plugin>
