You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ha...@apache.org on 2002/05/22 22:58:36 UTC

cvs commit: jakarta-avalon-apps/simpleserver/src/manifest simpleserver.mf

hammant     02/05/22 13:58:36

  Modified:    simpleserver build.xml
               simpleserver/src/java/org/apache/avalon/simpleserver
                        SimpleServer.java
  Removed:     simpleserver/src/java/org/apache/avalon/simpleserver
                        SimpleServer.xinfo
               simpleserver/src/manifest simpleserver.mf
  Log:
  .xinfo and manifest now autogenerated
  
  Revision  Changes    Path
  1.10      +26 -4     jakarta-avalon-apps/simpleserver/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/simpleserver/build.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.xml	18 May 2002 09:45:05 -0000	1.9
  +++ build.xml	22 May 2002 20:58:35 -0000	1.10
  @@ -25,6 +25,7 @@
     <!-- Set the properties for intermediate directory -->
     <property name="build.dir" value="build"/>
     <property name="build.lib" value="${build.dir}/lib"/>
  +  <property name="build.xdoclet" value="${build.dir}/xdoclet"/>  
     <property name="build.src" value="${build.dir}/src"/>
     <property name="build.classes" value="${build.dir}/classes"/>
     <property name="build.xdocs" value="${build.dir}/xdocs"/>
  @@ -96,21 +97,42 @@
   
     </target>
   
  +  <!-- Make .xinfo and manifest automatically for blocks -->
  +  <target name="phoenix-xdoclet" depends="compile">
  +  
  +    <mkdir dir="${build.xdoclet}"/>
  +  
  +    <taskdef name="phoenix-blocks"
  +             classname="org.apache.avalon.phoenix.tools.xdoclet.PhoenixXDoclet"
  +             classpathref="project.class.path"/>
  +
  +    <phoenix-blocks
  +        destdir="${build.xdoclet}"
  +        classpathref="project.class.path">
  +      <fileset dir="${java.dir}">
  +        <include name="**/*.java" />
  +      </fileset>
  +      <blockinfo/>
  +      <manifest manifestFile="manifest.mf" />
  +    </phoenix-blocks>
  +
  +  </target>
  +
     <!-- Jars up project -->
  -  <target name="jars" depends="compile">
  +  <target name="jars" depends="phoenix-xdoclet">
   
       <mkdir dir="${build.lib}"/>
   
       <jar jarfile="${build.lib}/simpleserver.jar"
  -         manifest="${manifest.dir}/simpleserver.mf">
  +         manifest="${build.xdoclet}/manifest.mf">
         <fileset dir="${build.classes}">
           <include name="org/apache/avalon/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/*"/>        
         </fileset>
  -      <fileset dir="${java.dir}">
  -        <include name="org/apache/avalon/simpleserver/**/*.xinfo"/>
  +      <fileset dir="${build.xdoclet}">
  +        <include name="**/*.xinfo"/>
         </fileset>
       </jar>
   
  
  
  
  1.9       +11 -0     jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/SimpleServer.java
  
  Index: SimpleServer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/SimpleServer.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SimpleServer.java	18 May 2002 09:21:55 -0000	1.8
  +++ SimpleServer.java	22 May 2002 20:58:36 -0000	1.9
  @@ -58,6 +58,8 @@
    * <br>COUNT counts the number of strings stored
    * <br>LIST responds with all the strings, one per line.
    *
  + * @phoenix:block
  + * 
    * @author Charles Benett <ch...@benett1.demon.co.uk>
    * @author Federico Barbieri <fe...@apache.org>
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  @@ -89,6 +91,15 @@
           return m_context;
       }
   
  +    /**
  +     * 
  +     * @phoenix:dependency name="org.apache.avalon.cornerstone.services.store.Store"
  +     * @phoenix:dependency name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
  +     * @phoenix:dependency name="org.apache.avalon.cornerstone.services.sockets.SocketManager"
  +     * @phoenix:dependency name="org.apache.avalon.cornerstone.services.packet.PacketManager"
  +     * @phoenix:dependency name="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"
  +     *
  +     */
       public void service( final ServiceManager serviceManager )
           throws ServiceException
       {
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>