You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@apache.org on 2005/12/24 14:32:44 UTC
svn commit: r358933 - in /cocoon/trunk: ./ legal/ tools/jetty/
tools/jetty/conf/ tools/jetty/lib/
Author: giacomo
Date: Sat Dec 24 05:32:04 2005
New Revision: 358933
URL: http://svn.apache.org/viewcvs?rev=358933&view=rev
Log:
upgrade jetty to 5.1.8 including JMX features
Added:
cocoon/trunk/legal/jetty-5.1.8.jar.license.txt
cocoon/trunk/tools/jetty/conf/admin-jmx.xml
cocoon/trunk/tools/jetty/conf/jetty-start.config
cocoon/trunk/tools/jetty/conf/main-jmx.xml
cocoon/trunk/tools/jetty/jetty-start-5.1.8.jar (with props)
cocoon/trunk/tools/jetty/lib/jetty-5.1.8.jar (with props)
cocoon/trunk/tools/jetty/lib/mx4j-3.0.1.jar (with props)
cocoon/trunk/tools/jetty/lib/mx4j-tools-2.1.1.jar (with props)
cocoon/trunk/tools/jetty/lib/servlet-2.4.jar (with props)
Removed:
cocoon/trunk/legal/jetty-4.2.23.jar.license.html
cocoon/trunk/tools/jetty/lib/jetty-4.2.23.jar
cocoon/trunk/tools/jetty/lib/servlet-2.3.jar
Modified:
cocoon/trunk/cocoon.sh
cocoon/trunk/tools/jetty/conf/main.xml
Modified: cocoon/trunk/cocoon.sh
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon.sh?rev=358933&r1=358932&r2=358933&view=diff
==============================================================================
--- cocoon/trunk/cocoon.sh (original)
+++ cocoon/trunk/cocoon.sh Sat Dec 24 05:32:04 2005
@@ -47,6 +47,9 @@
#
# JETTY_ADMIN_PORT
# The port where the jetty web administration should bind
+#
+# JETTY_JMX_PORT
+# The port where the jetty JMX HTTP Adapter should bind
#
@@ -57,6 +60,8 @@
echo " cli Run Cocoon from the command line"
echo " servlet Run Cocoon in a servlet container (default)"
echo " servlet-admin Run Cocoon in a servlet container and turn on container web administration"
+ echo " servlet-jmx Run Cocoon in a servlet container and turn on container web JMX adapter"
+ echo " servlet-admin-jmx Run Cocoon in a servlet container and turn on container web administration and JMX adapter"
echo " servlet-debug Run Cocoon in a servlet container and turn on JVM remote debug"
echo " servlet-profile Run Cocoon in a servlet container and turn on JVM profiling"
echo " osgi Run Cocoon with the experimental OSGI kernel"
@@ -117,6 +122,10 @@
JETTY_ADMIN_PORT='8889'
fi
+if [ "$JETTY_JMX_PORT" = "" ] ; then
+ JETTY_JMX_PORT='8890'
+fi
+
if [ "$JAVA_DEBUG_ARGS" = "" ] ; then
JAVA_DEBUG_ARGS='-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n'
fi
@@ -141,6 +150,7 @@
PARSER=-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
LOADER=Loader
LOADER_LIB="${COCOON_HOME}/tools/loader"
+BLOCKS="-Dorg.apache.cocoon.processor=org.apache.cocoon.blocks.BlocksManager -Dorg.apache.cocoon.configuration=/wiring.xml"
CLI=-Dloader.main.class=org.apache.cocoon.Main
CLI_LIBRARIES="-Dloader.jar.repositories=$COCOON_LIB"
@@ -148,12 +158,16 @@
JETTY=-Dloader.main.class=org.mortbay.jetty.Server
JETTY_CONF="$COCOON_HOME/tools/jetty/conf"
JETTY_MAIN="$JETTY_CONF/main.xml"
+JETTY_JMX_MAIN="$JETTY_CONF/main-jmx.xml"
JETTY_ADMIN="$JETTY_CONF/admin.xml"
+JETTY_JMX_ADMIN="$JETTY_CONF/admin-jmx.xml"
JETTY_WEBAPP="-Dwebapp=$COCOON_WEBAPP_HOME"
JETTY_HOME="-Dhome=$COCOON_HOME"
JETTY_PORT_ARGS="-Djetty.port=$JETTY_PORT"
JETTY_ADMIN_ARGS="-Djetty.admin.port=$JETTY_ADMIN_PORT"
-JETTY_LIBRARIES="-Dloader.jar.repositories=$COCOON_HOME/tools/jetty/lib${PATHSEP}${ENDORSED_LIBS}"
+JETTY_JMX_ARGS="-Djetty.jmx.port=$JETTY_JMX_PORT"
+JETTY_START_CONF="-DSTART=$COCOON_HOME/tools/jetty/conf/jetty-start.config"
+JETTY_START="-jar $COCOON_HOME/tools/jetty/jetty-start-5.1.8.jar"
# ----- Do the action ----------------------------------------------------------
@@ -163,23 +177,31 @@
;;
servlet)
- $JAVA $JAVA_OPTIONS -cp $LOADER_LIB $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_LIBRARIES $JETTY_WEBAPP $JETTY_HOME $JETTY $LOADER $JETTY_MAIN
+ $JAVA $JAVA_OPTIONS $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_START_CONF $JETTY_WEBAPP $JETTY_HOME $JETTY $JETTY_START $JETTY_MAIN
;;
servlet-admin)
- $JAVA $JAVA_OPTIONS -cp $LOADER_LIB $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_ADMIN_ARGS $JETTY_LIBRARIES $JETTY_WEBAPP $JETTY_HOME $JETTY $LOADER $JETTY_MAIN $JETTY_ADMIN
+ $JAVA $JAVA_OPTIONS $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_ADMIN_ARGS $JETTY_START_CONF $JETTY_WEBAPP $JETTY_HOME $JETTY $JETTY_START $JETTY_MAIN $JETTY_ADMIN
+ ;;
+
+ servlet-jmx)
+ $JAVA $JAVA_OPTIONS $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_JMX_ARGS $JETTY_START_CONF $JETTY_WEBAPP $JETTY_HOME $JETTY $JETTY_START $JETTY_JMX_MAIN
+ ;;
+
+ servlet-admin-jmx)
+ $JAVA $JAVA_OPTIONS $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_ADMIN_ARGS $JETTY_JMX_ARGS $JETTY_START_CONF $JETTY_WEBAPP $JETTY_HOME $JETTY $JETTY_START $JETTY_MAIN $JETTY_JMX_ADMIN
;;
servlet-debug)
- $JAVA $JAVA_OPTIONS $JAVA_DEBUG_ARGS -cp $LOADER_LIB $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_LIBRARIES $JETTY_WEBAPP $JETTY_HOME $JETTY $LOADER $JETTY_MAIN
+ $JAVA $JAVA_OPTIONS $JAVA_DEBUG_ARGS $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_START_CONF $JETTY_WEBAPP $JETTY_HOME $JETTY $JETTY_START $JETTY_MAIN
;;
servlet-profile)
- $JAVA $JAVA_OPTIONS $JAVA_PROFILE_ARGS -cp $LOADER_LIB $ENDORSED $PARSER $JETTY_ARGS $JETTY_LIBRARIES $JETTY_WEBAPP $JETTY_HOME $JETTY $LOADER $JETTY_MAIN
+ $JAVA $JAVA_OPTIONS $JAVA_PROFILE_ARGS $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_START_CONF $JETTY_WEBAPP $JETTY_HOME $JETTY $JETTY_START $JETTY_MAIN
;;
blocks)
- $JAVA $JAVA_OPTIONS -Dorg.apache.cocoon.processor=org.apache.cocoon.blocks.BlocksManager -Dorg.apache.cocoon.configuration=/wiring.xml -cp $LOADER_LIB $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_LIBRARIES $JETTY_WEBAPP $JETTY_HOME $JETTY $LOADER $JETTY_MAIN
+ $JAVA $JAVA_OPTIONS $BLOCKS $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_START_CONF $JETTY_WEBAPP $JETTY_HOME $JETTY $JETTY_START $JETTY_MAIN
;;
osgi)
Added: cocoon/trunk/legal/jetty-5.1.8.jar.license.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/legal/jetty-5.1.8.jar.license.txt?rev=358933&view=auto
==============================================================================
--- cocoon/trunk/legal/jetty-5.1.8.jar.license.txt (added)
+++ cocoon/trunk/legal/jetty-5.1.8.jar.license.txt Sat Dec 24 05:32:04 2005
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: cocoon/trunk/tools/jetty/conf/admin-jmx.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/jetty/conf/admin-jmx.xml?rev=358933&view=auto
==============================================================================
--- cocoon/trunk/tools/jetty/conf/admin-jmx.xml (added)
+++ cocoon/trunk/tools/jetty/conf/admin-jmx.xml Sat Dec 24 05:32:04 2005
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+
+<!-- =============================================================== -->
+<!-- Configure the Jetty Server -->
+<!-- =============================================================== -->
+<Configure>
+
+ <Call id="jmxserver" class="javax.management.MBeanServerFactory" name="createMBeanServer">
+
+ <Arg>org.mortbay</Arg>
+
+ <Call name="createMBean">
+ <Arg>org.mortbay.util.jmx.MX4JHttpAdaptor</Arg>
+ <Arg><New class="javax.management.ObjectName"><Arg>mx4j.tools:adaptor=http</Arg></New></Arg>
+ <Arg><Array type="java.lang.Object"><Item type="int"><SystemProperty name="jetty.jmx.port" default="8890"/></Item><Item>localhost</Item></Array></Arg>
+ <Arg><Array type="java.lang.String"><Item>int</Item><Item>java.lang.String</Item></Array></Arg>
+ </Call>
+
+ <Call name="createMBean">
+ <Arg>org.mortbay.jetty.jmx.ServerMBean</Arg>
+ <Arg><New class="javax.management.ObjectName"><Arg>org.mortbay:jetty=admin</Arg></New></Arg>
+ <!--Arg><Array type="java.lang.Object"><Item><SystemProperty name="home" default="."/>/tools/jetty/conf/admin.xml</Item></Array></Arg-->
+ <Arg><Array type="java.lang.Object"><Item>./tools/jetty/conf/admin.xml</Item></Array></Arg>
+ <Arg><Array type="java.lang.String"><Item>java.lang.String</Item></Array></Arg>
+ </Call>
+
+ <Call name="createMBean">
+ <Arg>org.mortbay.jetty.jmx.ServerMBean</Arg>
+ <Arg><New class="javax.management.ObjectName"><Arg>org.mortbay:jetty=default</Arg></New></Arg>
+ <!--Arg><Array type="java.lang.Object"><Item><SystemProperty name="home" default="."/>/tools/jetty/conf/main.xml</Item></Array></Arg-->
+ <Arg><Array type="java.lang.Object"><Item>./tools/jetty/conf/main.xml</Item></Array></Arg>
+ <Arg><Array type="java.lang.String"><Item>java.lang.String</Item></Array></Arg>
+ </Call>
+
+ </Call>
+
+</Configure>
Added: cocoon/trunk/tools/jetty/conf/jetty-start.config
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/jetty/conf/jetty-start.config?rev=358933&view=auto
==============================================================================
--- cocoon/trunk/tools/jetty/conf/jetty-start.config (added)
+++ cocoon/trunk/tools/jetty/conf/jetty-start.config Sat Dec 24 05:32:04 2005
@@ -0,0 +1,66 @@
+# This file controls what file are to be put on classpath or command line.
+#
+# Format is as follows:
+# Each line contains entry for one JAR file.
+# Format of line:
+#
+# SUBJECT [ [!] CONDITION [AND|OR] ]*
+#
+# where SUBJECT:
+# ends with ".class" is the Main class to run.
+# ends with ".xml" is a configuration file for the command line
+# ends with "/" is a directory from which add all jar and zip files from.
+# ends with "/*" is a directory from which add all unconsidered jar and zip files from.
+# Containing = are used to assign system properties.
+# all other subjects are treated as files to be added to the classpath.
+#
+# Subjects may include system properties with $(propertyname) syntax.
+#
+# Files starting with "/" are considered absolute, all others are relative to
+# the home directory.
+#
+# CONDITION is one of:
+# always
+# never
+# available classname # true if class on classpath
+# property name # true of set
+# java OPERATOR version # java version compared to literal
+# nargs OPERATOR number # number of command line args compared to literal
+# OPERATOR := one of "<",">","<=",">=","==","!="
+#
+# CONTITIONS can be combined with AND OR or !, with AND being the assume
+# operator for a list of CONDITIONS.
+# Classpath operations are evaluated on the fly, so once a class or jar is
+# added to the classpath, subsequent available conditions will see that class.
+#
+
+$(jetty.class.path) always
+
+org.mortbay.log.LogFactory.noDiscovery=true ! property org.mortbay.log.LogFactory.noDiscovery
+javax.management.builder.initial=mx4j.server.MX4JMBeanServerBuilder java > 1.4
+
+# Try different settings of jetty.home until the jetty.jar is found.
+jetty.home=./tools/jetty ! exists $(jetty.home)/lib/jetty-5.1.8.jar
+jetty.home=../tools/jetty ! exists $(jetty.home)/lib/jetty-5.1.8.jar
+
+# The main class to run
+org.mortbay.jetty.Server.class
+# override class with old property name
+$(start.class).class
+# override class with preferred property name
+$(main.class).class
+$(loader.main.class).class
+
+# The default configuration files
+$(jetty.home)/conf/main.xml nargs == 0
+
+# Set the jetty classpath
+$(jetty.home)/lib/*
+$(home)/lib/endorsed/* always
+$(home)/lib/core/commons-logging-1.0.4.jar always
+$(home)/lib/core/avalon-logkit-2.1.jar always
+
+# Add JMX jars
+$(home)/lib/core/jetty-jmx-5.1.8.jar java >= 1.4
+
+
Added: cocoon/trunk/tools/jetty/conf/main-jmx.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/jetty/conf/main-jmx.xml?rev=358933&view=auto
==============================================================================
--- cocoon/trunk/tools/jetty/conf/main-jmx.xml (added)
+++ cocoon/trunk/tools/jetty/conf/main-jmx.xml Sat Dec 24 05:32:04 2005
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+
+<!-- =============================================================== -->
+<!-- Configure the Jetty Server -->
+<!-- =============================================================== -->
+<Configure>
+
+ <Call id="jmxserver" class="javax.management.MBeanServerFactory" name="createMBeanServer">
+
+ <Arg>org.mortbay</Arg>
+
+ <Call name="createMBean">
+ <Arg>org.mortbay.util.jmx.MX4JHttpAdaptor</Arg>
+ <Arg><New class="javax.management.ObjectName"><Arg>mx4j.tools:adaptor=http</Arg></New></Arg>
+ <Arg><Array type="java.lang.Object"><Item type="int"><SystemProperty name="jetty.jmx.port" default="8890"/></Item><Item>localhost</Item></Array></Arg>
+ <Arg><Array type="java.lang.String"><Item>int</Item><Item>java.lang.String</Item></Array></Arg>
+ </Call>
+
+ <Call name="createMBean">
+ <Arg>org.mortbay.jetty.jmx.ServerMBean</Arg>
+ <Arg><New class="javax.management.ObjectName"><Arg>org.mortbay:jetty=default</Arg></New></Arg>
+ <Arg><Array type="java.lang.Object"><Item><SystemProperty name="home" default="."/>/tools/jetty/conf/main.xml</Item></Array></Arg>
+ <Arg><Array type="java.lang.String"><Item>java.lang.String</Item></Array></Arg>
+ </Call>
+
+ </Call>
+
+</Configure>
Modified: cocoon/trunk/tools/jetty/conf/main.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/jetty/conf/main.xml?rev=358933&r1=358932&r2=358933&view=diff
==============================================================================
--- cocoon/trunk/tools/jetty/conf/main.xml (original)
+++ cocoon/trunk/tools/jetty/conf/main.xml Sat Dec 24 05:32:04 2005
@@ -23,6 +23,7 @@
<Set name="MaxThreads">100</Set>
<Set name="MaxIdleTimeMs">30000</Set>
<Set name="LowResourcePersistTimeMs">5000</Set>
+ <Set name="PoolName">Listener</Set>
</New>
</Arg>
</Call>
Added: cocoon/trunk/tools/jetty/jetty-start-5.1.8.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/jetty/jetty-start-5.1.8.jar?rev=358933&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/trunk/tools/jetty/jetty-start-5.1.8.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/trunk/tools/jetty/lib/jetty-5.1.8.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/jetty/lib/jetty-5.1.8.jar?rev=358933&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/trunk/tools/jetty/lib/jetty-5.1.8.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/trunk/tools/jetty/lib/mx4j-3.0.1.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/jetty/lib/mx4j-3.0.1.jar?rev=358933&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/trunk/tools/jetty/lib/mx4j-3.0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/trunk/tools/jetty/lib/mx4j-tools-2.1.1.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/jetty/lib/mx4j-tools-2.1.1.jar?rev=358933&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/trunk/tools/jetty/lib/mx4j-tools-2.1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/trunk/tools/jetty/lib/servlet-2.4.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/jetty/lib/servlet-2.4.jar?rev=358933&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/trunk/tools/jetty/lib/servlet-2.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Re: svn commit: r358933 - in /cocoon/trunk: ./ legal/ tools/jetty/
tools/jetty/conf/ tools/jetty/lib/
Posted by Stefano Mazzocchi <st...@apache.org>.
Giacomo Pati wrote:
> (I was
> questioning myself which ideas it was to write such a Loader as the
> one from jetty look so similar to the one we have).
Ehm, well, I think it's simply because I wrote that Loader before they
did :-)
--
Stefano.
Re: svn commit: r358933 - in /cocoon/trunk: ./ legal/ tools/jetty/
tools/jetty/conf/ tools/jetty/lib/
Posted by Giacomo Pati <gi...@apache.org>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Sat, 24 Dec 2005, giacomo@apache.org wrote:
> Date: Sat, 24 Dec 2005 13:32:44 -0000
> From: giacomo@apache.org
> Reply-To: dev@cocoon.apache.org
> To: cvs@cocoon.apache.org
> Subject: svn commit: r358933 - in /cocoon/trunk: ./ legal/ tools/jetty/
> tools/jetty/conf/ tools/jetty/lib/
>
> Author: giacomo
> Date: Sat Dec 24 05:32:04 2005
> New Revision: 358933
>
> URL: http://svn.apache.org/viewcvs?rev=358933&view=rev
> Log:
> upgrade jetty to 5.1.8 including JMX features
Enjoy the new jetty with JMX support :-)
TODOs:
- - Adapt the cocoon.bat to the new cocoon.sh (I'd happily leave this to
some more experienced Windows gurus :-)
- - The classes in tools/jetty/jetty-start.jar should be able to make even
the cli part working so that Loader.java could be eliminated (I was
questioning myself which ideas it was to write such a Loader as the
one from jetty look so similar to the one we have). I'll work on that
a bit later this year
- - write some more MBeans for core component handler
- - review by others whether my JMX support covers all cases where
components are instantiated and managed (what about the other
ServiceManagers in Cocoon: InterBlockServiceManager,
SingleComponentServiceManager, ...)
Ciao and Merry Christmas to all
- --
Giacomo Pati Otego AG,
Switzerland - http://www.otego.com Orixo, the XML business alliance -
http://www.orixo.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
iD8DBQFDrVDaLNdJvZjjVZARApMAAKCTRxi9Co80eHeNVlxhMT00F+DmrACfclK4
abj9BBGALwvzVhapMRCr4gg=
=cTiu
-----END PGP SIGNATURE-----