Removed unnecessary configuration.
This commit is contained in:
		
							parent
							
								
									cfebd40b42
								
							
						
					
					
						commit
						b8eb2a799a
					
				| @ -107,15 +107,6 @@ | |||||||
|                 <groupId>org.eclipse.jetty</groupId> |                 <groupId>org.eclipse.jetty</groupId> | ||||||
|                 <artifactId>jetty-maven-plugin</artifactId> |                 <artifactId>jetty-maven-plugin</artifactId> | ||||||
|                 <version>${jetty9.version}</version> |                 <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> |             </plugin> | ||||||
|         </plugins> |         </plugins> | ||||||
|     </build> |     </build> | ||||||
|  | |||||||
| @ -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> |  | ||||||
| @ -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> |  | ||||||
| @ -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> |  | ||||||
| @ -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> |  | ||||||
										
											Binary file not shown.
										
									
								
							
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user