avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: avalon-apps/sevak/src/demo/conf catalina-config.xml jetty-config.xml jo-config.xml
Date Fri, 04 Apr 2003 22:04:07 GMT
donaldp     2003/04/04 14:04:07

  Modified:    demo/src/conf avalon-altrmidemo-config.xml
                        avalon-demo-config.xml avalon-gluedemo-config.xml
               ftpserver/src/conf ftp-config.xml
               httpproxy/src/conf httpproxy-config.xml
               sevak/src/demo/conf catalina-config.xml jetty-config.xml
                        jo-config.xml
  Log:
  Remove junk comments.
  
  Revision  Changes    Path
  1.11      +6 -11     avalon-apps/demo/src/conf/avalon-altrmidemo-config.xml
  
  Index: avalon-altrmidemo-config.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/demo/src/conf/avalon-altrmidemo-config.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- avalon-altrmidemo-config.xml	1 Mar 2003 16:32:52 -0000	1.10
  +++ avalon-altrmidemo-config.xml	4 Apr 2003 22:04:06 -0000	1.11
  @@ -1,10 +1,5 @@
   <?xml version="1.0"?>
  -<!--
  -                                README!
   
  -    All blocks have full defaults so nothing is needed to make them run.
  -
  --->
   <config>
   
     <thread-manager>
  @@ -12,7 +7,7 @@
           <name>default</name>
   
           <!-- normal priority == 5, max-priority = 10 -->
  -        <priority>5</priority> 
  +        <priority>5</priority>
   
           <!-- are threads deamon threads ? -->
           <is-daemon>false</is-daemon>
  @@ -23,7 +18,7 @@
           <min-spare-threads>20</min-spare-threads>
         </thread-group>
     </thread-manager>
  -  
  +
     <sockets>
         <server-sockets>
           <factory name="plain"
  @@ -31,7 +26,7 @@
         </server-sockets>
   
         <client-sockets>
  -        <factory name="plain" 
  +        <factory name="plain"
                    class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketFactory"
/>
         </client-sockets>
     </sockets>
  @@ -56,16 +51,16 @@
     </altrmi-publisher>
   
     <altrmi-authenticator>
  -  </altrmi-authenticator>  
  +  </altrmi-authenticator>
   
     <altrmification-listener>
   
       <publisher>altrmi-publisher</publisher>
   
  -    <publish block="helloworldserver" 
  +    <publish block="helloworldserver"
         interfaceToPublish="org.apache.avalon.apps.demos.helloworldserver.HelloWorldServer"
         publishAsName="helloworld"/>
   
     </altrmification-listener>
  -  
  +
   </config>
  
  
  
  1.11      +4 -9      avalon-apps/demo/src/conf/avalon-demo-config.xml
  
  Index: avalon-demo-config.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/demo/src/conf/avalon-demo-config.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- avalon-demo-config.xml	1 Jan 2003 20:49:51 -0000	1.10
  +++ avalon-demo-config.xml	4 Apr 2003 22:04:06 -0000	1.11
  @@ -1,10 +1,5 @@
   <?xml version="1.0"?>
  -<!--
  -                                README!
   
  -    All blocks have full defaults so nothing is needed to make them run.
  -
  --->
   <config>
   
     <thread-manager>
  @@ -12,7 +7,7 @@
           <name>default</name>
   
           <!-- normal priority == 5, max-priority = 10 -->
  -        <priority>5</priority> 
  +        <priority>5</priority>
   
           <!-- are threads deamon threads ? -->
           <is-daemon>false</is-daemon>
  @@ -23,7 +18,7 @@
           <min-spare-threads>20</min-spare-threads>
         </thread-group>
     </thread-manager>
  -   
  +
     <sockets>
         <server-sockets>
           <factory name="plain"
  @@ -31,7 +26,7 @@
         </server-sockets>
   
         <client-sockets>
  -        <factory name="plain" 
  +        <factory name="plain"
                    class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketFactory"
