Scarab commit: svn commit: r11058 - trunk/tomcat: conf webapps
[email protected] Mon, 5 Dec 2011 07:04:48 -0800 (PST)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: dabbous
Date: 2011-12-05 07:04:47-0800
New Revision: 11058
Modified:
trunk/tomcat/conf/server.xml
trunk/tomcat/webapps/scarab.xml
Log:
revert unintentional checkin of local tomcat configuration
Modified: trunk/tomcat/conf/server.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/tomcat/conf/server.xml?view=diff&pathrev=11058&r1=11057&r2=11058
==============================================================================
--- trunk/tomcat/conf/server.xml (original)
+++ trunk/tomcat/conf/server.xml 2011-12-05 07:04:47-0800
@@ -1,68 +1,47 @@
<Server port="8035" shutdown="SHUTDOWN" debug="0">
<Service name="Tomcat-Standalone">
- <!--
- <Connector className = "org.apache.coyote.tomcat4.CoyoteConnector"
- port = "8080"
- minProcessors = "5"
- maxProcessors = "75"
+ <Connector className = "org.apache.coyote.tomcat4.CoyoteConnector"
+ port = "8080"
+ minProcessors = "5"
+ maxProcessors = "75"
enableLookups = "true"
- redirectPort = "8443"
- acceptCount = "10"
- debug = "0"
- connectionTimeout= "60000"
- proxyHost="issues.machinimatrix.org"
- proxyPort="80"
+ redirectPort = "8443"
+ acceptCount = "10"
+ debug = "0"
+ connectionTimeout= "60000"
useURIValidationHack="false"
- compression="off"
- />
- -->
-
- <Connector className = "org.apache.coyote.tomcat4.CoyoteConnector"
- port = "7070"
- minProcessors = "5"
- maxProcessors = "75"
- enableLookups = "true"
- redirectPort = "8443"
- acceptCount = "10"
- debug = "0"
- connectionTimeout= "60000"
- useURIValidationHack="false"
- compression="off"
- />
-
+ compression="off"/>
-
- <Engine name = "Standalone"
- defaultHost = "localhost"
+ <Engine name = "Standalone"
+ defaultHost = "localhost"
debug = "0">
- <Logger className = "org.apache.catalina.logger.FileLogger"
- prefix = "catalina_log."
- suffix = ".txt"
+ <Logger className = "org.apache.catalina.logger.FileLogger"
+ prefix = "catalina_log."
+ suffix = ".txt"
timestamp = "true"/>
<Realm className = "org.apache.catalina.realm.MemoryRealm" />
- <Host name = "localhost"
- debug = "0"
- appBase = "webapps"
- unpackWARs = "true"
+ <Host name = "localhost"
+ debug = "0"
+ appBase = "webapps"
+ unpackWARs = "true"
autoDeploy = "true">
- <Valve className = "org.apache.catalina.valves.AccessLogValve"
- directory = "logs"
- prefix = "localhost_access_log."
- suffix = ".txt"
+ <Valve className = "org.apache.catalina.valves.AccessLogValve"
+ directory = "logs"
+ prefix = "localhost_access_log."
+ suffix = ".txt"
pattern = "common"/>
- <Logger className = "org.apache.catalina.logger.FileLogger"
- directory = "logs"
- prefix = "localhost_log."
- suffix = ".txt"
+ <Logger className = "org.apache.catalina.logger.FileLogger"
+ directory = "logs"
+ prefix = "localhost_log."
+ suffix = ".txt"
timestamp = "true"/>
</Host>
</Engine>
</Service>
</Server>
-
Modified: trunk/tomcat/webapps/scarab.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/tomcat/webapps/scarab.xml?view=diff&pathrev=11058&r1=11057&r2=11058
==============================================================================
--- trunk/tomcat/webapps/scarab.xml (original)
+++ trunk/tomcat/webapps/scarab.xml 2011-12-05 07:04:47-0800
@@ -3,7 +3,7 @@
<!--
The docBase attribute defines where Tomcat looks for the Scarab webapp.
-->
-<Context path="/clarify" docBase="../../target/scarab" debug="0" reloadable="true">
+<Context path="/scarab" docBase="../../target/scarab" debug="0" reloadable="true">
<Logger className="org.apache.catalina.logger.FileLogger"
prefix="scarab_log." suffix=".txt"
timestamp="true"/>
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2890584