cvs commit: jakarta-tomcat-5/resources/mbeans tomcat5-ant.xml

2003-11-13 Thread remm
remm2003/11/13 00:31:51

  Modified:resources/mbeans tomcat5-ant.xml
  Log:
  - Fix the webapps docbase (I wonder if the currently release package runs ...),
which was using my Tomcat build directory behind my back.
  
  Revision  ChangesPath
  1.15  +2 -2  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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- tomcat5-ant.xml   24 Oct 2003 13:08:47 -  1.14
  +++ tomcat5-ant.xml   13 Nov 2003 08:31:51 -  1.15
  @@ -5,7 +5,7 @@
   
 property name=tomcat.home location=. /
 !-- This matches the build struct with build and embed at the same level --
  -  property name=tomcat.webapps location=${tomcat.home}/../build/webapps /
  +  property name=tomcat.webapps location=${tomcat.home}/webapps /
   
 path id=tomcatCP-extra / 
   
  @@ -252,7 +252,7 @@
   
  mbean 
name=${jsr77Domain}:j2eeType=WebModule,name=//localhost/manager,J2EEApplication=none,J2EEServer=none
 
 code=org.apache.catalina.core.StandardContext  modeler=true
  - attribute name=docBase 
value=${tomcat.webapps}/../server/webapps/manager /
  + attribute name=docBase value=${tomcat.webapps}/manager /
attribute name=engineName value=${domain} /
attribute name=privileged value=true /
  /mbean
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-5/resources/mbeans tomcat5-ant.xml

2003-11-13 Thread remm
remm2003/11/13 00:45:48

  Modified:resources/mbeans tomcat5-ant.xml
  Log:
  - More cleanup.
  
  Revision  ChangesPath
  1.16  +8 -133jakarta-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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- tomcat5-ant.xml   13 Nov 2003 08:31:51 -  1.15
  +++ tomcat5-ant.xml   13 Nov 2003 08:45:48 -  1.16
  @@ -9,7 +9,6 @@
   
 path id=tomcatCP-extra / 
   
  -
 target name=init unless=init.done
   
   path id=tomcatCP 
  @@ -248,6 +247,13 @@
attribute name=privileged value=true /
attribute name=engineName value=${domain} /
  /mbean
  +
  +   mbean 
name=${jsr77Domain}:j2eeType=WebModule,name=//localhost/tomcat-docs,J2EEApplication=none,J2EEServer=none
 
  +  code=org.apache.catalina.core.StandardContext  modeler=true
  + attribute name=docBase value=${tomcat.webapps}/tomcat-docs /
  + attribute name=privileged value=true /
  + attribute name=engineName value=${domain} /
  +   /mbean
   --
   
  mbean 
name=${jsr77Domain}:j2eeType=WebModule,name=//localhost/manager,J2EEApplication=none,J2EEServer=none
 
  @@ -268,7 +274,7 @@
   !--
  mbean 
name=${domain}:j2eeType=WebModule,name=//localhost/admin,J2EEApplication=none,J2EEServer=none
 
 code=org.apache.catalina.core.StandardContext  modeler=true
  - attribute name=docBase 
value=${tomcat.webapps}/../server/webapps/admin /
  + attribute name=docBase value=${tomcat.webapps}/admin /
