avalon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-cornerstone/src/conf avalon-demo-config.xml avalon-demo-assembly.xml
Date Fri, 20 Apr 2001 02:18:22 GMT
donaldp     01/04/19 19:18:22

  Modified:    src/conf avalon-demo-assembly.xml
  Added:       src/conf avalon-demo-config.xml
  Log:
  Update to separate config.xml from assembly.xml
  
  Revision  Changes    Path
  1.5       +10 -116   jakarta-avalon-cornerstone/src/conf/avalon-demo-assembly.xml
  
  Index: avalon-demo-assembly.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/src/conf/avalon-demo-assembly.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- avalon-demo-assembly.xml	2001/03/30 04:08:02	1.4
  +++ avalon-demo-assembly.xml	2001/04/20 02:18:22	1.5
  @@ -1,47 +1,10 @@
   <?xml version="1.0"?>
  -<!--
  -                                README!
   
  -    All blocks have full defaults so nothing is needed to make them run.
  +<assembly>
   
  --->
  -<phoenix>
  -
     <!-- The Storage block -->
     <block class="org.apache.cornerstone.blocks.masterstore.RepositoryManager" 
  -         name="objectstorage" >
  -
  -    <configuration>
  -      <repositories>
  -        <repository class="org.apache.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.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>
  -    </configuration>
  -  </block>
  +         name="objectstorage" />
      
     <!-- The Packet Manager block -->
     <block class="org.apache.cornerstone.blocks.packet.DefaultPacketManager" 
  @@ -52,50 +15,20 @@
            name="connections" />
   
     <!-- The Socket Manager block -->
  -  <block class="org.apache.cornerstone.blocks.sockets.DefaultSocketManager" name="sockets"
>
  -    <configuration>
  -      <server-sockets>
  -        <factory name="plain"
  -                 class="org.apache.cornerstone.blocks.sockets.DefaultServerSocketFactory"
/>
  -        <!--
  -        <factory name="ssl" 
  -                 class="org.apache.cornerstone.blocks.sockets.TLSServerSocketFactory">
  -          <keystore>
  -            <file>conf/keystore</file> 
  -            <password>secret</password> 
  -            <type>JKS</type> 
  -            <protocol>TLS</protocol> 
  -            <algorithm>SunX509</algorithm> 
  -            <authenticate-client>false</authenticate-client> 
  -          </keystore>
  -        </factory>
  -        -->
  -      </server-sockets>
  -
  -      <client-sockets>
  -        <factory name="plain" 
  -                 class="org.apache.cornerstone.blocks.sockets.DefaultSocketFactory" />
  -      </client-sockets>
  -    </configuration>
  -  </block>
  +  <block class="org.apache.cornerstone.blocks.sockets.DefaultSocketManager" name="sockets"