/>
         </client-sockets>
     </sockets>
  @@ -42,7 +37,7 @@
         <helloworldhandler>
           <connectiontimeout>360000</connectiontimeout>
         </helloworldhandler>
  -      <test></test> 
  +      <test></test>
     </helloworldserver>
   
   </config>
  
  
  
  1.4       +8 -13     avalon-apps/demo/src/conf/avalon-gluedemo-config.xml
  
  Index: avalon-gluedemo-config.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/demo/src/conf/avalon-gluedemo-config.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- avalon-gluedemo-config.xml	19 Nov 2001 12:28:39 -0000	1.3
  +++ avalon-gluedemo-config.xml	4 Apr 2003 22:04:06 -0000	1.4
  @@ -1,10 +1,5 @@
   <?xml version="1.0"?>
  -<!--
  -                                README!
   
  -    All blocks have full defaults so nothing is needed to make them run.
  -
  --->
   <config>
   
     <thread-manager>
  @@ -12,7 +7,7 @@
           <name>default</name>
   
           <!-- normal priority == 5, max-priority = 10 -->
  -        <priority>5</priority> 
  +        <priority>5</priority>
   
           <!-- are threads deamon threads ? -->
           <is-daemon>false</is-daemon>
  @@ -23,7 +18,7 @@
           <min-spare-threads>20</min-spare-threads>
         </thread-group>
     </thread-manager>
  -  
  +
     <sockets>
         <server-sockets>
           <factory name="plain"
  @@ -31,7 +26,7 @@
         </server-sockets>
   
         <client-sockets>
  -        <factory name="plain" 
  +        <factory name="plain"
                    class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketFactory"
/>
         </client-sockets>
     </sockets>
  @@ -44,13 +39,13 @@
         </helloworldhandler>
     </helloworldserver>
   
  -  <glue-soapification>  
  +  <glue-soapification>
         <port>7998</port>
  -  </glue-soapification> 
  -  
  -  <soaphelloworldserver>  
  +  </glue-soapification>
  +
  +  <soaphelloworldserver>
         <pub-name>helloworld</pub-name>
  -  </soaphelloworldserver>  
  +  </soaphelloworldserver>
   
   
   </config>
  
  
  
  1.18      +27 -32    avalon-apps/ftpserver/src/conf/ftp-config.xml
  
  Index: ftp-config.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/ftpserver/src/conf/ftp-config.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ftp-config.xml	20 Jan 2003 15:23:01 -0000	1.17
  +++ ftp-config.xml	4 Apr 2003 22:04:07 -0000	1.18
  @@ -1,12 +1,7 @@
   <?xml version="1.0"?>
  -<!--
  -                                README!
   
  -    All blocks have full defaults so nothing is needed to make them run.
  -
  --->
   <config>
  -  
  +
   
     <!-- thread manager configuration -->
     <thread-manager>
  @@ -14,7 +9,7 @@
           <name>default</name>
   
           <!-- normal priority = 5, max-priority = 10 -->
  -        <priority>5</priority> 
  +        <priority>5</priority>
   
           <!-- are threads deamon threads ? -->
           <is-daemon>false</is-daemon>
  @@ -26,7 +21,7 @@
         </thread-group>
     </thread-manager>
   
  -  
  +
     <!-- socket configuration -->
     <sockets>
         <server-sockets>
  @@ -41,7 +36,7 @@
   
     <!-- ftp server specific configuration -->
     <ftp-server>
  -    
  +
       <!-- Ftp server host name
            The default host is the localhost. It can be used on a multi-homed host.
            In Linux the localhost IP is always 127.0.0.1. So specify the actual IP.
  @@ -57,43 +52,43 @@
   
       <!-- Ftp data port numbers to indicate the PASV data ports
            Default data port is 0 (means any available ports will be used).
  -         If the server is behind firewall, these are firewall holes. 
  +         If the server is behind firewall, these are firewall holes.
       <data-port-pool>10022,10023,10024,10025,10026,10027,10028,10029</data-port-pool>
       -->
   
       <!-- maximum number of ftp client connections -->
  -    <max-connection>20</max-connection>    
  +    <max-connection>20</max-connection>
   
       <!-- maximum number of anonymous connections -->
       <anonymous-max-connection>10</anonymous-max-connection>
   
       <!-- does it allow anonymous connection -->
  -    <anonymous-login-allowed>true</anonymous-login-allowed>    
  +    <anonymous-login-allowed>true</anonymous-login-allowed>
   
       <!-- does it allow remote administration -->
  -    <remote-admin-allowed>true</remote-admin-allowed>   
  -        
  +    <remote-admin-allowed>true</remote-admin-allowed>
  +
       <!-- create user home is necessary -->
       <create-user-home>false</create-user-home>
  - 
  -    <!-- port number to be used for remote administration --> 
  -    <remote-admin-port>1099</remote-admin-port>   
   
  -    <!-- poll interval in seconds to kick out idle users and reload user manager if
necessary--> 
  -    <poll-interval>120</poll-interval>    
  +    <!-- port number to be used for remote administration -->
  +    <remote-admin-port>1099</remote-admin-port>
  +
  +    <!-- poll interval in seconds to kick out idle users and reload user manager if
