Author: markt
Date: Sun Nov 16 15:07:52 2008
New Revision: 718140
URL: http://svn.apache.org/viewvc?rev=718140&view=rev
Log:
Revert accidental changes in r718133
Modified:
tomcat/trunk/.classpath
tomcat/trunk/conf/server.xml
Modified: tomcat/trunk/.classpath
URL:
http://svn.apache.org/viewvc/tomcat/trunk/.classpath?rev=718140&r1=718139&r2=718140&view=diff
==============================================================================
--- tomcat/trunk/.classpath (original)
+++ tomcat/trunk/.classpath Sun Nov 16 15:07:52 2008
@@ -1,11 +1,27 @@
<?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.
+-->
<classpath>
- <classpathentry
excluding="**/.svn/**|org/apache/naming/factory/webservices/" kind="src"
path="java"/>
+ <classpathentry
excluding="**/.svn/**|org/apache/naming/factory/webservices/" kind="src"
path="java"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="src" path="webapps/examples/WEB-INF/classes"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_16"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/eclipse/plugins/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar"/>
- <classpathentry kind="var"
path="TOMCAT_LIBS_BASE/json-20080701/json.jar"/>
+ <classpathentry kind="var"
path="TOMCAT_LIBS_BASE/json-20080701/json.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
<classpathentry kind="lib" path="output/extras/webservices/jaxrpc.jar"/>
Modified: tomcat/trunk/conf/server.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/server.xml?rev=718140&r1=718139&r2=718140&view=diff
==============================================================================
--- tomcat/trunk/conf/server.xml (original)
+++ tomcat/trunk/conf/server.xml Sun Nov 16 15:07:52 2008
@@ -78,10 +78,11 @@
This connector uses the JSSE configuration, when using APR, the
connector should be using the OpenSSL style configuration
described in the APR documentation -->
+ <!--
<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
maxThreads="150" scheme="https" secure="true"
- clientAuth="false" sslProtocol="TLS"
- keystoreFile="conf/.keystore" />
+ clientAuth="false" sslProtocol="TLS" />
+ -->
<!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