attribute name=privileged value=true /
  /mbean
   --
  @@ -276,137 +282,6 @@
   /jmx-service
 /target
   
  -  target name=run2 depends=init,jmx-console
  -description=Start 2 engines
  -
  -modelerRegistry resource=org/apache/catalina/mbeans/mbeans-descriptors.xml /
  -
  -mkdir dir=${tomcat.home}/work/${domain}/ /
  -
  -jmx-service
  -!--
  -  Should be optional - but the name is used in several places.
  -  The whole name should disapear - use domain instead
  ---
  -   mbean name=${domain}:type=Service 
  -  code=org.apache.catalina.core.StandardService
  -  modeler=true
  - attribute name=name value=Tomcat-Standalone/
  -   /mbean
  -
  -
  -   mbean name=${domain}:type=Engine 
  -  code=org.apache.catalina.core.StandardEngine
  -  modeler=true
  - attribute name=name value=Tomcat-Standalone/
  - attribute name=baseDir value=${tomcat.home}/
  - attribute name=defaultHost value=localhost/
  -   /mbean
  -
  -!--
  -   mbean name=${domain}:type=Realm 
  -  code=org.apache.catalina.realm.JAASRealm modeler=true
  -   /mbean
  ---
  -   mbean name=${domain}:type=Realm 
  -  code=org.apache.catalina.realm.MemoryRealm modeler=true
  - attribute name=pathname
  -value=${tomcat.home}/conf/tomcat-users.xml /
  -   /mbean
  -
  -!--
  -   mbean name=${domain}:type=Connector,port=9009 
  -  code=org.apache.coyote.tomcat5.CoyoteConnector
  -  modeler=true
  - attribute name=protocolHandlerClassName
  -value=org.apache.jk.server.JkCoyoteHandler /
  -   /mbean
  ---
  -
  -   mbean name=${domain}:type=Channel,name=ChannelUn 
  -  code=org.apache.jk.common.ChannelUn
  -  modeler=true
  -  attribute name=file value=${tomcat.home}/work/${domain}/jk2.channel 
/
  -   /mbean
  -
  -
  -   mbean name=${domain}:type=Connector,port=9080 
  -  code=org.apache.coyote.tomcat5.CoyoteConnector
  -  modeler=true
  -  attribute name=port value=9080 /
  -   /mbean
  -
  -
  -!--
  -   mbean 
name=${domain}:type=DefaultContext,host=localhost,service=Tomcat-Standalone 
  -  code=org.apache.catalina.core.StandardDefaultContext
  -  modeler=true
  -   /mbean
  ---
  -
  -
  -!-- Optional: when the context is created it'll create a host if none is found.
  ---
  -   mbean name=${domain}:type=Host,host=localhost 
  -  code=org.apache.catalina.core.StandardHost modeler=true
  - attribute name=name value=localhost/
  -   /mbean
  -
  -
  -   mbean 
name=${domain}:j2eeType=WebModule,name=//localhost/,J2EEApplication=none,J2EEServer=none
 
  -  code=org.apache.catalina.core.StandardContext  modeler=true
  - attribute name=docBase value=${tomcat.webapps}/ROOT /
  - !-- Required for now --
  - attribute name=privileged value=true /
  -   /mbean
  -
  -!-- 
  -   mbean 

cvs commit: jakarta-tomcat-5/resources/mbeans tomcat5-ant.xml

2003-10-24 Thread remm
remm2003/10/24 06:08:47

  Modified:resources/mbeans tomcat5-ant.xml
  Log:
  - The JSR 77 beans must be in the same domain as the engine.
  - This is due
to a limitation of JMX which prevents retrieving attributes of a bean when
the unregistration event is sent. IMO, the server should send the unregistration
before removing the bean.
  
  Revision  ChangesPath
  1.14  +1 -1  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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- tomcat5-ant.xml   10 Aug 2003 09:53:37 -  1.13
  +++ tomcat5-ant.xml   24 Oct 2003 13:08:47 -  1.14
  @@ -139,7 +139,7 @@
 !-- === Server.xml based - backward compat  
--
   
 property name=domain value=Catalina /
  -  property name=jsr77Domain value=JSR77 /
  +  property name=jsr77Domain value=Catalina /
   
 !-- === JMX only   --
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-5/resources/mbeans tomcat5-ant.xml

2003-08-14 Thread remm
remm2003/08/10 02:53:37

  Modified:.build.xml
   resources/mbeans tomcat5-ant.xml
  Log:
  - Make the embed distribution easier to run (just type ant).
  
  Revision  ChangesPath
  1.149 +1 -1  jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.148
  retrieving revision 1.149
  diff -u -r1.148 -r1.149
  --- build.xml 10 Aug 2003 08:50:44 -  1.148
  +++ build.xml 10 Aug 2003 09:53:37 -  1.149
  @@ -682,7 +682,7 @@
 /fileset
   /copy
   --
  -copy tofile=embed/tomcat5-ant.xml file=resources/mbeans/tomcat5-ant.xml /
  +copy tofile=embed/build.xml file=resources/mbeans/tomcat5-ant.xml /
   !-- 
   copy tofile=embed/tomcat5-mbeans.xml 
