avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: jakarta-avalon-cornerstone/apps/demo/src/xdocs book.xml cornerstone.uris demo-httpproxy.xml demo-simpleserver.xml
Date Thu, 22 Nov 2001 09:32:29 GMT
hammant     01/11/22 01:32:29

  Modified:    apps/demo build.xml
               apps/demo/src/conf avalon-demo-assembly.xml
                        avalon-demo-config.xml
               apps/demo/src/xdocs book.xml cornerstone.uris
  Removed:     apps/demo/src/manifest http-proxy-demo.mf
                        simpleserver-demo.mf test-extension1.mf
                        test-extension2.mf
               apps/demo/src/xdocs demo-httpproxy.xml demo-simpleserver.xml
  Log:
  simpleserver in new location
  
  Revision  Changes    Path
  1.25      +1 -34     jakarta-avalon-cornerstone/apps/demo/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/demo/build.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- build.xml	2001/11/21 10:59:08	1.24
  +++ build.xml	2001/11/22 09:32:28	1.25
  @@ -94,12 +94,6 @@
   
       <mkdir dir="${build.lib}"/>
   
  -    <jar jarfile="${build.lib}/demo-httpproxy.jar"
  -         basedir="${build.classes}"
  -         manifest="${manifest.dir}/http-proxy-demo.mf">
  -      <include name="org/apache/avalon/cornerstone/demos/httpproxy/*"/>
  -    </jar>
  -
       <jar jarfile="${build.lib}/demo-xcommander.jar"
            basedir="${build.classes}"
            manifest="${manifest.dir}/demo-xcommander.mf">
  @@ -118,26 +112,6 @@
         <include name="org/apache/avalon/cornerstone/demos/soaphelloworldserver/*"/>
       </jar>
   
  -    <jar jarfile="${build.lib}/demo-simpleserver.jar"
  -         basedir="${build.classes}"
  -         manifest="${manifest.dir}/simpleserver-demo.mf">
  -      <include name="org/apache/avalon/cornerstone/demos/simpleserver/*"/>
  -      <exclude name="org/apache/avalon/cornerstone/demos/simpleserver/extension1/*"/>
  -      <exclude name="org/apache/avalon/cornerstone/demos/simpleserver/extension2/*"/>
  -      <exclude name="org/apache/avalon/cornerstone/demos/simpleserver/classes/*"/>
  -    </jar>
  -
  -    <jar jarfile="${build.lib}/demo-test-extension1.jar"
  -         basedir="${build.classes}"
  -         manifest="${manifest.dir}/test-extension1.mf">
  -      <include name="org/apache/avalon/cornerstone/demos/simpleserver/extension1/*"/>
  -    </jar>
  -
  -    <jar jarfile="${build.lib}/demo-test-extension2.jar"
  -         basedir="${build.classes}"
  -         manifest="${manifest.dir}/test-extension2.mf">
  -      <include name="org/apache/avalon/cornerstone/demos/simpleserver/extension2/*"/>
  -    </jar>
     </target>
   
     <target name="main" depends="sars" description="Default target to generate build products
minus docs"/>
  @@ -150,13 +124,8 @@
            environment="${conf.dir}/avalon-demo-environment.xml"
            assembly="${conf.dir}/avalon-demo-assembly.xml" >
   
  -      <zipfileset dir="${build.classes}" prefix="SAR-INF/classes">
  -        <include name="org/apache/avalon/cornerstone/demos/simpleserver/classes/*"/>
  -      </zipfileset>
  -
         <lib dir="${build.lib}/">
           <include name="*.jar"/>
  -        <exclude name="demo-test-extension2.jar"/>
           <exclude name="demo-soaphelloworld.jar"/>
         </lib>
   
  @@ -337,9 +306,7 @@
       <echo message="Installing to ${install.dir}" />
       <delete dir="${install.dir}/avalon-demo" />
       <copy file="${build.lib}/avalon-demo.sar" todir="${install.dir}" />
  -    <copy file="${build.lib}/demo-test-extension2.jar" 
  -          tofile="${phoenix.home}/ext/demo-test-extension2.jar"
  -          overwrite="true" />
  +
     </target>
   
     <target name="uninstall" description="Uninstalls from Phoenix">
  
  
  
  1.7       +0 -31     jakarta-avalon-cornerstone/apps/demo/src/conf/avalon-demo-assembly.xml
  
  Index: avalon-demo-assembly.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/demo/src/conf/avalon-demo-assembly.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- avalon-demo-assembly.xml	2001/11/20 12:23:51	1.6
  +++ avalon-demo-assembly.xml	2001/11/22 09:32:28	1.7
  @@ -47,37 +47,6 @@
                role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
