You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by co...@apache.org on 2002/04/20 13:32:31 UTC
cvs commit: jakarta-avalon-apps/httpproxy/src/conf httpproxy-assembly.xml httpproxy-config.xml httpproxy-environment.xml
colus 02/04/20 04:32:31
Modified: httpproxy/src/conf httpproxy-assembly.xml
httpproxy-config.xml httpproxy-environment.xml
Log:
Restyled.
Removed unused blocks.
Revision Changes Path
1.4 +39 -48 jakarta-avalon-apps/httpproxy/src/conf/httpproxy-assembly.xml
Index: httpproxy-assembly.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/httpproxy/src/conf/httpproxy-assembly.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- httpproxy-assembly.xml 15 Jan 2002 10:47:50 -0000 1.3
+++ httpproxy-assembly.xml 20 Apr 2002 11:32:31 -0000 1.4
@@ -2,53 +2,44 @@
<assembly>
- <!-- The Storage block -->
- <block class="org.apache.avalon.cornerstone.blocks.masterstore.RepositoryManager"
- name="objectstorage" />
-
- <!-- The Packet Manager block -->
- <block class="org.apache.avalon.cornerstone.blocks.packet.DefaultPacketManager"
- name="packet-manager">
- <provide name="thread-manager"
- role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
- </block>
-
- <!-- The ThreadManager block -->
- <block class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager"
- 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" />
- </block>
-
- <!-- The Socket Manager block -->
- <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" />
- </block>
-
- <!-- -->
- <!-- Below this section are the demo blocks -->
- <!-- -->
-
- <block class="org.apache.avalon.httpproxy.DefaultHttpAuditingProxyServer"
- 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" />
- </block>
-
- <block class="org.apache.avalon.httpproxy.DefaultHttpFilteringProxyServer"
- 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" />
- </block>
+ <!-- The ThreadManager block -->
+ <block class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager"
+ 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" />
+ </block>
+
+ <!-- The Socket Manager block -->
+ <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" />
+ </block>
+
+ <!-- -->
+ <!-- Below this section are the demo blocks -->
+ <!-- -->
+
+ <block class="org.apache.avalon.httpproxy.DefaultHttpAuditingProxyServer"
+ 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" />
+ </block>
+
+ <block class="org.apache.avalon.httpproxy.DefaultHttpFilteringProxyServer"
+ 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" />
+ </block>
</assembly>
1.3 +54 -86 jakarta-avalon-apps/httpproxy/src/conf/httpproxy-config.xml
Index: httpproxy-config.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/httpproxy/src/conf/httpproxy-config.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- httpproxy-config.xml 21 Nov 2001 17:23:07 -0000 1.2
+++ httpproxy-config.xml 20 Apr 2002 11:32:31 -0000 1.3
@@ -7,91 +7,59 @@
-->
<config>
- <thread-manager>
- <thread-group>
- <name>default</name>
-
- <!-- normal priority == 5, max-priority = 10 -->
- <priority>5</priority>
-
- <!-- are threads deamon threads ? -->
- <is-daemon>false</is-daemon>
-
- <max-threads>40</max-threads>
- <!-- these are ignored at the moment but will be fixed in later revisions -->
- <min-threads>20</min-threads>
- <min-spare-threads>20</min-spare-threads>
- </thread-group>
- </thread-manager>
-
- <!-- The Storage block -->
- <objectstorage>
- <repositories>
- <repository class="org.apache.avalon.cornerstone.blocks.masterstore.File_Persistent_Object_Repository">
- <protocols>
- <protocol>file</protocol>
- </protocols>
- <types>
- <type>OBJECT</type>
- </types>
- <models>
- <model>SYNCHRONOUS</model>
- <model>ASYNCHRONOUS</model>
- <model>CACHE</model>
- </models>
- </repository>
- <repository class="org.apache.avalon.cornerstone.blocks.masterstore.File_Persistent_Stream_Repository">
- <protocols>
- <protocol>file</protocol>
- </protocols>
- <types>
- <type>STREAM</type>
- </types>
- <models>
- <model>SYNCHRONOUS</model>
- <model>ASYNCHRONOUS</model>
- <model>CACHE</model>
- </models>
- </repository>
- </repositories>
- </objectstorage>
-
- <sockets>
- <server-sockets>
- <factory name="plain"
- class="org.apache.avalon.cornerstone.blocks.sockets.DefaultServerSocketFactory" />
- </server-sockets>
-
- <client-sockets>
- <factory name="plain"
- class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketFactory" />
- </client-sockets>
- </sockets>
-
- <httpproxyserver-Auditing>
- <listen-port>9997</listen-port>
- <bind>127.0.0.1</bind>
- <httpproxyhandler-Auditing>
- <connectiontimeout>360000</connectiontimeout>
- </httpproxyhandler-Auditing>
- </httpproxyserver-Auditing>
-
- <httpproxyserver-Filtering>
- <listen-port>9998</listen-port>
- <fforward-to-another-proxy>localhost:9997</fforward-to-another-proxy>
- <bind>127.0.0.1</bind>
- <httpproxyhandler-Filtering>
- <connectiontimeout>360000</connectiontimeout>
- </httpproxyhandler-Filtering>
-
- <blocked-domains>
- <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-domains>
- </httpproxyserver-Filtering>
+ <thread-manager>
+ <thread-group>
+ <name>default</name>
+
+ <!-- normal priority == 5, max-priority = 10 -->
+ <priority>5</priority>
+
+ <!-- are threads deamon threads ? -->
+ <is-daemon>false</is-daemon>
+
+ <max-threads>40</max-threads>
+ <!-- these are ignored at the moment but will be fixed in later revisions -->
+ <min-threads>20</min-threads>
+ <min-spare-threads>20</min-spare-threads>
+ </thread-group>
+ </thread-manager>
+
+ <sockets>
+ <server-sockets>
+ <factory name="plain"
+ class="org.apache.avalon.cornerstone.blocks.sockets.DefaultServerSocketFactory" />
+ </server-sockets>
+
+ <client-sockets>
+ <factory name="plain"
+ class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketFactory" />
+ </client-sockets>
+ </sockets>
+
+ <httpproxyserver-Auditing>
+ <listen-port>9997</listen-port>
+ <bind>127.0.0.1</bind>
+ <httpproxyhandler-Auditing>
+ <connectiontimeout>360000</connectiontimeout>
+ </httpproxyhandler-Auditing>
+ </httpproxyserver-Auditing>
+
+ <httpproxyserver-Filtering>
+ <listen-port>9998</listen-port>
+ <fforward-to-another-proxy>localhost:9997</fforward-to-another-proxy>
+ <bind>127.0.0.1</bind>
+ <httpproxyhandler-Filtering>
+ <connectiontimeout>360000</connectiontimeout>
+ </httpproxyhandler-Filtering>
+
+ <blocked-domains>
+ <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-domains>
+ </httpproxyserver-Filtering>
</config>
1.2 +7 -9 jakarta-avalon-apps/httpproxy/src/conf/httpproxy-environment.xml
Index: httpproxy-environment.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/httpproxy/src/conf/httpproxy-environment.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpproxy-environment.xml 21 Nov 2001 17:03:32 -0000 1.1
+++ httpproxy-environment.xml 20 Apr 2002 11:32:31 -0000 1.2
@@ -9,18 +9,16 @@
<logs>
- <category name="" target="default" priority="DEBUG" />
- <category name="objectstorage" target="objectstorage-target" priority="DEBUG" />
- <category name="simple-server" target="simple-server" priority="DEBUG" />
- <log-target name="default" location="/logs/avalon-demo.log" />
- <log-target name="objectstorage-target" location="/logs/objectstorage.log" />
- <log-target name="simple-server" location="/logs/simple-server.log" />
+ <category name="" target="default" priority="DEBUG" />
+
+ <log-target name="default" location="/logs/avalon-demo.log" />
+
</logs>
<policy>
- <grant code-base="file:${app.home}${/}SAR-INF${/}lib${/}*">
- <permission class="java.security.AllPermission" />
- </grant>
+ <grant code-base="file:${app.home}${/}SAR-INF${/}lib${/}*">
+ <permission class="java.security.AllPermission" />
+ </grant>
</policy>
</environment>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>