Return-Path: 
 <avalon-cvs-return-7036-qmlist-jakarta-archive-avalon-cvs=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org
Received: (qmail 32015 invoked from network); 22 May 2002 21:05:03 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 22 May 2002 21:05:03 -0000
Received: (qmail 12577 invoked by uid 97); 22 May 2002 21:05:09 -0000
Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org
Received: (qmail 12561 invoked by uid 97); 22 May 2002 21:05:08 -0000
Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:avalon-cvs-subscribe@jakarta.apache.org>
List-Help: <mailto:avalon-cvs-help@jakarta.apache.org>
List-Post: <mailto:avalon-cvs@jakarta.apache.org>
List-Id: "Avalon CVS List" <avalon-cvs.jakarta.apache.org>
Reply-To: "Avalon Developers List" <avalon-dev@jakarta.apache.org>
Delivered-To: mailing list avalon-cvs@jakarta.apache.org
Received: (qmail 12550 invoked by uid 97); 22 May 2002 21:05:08 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 22 May 2002 21:04:59 -0000
Message-ID: <20020522210459.6686.qmail@icarus.apache.org>
From: hammant@apache.org
To: jakarta-avalon-apps-cvs@apache.org
Subject: cvs commit: jakarta-avalon-apps/xcommander/src/manifest xcommander.mf
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

hammant     02/05/22 14:04:59

  Modified:    xcommander build.xml
               xcommander/src/java/org/apache/avalon/xcommander
                        XCommanderServer.java
  Removed:     xcommander/src/java/org/apache/avalon/xcommander
                        XCommanderServer.xinfo
               xcommander/src/manifest xcommander.mf
  Log:
  .xinfo and manifests now autogenerated
  
  Revision  Changes    Path
  1.10      +26 -4     jakarta-avalon-apps/xcommander/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/xcommander/build.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.xml	18 May 2002 10:52:14 -0000	1.9
  +++ build.xml	22 May 2002 21:04:59 -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"/>
  @@ -122,18 +123,39 @@
   
     </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}/xcommander.jar"
  -         manifest="${manifest.dir}/xcommander.mf">
  +         manifest="${build.xdoclet}/manifest.mf">
         <fileset dir="${build.classes}">
           <include name="org/apache/avalon/xcommander/**"/>
         </fileset>
  -      <fileset dir="${java.dir}">
  -        <include name="org/apache/avalon/xcommander/**/*.xinfo"/>
  +      <fileset dir="${build.xdoclet}">
  +        <include name="**/*.xinfo"/>
         </fileset>
       </jar>
   
  
  
  
  1.8       +8 -1      jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/XCommanderServer.java
  
  Index: XCommanderServer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/XCommanderServer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XCommanderServer.java	18 May 2002 09:49:01 -0000	1.7
  +++ XCommanderServer.java	22 May 2002 21:04:59 -0000	1.8
  @@ -37,6 +37,8 @@
    * for XCommander. It listens on a port specified in the block's configuration,
    * and delegates incoming requests to an {@link XCommanderHandler XCommanderHandler}.
    *
  + * @phoenix:block
  + * 
    * @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
    */
   public class XCommanderServer
  @@ -52,7 +54,12 @@
       protected ArrayList               m_clients;
       protected HashMap                 m_xcommands;
   
  -    // BLOCK METHODS
  +    /**
  +     * 
  +     * @phoenix:dependency name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
  +     * @phoenix:dependency name="org.apache.avalon.cornerstone.services.sockets.SocketManager"
  +     *
  +     */
       public void service( final ServiceManager serviceManager )
           throws ServiceException
       {
  
  
  

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