avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/activation DefaultServiceResolver.java DefaultServiceResolver.xinfo
Date Mon, 09 Sep 2002 05:49:18 GMT
mcconnell    2002/09/08 22:49:18

  Modified:    assembly/src/etc/activator server.xml
               assembly/src/java/org/apache/excalibur/merlin/activation
                        DefaultServiceResolver.java
                        DefaultServiceResolver.xinfo
  Log:
  Corrected causal exception handling.
  
  Revision  Changes    Path
  1.6       +5 -0      jakarta-avalon-excalibur/assembly/src/etc/activator/server.xml
  
  Index: server.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/etc/activator/server.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- server.xml	9 Sep 2002 04:33:52 -0000	1.5
  +++ server.xml	9 Sep 2002 05:49:17 -0000	1.6
  @@ -57,6 +57,11 @@
           </configuration>
        </component>
   
  +     <!--
  +     The activator container is container that provides support for remote activation
  +     of services that it is hosting.
  +     -->
  +
        <container name="activator" class="org.apache.excalibur.merlin.activation.DefaultServiceResolver">
   
          <categories priority="INFO">
  
  
  
  1.9       +1 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/activation/DefaultServiceResolver.java
  
  Index: DefaultServiceResolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/activation/DefaultServiceResolver.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DefaultServiceResolver.java	9 Sep 2002 04:33:53 -0000	1.8
  +++ DefaultServiceResolver.java	9 Sep 2002 05:49:17 -0000	1.9
  @@ -163,7 +163,7 @@
      /**
       * Initialization of the server.  The initialization validates that a 
       * logging channel is available, that configuration exists, and that 
  -    * context is not null.  Folowing validation, the implementation 
  +    * context is not null.  Following validation, the implementation 
       * creates an ORB based on a child configuration named 'orb' supplied
       * during Initializer establishment.  Once the ORB is obtained, the 
       * implementation handles the establishment of the POA and servant.
  
  
  
  1.4       +0 -3      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/activation/DefaultServiceResolver.xinfo
  
  Index: DefaultServiceResolver.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/activation/DefaultServiceResolver.xinfo,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultServiceResolver.xinfo	8 Sep 2002 16:59:36 -0000	1.3
  +++ DefaultServiceResolver.xinfo	9 Sep 2002 05:49:17 -0000	1.4
  @@ -35,9 +35,6 @@
   
     <services>
       <service>
  -      <attributes>
  -        <attribute key="corba:helper" value="org.apache.orb.corbaloc.ServiceResolver"/>
  -      </attributes>
         <reference type="org.apache.orb.corbaloc.ServiceResolverOperations" />
       </service>
       <service>
  
  
  

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