You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ba...@apache.org on 2006/01/04 17:27:35 UTC
svn commit: r365934 - in /james/server/trunk: ./ phoenix-bin/
phoenix-bin/bin/ phoenix-bin/bin/lib/ phoenix-bin/conf/ phoenix-bin/lib/
phoenix-bin/tools/ phoenix-bin/tools/lib/ src/xdocs/ src/xdocs/images/
tools/lib/
Author: bago
Date: Wed Jan 4 08:23:19 2006
New Revision: 365934
URL: http://svn.apache.org/viewcvs?rev=365934&view=rev
Log:
Upgraded avalon phoenix to 4.2 and updated the build script according to new phoenix tasks (related to JAMES-406 and JAMES-418).
Added:
james/server/trunk/phoenix-bin/bin/lib/excalibur-cli-1.0.jar (with props)
james/server/trunk/phoenix-bin/bin/lib/excalibur-extension-1.0a.jar (with props)
james/server/trunk/phoenix-bin/bin/lib/excalibur-instrument-manager-1.0.jar (with props)
james/server/trunk/phoenix-bin/bin/lib/excalibur-io-1.1.jar (with props)
james/server/trunk/phoenix-bin/bin/lib/excalibur-logger-2.1.jar (with props)
james/server/trunk/phoenix-bin/bin/lib/excalibur-monitor-2.1.jar (with props)
james/server/trunk/phoenix-bin/bin/lib/jakarta-oro-2.0.8.jar (with props)
james/server/trunk/phoenix-bin/bin/lib/spice-classman-1.0.jar (with props)
james/server/trunk/phoenix-bin/bin/lib/spice-loggerstore-0.5.jar (with props)
james/server/trunk/phoenix-bin/bin/lib/spice-salt-0.8.jar (with props)
james/server/trunk/phoenix-bin/bin/lib/spice-xmlpolicy-1.0.jar (with props)
james/server/trunk/phoenix-bin/conf/phoenix-service.xml
james/server/trunk/phoenix-bin/lib/excalibur-instrument-api-2.1.jar (with props)
james/server/trunk/phoenix-bin/lib/excalibur-logger-2.1.jar (with props)
james/server/trunk/phoenix-bin/lib/excalibur-monitor-2.1.jar (with props)
james/server/trunk/phoenix-bin/lib/jakarta-oro-2.0.8.jar (with props)
james/server/trunk/phoenix-bin/lib/mx4j-jmx.jar (with props)
james/server/trunk/phoenix-bin/lib/mx4j-tools.jar (with props)
james/server/trunk/phoenix-bin/lib/phoenix-engine.jar (with props)
james/server/trunk/phoenix-bin/lib/spice-classman-1.0.jar (with props)
james/server/trunk/phoenix-bin/lib/spice-loggerstore-0.5.jar (with props)
james/server/trunk/phoenix-bin/lib/spice-salt-0.8.jar (with props)
james/server/trunk/phoenix-bin/lib/spice-xmlpolicy-1.0.jar (with props)
james/server/trunk/phoenix-bin/tools/
james/server/trunk/phoenix-bin/tools/lib/
james/server/trunk/phoenix-bin/tools/lib/excalibur-i18n-1.0.jar (with props)
james/server/trunk/phoenix-bin/tools/lib/isorelax-20020414.jar (with props)
james/server/trunk/phoenix-bin/tools/lib/msv-20020414.jar (with props)
james/server/trunk/phoenix-bin/tools/lib/phoenix-tools.jar (with props)
james/server/trunk/phoenix-bin/tools/lib/qdox-1.1.jar (with props)
james/server/trunk/phoenix-bin/tools/lib/relaxngDatatype-20020414.jar (with props)
james/server/trunk/phoenix-bin/tools/lib/spice-configkit-1.1.2.jar (with props)
james/server/trunk/phoenix-bin/tools/lib/xsdlib-20020414.jar (with props)
james/server/trunk/src/xdocs/
james/server/trunk/src/xdocs/images/
james/server/trunk/tools/lib/phoenix-tools.jar (with props)
james/server/trunk/tools/lib/qdox-1.1.jar (with props)
Removed:
james/server/trunk/phoenix-bin/lib/excalibur-baxter-1.0a.jar
james/server/trunk/phoenix-bin/lib/excalibur-configuration-1.0.jar
james/server/trunk/phoenix-bin/lib/excalibur-containerkit-1.0.jar
james/server/trunk/phoenix-bin/lib/excalibur-i18n-1.0.jar
james/server/trunk/phoenix-bin/lib/excalibur-logger-1.0.jar
james/server/trunk/phoenix-bin/lib/excalibur-threadcontext-1.0.jar
james/server/trunk/phoenix-bin/lib/excalibur-util-1.0.jar
james/server/trunk/phoenix-bin/lib/isorelax.jar
james/server/trunk/phoenix-bin/lib/jing.jar
james/server/trunk/phoenix-bin/lib/phoenix-bsh-commands.jar
Modified:
james/server/trunk/build.xml
james/server/trunk/phoenix-bin/JAMES_PHOENIX.txt
james/server/trunk/phoenix-bin/bin/lib/mx4j-tools.jar
james/server/trunk/phoenix-bin/bin/lib/phoenix-engine.jar
james/server/trunk/phoenix-bin/bin/phoenix-loader.jar
james/server/trunk/phoenix-bin/bin/phoenix.sh
james/server/trunk/phoenix-bin/bin/run.bat
james/server/trunk/phoenix-bin/conf/kernel.xml
james/server/trunk/phoenix-bin/lib/excalibur-extension-1.0a.jar
james/server/trunk/phoenix-bin/lib/excalibur-io-1.1.jar
james/server/trunk/phoenix-bin/lib/phoenix-client.jar
Modified: james/server/trunk/build.xml
URL: http://svn.apache.org/viewcvs/james/server/trunk/build.xml?rev=365934&r1=365933&r2=365934&view=diff
==============================================================================
--- james/server/trunk/build.xml (original)
+++ james/server/trunk/build.xml Wed Jan 4 08:23:19 2006
@@ -100,11 +100,6 @@
<pathelement location="${phoenix-client.jar}"/>
</path>
- <taskdef name="phoenix-mxinfo" classname="org.apache.avalon.phoenix.tools.xdoclet.PhoenixXDoclet">
- <classpath refid="tools.class.path"/>
- </taskdef>
-
-
<taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
<classpath refid="tools.class.path"/>
</taskdef>
@@ -218,13 +213,21 @@
jmx
===================================================================
-->
+
+ <!-- Make .xinfo, .mxinfo and manifest automatically for blocks -->
<target name="prepare-mxinfo">
- <phoenix-mxinfo destdir="${build.classes}">
- <fileset dir="${java.dir}">
- <include name="**" />
- </fileset>
- <mxinfo/>
- </phoenix-mxinfo>
+ <taskdef name="generatemeta" classname="org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask">
+ <classpath refid="tools.class.path"/>
+ </taskdef>
+
+ <mkdir dir="${build.classes}" />
+
+ <generatemeta dest="${build.classes}">
+ <fileset dir="${java.dir}">
+ <include name="**/*.java"/>
+ </fileset>
+ </generatemeta>
+
</target>
<!--
@@ -365,6 +368,7 @@
===================================================================
-->
<target name="xdocs" depends="prepare">
+ <mkdir dir="${build.docs}" />
<style style="${docs.src}/stylesheets/site.xsl"
basedir="${docs.src}/"
destdir="${build.docs}/"
Modified: james/server/trunk/phoenix-bin/JAMES_PHOENIX.txt
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/JAMES_PHOENIX.txt?rev=365934&r1=365933&r2=365934&view=diff
==============================================================================
--- james/server/trunk/phoenix-bin/JAMES_PHOENIX.txt (original)
+++ james/server/trunk/phoenix-bin/JAMES_PHOENIX.txt Wed Jan 4 08:23:19 2006
@@ -1,21 +1,14 @@
-This is a custom branch of Phoenix 4.0.4.
+This is Phoenix 4.2 trunk with updated libraries.
-Here are the differences between official phoenix 4.0.4 and the one James uses:
+https://svn.apache.org/repos/asf/avalon/cvs-migration-snapshot/avalon-phoenix/
-- removed libs
- - avalon-framework-4.1.3.jar
- - excalibur-collections-1.0.jar
- - excalibur-concurrent-1.0.jar
- - excalibur-instrument-1.0.jar
- - excalibur-pool-1.0.jar
- - excalibur-thread-1.1.jar
- - logkit-1.1.1.jar
-- added libs
- - avalon-framework-api-4.3-RC2.jar
- - avalon-framework-impl-4.3-RC2.jar
- - avalon-logkit-2.1-RC2.jar
+Here are the differences between the svn version and this one:
-We also can remove xerces/xalan/xml-apis as we don't need jdk1.3 compatibility anymore.
+- removed xml libraries (we run only in java 1.4+)
+- upgraded avalon libraries to 4.3
+- upgraded cornerstone libraries to 2.1
+- upgraded logkit to 2.1
+- changed the default SystemManager to NoopSystemManager in kernel.xml
Changed the build.xml to reflect the changes.
Added: james/server/trunk/phoenix-bin/bin/lib/excalibur-cli-1.0.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/bin/lib/excalibur-cli-1.0.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/bin/lib/excalibur-cli-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/bin/lib/excalibur-extension-1.0a.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/bin/lib/excalibur-extension-1.0a.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/bin/lib/excalibur-extension-1.0a.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/bin/lib/excalibur-instrument-manager-1.0.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/bin/lib/excalibur-instrument-manager-1.0.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/bin/lib/excalibur-instrument-manager-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/bin/lib/excalibur-io-1.1.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/bin/lib/excalibur-io-1.1.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/bin/lib/excalibur-io-1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/bin/lib/excalibur-logger-2.1.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/bin/lib/excalibur-logger-2.1.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/bin/lib/excalibur-logger-2.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/bin/lib/excalibur-monitor-2.1.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/bin/lib/excalibur-monitor-2.1.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/bin/lib/excalibur-monitor-2.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/bin/lib/jakarta-oro-2.0.8.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/bin/lib/jakarta-oro-2.0.8.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/bin/lib/jakarta-oro-2.0.8.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: james/server/trunk/phoenix-bin/bin/lib/mx4j-tools.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/bin/lib/mx4j-tools.jar?rev=365934&r1=365933&r2=365934&view=diff
==============================================================================
Binary files - no diff available.
Modified: james/server/trunk/phoenix-bin/bin/lib/phoenix-engine.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/bin/lib/phoenix-engine.jar?rev=365934&r1=365933&r2=365934&view=diff
==============================================================================
Binary files - no diff available.
Added: james/server/trunk/phoenix-bin/bin/lib/spice-classman-1.0.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/bin/lib/spice-classman-1.0.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/bin/lib/spice-classman-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/bin/lib/spice-loggerstore-0.5.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/bin/lib/spice-loggerstore-0.5.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/bin/lib/spice-loggerstore-0.5.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/bin/lib/spice-salt-0.8.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/bin/lib/spice-salt-0.8.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/bin/lib/spice-salt-0.8.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/bin/lib/spice-xmlpolicy-1.0.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/bin/lib/spice-xmlpolicy-1.0.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/bin/lib/spice-xmlpolicy-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: james/server/trunk/phoenix-bin/bin/phoenix-loader.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/bin/phoenix-loader.jar?rev=365934&r1=365933&r2=365934&view=diff
==============================================================================
Binary files - no diff available.
Modified: james/server/trunk/phoenix-bin/bin/phoenix.sh
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/bin/phoenix.sh?rev=365934&r1=365933&r2=365934&view=diff
==============================================================================
--- james/server/trunk/phoenix-bin/bin/phoenix.sh (original)
+++ james/server/trunk/phoenix-bin/bin/phoenix.sh Wed Jan 4 08:23:19 2006
@@ -8,18 +8,23 @@
#
# Environment Variable Prequisites
#
-# PHOENIX_OPTS (Optional) Java runtime options used when the command is
+# PHOENIX_OPTS (Optional) Java runtime options used when the command is
# executed.
#
# PHOENIX_TMPDIR (Optional) Directory path location of temporary directory
# the JVM should use (java.io.tmpdir). Defaults to
-# $CATALINA_BASE/temp.
+# $PHOENIX_BASE/temp.
#
# JAVA_HOME Must point at your Java Development Kit installation.
#
-# PHOENIX_JVM_OPTS (Optional) Java runtime options used when the command is
+# PHOENIX_JVM_OPTS (Optional) Java runtime options used when the command is
# executed.
#
+# PHOENIX_KILLDELAY (Optional) When shutting the server this script sends s
+# SIGTERM signal then delays for a time before forcefully
+# shutting down the process if it is still alive. This
+# variable controls the delay and defaults to 5 (seconds)
+#
# -----------------------------------------------------------------------------
usage()
@@ -63,6 +68,12 @@
PRGDIR=`dirname "$THIS_PROG"`
PHOENIX_HOME=`cd "$PRGDIR/.." ; pwd`
+#setup time between signals to kill phoenix
+if [ -z "$PHOENIX_KILLDELAY" ] ; then
+ PHOENIX_KILLDELAY=5
+fi
+
+
unset THIS_PROG
if [ -r "$PHOENIX_HOME"/bin/setenv.sh ]; then
@@ -93,6 +104,7 @@
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
PHOENIX_HOME=`cygpath --path --windows "$PHOENIX_HOME"`
+ PHOENIX_TMPDIR=`cygpath --path --windows "$PHOENIX_TMPDIR"`
fi
# ----- Execute The Requested Command -----------------------------------------
@@ -110,7 +122,11 @@
# like placing jaxp/jaas/xml-parser jars in ext dir
# thus breaking Phoenix
#
-JVM_OPTS="-Djava.ext.dirs=$PHOENIX_HOME/lib"
+JVM_EXT_DIRS="$PHOENIX_HOME/lib:$PHOENIX_HOME/tools/lib"
+if $cygwin; then
+ JVM_EXT_DIRS=`cygpath --path --windows "$JVM_EXT_DIRS"`
+fi
+JVM_OPTS="-Djava.ext.dirs=$JVM_EXT_DIRS"
if [ "$PHOENIX_SECURE" != "false" ] ; then
# Make phoenix run with security manager enabled
@@ -161,8 +177,11 @@
if [ -f $PHOENIX_PID ]
then
- echo "Already Running!!"
- exit 1
+ if ps -p `cat $PHOENIX_PID ` >/dev/null 2>/dev/null
+ then
+ echo "Already Running!!"
+ exit 1
+ fi
fi
echo "STARTED Phoenix `date`" >> $PHOENIX_CONSOLE
@@ -176,7 +195,7 @@
PID=`cat $PHOENIX_PID 2>/dev/null`
echo "Shutting down Phoenix: $PID"
kill $PID 2>/dev/null
- sleep 2
+ sleep $PHOENIX_KILLDELAY
kill -9 $PID 2>/dev/null
rm -f $PHOENIX_PID
echo "STOPPED `date`" >>$PHOENIX_CONSOLE
@@ -207,7 +226,7 @@
exec $RUN_CMD
;;
-
+
check)
echo "Checking arguments to Phoenix: "
echo "PHOENIX_HOME: $PHOENIX_HOME"
@@ -226,7 +245,7 @@
fi
exit 1
;;
-
+
*)
usage
;;
Modified: james/server/trunk/phoenix-bin/bin/run.bat
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/bin/run.bat?rev=365934&r1=365933&r2=365934&view=diff
==============================================================================
--- james/server/trunk/phoenix-bin/bin/run.bat (original)
+++ james/server/trunk/phoenix-bin/bin/run.bat Wed Jan 4 08:23:19 2006
@@ -11,7 +11,7 @@
rem
rem PHOENIX_TMPDIR (Optional) Directory path location of temporary directory
rem the JVM should use (java.io.tmpdir). Defaults to
-rem $CATALINA_BASE/temp.
+rem $PHOENIX_BASE/temp.
rem
rem JAVA_HOME Must point at your Java Development Kit installation.
rem
@@ -49,9 +49,9 @@
if not "%PHOENIX_HOME%" == "" goto phoenix_home
echo.
-echo Warning: PHOENIX_HOME environment variable is not set.
-echo This needs to be set for Win9x as it's command prompt
-echo scripting bites
+echo Error: PHOENIX_HOME environment variable is not set.
+echo This needs to be set manually for Win9x as its command
+echo prompt scripting does not allow it to be set automatically.
echo.
goto end
@@ -86,6 +86,7 @@
rem set DEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
rem Kicking the tires and lighting the fires!!!
-"%PHOENIX_JAVACMD%" %DEBUG% "-Djava.ext.dirs=%PHOENIX_HOME%\lib" "-Dphoenix.home=%PHOENIX_HOME%" "-Djava.security.policy=jar:file:%PHOENIX_HOME%/bin/phoenix-loader.jar!/META-INF/java.policy" %PHOENIX_JVM_OPTS% %PHOENIX_SECURE% -jar "%PHOENIX_HOME%\bin\phoenix-loader.jar" %1 %2 %3 %4 %5 %6 %7 %8 %9
+"%PHOENIX_JAVACMD%" %DEBUG% "-Djava.ext.dirs=%PHOENIX_HOME%\lib;%PHOENIX_HOME%\tools\lib" "-Dphoenix.home=%PHOENIX_HOME%" "-Djava.security.policy=jar:file:%PHOENIX_HOME%/bin/phoenix-loader.jar!/META-INF/java.policy" %PHOENIX_JVM_OPTS% %PHOENIX_SM% -jar "%PHOENIX_HOME%\bin\phoenix-loader.jar" %1 %2 %3 %4 %5 %6 %7 %8 %9
:end
+
Modified: james/server/trunk/phoenix-bin/conf/kernel.xml
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/conf/kernel.xml?rev=365934&r1=365933&r2=365934&view=diff
==============================================================================
--- james/server/trunk/phoenix-bin/conf/kernel.xml (original)
+++ james/server/trunk/phoenix-bin/conf/kernel.xml Wed Jan 4 08:23:19 2006
@@ -4,6 +4,10 @@
<embeddor role="org.apache.avalon.phoenix.interfaces.Embeddor"
class="org.apache.avalon.phoenix.components.embeddor.DefaultEmbeddor">
+ <component role="org.apache.avalon.phoenix.interfaces.Installer"
+ class="org.apache.avalon.phoenix.components.installer.DefaultInstaller"
+ logger="installer"/>
+
<component role="org.apache.avalon.phoenix.interfaces.Deployer"
class="org.apache.avalon.phoenix.components.deployer.DefaultDeployer"
logger="deployer"/>
@@ -22,13 +26,14 @@
See http://mx4j.sourceforge.net/ -
org.apache.avalon.phoenix.components.manager.MX4JSystemManager
-
+
There is an impl of system manager that does nothing and it is....
-
+
org.apache.avalon.phoenix.components.manager.NoopSystemManager
-
+
Alternatively, you could comment the whole SystemManager section out.
-->
+
<!--
PLEASE NOTE: We changed the MX4JSystemManager to NoopSystemManager
because of the vulnerability described here:
@@ -41,38 +46,128 @@
<component role="org.apache.avalon.phoenix.interfaces.SystemManager"
class="org.apache.avalon.phoenix.components.manager.NoopSystemManager"
+ logger="manager" />
+
+ <!--
+ <component role="org.apache.avalon.phoenix.interfaces.SystemManager"
+ class="org.apache.avalon.phoenix.components.manager.MX4JSystemManager"
+ logger="manager">
+ -->
+ <!--
+ By default the Mx4J Http Adaptor will bind a webserver to a
+ single network interface, localhost. If you wish to restrict it to
+ only one a different interface, include that below. To bind to all
+ interfaces, use 0.0.0.0 as the value.
+ -->
+ <!--
+ <manager-adaptor-host>localhost</manager-adaptor-host>
+ -->
+
+ <!--
+ This specifies the IP port which the Http Adaptor will bind on.
+ -->
+ <!--
+ <manager-adaptor-port>8082</manager-adaptor-port>
+ -->
+
+ <!--
+ If you wish to enable the HTTP adaptor altogether
+ then uncomment the following line.
+ -->
+ <!--<enable-http-adaptor>true</enable-http-adaptor>-->
+
+ <!--
+ The Http Adaptor will use the $PHOENIX_HOME/conf/xsl directory
+ by default to retrieve it's stylesheets.
+ -->
+ <!-- <stylesheets-dir>conf/xsl</stylesheets-dir> -->
+
+ <!--
+ If you want the HTTPAdaptor to require authentication then you need to specify
+ a username and password in the next xml block.
+ -->
+ <!--
+ <user>
+ <name>user</name>
+ <password>password</password>
+ </user>
+ -->
+
+ <!--
+ Mx4j is capable of exporting the MBeanServer over RMI. By default this is
+ disabled but it can be enabled by specifying true in enable-rmi-adaptor element
+ and specifying a particular naming factory.
+ -->
+ <!--
+ <enable-rmi-adaptor>true</enable-rmi-adaptor>
+ <rmi-naming-factory>com.sun.jndi.rmi.registry.RegistryContextFactory</rmi-naming-factory>
+ <rmi-registry-port>1099</rmi-registry-port>
+ -->
+ <!--
+ </component>
+ -->
+
+ <!--
+ This SystemManager is useful when you are Running Phoenix in a system
+ where a MBeanServer is already running. It will grab this MBeanServer and
+ use it to manage Phoenix.
+ <component role="org.apache.avalon.phoenix.interfaces.SystemManager"
+ class="org.apache.avalon.phoenix.components.manager.HostedSystemManager"
logger="manager" >
-
- <!--
- By default the Mx4J Http Adaptor will bind a webserver to all
- network interfaces. If you wish to restrict it to only one
- interface (say localhost) then uncomment and edit the next line.
- -->
- <!--
- <manager-adaptor-host>localhost</manager-adaptor-host>
- -->
-
- <!--
- This specifies the IP port which the Http Adaptor will bind on.
- -->
- <!--
- <manager-adaptor-port>8082</manager-adaptor-port>
- <enable-rmi-adaptor>true</enable-rmi-adaptor>
- <rmi-naming-factory>com.sun.jndi.rmi.registry.RegistryContextFactory</rmi-naming-factory>
- <stylesheets-dir>conf/xsl</stylesheets-dir>
- -->
-
- <!--
- If you want the HTTPAdaptor to require authentication then you need to specify
- a username and password in the next xml block.
- -->
- <!--
- <user>
- <name>user</name>
- <password>password</password>
- </user>
- -->
</component>
+ -->
+
+ <!--
+ This SystemManager is useful when you want to do arbitrary scripting of MBeans
+ to setup the MX manager. You can pretty much configure any mbean on the classpath
+ via this mechanism.
+ <component role="org.apache.avalon.phoenix.interfaces.SystemManager"
+ class="org.apache.avalon.phoenix.components.manager.ExtendedMX4JSystemManager"
+ logger="manager">
+
+ <mbean name="Http:name=XSLTProcessor" class="mx4j.adaptor.http.XSLTProcessor">
+ <attribute name="File" type="java.lang.String">conf/xsl</attribute>
+ <attribute name="UseCache" type="java.lang.Boolean">false</attribute>
+ </mbean>
+ <mbean name="Http:name=HttpAdaptor" class="mx4j.adaptor.http.HttpAdaptor">
+ <use name="ProcessorName">Http:name=XSLTProcessor</use>
+ <attribute name="Host" type="java.lang.String">localhost</attribute>
+ <attribute name="Port" type="java.lang.Integer">8082</attribute>
+ <attribute name="AuthenticationMethod" type="java.lang.String">basic</attribute>
+
+ <startup>
+ <invoke name="addAuthorization">
+ <parameter type="java.lang.String">jmx</parameter>
+ <parameter type="java.lang.String">jmx</parameter>
+ </invoke>
+ <invoke name="start"/>
+ </startup>
+ <shutdown>
+ <invoke name="stop"/>
+ </shutdown>
+ </mbean>
+
+ <mbean name="Naming:type=rmiregistry" class="mx4j.tools.naming.NamingService">
+ <startup>
+ <invoke name="start"/>
+ </startup>
+ <shutdown>
+ <invoke name="stop"/>
+ </shutdown>
+ </mbean>
+ <mbean name="Adaptor:protocol=JRMP" class="mx4j.adaptor.rmi.jrmp.JRMPAdaptor">
+ <attribute name="JNDIName" type="java.lang.String">jrmp</attribute>
+
+ <startup>
+ <invoke name="start"/>
+ </startup>
+ <shutdown>
+ <invoke name="stop"/>
+ </shutdown>
+ </mbean>
+
+ </component>
+ -->
<!-- There are two kernels
org.apache.avalon.phoenix.components.kernel.DefaultKernel
@@ -95,30 +190,56 @@
-->
<component role="org.apache.avalon.phoenix.interfaces.ConfigurationValidator"
- class="org.apache.avalon.phoenix.components.configuration.validator.NoopConfigurationValidator"
- logger="validator"/>
-
-<!--
- <component role="org.apache.avalon.phoenix.interfaces.ConfigurationValidator"
- class="org.apache.avalon.phoenix.components.configuration.validator.DelegatingConfigurationValidator"
+ class="org.apache.avalon.phoenix.components.validator.DefaultConfigurationValidator"
logger="validator">
- <delegate schema-type="relax-ng"
- class="org.apache.avalon.phoenix.components.configuration.validator.JarvConfigurationValidator">
- <schema-language>http://relaxng.org/ns/structure/1.0</schema-language>
- </delegate>
+ <schema-type name="relax-ng" uri="http://relaxng.org/ns/structure/1.0"/>
</component>
- -->
<component role="org.apache.avalon.phoenix.interfaces.ClassLoaderManager"
class="org.apache.avalon.phoenix.components.classloader.DefaultClassLoaderManager"
logger="classes"/>
- <component role="org.apache.avalon.excalibur.packagemanager.ExtensionManager"
+ <component role="org.apache.avalon.phoenix.components.extensions.pkgmgr.ExtensionManager"
class="org.apache.avalon.phoenix.components.extensions.DefaultExtensionManager"
logger="packages"/>
-<!--
- <component role="org.apache.avalon.excalibur.packagemanager.ExtensionManager"
- class="org.apache.avalon.excalibur.packagemanager.impl.NoopPackageRepository"
- logger="packages"/>
--->
+ <!--
+ <component role="org.apache.avalon.phoenix.components.extensions.pkgmgr.ExtensionManager"
+ class="org.apache.avalon.phoenix.components.extensions.pkgmgr.impl.NoopPackageRepository"
+ logger="packages"/>
+ -->
+
+ <!--
+ Can disable the Hot-Deploy monitor by commenting out the next component.
+ -->
+ <component
+ class="org.apache.avalon.phoenix.components.monitor.DefaultDeploymentMonitor"
+ logger="monitor">
+ <!-- the amount of time in milliseconds between checks
+ of deployment dir -->
+ <monitor-frequency>1000</monitor-frequency>
+ </component>
+
+ <component role="org.apache.excalibur.instrument.InstrumentManager"
+ class="org.apache.excalibur.instrument.manager.NoopInstrumentManager"
+ logger="instrument"/>
+
+ <!--
+ Use the DefaultInstrumentManager when you want to enable instrumentation of Phoenix and
+ hosted applications
+
+ You may also want to add:
+ <!ENTITY % instrumentables.xml SYSTEM "instrumentables.xml">
+ to the top of the kernel (before the phoenix tag) to store instrumentable configuration
+ in a separate document
+ <component role="org.apache.excalibur.instrument.InstrumentManager"
+ class="org.apache.excalibur.instrument.manager.DefaultInstrumentManager"
+ logger="instrument">
+ <name>phoenix</name>
+ <description>Apache Avalon Phoenix</description>
+ <connectors>
+ <connector class="altrmi"/>
+ </connectors>
+ &instrumentables;
+ </component>
+ -->
</embeddor>
-</phoenix>
+</phoenix>
\ No newline at end of file
Added: james/server/trunk/phoenix-bin/conf/phoenix-service.xml
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/conf/phoenix-service.xml?rev=365934&view=auto
==============================================================================
--- james/server/trunk/phoenix-bin/conf/phoenix-service.xml (added)
+++ james/server/trunk/phoenix-bin/conf/phoenix-service.xml Wed Jan 4 08:23:19 2006
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE server>
+<!-- JBoss Service configuration file -->
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Phoenix Launcher Service Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<server>
+ <classpath codebase="." archives="phoenix-loader.jar"/>
+ <mbean code="org.apache.avalon.phoenix.launcher.JMXLauncher" name="Phoenix:service=Launcher">
+ <attribute name="PhoenixHome">../../phoenix/</attribute>
+ <attribute name="PhoenixConfigFile">../../phoenix/conf/kernel.xml</attribute>
+ <attribute name="AppsPath">../../phoenix/apps/</attribute>
+ <attribute name="LogFilename">../../phoenix/logs/phoenix.log/</attribute>
+ <attribute name="PhoenixDebug">false</attribute>
+ </mbean>
+</server>
\ No newline at end of file
Modified: james/server/trunk/phoenix-bin/lib/excalibur-extension-1.0a.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/lib/excalibur-extension-1.0a.jar?rev=365934&r1=365933&r2=365934&view=diff
==============================================================================
Binary files - no diff available.
Added: james/server/trunk/phoenix-bin/lib/excalibur-instrument-api-2.1.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/lib/excalibur-instrument-api-2.1.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/lib/excalibur-instrument-api-2.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: james/server/trunk/phoenix-bin/lib/excalibur-io-1.1.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/lib/excalibur-io-1.1.jar?rev=365934&r1=365933&r2=365934&view=diff
==============================================================================
Binary files - no diff available.
Added: james/server/trunk/phoenix-bin/lib/excalibur-logger-2.1.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/lib/excalibur-logger-2.1.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/lib/excalibur-logger-2.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/lib/excalibur-monitor-2.1.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/lib/excalibur-monitor-2.1.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/lib/excalibur-monitor-2.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/lib/jakarta-oro-2.0.8.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/lib/jakarta-oro-2.0.8.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/lib/jakarta-oro-2.0.8.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/lib/mx4j-jmx.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/lib/mx4j-jmx.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/lib/mx4j-jmx.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/lib/mx4j-tools.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/lib/mx4j-tools.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/lib/mx4j-tools.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: james/server/trunk/phoenix-bin/lib/phoenix-client.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/lib/phoenix-client.jar?rev=365934&r1=365933&r2=365934&view=diff
==============================================================================
Binary files - no diff available.
Added: james/server/trunk/phoenix-bin/lib/phoenix-engine.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/lib/phoenix-engine.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/lib/phoenix-engine.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/lib/spice-classman-1.0.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/lib/spice-classman-1.0.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/lib/spice-classman-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/lib/spice-loggerstore-0.5.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/lib/spice-loggerstore-0.5.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/lib/spice-loggerstore-0.5.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/lib/spice-salt-0.8.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/lib/spice-salt-0.8.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/lib/spice-salt-0.8.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/lib/spice-xmlpolicy-1.0.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/lib/spice-xmlpolicy-1.0.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/lib/spice-xmlpolicy-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/tools/lib/excalibur-i18n-1.0.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/tools/lib/excalibur-i18n-1.0.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/tools/lib/excalibur-i18n-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/tools/lib/isorelax-20020414.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/tools/lib/isorelax-20020414.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/tools/lib/isorelax-20020414.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/tools/lib/msv-20020414.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/tools/lib/msv-20020414.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/tools/lib/msv-20020414.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/tools/lib/phoenix-tools.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/tools/lib/phoenix-tools.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/tools/lib/phoenix-tools.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/tools/lib/qdox-1.1.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/tools/lib/qdox-1.1.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/tools/lib/qdox-1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/tools/lib/relaxngDatatype-20020414.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/tools/lib/relaxngDatatype-20020414.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/tools/lib/relaxngDatatype-20020414.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/tools/lib/spice-configkit-1.1.2.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/tools/lib/spice-configkit-1.1.2.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/tools/lib/spice-configkit-1.1.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/phoenix-bin/tools/lib/xsdlib-20020414.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/phoenix-bin/tools/lib/xsdlib-20020414.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/phoenix-bin/tools/lib/xsdlib-20020414.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/tools/lib/phoenix-tools.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/tools/lib/phoenix-tools.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/tools/lib/phoenix-tools.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/tools/lib/qdox-1.1.jar
URL: http://svn.apache.org/viewcvs/james/server/trunk/tools/lib/qdox-1.1.jar?rev=365934&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/tools/lib/qdox-1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org