file=resources/mbeans/tomcat5-mbeans.xml /
   copy tofile=embed/tomcat5-mlet.xml file=resources/mbeans/tomcat5-mlet.xml 
/
  
  
  
  1.13  +1 -1  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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- tomcat5-ant.xml   24 Jul 2003 09:55:16 -  1.12
  +++ tomcat5-ant.xml   10 Aug 2003 09:53:37 -  1.13
  @@ -1,4 +1,4 @@
  -project name=tomcat-embed default=run basedir=.
  +project name=tomcat-embed default=start basedir=.
   
 property file=${user.home}/build.properties/
 property file=build.properties/
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-5/resources/mbeans tomcat5-ant.xml

2003-07-24 Thread remm
remm2003/07/24 02:55:16

  Modified:resources/mbeans tomcat5-ant.xml
  Log:
  - Fix obscure JAXP related CL problem. The issue is likely the lack of decoupling
with the main Ant CL.
  
  Revision  ChangesPath
  1.12  +1 -0  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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- tomcat5-ant.xml   26 Jun 2003 00:08:41 -  1.11
  +++ tomcat5-ant.xml   24 Jul 2003 09:55:16 -  1.12
  @@ -147,6 +147,7 @@
   description=Start tomcat as an mbean, no server.xml
   
   modelerRegistry resource=org/apache/catalina/mbeans/mbeans-descriptors.xml /
  +modelerRegistry resource=org/apache/catalina/loader/mbeans-descriptors.xml /
   mkdir dir=${tomcat.home}/work/${domain}/ /
   
   jmx-service
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-5/resources/mbeans tomcat5-ant.xml

2003-06-25 Thread yoavs
yoavs   2003/06/25 17:08:41

  Modified:resources/mbeans tomcat5-ant.xml
  Log:
  Fixed bug 19940
  
  Revision  ChangesPath
  1.11  +5 -7  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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- tomcat5-ant.xml   25 Apr 2003 14:38:50 -  1.10
  +++ tomcat5-ant.xml   26 Jun 2003 00:08:41 -  1.11
  @@ -4,7 +4,7 @@
 property file=build.properties/
   
 property name=tomcat.home location=. /
  -  !-- That matches the build struct with build and embed at the same level --
  +  !-- This matches the build struct with build and embed at the same level --
 property name=tomcat.webapps location=${tomcat.home}/../build/webapps /
   
 path id=tomcatCP-extra / 
  @@ -15,8 +15,7 @@
   path id=tomcatCP 
 path refid=tomcatCP-extra/
   
  -  !-- Just include everything for now 
  -   --
  +  !-- Just include everything for now --
 fileset dir=${tomcat.home}/lib includes=*.jar/
 pathelement  path=${tomcat.home}/conf/
 !-- my log4j.properties --
  @@ -39,7 +38,7 @@
   
 !--  Console - for debugging.  
  Call this target if you want the console added.
  ---
  +  --
   
 target name=jmx-console depends=jmx-console-ri,jmx-console-mx4j /
   
  @@ -257,7 +256,7 @@
attribute name=privileged value=true /
  /mbean
   
  -   !-- The realm must be declared after the web module. ( for now ) --
  +   !-- The realm must be declared after the web module (for now). --
  mbean name=${domain}:type=Realm,host=localhost,path=manager 
 code=org.apache.catalina.realm.MemoryRealm modeler=true
attribute name=pathname
  @@ -409,8 +408,7 @@
 /target
   
 !--  Await  
  -   Call this target if you want the build file to hung in await. Tomcat stop 
or ^C will stop 
  -   the ant execution
  +   Call this target if you want the build file to hang in await. Tomcat stop 
or ^C will stop the ant execution.
   --
 target name=await depends=init
   description=Wait for tomcat stop. Call this target after run
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-5/resources/mbeans tomcat5-ant.xml