/>
   
     <!-- The TimeScheduler block -->
  -  <block class="org.apache.cornerstone.blocks.scheduler.DefaultTimeScheduler" 
  -         name="scheduler"/>
  +  <block class="org.apache.cornerstone.blocks.scheduler.DefaultTimeScheduler" name="scheduler"/>
  +
  +  <!--                                        -->
  +  <!-- Below this section are the demo blocks -->
  +  <!--                                        -->
   
     <block class="org.apache.cornerstone.demos.helloworldserver.HelloWorldServerImpl"

            name="helloworldserver" >
       <provide name="sockets" role="org.apache.cornerstone.services.sockets.SocketManager"/>
       <provide name="connections" 
                role="org.apache.cornerstone.services.connection.ConnectionManager" />
  -
  -    <configuration>
  -      <port>8999</port>
  -      <bind>127.0.0.1</bind>
  -      <helloworldhandler>
  -        <connectiontimeout>360000</connectiontimeout>
  -      </helloworldhandler>
  -    </configuration>
     </block>
   
     <block class="org.apache.cornerstone.demos.httpproxy.DefaultHttpAuditingProxyServer"

  @@ -103,14 +36,6 @@
       <provide name="sockets" role="org.apache.cornerstone.services.sockets.SocketManager"/>
       <provide name="connections" 
                role="org.apache.cornerstone.services.connection.ConnectionManager" />
  -
  -    <configuration>
  -      <listen-port>9997</listen-port>
  -      <bind>127.0.0.1</bind>
  -      <httpproxyhandler-Auditing>
  -        <connectiontimeout>360000</connectiontimeout>
  -      </httpproxyhandler-Auditing>
  -    </configuration>
     </block>
       
     <block class="org.apache.cornerstone.demos.httpproxy.DefaultHttpFilteringProxyServer"

  @@ -118,24 +43,6 @@
       <provide name="sockets" role="org.apache.cornerstone.services.sockets.SocketManager"/>
       <provide name="connections" 
                role="org.apache.cornerstone.services.connection.ConnectionManager" />
  -
  -    <configuration>
  -      <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>              
  -    </configuration>
     </block>    
   
     <block class="org.apache.cornerstone.demos.simpleserver.SimpleServer" 
  @@ -150,25 +57,12 @@
       <provide name="objectstorage" role="org.apache.cornerstone.services.store.Store"/>
       <provide name="scheduler" 
                role="org.apache.cornerstone.services.scheduler.TimeScheduler"/>
  -
  -    <!-- Note trailing file searator in destinationURL -->
  -    <configuration>
  -      <repository destinationURL="file://var/demo/" type="OBJECT" model="SYNCHRONOUS"/>
  -      <port>4556</port>
  -    </configuration>
     </block>    
   
  -  <block class="org.apache.cornerstone.demos.xcommander.XCommanderServer" 
  -         name="xcommander-server" >
  -
  +  <block class="org.apache.cornerstone.demos.xcommander.XCommanderServer" name="xcommander-server"
>
       <provide name="sockets" role="org.apache.cornerstone.services.sockets.SocketManager"/>
       <provide name="connections" 
                role="org.apache.cornerstone.services.connection.ConnectionManager" />
  -
  -    <!-- Note trailing file separator in destinationURL -->
  -    <configuration>
  -	  <port>4557</port>
  -    </configuration>
     </block>  
   
  -</phoenix>
  \ No newline at end of file
  +</assembly>
  \ No newline at end of file
  
  
  
  1.1                  jakarta-avalon-cornerstone/src/conf/avalon-demo-config.xml
  
  Index: avalon-demo-config.xml
  ===================================================================
  <?xml version="1.0"?>
  <!--
                                  README!
  
      All blocks have full defaults so nothing is needed to make them run.
  
  -->
  <config>
  
    <!-- The Storage block -->
    <objectstorage>
        <repositories>
          <repository class="org.apache.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.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.cornerstone.blocks.sockets.DefaultServerSocketFactory"
/>
          <!--
          <factory name="ssl" 
                   class="org.apache.cornerstone.blocks.sockets.TLSServerSocketFactory">
            <keystore>
              <file>conf/keystore</file> 
              <password>secret</password> 
              <type>JKS</type> 
              <protocol>TLS</protocol> 
              <algorithm>SunX509</algorithm> 
              <authenticate-client>false</authenticate-client> 
            </keystore>
          </factory>
          -->
        </server-sockets>
  
        <client-sockets>
          <factory name="plain" 
                   class="org.apache.cornerstone.blocks.sockets.DefaultSocketFactory" />
        </client-sockets>
    </sockets>
  
    <helloworldserver>
        <port>8999</port>
        <bind>127.0.0.1</bind>
        <helloworldhandler>
          <connectiontimeout>360000</connectiontimeout>
        </helloworldhandler>
    </helloworldserver>
  
    <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>
  
    <demoblock>
      <!-- Note trailing file searator in destinationURL -->
        <repository destinationURL="file://var/demo/" type="OBJECT" model="SYNCHRONOUS"/>
        <port>4556</port>
    </demoblock>
  
    <xcommander-server>
  	  <port>4557</port>
    </xcommander-server>
  
  </config>
  
  

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


Mime
View raw message