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-apps/sevak/src/xdocs index.xml
Date Sat, 29 Jun 2002 13:20:21 GMT
hammant     2002/06/29 06:20:21

  Modified:    sevak    build.xml
               sevak/src/demo/conf sevak-demo-config.xml
               sevak/src/demo/java/org/apache/avalon/apps/sevak/demo
                        SevakTest.java
               sevak/src/xdocs index.xml
  Log:
  User webapps from downloaded Catalina.
  
  Revision  Changes    Path
  1.3       +10 -13    jakarta-avalon-apps/sevak/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/sevak/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	29 Jun 2002 03:32:56 -0000	1.2
  +++ build.xml	29 Jun 2002 13:20:21 -0000	1.3
  @@ -162,12 +162,12 @@
     <!-- Get catalina jars from apache repository -->
     <target name="get-catalina">
    
  -    <mkdir  dir="tmp-dir-to-delete"/>
  +    <mkdir  dir="catalina-download"/>
       <mkdir dir="${lib.dir}"/>
       <mkdir dir="${tomcat.jars.dir}"/>
   
       <get src="http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4.0.3/bin/jakarta-tomcat-4.0.3.zip"

  -    dest="tmp-dir-to-delete/jakarta-tomcat.zip" 
  +    dest="catalina-download/jakarta-tomcat.zip" 
       verbose="true"
       usetimestamp="true"/>
       
  @@ -198,16 +198,14 @@
       />
   
   
  -    <unzip src="tmp-dir-to-delete/jakarta-tomcat.zip" dest="tmp-dir-to-delete" />
  +    <unzip src="catalina-download/jakarta-tomcat.zip" dest="catalina-download" />
       
       <copy todir="${tomcat.jars.dir}" flatten="true">
  -      <fileset dir="tmp-dir-to-delete">
  +      <fileset dir="catalina-download">
           <include  name="**/bin/*.jar"/>
           <include  name="**/lib/*.jar"/>
         </fileset>
  -    </copy>
  -    
  -    <delete dir="tmp-dir-to-delete"/>
  +    </copy>   
       
     </target>
    
  @@ -312,9 +310,13 @@
           <include name="*.jar"/>
         </lib>
   
  +      <!-- 
  +
         <lib dir="${java.home}/../lib/">
           <include name="tools.jar"/>
         </lib>
  +      
  +      -->
       </sar>
       
       <mkdir dir="dist"/>
  @@ -713,13 +715,8 @@
         <lib dir="${tomcat.jars.dir}">
           <include name="*.jar"/>
         </lib>
  -
  -      
  -      <lib dir="${java.home}/../lib/">
  -        <include name="tools.jar"/>
  -      </lib>
       
  -      <zipfileset dir="${demo.dir}/webapps/" prefix="webapps"/>
  +      <zipfileset dir="catalina-download/jakarta-tomcat-4.0.3/webapps" prefix="webapps"/>
   
       </sar>
   
  
  
  
  1.2       +15 -2     jakarta-avalon-apps/sevak/src/demo/conf/sevak-demo-config.xml
  
  Index: sevak-demo-config.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/sevak/src/demo/conf/sevak-demo-config.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sevak-demo-config.xml	28 Jun 2002 05:04:52 -0000	1.1
  +++ sevak-demo-config.xml	29 Jun 2002 13:20:21 -0000	1.2
  @@ -17,8 +17,21 @@
   	   * is added into the Sevak Demo Block SAR file under
   	   * webapps/ folder  within it.
   	   * -->
  -	  <Context docBase="/" path="webapps/ROOT"/>
  -	  <Context docBase="/demo" path="webapps/demo.war"/>
  +	   
  +	  <Context docBase="/" path="webapps/ROOT"/>	  
  +	  
  +	  <!-- 	  
  +	    <Context docBase="/examples" path="webapps/examples"/>
  +	    <Context docBase="/manager" path="webapps/manager"/>	  
  +	  -->
  +	  
  +	  
  +	  <Context docBase="/tomcat-docs" path="webapps/tomcat-docs"/>
  +	  
  +	  <!--
  +	    <Context docBase="/webdav" path="webapps/webdav"/>	  
  +	  -->
  +	  
     </sevakTest>
   
   </config>
  
  
  
  1.2       +7 -3      jakarta-avalon-apps/sevak/src/demo/java/org/apache/avalon/apps/sevak/demo/SevakTest.java
  
  Index: SevakTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/sevak/src/demo/java/org/apache/avalon/apps/sevak/demo/SevakTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SevakTest.java	28 Jun 2002 05:04:38 -0000	1.1
  +++ SevakTest.java	29 Jun 2002 13:20:21 -0000	1.2
  @@ -8,7 +8,6 @@
   package org.apache.avalon.apps.sevak.demo;
   
   import java.io.File;
  -import java.net.URL;
   //avalon imports
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.configuration.Configurable;
  @@ -23,7 +22,6 @@
   import org.apache.avalon.phoenix.BlockContext;
   //sevak imports
   import org.apache.avalon.apps.sevak.Sevak;
  -import org.apache.avalon.apps.sevak.SevakException;
   
   /**
    * @phoenix:block
  @@ -73,7 +71,13 @@
           Configuration[] contexts=m_configuration.getChildren("Context");
           for(int i=0;i<contexts.length;i++)
           {
  -   	     	m_sevak.deploy(contexts[i].getAttribute("docBase"),new File(m_context.getBaseDirectory().getAbsolutePath()+File.separatorChar+contexts[i].getAttribute("path")));
 
  +            String ctx = contexts[i].getAttribute("docBase");
  +            String ctxPath = contexts[i].getAttribute("path");
  +            ctxPath = ctxPath.replace('/',File.separatorChar);
  +            ctxPath = ctxPath.replace('\\',File.separatorChar);
  +            String ctxFullPath = m_context.getBaseDirectory().getAbsolutePath() + File.separatorChar
+ ctxPath;
  +            //System.out.println("Ctx = " + ctx + ", path = " + ctxFullPath);
  +   	     	m_sevak.deploy(ctx,new File(ctxFullPath));
           }
   		
       }
  
  
  
  1.3       +12 -3     jakarta-avalon-apps/sevak/src/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/sevak/src/xdocs/index.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.xml	28 Jun 2002 05:07:21 -0000	1.2
  +++ index.xml	29 Jun 2002 13:20:21 -0000	1.3
  @@ -4,7 +4,7 @@
   
   <document>
     <header>
  -    <title>Avalon Applications / Sevak (A Catalina Wrapper)</title>
  +    <title>Avalon Applications / Sevak</title>
       <subtitle>Introduction</subtitle>
       <authors>
         <person name="Avalon Documentation Team" email="avalon-dev@jakarta.apache.org"/>
  @@ -13,11 +13,20 @@
     <body>
       <s1 title="Introduction">
         <p>
  -        This block is a wrapper for Tomcat Catalina  server
  +        Sevak is a wrapper for Tomcat Catalina server in a Phoenix machine.
           <link href="http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4.0.3/">
           http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4.0.3/</link>
         </p>
       </s1>
  +    <s1 title="Blocks">
  +      <p>
  +        There are two blocks delivered with Sevak.  The first is the block that provides
  +        the deployment/undepoyment of web applications to other blocks.  That is 
  +        org.apache.avalon.apps.sevak.blocks.CatalinaSevakImpl.  The second is one uses
the 
  +        first to mount Catalina's demo apps.  The block class is 
  +        org.apache.avalon.apps.sevak.demo.SevakTest.
  +      </p>
  +    </s1>    
     </body>
     <footer>
       <legal>
  
  
  

--
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