2003-03-17 Thread costin
costin  2003/03/17 11:28:19

  Modified:resources/mbeans tomcat5-ant.xml
  Log:
  More friendly startup for the console ( detect jmxri or mx4j )
  
  Removed service
  
  Added /admin ( commented out for now )
  
  Revision  ChangesPath
  1.6   +30 -7 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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- tomcat5-ant.xml   12 Mar 2003 15:48:45 -  1.5
  +++ tomcat5-ant.xml   17 Mar 2003 19:28:18 -  1.6
  @@ -22,6 +22,14 @@
   taskdef resource=org/apache/commons/modeler/ant/ant.properties
classpathref=tomcatCP /
   property name=init.done value=true/
  +
  +available classname=com.sun.jdmk.comm.HtmlAdaptorServer
  +   property=jmxritools-available 
  +   classpathref=tomcatCP /
  +
  +available classname=mx4j.adaptor.http.XSLTProcessor
  +   property=mx4jtools-available 
  +   classpathref=tomcatCP /
 /target
   
   
  @@ -29,7 +37,12 @@
  Call this target if you want the console added.
   --
   
  -  target name=jmx-console-ri depends=init description=Enable JMX-RI console ( 
web interface ) 
  +  target name=jmx-console depends=jmx-console-ri,jmx-console-mx4j /
  +
  +  target name=jmx-console-ri 
  +  depends=init 
  +  description=Enable JMX-RI console ( web interface ) 
  +  if=jmxritools-available
   
   jmx-service
 mbean code=com.sun.jdmk.comm.HtmlAdaptorServer
  @@ -40,7 +53,10 @@
   
 /target
   
  -  target name=jmx-console-mx4j depends=init description=Enable JMX console ( 
mx4j ) 
  +  target name=jmx-console-mx4j 
  +  depends=init 
  +  description=Enable JMX console ( mx4j ) 
  +  if=mx4jtools-available
   
   jmx-service
 mbean code=mx4j.adaptor.http.XSLTProcessor
  @@ -75,7 +91,7 @@
 /target
   
   
  -  target name=run2 depends=init
  +  target name=run2 depends=init,jmx-console
   description=Start tomcat as an mbean, no server.xml
   
   modelerRegistry resource=org/apache/catalina/mbeans/mbeans-descriptors.xml /
  @@ -86,14 +102,14 @@
 Should be optional - but the name is used in several places.
 The whole name should disapear - use domain instead
   --
  -   mbean name=${domain}:type=Service,name=Tomcat-Standalone 
  +   mbean name=${domain}:type=Service 
 code=org.apache.catalina.core.StandardService
 modeler=true
attribute name=name value=Tomcat-Standalone/
  /mbean
   
   
  -   mbean name=${domain}:type=Engine,name=Tomcat-Standalone 
  +   mbean name=${domain}:type=Engine 
 code=org.apache.catalina.core.StandardEngine
 modeler=true
attribute name=name value=Tomcat-Standalone/
  @@ -101,7 +117,7 @@
attribute name=defaultHost value=localhost/
  /mbean
   
  -   mbean name=${domain}:type=Realm,service=Tomcat-Standalone 
  +   mbean name=${domain}:type=Realm 
 code=org.apache.catalina.realm.JAASRealm modeler=true
  /mbean
   
  @@ -132,7 +148,7 @@
   
   !-- Optional: when the context is created it'll create a host if none is found.
   --
  -   mbean name=${domain}:type=Host,host=localhost,service=Tomcat-Standalone 
  +   mbean name=${domain}:type=Host,host=localhost 
 code=org.apache.catalina.core.StandardHost modeler=true
attribute name=name value=localhost/
  /mbean
  @@ -159,6 +175,13 @@
attribute name=privileged value=true /
  /mbean
   
  +!--
  +   mbean 
name=${domain}:j2eeType=WebModule,name=//localhost/admin,J2EEApplication=none,J2EEServer=none
 
  +  code=org.apache.catalina.core.StandardContext  modeler=true
  + attribute name=docBase value=/opt/50/server/webapps/admin /
  + attribute name=privileged value=true /
  +   /mbean
  +--
   
   /jmx-service
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-5/resources/mbeans tomcat5-ant.xml