/>
     </block>
   
  -  <block class="org.apache.avalon.cornerstone.demos.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.cornerstone.demos.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>    
  -
  -  <block class="org.apache.avalon.cornerstone.demos.simpleserver.SimpleServer" 
  -         name="simple-server" >
  -
  -    <!-- The names here must match the names specified for a Block in some conf.xml
file.
  -    The role should be the interface mentioned in the BlockInfo (.xinfo) files  -->
  -
  -
  -    <provide name="packet-manager" 
  -             role="org.apache.avalon.cornerstone.services.packet.PacketManager"/>
  -    <provide name="sockets" role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
  -    <provide name="connections"
  -             role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
/>
  -    <provide name="objectstorage" role="org.apache.avalon.cornerstone.services.store.Store"/>
  -    <provide name="scheduler" 
  -             role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
  -  </block>    
  -
     <block class="org.apache.avalon.cornerstone.demos.xcommander.XCommanderServer" name="xcommander-server"
>
       <provide name="sockets" role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
       <provide name="connections" 
  
  
  
  1.7       +0 -32     jakarta-avalon-cornerstone/apps/demo/src/conf/avalon-demo-config.xml
  
  Index: avalon-demo-config.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/demo/src/conf/avalon-demo-config.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- avalon-demo-config.xml	2001/11/19 12:28:39	1.6
  +++ avalon-demo-config.xml	2001/11/22 09:32:28	1.7
  @@ -80,38 +80,6 @@
         </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>
  -
  -  <simple-server>
  -    <!-- Note trailing file searator in destinationURL -->
  -      <repository destinationURL="file://var/demo/" type="OBJECT" model="SYNCHRONOUS"/>
  -      <port>4556</port>
  -  </simple-server>
  -
     <xcommander-server>
   	  <port>4557</port>
     </xcommander-server>
  
  
  
  1.2       +0 -2      jakarta-avalon-cornerstone/apps/demo/src/xdocs/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/demo/src/xdocs/book.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- book.xml	2001/09/10 20:12:21	1.1
  +++ book.xml	2001/11/22 09:32:29	1.2
  @@ -21,8 +21,6 @@
     <menu label="Demo Components">
       <menu-item label="Hello World" href="demo-helloworld.html"/>
       <menu-item label="SOAP Hello World" href="demo-soaphelloworld.html"/>
  -    <menu-item label="HTTP Proxy" href="demo-httpproxy.html"/>
  -    <menu-item label="Simple Server" href="demo-simpleserver.html"/>
     </menu>
   
   </book>
  
  
  
  1.2       +0 -2      jakarta-avalon-cornerstone/apps/demo/src/xdocs/cornerstone.uris
  
  Index: cornerstone.uris
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/demo/src/xdocs/cornerstone.uris,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cornerstone.uris	2001/09/10 20:12:21	1.1
  +++ cornerstone.uris	2001/11/22 09:32:29	1.2
  @@ -2,8 +2,6 @@
   changes.html
   demo-helloworld.html
   demo-soaphelloworld.html
  -demo-httpproxy.html
  -demo-simpleserver.html
   features.html
   todo.html
   images/add.jpg
  
  
  

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


Mime
View raw message