avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon-excalibur/xfc default.properties
Date Tue, 22 Apr 2003 00:07:56 GMT
bloritsch    2003/04/21 17:07:56

  Modified:    .        build.xml libraries.properties
               event/src/java/org/apache/excalibur/event/command
                        TPSPThreadManager.java
               fortress build.xml default.properties
               logger   default.properties
               xfc      default.properties
  Log:
  fix the build
  
  Revision  Changes    Path
  1.207     +3 -24     avalon-excalibur/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/build.xml,v
  retrieving revision 1.206
  retrieving revision 1.207
  diff -u -r1.206 -r1.207
  --- build.xml	5 Apr 2003 19:39:33 -0000	1.206
  +++ build.xml	22 Apr 2003 00:07:55 -0000	1.207
  @@ -95,21 +95,6 @@
           <ant dir="logger" target="${subproject-target}"/>
       </target>
   
  -    <!-- Loader -->
  -    <target name="prj-loader" depends="prj-extension, prj-i18n">
  -        <ant dir="loader" target="${subproject-target}"/>
  -    </target>
  -
  -    <!-- Naming -->
  -    <target name="prj-naming">
  -        <ant dir="naming" target="${subproject-target}"/>
  -    </target>
  -
  -    <!-- Policy -->
  -    <target name="prj-policy">
  -        <ant dir="policy" target="${subproject-target}"/>
  -    </target>
  -
       <!-- Pool -->
       <target name="prj-pool" depends="prj-instrument">
           <ant dir="pool" target="${subproject-target}"/>
  @@ -126,15 +111,10 @@
       </target>
   
       <!-- Thread -->
  -    <target name="prj-thread" depends="prj-instrument, prj-pool, prj-threadcontext">
  +    <target name="prj-thread" depends="prj-instrument, prj-pool">
           <ant dir="thread" target="${subproject-target}"/>
       </target>
   
  -    <!-- ThreadContext -->
  -    <target name="prj-threadcontext">
  -        <ant dir="threadcontext" target="${subproject-target}"/>
  -    </target>
  -
       <!-- XMLUtil -->
       <target name="prj-xmlutil" depends="prj-component, prj-instrument, prj-logger, prj-pool,