2003-03-12 Thread costin
costin  2003/03/12 07:48:45

  Modified:resources/mbeans tomcat5-ant.xml
  Log:
  Fix the app name, now it works fine
  
  Revision  ChangesPath
  1.5   +1 -1  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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- tomcat5-ant.xml   8 Mar 2003 06:46:54 -   1.4
  +++ tomcat5-ant.xml   12 Mar 2003 15:48:45 -  1.5
  @@ -145,7 +145,7 @@
attribute name=privileged value=true /
  /mbean
   
  -   mbean 
name=${domain}:j2eeType=WebModule,name=//localhost/servlet-examples,J2EEApplication=none,J2EEServer=none
 
  +   mbean 
name=${domain}:j2eeType=WebModule,name=//localhost/servlets-examples,J2EEApplication=none,J2EEServer=none
 
 code=org.apache.catalina.core.StandardContext  modeler=true
attribute name=docBase value=/opt/50/webapps/servlets-examples /
!-- Required for now --
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-5/resources/mbeans tomcat5-ant.xml

2003-03-07 Thread costin
costin  2003/03/07 07:34:12

  Modified:resources/mbeans tomcat5-ant.xml
  Log:
  Added a run2 target that uses only mbeans, no external config.
  
  Don't try to run it yet - there are a dozen of NPEs fixes I need to
  check in.
  
  Revision  ChangesPath
  1.3   +64 -9 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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- tomcat5-ant.xml   28 Feb 2003 04:56:54 -  1.2
  +++ tomcat5-ant.xml   7 Mar 2003 15:34:12 -   1.3
  @@ -16,6 +16,7 @@
 !-- Just include everything for now 
  --
 fileset dir=${tomcat.home}/lib includes=*.jar/
  +  pathelement  path=${tomcat.home}/classes/
   /path
   
   taskdef resource=org/apache/commons/modeler/ant/ant.properties
  @@ -61,7 +62,6 @@
 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 
  @@ -72,20 +72,77 @@
   /jmx-service
   
   echo message=Tomcat5 running/
  +  /target
  +
  +
  +  target name=run2 depends=init
  +description=Start tomcat as an mbean, no server.xml
  +
  +modelerRegistry resource=org/apache/catalina/mbeans/mbeans-descriptors.xml /
   
  -!-- let's add a context - using JMX. 
  - That will fail with class loader problems... XXX 
  -  --
   
   jmx-service
  -   mbean 
name=${domain}:j2eeType=WebModule,name=//localhost/servlet-examples,J2EEApplication=none,J2EEServer=none
 
  +!--
  +  Should be optional - but the name is used in several places.
  +  The whole name should disapear - use domain instead
  +--
  +   mbean name=${domain}:type=Service,name=Tomcat-Standalone 
  +  code=org.apache.catalina.core.StandardService
  +  modeler=true
  + attribute name=name value=Tomcat-Standalone/
  +   /mbean
  +
  +   mbean name=${domain}:type=Engine,name=Tomcat-Standalone 
  +  code=org.apache.catalina.core.StandardEngine
  +  modeler=true
  + attribute name=name value=Tomcat-Standalone/
  + attribute name=baseDir value=/opt/50/
  + attribute name=defaultHost value=localhost/
  +   /mbean
  +
  +!--
  +   mbean name=${domain}:type=Connector,port=9009 
  +  code=org.apache.coyote.tomcat5.CoyoteConnector
  +  modeler=true
  + attribute name=protocolHandlerClassName
  +value=org.apache.jk.server.JkCoyoteHandler /
  +   /mbean
  +--
  +
  +   mbean name=${domain}:type=Connector,port=9080 
  +  code=org.apache.coyote.tomcat5.CoyoteConnector
  +  modeler=true
  +  attribute name=port value=9080 /
  +   /mbean
  +
  +!--
  +   mbean 
name=${domain}:type=DefaultContext,host=localhost,Service=Tomcat-Standalone 
  +  code=org.apache.catalina.core.StandardDefaultContext
  +  modeler=true
  +   /mbean
  +--
  +
  +   mbean name=${domain}:type=Host,host=localhost,Service=Tomcat-Standalone 
  +  code=org.apache.catalina.core.StandardHost
  +  modeler=true
  + attribute name=name value=localhost1/
  +   /mbean
  +
  +   mbean 
