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/db/src/manifest db.mf
Date Sun, 19 May 2002 12:16:20 GMT
hammant     02/05/19 05:16:20

  Modified:    db       build.xml
               db/src/java/org/apache/avalon/db/actioncache
                        DefaultActionCache.java
               db/src/java/org/apache/avalon/db/basic/parser
                        BasicDualParserManager.java
                        BasicLXSQLParserManager.java
                        BasicSQLParserManager.java
               db/src/java/org/apache/avalon/db/optimizer
                        DefaultSQLOptimizer.java
               db/src/java/org/apache/avalon/db/persistence/inmemory
                        NoPersistence.java
               db/src/java/org/apache/avalon/db/persistence/store
                        StorePersistence.java
               db/src/java/org/apache/avalon/db/transport/altrmi/server
                        AltrmiDatabaseManager.java
               db/src/java/org/apache/avalon/db/transport/cmdstream/server
                        PlainCMDDatabaseManager.java
               db/src/java/org/apache/avalon/db/transport/soap/server
                        SoapDatabaseManager.java
  Removed:     db/src/java/org/apache/avalon/db/actioncache
                        DefaultActionCache.xinfo
               db/src/java/org/apache/avalon/db/basic/parser
                        BasicDualParserManager.xinfo
                        BasicLXSQLParserManager.xinfo
                        BasicSQLParserManager.xinfo
               db/src/java/org/apache/avalon/db/optimizer
                        DefaultSQLOptimizer.xinfo
               db/src/java/org/apache/avalon/db/persistence/inmemory
                        NoPersistence.xinfo
               db/src/java/org/apache/avalon/db/persistence/store
                        StorePersistence.xinfo
               db/src/java/org/apache/avalon/db/transport/altrmi/server
                        AltrmiDatabaseManager.xinfo
               db/src/java/org/apache/avalon/db/transport/cmdstream/server
                        PlainCMDDatabaseManager.xinfo
               db/src/java/org/apache/avalon/db/transport/soap/server
                        SoapDatabaseManager.xinfo
               db/src/manifest db.mf
  Log:
  Automatic .xinfo and manifests
  
  Revision  Changes    Path
  1.48      +27 -4     jakarta-avalon-apps/db/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/build.xml,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- build.xml	18 May 2002 10:52:14 -0000	1.47
  +++ build.xml	19 May 2002 12:16:19 -0000	1.48
  @@ -26,6 +26,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"/>
   
  @@ -186,23 +187,45 @@
       </copy>
   
     </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}"/>
   
       <!-- The Block -->
       <jar jarfile="${build.lib}/avalon-db.jar"
  -         manifest="${manifest.dir}/db.mf">
  +         manifest="${build.xdoclet}/manifest.mf">
         <fileset dir="${build.classes}">
           <include name="org/apache/avalon/db/**"/>
           <exclude name="org/apache/avalon/db/transport/cmdstream/client/**"/>
           <exclude name="org/apache/avalon/db/driver/**"/>
           <exclude name="org/apache/avalon/db/test/**"/>
         </fileset>
  -      <fileset dir="${java.dir}">
  -        <include name="org/apache/avalon/db/**/*.xinfo"/>
  +      <fileset dir="${build.xdoclet}">
  +        <include name="org/apache/avalon/hsql/**/*.xinfo"/>
         </fileset>
       </jar>
   
  
  
  
  1.6       +4 -1      jakarta-avalon-apps/db/src/java/org/apache/avalon/db/actioncache/DefaultActionCache.java
  
  Index: DefaultActionCache.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/actioncache/DefaultActionCache.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultActionCache.java	18 May 2002 09:49:00 -0000	1.5
  +++ DefaultActionCache.java	19 May 2002 12:16:19 -0000	1.6
  @@ -21,8 +21,11 @@
   import org.apache.avalon.framework.service.Serviceable;
   
   /**
  + *
  + * @phoenix:block
  + * 
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public class DefaultActionCache
       extends AbstractLogEnabled
  
  
  
  1.6       +11 -1     jakarta-avalon-apps/db/src/java/org/apache/avalon/db/basic/parser/BasicDualParserManager.java
  
  Index: BasicDualParserManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/basic/parser/BasicDualParserManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BasicDualParserManager.java	18 May 2002 09:49:00 -0000	1.5
  +++ BasicDualParserManager.java	19 May 2002 12:16:19 -0000	1.6
  @@ -26,6 +26,10 @@
   import org.apache.avalon.db.actions.ActionException;
   
   /**
  + *
  + * @phoenix:block
  + * @phoenix:service name="org.apache.avalon.db.services.ParserManager"
  + *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
    */
   public class BasicDualParserManager
  @@ -39,7 +43,13 @@
           mBasicLXSQLParserMgr = new BasicLXSQLParserManager();
           mBasicSQLParserMgr = new BasicSQLParserManager();
       }
  -
  +    
  +    /**
  +     * 
  +     * @phoenix:dependency name="org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory"
  +     * @phoenix:dependency name="org.apache.avalon.db.services.DatabasePersistor"
  +     *
  +     */
       public void service(ServiceManager serviceManager) throws ServiceException {
           mBasicLXSQLParserMgr.service(serviceManager);
           if (mBasicSQLParserMgr != null) mBasicSQLParserMgr.service(serviceManager);
  
  
  
  1.4       +16 -1     jakarta-avalon-apps/db/src/java/org/apache/avalon/db/basic/parser/BasicLXSQLParserManager.java
  
  Index: BasicLXSQLParserManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/basic/parser/BasicLXSQLParserManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BasicLXSQLParserManager.java	17 Dec 2001 16:00:00 -0000	1.3
  +++ BasicLXSQLParserManager.java	19 May 2002 12:16:19 -0000	1.4
  @@ -27,13 +27,18 @@
   import org.apache.avalon.db.server.stdhandlers.EstablishConnectionHandler;
   import org.apache.avalon.db.server.stdhandlers.PingHandler;
   import org.apache.avalon.db.transport.Request;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
   
   /**
    *  Class BasicLXSQLParserManager
    *
  + * @phoenix:block
  + * @phoenix:service name="org.apache.avalon.db.services.ParserManager" 
  + *
    * @author     Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">
    *      Paul_Hammant@yahoo.com</a>
  - * @version    $Revision: 1.3 $
  + * @version    $Revision: 1.4 $
    */
   public class BasicLXSQLParserManager extends AbstractLXSQLParser {
   
  @@ -49,6 +54,16 @@
           setupLogger(action);
           action.initialize();
       }
  +    
  +    /**
  +     * 
  +     * @phoenix:dependency name="org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory"
  +     * @phoenix:dependency name="org.apache.avalon.db.services.DatabasePersistor"
  +     *
  +     */
  +    public void service(ServiceManager serviceManager) throws ServiceException {
  +		super.service(serviceManager);
  +	}
   
       /**
        *  Gets the customRequestHandlers attribute of the BasicLXSQLParserManager
  
  
  
  1.7       +16 -0     jakarta-avalon-apps/db/src/java/org/apache/avalon/db/basic/parser/BasicSQLParserManager.java
  
  Index: BasicSQLParserManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/basic/parser/BasicSQLParserManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BasicSQLParserManager.java	17 Dec 2001 16:00:00 -0000	1.6
  +++ BasicSQLParserManager.java	19 May 2002 12:16:19 -0000	1.7
  @@ -15,10 +15,16 @@
   import org.apache.avalon.db.server.AbstractRequestHandler;
   import org.apache.avalon.db.server.sql.AbstractSQLParser;
   import org.apache.avalon.db.transport.Request;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.ServiceException;
   
   /**
    *  Class BasicSQLParserManager
    *
  + * @phoenix:block
  + * @phoenix:service name="org.apache.avalon.db.services.ParserManager"  
  + * 
  + *
    * @author     Gerhard Froehlich <a href="mailto:g-froehlich@gmx.de">
    *      g-froehlich@gmx.de</a>
    * @version
  @@ -37,6 +43,16 @@
           setupLogger(action);
           action.initialize();
       }
  +
  +    /**
  +     * 
  +     * @phoenix:dependency name="org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory"
  +     * @phoenix:dependency name="org.apache.avalon.db.services.DatabasePersistor"
  +     *
  +     */
  +    public void service(ServiceManager serviceManager) throws ServiceException {
  +		super.service(serviceManager);
  +	}
   
       /**
        *  Gets the customRequestHandlers attribute of the BasicSQLParserManager
  
  
  
  1.5       +5 -1      jakarta-avalon-apps/db/src/java/org/apache/avalon/db/optimizer/DefaultSQLOptimizer.java
  
  Index: DefaultSQLOptimizer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/optimizer/DefaultSQLOptimizer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultSQLOptimizer.java	18 May 2002 09:49:00 -0000	1.4
  +++ DefaultSQLOptimizer.java	19 May 2002 12:16:19 -0000	1.5
  @@ -22,8 +22,12 @@
   import org.apache.avalon.framework.service.Serviceable;
   
   /**
  + *
  + * @phoenix:block
  + * @phoenix:service name="org.apache.avalon.db.services.SQLOptimizer" 
  + *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   public class DefaultSQLOptimizer
       extends AbstractLogEnabled
  
  
  
  1.15      +5 -1      jakarta-avalon-apps/db/src/java/org/apache/avalon/db/persistence/inmemory/NoPersistence.java
  
  Index: NoPersistence.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/persistence/inmemory/NoPersistence.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- NoPersistence.java	18 May 2002 09:49:00 -0000	1.14
  +++ NoPersistence.java	19 May 2002 12:16:19 -0000	1.15
  @@ -29,8 +29,12 @@
   import java.util.HashMap;
   
   /**
  + *
  + * @phoenix:block
  + * @phoenix:service name="org.apache.avalon.db.services.DatabasePersistor" 
  + *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.14 $
  + * @version $Revision: 1.15 $
    */
   public class NoPersistence
       extends AbstractLogEnabled
  
  
  
  1.16      +6 -1      jakarta-avalon-apps/db/src/java/org/apache/avalon/db/persistence/store/StorePersistence.java
  
  Index: StorePersistence.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/persistence/store/StorePersistence.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- StorePersistence.java	12 May 2002 10:09:24 -0000	1.15
  +++ StorePersistence.java	19 May 2002 12:16:19 -0000	1.16
  @@ -27,8 +27,12 @@
    * Class StorePersistence
    *
    *
  + * @phoenix:block
  + * @phoenix:service name="org.apache.avalon.db.services.DatabasePersistor" 
  + * 
  + *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.15 $
  + * @version $Revision: 1.16 $
    */
   public class StorePersistence extends NoPersistence implements RowListener {
   
  @@ -42,6 +46,7 @@
        * @param serviceManager
        *
        * @throws ServiceException
  +     * @phoenix:dependency name="org.apache.avalon.cornerstone.services.store.Store"
        *
        */
       public void service(ServiceManager serviceManager) throws ServiceException {
  
  
  
  1.6       +11 -0     jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/altrmi/server/AltrmiDatabaseManager.java
  
  Index: AltrmiDatabaseManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/altrmi/server/AltrmiDatabaseManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AltrmiDatabaseManager.java	18 May 2002 09:49:00 -0000	1.5
  +++ AltrmiDatabaseManager.java	19 May 2002 12:16:20 -0000	1.6
  @@ -18,6 +18,10 @@
   import org.apache.excalibur.altrmi.server.AltrmiPublisher;
   
   /**
  + *
  + * @phoenix:block
  + * @phoenix:service name="org.apache.avalon.db.services.DatabaseManager"
  + * 
    * @author  Paul Hammant <Paul_Hammant@yahoo.com>
    * @version 1.0
    */
  @@ -34,6 +38,13 @@
           mContext = (BlockContext)context;
       }
   
  +    /**
  +     *
  +     * @phoenix:dependency name="org.apache.excalibur.altrmi.server.AltrmiPublisher"
  +     * @phoenix:dependency name="org.apache.avalon.db.services.ParserManager"
  +     * @phoenix:dependency name="org.apache.avalon.db.services.SQLOptimizer"
  +     *
  +     */
       public void service( final ServiceManager serviceManager ) throws ServiceException
       {
   
  
  
  
  1.12      +12 -0     jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.java
  
  Index: PlainCMDDatabaseManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- PlainCMDDatabaseManager.java	18 May 2002 09:49:01 -0000	1.11
  +++ PlainCMDDatabaseManager.java	19 May 2002 12:16:20 -0000	1.12
  @@ -28,6 +28,10 @@
   import org.apache.avalon.phoenix.BlockContext;
   
   /**
  + *
  + * @phoenix:block
  + * @phoenix:service name="org.apache.avalon.db.services.DatabaseManager" 
  + *
    * @author  Paul Hammant <Paul_Hammant@yahoo.com>
    * @version 1.0
    */
  @@ -83,6 +87,14 @@
           }
       }
   
  +    /**
  +     * 
  +     * @phoenix:dependency name="org.apache.avalon.db.services.ParserManager"
  +     * @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.db.services.SQLOptimizer"     
  +     *
  +     */
       public void service( final ServiceManager serviceManager ) throws ServiceException
       {
   
  
  
  
  1.7       +12 -0     jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/soap/server/SoapDatabaseManager.java
  
  Index: SoapDatabaseManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/soap/server/SoapDatabaseManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SoapDatabaseManager.java	18 May 2002 09:49:01 -0000	1.6
  +++ SoapDatabaseManager.java	19 May 2002 12:16:20 -0000	1.7
  @@ -18,6 +18,10 @@
   import org.apache.avalon.phoenix.BlockContext;
   
   /**
  + *
  + * @phoenix:block
  + * @phoenix:service name="org.apache.avalon.db.services.DatabaseManager" 
  + *
    * @author  Paul Hammant <Paul_Hammant@yahoo.com>
    * @version 1.0
    */
  @@ -34,6 +38,14 @@
           mContext = (BlockContext)context;
       }
   
  +    /**
  +     * 
  +     * @phoenix:dependency name="org.apache.avalon.db.services.ParserManager"
  +     * @phoenix:dependency name="org.apache.avalon.cornerstone.services.soapification.SOAPification"
  +     * @phoenix:dependency name="org.apache.avalon.db.services.DatabasePersistence"
  +     * @phoenix:dependency name="org.apache.avalon.db.services.SQLOptimizer"     
  +     *
  +     */
       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>


Mime
View raw message