prj-sourceresolve, prj-store">
           <ant dir="xmlutil" target="${subproject-target}"/>
  @@ -146,12 +126,11 @@
       <!-- This target depends on all of the projects above.  Relies on -->
       <!--  Ant to decide on the correct build order. -->
       <target name="build-all-subprojects"
  -        depends="prj-compatibility, prj-loader,
  -                prj-naming, prj-threadcontext,
  +        depends="prj-compatibility,
   		prj-i18n, prj-extension,
                   prj-configuration, prj-event,
                   prj-thread, prj-monitor, prj-fortress, prj-datasource,
  -                prj-instrument, prj-store, prj-logger, prj-policy,
  +                prj-instrument, prj-store, prj-logger,
                   prj-pool, prj-xmlutil, prj-lifecycle,
                   prj-sourceresolve, prj-instrument-client,
                   prj-instrument-manager, prj-component"/>
  
  
  
  1.2       +1 -1      avalon-excalibur/libraries.properties
  
  Index: libraries.properties
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/libraries.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- libraries.properties	5 Apr 2003 20:48:37 -0000	1.1
  +++ libraries.properties	22 Apr 2003 00:07:55 -0000	1.2
  @@ -133,7 +133,7 @@
   # ----- datasource -----
   excalibur-datasource.home=${basedir}/../datasource
   excalibur-datasource.lib=${excalibur-datasource.home}/build/lib
  -excalibur-datasource.jar=${excalibur-datasource.lib}/excalibur-datasource-1.1.jar
  +excalibur-datasource.jar=${excalibur-datasource.lib}/excalibur-datasource-1.1.1.jar
   
   # ----- event -----
   excalibur-event.home=${basedir}/../event
  
  
  
  1.25      +8 -9      avalon-excalibur/event/src/java/org/apache/excalibur/event/command/TPSPThreadManager.java
  
  Index: TPSPThreadManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/event/src/java/org/apache/excalibur/event/command/TPSPThreadManager.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- TPSPThreadManager.java	22 Mar 2003 12:46:27 -0000	1.24
  +++ TPSPThreadManager.java	22 Apr 2003 00:07:55 -0000	1.25
  @@ -57,9 +57,8 @@
   
   /**
    * This is a <code>ThreadManager</code> which provides a threadpool per
  - * <code>Sink</code> per <code>EventPipeline</code>.
  - *
  - * ::NOTE:: This is not implemented yet!
  + * <code>Sink</code> per <code>EventPipeline</code>. ::NOTE:: This
is not
  + * implemented yet!
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    */
  @@ -71,9 +70,9 @@
       private int m_threadsPerPool = 2;
   
       /**
  -     * The default constructor assumes there is a system property named "os.arch.cpus"
  -     * that has a default for the number of CPUs on a system.  Otherwise, the value
  -     * is 1.
  +     * The default constructor assumes there is a system property named
  +     * "os.arch.cpus" that has a default for the number of CPUs on a system.
  +     * Otherwise, the value is 1.
        *
        * @throws Exception if there is any problems creating the ThreadManager
        */
  @@ -84,11 +83,11 @@
       }
   
       /**
  -     * Constructor provides a specified number of threads per processor.  If
  +     * Constructor provides a specified number of threads per processor. If
        * either value is less then one, then the value is rewritten as one.
        *
  -     * @param maxThreadPerPool     The number of processors in the machine
  -     * @param sleepTime            The number of milliseconds to wait between cycles
  +     * @param maxThreadPerPool  The number of processors in the machine
  +     * @param sleepTime         The number of milliseconds to wait between cycles
        *
        * @throws Exception when there is a problem creating the ThreadManager
        */
  
  
  
  1.86      +0 -1      avalon-excalibur/fortress/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/build.xml,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- build.xml	16 Apr 2003 22:20:51 -0000	1.85
  +++ build.xml	22 Apr 2003 00:07:56 -0000	1.86
  @@ -405,7 +405,6 @@
   
   
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
  -        <copy file="../avalon/KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
           <mkdir dir="${dist.base}"/>
  
  
  
  1.73      +1 -1      avalon-excalibur/fortress/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/default.properties,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- default.properties	5 Apr 2003 19:39:35 -0000	1.72
  +++ default.properties	22 Apr 2003 00:07:56 -0000	1.73
  @@ -101,7 +101,7 @@
   # ----- Excalibur datasource, version 1.0 or later -----
   excalibur-datasource.home=${basedir}/../datasource/dist
   excalibur-datasource.lib=${excalibur-datasource.home}
  -excalibur-datasource.jar=${excalibur-datasource.lib}/excalibur-datasource-1.1.jar
  +excalibur-datasource.jar=${excalibur-datasource.lib}/excalibur-datasource-1.1.1.jar
   
   # ----- Excalibur component, version 1.0 or later -----
   excalibur-component.home=${basedir}/../component/dist
  
  
  
  1.24      +1 -1      avalon-excalibur/logger/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/logger/default.properties,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- default.properties	5 Apr 2003 19:39:37 -0000	1.23
  +++ default.properties	22 Apr 2003 00:07:56 -0000	1.24
  @@ -35,7 +35,7 @@
   
   # For optional logging capabilities.  See http://jakarta.apache.org/turbine/jars/
   #defaults lib.repo to a lib directory
  -lib.repo=${basedir}/lib
  +lib.repo=${basedir}/../lib
   servlet.jar=${lib.repo}/servlet.jar
   jdbc.jar=${lib.repo}/jdbc2_0-stdext.jar
   mail.jar=${lib.repo}/mail.jar
  
  
  
  1.11      +1 -1      avalon-excalibur/xfc/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/xfc/default.properties,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- default.properties	5 Apr 2003 19:39:38 -0000	1.10
  +++ default.properties	22 Apr 2003 00:07:56 -0000	1.11
  @@ -59,7 +59,7 @@
   # ----- Excalibur DataSource -----
   excalibur-datasource.home=${basedir}/../datasource
   excalibur-datasource.lib=${excalibur-datasource.home}/build/lib
  -excalibur-datasource.jar=${excalibur-datasource.lib}/excalibur-datasource-1.1.jar
  +excalibur-datasource.jar=${excalibur-datasource.lib}/excalibur-datasource-1.1.1.jar
   
   # ----- Excalibur Instrumentable -----
   excalibur-instrument.home=${basedir}/../instrument
  
  
  

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


Mime
View raw message