name=${domain}:j2eeType=WebModule,name=//localhost/,J2EEApplication=none,J2EEServer=none
 
 code=org.apache.catalina.core.StandardContext
 modeler=true
attribute name=docBase
  -value=/ws/50/build/webapps/servlet-examples /
  +value=/ws/50/build/webapps/ROOT /
  + attribute name=privileged
  +value=true /
  /mbean
   /jmx-service
  -
  +
  +echo message=Tomcat5 running/
  +
  +!-- XXX hack - I need to make the threads non-daemon --
  +sleep hours=1/
  +
 /target
   
 !--  Await  
  @@ -94,10 +151,8 @@
   --
 target name=await depends=init
   description=Wait for tomcat stop. Call this target after run
  -
   jmx objectName=${domain}:type=server
operation=await /
  -
 /target
   
 target name=start depends=init,run,await description=Start tomcat, wait for 
stop message/
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-5/resources/mbeans tomcat5-ant.xml

2003-03-07 Thread costin
costin  2003/03/07 22:46:54

  Modified:resources/mbeans tomcat5-ant.xml
  Log:
  Added the realm, now all apps start and seem to basically work.
  
  Revision  ChangesPath
  1.4   +37 -12jakarta-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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- tomcat5-ant.xml   7 Mar 2003 15:34:12 -   1.3
  +++ tomcat5-ant.xml   8 Mar 2003 06:46:54 -   1.4
  @@ -16,7 +16,7 @@
 !-- Just include everything for now 
  --
 fileset dir=${tomcat.home}/lib includes=*.jar/
  -  pathelement  path=${tomcat.home}/classes/
  +  pathelement  path=${tomcat.home}/conf/
   /path
   
   taskdef resource=org/apache/commons/modeler/ant/ant.properties
  @@ -92,6 +92,7 @@
attribute name=name value=Tomcat-Standalone/
  /mbean
   
  +
  mbean name=${domain}:type=Engine,name=Tomcat-Standalone 
 code=org.apache.catalina.core.StandardEngine
 modeler=true
  @@ -100,6 +101,10 @@
attribute name=defaultHost value=localhost/
  /mbean
   
  +   mbean name=${domain}:type=Realm,service=Tomcat-Standalone 
  +  code=org.apache.catalina.realm.JAASRealm modeler=true
  +   /mbean
  +
   !--
  mbean name=${domain}:type=Connector,port=9009 
 code=org.apache.coyote.tomcat5.CoyoteConnector
  @@ -109,34 +114,54 @@
  /mbean
   --
   
  +
  mbean name=${domain}:type=Connector,port=9080 
 code=org.apache.coyote.tomcat5.CoyoteConnector
 modeler=true
 attribute name=port value=9080 /
  /mbean
   
  +
   !--
  -   mbean 
name=${domain}:type=DefaultContext,host=localhost,Service=Tomcat-Standalone 
  +   mbean 
name=${domain}:type=DefaultContext,host=localhost,service=Tomcat-Standalone 
 code=org.apache.catalina.core.StandardDefaultContext
 modeler=true
  /mbean
   --
   
  -   mbean name=${domain}:type=Host,host=localhost,Service=Tomcat-Standalone 
  -  code=org.apache.catalina.core.StandardHost
  -  modeler=true
  - attribute name=name value=localhost1/
  +
  +!-- Optional: when the context is created it'll create a host if none is found.
  +--
  +   mbean name=${domain}:type=Host,host=localhost,service=Tomcat-Standalone 
  +  code=org.apache.catalina.core.StandardHost modeler=true
  + attribute name=name value=localhost/
  /mbean
   
  +
  mbean 
name=${domain}:j2eeType=WebModule,name=//localhost/,J2EEApplication=none,J2EEServer=none
 
  -  code=org.apache.catalina.core.StandardContext
  -  modeler=true
  - attribute name=docBase
  -value=/ws/50/build/webapps/ROOT /
  - attribute name=privileged
  -value=true /
  +  code=org.apache.catalina.core.StandardContext  modeler=true
  + attribute name=docBase value=/opt/50/webapps/ROOT /
  + !-- Required for now --
  + attribute name=privileged value=true /
  +   /mbean
  +
  +   mbean 