necessary-->
  +    <poll-interval>120</poll-interval>
   
       <!-- default idle timeout in second -->
  -    <default-idle-time>300</default-idle-time>    
  +    <default-idle-time>300</default-idle-time>
   
       <!-- default user root directory -->
  -    <default-user-root>../</default-user-root>    
  +    <default-user-root>../</default-user-root>
   
     </ftp-server>
  -  
  -  
  +
  +
     <!-- the storage block configuration -->
     <objectstorage>
  -      
  +
         <!-- file object repository -->
         <repositories>
           <repository class="org.apache.avalon.cornerstone.blocks.masterstore.File_Persistent_Object_Repository">
  @@ -109,7 +104,7 @@
               <model>CACHE</model>
             </models>
           </repository>
  -        
  +
           <!-- file stream repository -->
           <repository class="org.apache.avalon.cornerstone.blocks.masterstore.File_Persistent_Stream_Repository">
             <protocols>
  @@ -130,13 +125,13 @@
   
     <!-- user manager configuration -->
     <user-manager>
  -   
  +
       <!-- admin user name -->
  -    <ftp-admin-name>admin</ftp-admin-name>   
  +    <ftp-admin-name>admin</ftp-admin-name>
   
       <!-- property file based user manager -->
       <encrypt>false</encrypt>
  -    
  +
       <!-- file object store based user manager
       <repository destinationURL="file://./FtpUserManagerStore/"
                   type="OBJECT"
  @@ -155,16 +150,16 @@
       <url>ldap://localhost:389</url>
       <admin>cn=Directory Manager</admin>
       <password>password</password>
  -    <authentication>simple</authentication>    
  +    <authentication>simple</authentication>
       <root>ou=people,o=apache.org</root>
       <prefix>uid=</prefix>
       <suffix>,ou=people,o=apache.org</suffix>
  -    -->    
  +    -->
   
     </user-manager>
   
  -  
  -  <!-- IP restrictor configuration -->  
  +
  +  <!-- IP restrictor configuration -->
     <ip-restrictor>
       <allow-ip>false</allow-ip>
     </ip-restrictor>
  
  
  
  1.4       +0 -5      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- httpproxy-config.xml	20 Apr 2002 11:32:31 -0000	1.3
  +++ httpproxy-config.xml	4 Apr 2003 22:04:07 -0000	1.4
  @@ -1,10 +1,5 @@
   <?xml version="1.0"?>
  -<!--
  -                                README!
   
  -    All blocks have full defaults so nothing is needed to make them run.
  -
  --->
   <config>
   
       <thread-manager>
  
  
  
  1.5       +0 -5      avalon-apps/sevak/src/demo/conf/catalina-config.xml
  
  Index: catalina-config.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/sevak/src/demo/conf/catalina-config.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- catalina-config.xml	9 Oct 2002 06:07:17 -0000	1.4
  +++ catalina-config.xml	4 Apr 2003 22:04:07 -0000	1.5
  @@ -1,10 +1,5 @@
   <?xml version="1.0"?>
  -<!--
  -                                README!
   
  -    MODIFY the catalina.home parameter to point to the webapps folder 
  -
  --->
   <config>
   
       <sevak>
  
  
  
  1.5       +1 -6      avalon-apps/sevak/src/demo/conf/jetty-config.xml
  
  Index: jetty-config.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/sevak/src/demo/conf/jetty-config.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jetty-config.xml	29 Nov 2002 23:50:10 -0000	1.4
  +++ jetty-config.xml	4 Apr 2003 22:04:07 -0000	1.5
  @@ -1,16 +1,11 @@
   <?xml version="1.0"?>
  -<!--
  -                                README!
   
  -    MODIFY the catalina.home parameter to point to the webapps folder 
  -
  --->
   <config>
   
     <sevak>
         <hostname>localhost</hostname>
     </sevak>
  -  <sevakTest>  
  +  <sevakTest>
         <Context docBase="/" path="sevak-demo.war"/>
     </sevakTest>
   
  
  
  
  1.2       +1 -6      avalon-apps/sevak/src/demo/conf/jo-config.xml
  
  Index: jo-config.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/sevak/src/demo/conf/jo-config.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jo-config.xml	22 Sep 2002 09:35:01 -0000	1.1
  +++ jo-config.xml	4 Apr 2003 22:04:07 -0000	1.2
  @@ -1,16 +1,11 @@
   <?xml version="1.0"?>
  -<!--
  -                                README!
   
  -    MODIFY the catalina.home parameter to point to the webapps folder 
  -
  --->
   <config>
   
     <sevak>
         <hostname>localhost</hostname>
     </sevak>
  -  <sevakTest>  
  +  <sevakTest>
     </sevakTest>
   
   </config>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message