You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2003/04/11 01:54:43 UTC
cvs commit: avalon-apps/httpproxy/src/conf httpproxy-assembly.xml httpproxy-config.xml httpproxy-environment.xml
donaldp 2003/04/10 16:54:43
Modified: httpproxy/src/conf httpproxy-assembly.xml
httpproxy-config.xml httpproxy-environment.xml
Log:
styled
Revision Changes Path
1.6 +9 -9 avalon-apps/httpproxy/src/conf/httpproxy-assembly.xml
Index: httpproxy-assembly.xml
===================================================================
RCS file: /home/cvs/avalon-apps/httpproxy/src/conf/httpproxy-assembly.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- httpproxy-assembly.xml 12 May 2002 06:09:09 -0000 1.5
+++ httpproxy-assembly.xml 10 Apr 2003 23:54:43 -0000 1.6
@@ -1,27 +1,27 @@
<?xml version="1.0"?>
-<!DOCTYPE assembly PUBLIC "-//PHOENIX/Assembly DTD Version 1.0//EN"
+<!DOCTYPE assembly PUBLIC "-//PHOENIX/Assembly DTD Version 1.0//EN"
"http://jakarta.apache.org/phoenix/assembly_1_0.dtd">
<assembly>
<!-- The ThreadManager block -->
<block class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager"
- name="thread-manager" />
+ name="thread-manager"/>
<!-- The Connection Manager block -->
<block class="org.apache.avalon.cornerstone.blocks.connection.DefaultConnectionManager"
name="connections">
<provide name="thread-manager"
- role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
+ role="org.apache.avalon.cornerstone.services.threads.ThreadManager"/>
</block>
<!-- The Socket Manager block -->
- <block class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketManager" name="sockets" />
+ <block class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketManager" name="sockets"/>
<!-- The TimeScheduler block -->
<block class="org.apache.avalon.cornerstone.blocks.scheduler.DefaultTimeScheduler" name="scheduler">
<provide name="thread-manager"
- role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
+ role="org.apache.avalon.cornerstone.services.threads.ThreadManager"/>
</block>
<!-- -->
@@ -29,19 +29,19 @@
<!-- -->
<block class="org.apache.avalon.httpproxy.DefaultHttpAuditingProxyServer"
- name="httpproxyserver-Auditing" >
+ name="httpproxyserver-Auditing">
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
- role="org.apache.avalon.cornerstone.services.connection.ConnectionManager" />
+ role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
</block>
<block class="org.apache.avalon.httpproxy.DefaultHttpFilteringProxyServer"
- name="httpproxyserver-Filtering" >
+ name="httpproxyserver-Filtering">
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
- role="org.apache.avalon.cornerstone.services.connection.ConnectionManager" />
+ role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
</block>
</assembly>
1.5 +6 -6 avalon-apps/httpproxy/src/conf/httpproxy-config.xml
Index: httpproxy-config.xml
===================================================================
RCS file: /home/cvs/avalon-apps/httpproxy/src/conf/httpproxy-config.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- httpproxy-config.xml 4 Apr 2003 22:04:07 -0000 1.4
+++ httpproxy-config.xml 10 Apr 2003 23:54:43 -0000 1.5
@@ -22,12 +22,12 @@
<sockets>
<server-sockets>
<factory name="plain"
- class="org.apache.avalon.cornerstone.blocks.sockets.DefaultServerSocketFactory" />
+ class="org.apache.avalon.cornerstone.blocks.sockets.DefaultServerSocketFactory"/>
</server-sockets>
<client-sockets>
<factory name="plain"
- class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketFactory" />
+ class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketFactory"/>
</client-sockets>
</sockets>
@@ -48,12 +48,12 @@
</httpproxyhandler-Filtering>
<blocked-domains>
- <blocked-domain domain-name="doubleclick.net" />
- <blocked-domain domain-name="akamai.net" />
+ <blocked-domain domain-name="doubleclick.net"/>
+ <blocked-domain domain-name="akamai.net"/>
</blocked-domains>
<cookies-allowed-domains>
- <cookies-allowed-domain domain-name="yahoo.co.uk" />
- <cookies-allowed-domain domain-name="yahoo.com" />
+ <cookies-allowed-domain domain-name="yahoo.co.uk"/>
+ <cookies-allowed-domain domain-name="yahoo.com"/>
</cookies-allowed-domains>
</httpproxyserver-Filtering>
1.6 +2 -7 avalon-apps/httpproxy/src/conf/httpproxy-environment.xml
Index: httpproxy-environment.xml
===================================================================
RCS file: /home/cvs/avalon-apps/httpproxy/src/conf/httpproxy-environment.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- httpproxy-environment.xml 4 Apr 2003 22:03:24 -0000 1.5
+++ httpproxy-environment.xml 10 Apr 2003 23:54:43 -0000 1.6
@@ -1,12 +1,7 @@
<?xml version="1.0"?>
<environment>
-
<logs>
-
- <category name="" target="default" priority="DEBUG" />
-
- <log-target name="default" location="/logs/httpproxy.log" />
-
+ <category name="" target="default" priority="DEBUG"/>
+ <log-target name="default" location="/logs/httpproxy.log"/>
</logs>
-
</environment>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org