name=${domain}:j2eeType=WebModule,name=//localhost/servlet-examples,J2EEApplication=none,J2EEServer=none
 
  +  code=org.apache.catalina.core.StandardContext  modeler=true
  + attribute name=docBase value=/opt/50/webapps/servlets-examples /
  + !-- Required for now --
  + attribute name=privileged value=true /
  +   /mbean
  +
  +   mbean 
name=${domain}:j2eeType=WebModule,name=//localhost/jsp-examples,J2EEApplication=none,J2EEServer=none
 
  +  code=org.apache.catalina.core.StandardContext  modeler=true
  + attribute name=docBase value=/opt/50/webapps/jsp-examples /
  + !-- Required for now --
  + attribute name=privileged value=true /
  /mbean
  +
  +
   /jmx-service
  +
   
   echo message=Tomcat5 running/
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-5/resources/mbeans tomcat5-ant.xml

2003-02-27 Thread costin
costin  2003/02/27 20:56:54

  Modified:resources/mbeans tomcat5-ant.xml
  Log:
  Update to the new syntax in modeler.
  
  Revision  ChangesPath
  1.2   +44 -36jakarta-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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tomcat5-ant.xml   26 Feb 2003 19:22:05 -  1.1
  +++ tomcat5-ant.xml   28 Feb 2003 04:56:54 -  1.2
  @@ -29,54 +29,62 @@
   --
   
 target name=jmx-console-ri depends=init description=Enable JMX-RI console ( 
web interface ) 
  -mbean code=com.sun.jdmk.comm.HtmlAdaptorServer
  -   name=jmx-console:type=HtmlAdaptorServer,port=9998
  -/mbean
  -jmx-attribute objectName=jmx-console:type=HtmlAdaptorServer,port=9998 
  -   attribute=Port type=int value=9998/
   
  -jmx-operation objectName=jmx-console:type=HtmlAdaptorServer,port=9998
  -   operation=start /
  +jmx-service
  +  mbean code=com.sun.jdmk.comm.HtmlAdaptorServer
  + name=jmx-console:type=HtmlAdaptorServer,port=9998
  + attribute name=Port value=9998/
  + /mbean
  +/jmx-service
  +
  +  /target
  +
  +  target name=jmx-console-mx4j depends=init description=Enable JMX console ( 
mx4j ) 
  +
  +jmx-service
  +  mbean code=mx4j.adaptor.http.XSLTProcessor
  + name=Http:name=XSLTProcessor
  +  /mbean
  +  mbean code=mx4j.adaptor.http.HttpAdaptor
  + name=Http:name=HttpAdaptor
  + attribute name=Port value=9998/
  + attribute name=ProcessorName value=Http:name=XSLTProcessor/
  + /mbean
  +/jmx-service
  +
 /target
   
   
 !-- === Server.xml based  --
  +  property name=domain value=Catalina /
   
 target name=run depends=init
   description=Start tomcat as an mbean using server.xml config and returns
  -property name=domain value=Catalina /
  -
  -modeler code=org.apache.catalina.startup.Catalina
  -  name=${domain}:type=server /
   
  -jmxSet objectName=${domain}:type=server
  -attribute=catalinaHome
  -value=${tomcat.home}/
  -  
  -!-- We could also call init and set other properties - 
  - init should load the modules --
  -
  -jmx objectName=${domain}:type=server
  - operation=start /
   
  +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/
   
  -!-- let's add a context - using JMX 
  -property name=admin1Name 
  -  
value=${domain}:j2eeType=WebModule,name=//localhost/admin1,J2EEApplication=none,J2EEServer=none
 /
  -
  -modeler code=org.apache.catalina.core.StandardContext
  -   name=${admin1Name} /
  -
  -jmxSet objectName=${admin1Name}
  -attribute=docBase
  -value=${tomcat.home}/server/webapps/admin /
  -
  -jmx objectName=${admin1Name}
  - operation=init /
  ---
  -
  +!-- let's add a context - using JMX. 
  + That will fail with class loader problems... XXX 
  +  --
  +
  +jmx-service
  +   mbean 
