tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-5/resources/mbeans tomcat5-ant.xml
Date Tue, 22 Apr 2003 06:36:10 GMT
costin      2003/04/21 23:36:10

  Modified:    resources/mbeans tomcat5-ant.xml
  Log:
  To avoid confusions, remove the "run" target ( which was broken for some
  time and uses server.xml ) and rename run2.
  
  This won't work without reverting the Engine name ( or fixing the registration )
  
  In embed mode, we rely a lot on the domain name - a component can
  locate it's parent by using the component name ( and the domain )
  to construct the parent name. If Engine is identified by both domain
  and name - that becomes impossible. In addition it makes it difficult
  to work with multiple engines.
  
  Revision  Changes    Path
  1.9       +2 -17     jakarta-tomcat-5/resources/mbeans/tomcat5-ant.xml
  
  Index: tomcat5-ant.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/resources/mbeans/tomcat5-ant.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- tomcat5-ant.xml	19 Apr 2003 21:07:05 -0000	1.8
  +++ tomcat5-ant.xml	22 Apr 2003 06:36:10 -0000	1.9
  @@ -141,24 +141,9 @@
   
     <property name="domain" value="Catalina" />
   
  -  <target name="run" depends="init"
  -        description="Start tomcat as an mbean using server.xml config and returns">
  -
  -    <jmx-service>
  -       <mbean code="org.apache.catalina.startup.Catalina"
  -              name="${domain}:type=server" 
  -              modeler="true" >
  -         <attribute name="catalinaHome"
  -                    value="${tomcat.home}"/>
  -       </mbean>
  -    </jmx-service>
  -
  -    <echo message="Tomcat5 running"/>
  -  </target>
  -
     <!-- ======================= JMX only  ================ -->
   
  -  <target name="run2" depends="init,jmx-console"
  +  <target name="run" depends="init,jmx-console"
           description="Start tomcat as an mbean, no server.xml">
   
       <modelerRegistry resource="org/apache/catalina/mbeans/mbeans-descriptors.xml" />
  @@ -265,7 +250,7 @@
          <mbean name="${domain}:type=Realm,host=localhost,path=manager" 
                 code="org.apache.catalina.realm.MemoryRealm" modeler="true">
            <attribute name="pathname"
  -                    value="${tomcat.home}/conf/tomcat-users-manager.xml" />
  +                    value="${tomcat.home}/conf/tomcat-users.xml" />
          </mbean>
   
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message