name=${domain}:j2eeType=WebModule,name=//localhost/servlet-examples,J2EEApplication=none,J2EEServer=none
 
  +  code=org.apache.catalina.core.StandardContext
  +  modeler=true
  + attribute name=docBase
  +value=/ws/50/build/webapps/servlet-examples /
  +   /mbean
  +/jmx-service
   
 /target
   
  @@ -87,7 +95,7 @@
 target name=await depends=init
   description=Wait for tomcat stop. Call this target after run
   
  -jmx objectName=Catalina:type=server
  +jmx objectName=${domain}:type=server
operation=await /
   
 /target
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-5/resources/mbeans tomcat5-ant.xml

2003-02-26 Thread costin
costin  2003/02/26 11:22:05

  Added:   resources/mbeans tomcat5-ant.xml
  Log:
  Minimal ant script to get embeded tomcat running.
  
  The startup time on a 1 GHz machine is 6 seconds ( with no webapp ) :-)
  So far the size is 3 MB - but a lot of stuff can be moved to modules, and
  libraries are almost half of it.
  
  Revision  ChangesPath
  1.1  jakarta-tomcat-5/resources/mbeans/tomcat5-ant.xml
  
  Index: tomcat5-ant.xml
  ===
  project name=tomcat-embed default=start basedir=.
  
property file=${user.home}/build.properties/
property file=build.properties/
  
property name=tomcat.home location=. /
  
path id=tomcatCP-extra / 
  
  
target name=init unless=init.done
  
  path id=tomcatCP 
path refid=tomcatCP-extra/
  
!-- Just include everything for now 
 --
fileset dir=${tomcat.home}/lib includes=*.jar/
  /path
  
  taskdef resource=org/apache/commons/modeler/ant/ant.properties
   classpathref=tomcatCP /
  property name=init.done value=true/
/target
  
  
!--  Console - for debugging.  
 Call this target if you want the console added.
  --
  
target name=jmx-console-ri depends=init description=Enable JMX-RI console ( 
web interface ) 
  mbean code=com.sun.jdmk.comm.HtmlAdaptorServer
 name=jmx-console:type=HtmlAdaptorServer,port=9998
  /mbean
  jmx-attribute objectName=jmx-console:type=HtmlAdaptorServer,port=9998 
 attribute=Port type=int value=9998/
  
  jmx-operation objectName=jmx-console:type=HtmlAdaptorServer,port=9998
 operation=start /
/target
  
  
!-- === Server.xml based  --
  
target name=run depends=init
  description=Start tomcat as an mbean using server.xml config and returns
  property name=domain value=Catalina /
  
  modeler code=org.apache.catalina.startup.Catalina
name=${domain}:type=server /
  
  jmxSet objectName=${domain}:type=server
  attribute=catalinaHome
  value=${tomcat.home}/

  !-- We could also call init and set other properties - 
   init should load the modules --
  
  jmx objectName=${domain}:type=server
   operation=start /
  
  
  echo message=Tomcat5 running/
  
  !-- let's add a context - using JMX 
  property name=admin1Name 

value=${domain}:j2eeType=WebModule,name=//localhost/admin1,J2EEApplication=none,J2EEServer=none
 /
  
  modeler code=org.apache.catalina.core.StandardContext
 name=${admin1Name} /
  
  jmxSet objectName=${admin1Name}
  attribute=docBase
  value=${tomcat.home}/server/webapps/admin /
  
  jmx objectName=${admin1Name}
   operation=init /
  --
  
  
/target
  
!--  Await  
 Call this target if you want the build file to hung in await. Tomcat stop 
or ^C will stop 
 the ant execution
  --
target name=await depends=init
  description=Wait for tomcat stop. Call this target after run
  
  jmx objectName=Catalina:type=server
   operation=await /
  
/target
  
target name=start depends=init,run,await description=Start tomcat, wait for 
stop message/
  
  /project
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]