hammant 2002/09/25 14:14:56
Modified: . build.bat build.xml
phoenix-bin/bin/lib mx4j-tools.jar phoenix-engine.jar
phoenix-bin/bin phoenix-loader.jar run.bat run.sh
phoenix-bin/conf kernel.xml
phoenix-bin/lib excalibur-i18n-1.0.jar
excalibur-logger-1.0.jar phoenix-client.jar
Added: lib commons-net-1.0.0-dev.jar mail_1_2.jar
phoenix-bin/bin Wrapper.dll Wrapper.exe phoenix.sh
wrapper.jar
phoenix-bin/conf wrapper.conf
phoenix-bin/lib logkit-1.1.jar
Removed: phoenix-bin/lib activation.jar commons-net-1.0.0-dev.jar
logkit-1.1a.jar mail_1_2.jar
phoenix-bin WARNING.txt
Log:
Phoenix upgraded to 4.0 final
Revision Changes Path
1.7 +18 -18 jakarta-james/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-james/build.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.bat 18 Aug 2002 17:42:45 -0000 1.6
+++ build.bat 25 Sep 2002 21:14:54 -0000 1.7
@@ -1,18 +1,18 @@
-@echo off
-
-echo.
-echo James Build System
-echo -------------------
-
-set OLD_ANT_HOME=%ANT_HOME%
-set ANT_HOME=tools
-
-set OLD_CLASSPATH=%CLASSPATH%
-set
CLASSPATH=phoenix-bin\lib\xercesImpl-2.0.2.jar;phoenix-bin\lib\xml-apis.jar;tools\lib\velocity-1.3-dev.jar;tools\lib\jdom-b7.jar
-
-%ANT_HOME%\bin\ant.bat -emacs %1 %2 %3 %4 %5 %6 %7 %8
-goto cleanup
-
-:cleanup
-set ANT_HOME=%OLD_ANT_HOME%
-set CLASSPATH=%OLD_CLASSPATH%
+@echo off
+
+echo.
+echo James Build System
+echo -------------------
+
+set OLD_ANT_HOME=%ANT_HOME%
+set ANT_HOME=tools
+
+set OLD_CLASSPATH=%CLASSPATH%
+set
CLASSPATH=phoenix-bin\lib\xercesImpl-2.0.2.jar;phoenix-bin\lib\xml-apis.jar;tools\lib\velocity-1.3-dev.jar;tools\lib\jdom-b7.jar
+
+%ANT_HOME%\bin\ant.bat -emacs %1 %2 %3 %4 %5 %6 %7 %8
+goto cleanup
+
+:cleanup
+set ANT_HOME=%OLD_ANT_HOME%
+set CLASSPATH=%OLD_CLASSPATH%
1.108 +4 -1 jakarta-james/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-james/build.xml,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- build.xml 23 Sep 2002 19:05:24 -0000 1.107
+++ build.xml 25 Sep 2002 21:14:54 -0000 1.108
@@ -375,6 +375,9 @@
<include name="avalon-framework-20020713.jar"/>
<include name="cornerstone.jar"/>
<include name="excalibur-datasource-1.0.jar"/>
+ <include name="activation.jar"/>
+ <include name="mail_1_2.jar"/>
+ <include name="commons-net-1.0.0-dev.jar"/>
</lib>
<lib dir="${phoenix.lib.dir}">
<include name="mail_1_2.jar"/>
1.1 jakarta-james/lib/commons-net-1.0.0-dev.jar
<<Binary file>>
1.3 +0 -0 jakarta-james/lib/mail_1_2.jar
<<Binary file>>
1.2 +67 -67 jakarta-james/phoenix-bin/bin/lib/mx4j-tools.jar
<<Binary file>>
1.2 +354 -357 jakarta-james/phoenix-bin/bin/lib/phoenix-engine.jar
<<Binary file>>
1.4 +45 -28 jakarta-james/phoenix-bin/bin/phoenix-loader.jar
<<Binary file>>
1.3 +4 -1 jakarta-james/phoenix-bin/bin/run.bat
Index: run.bat
===================================================================
RCS file: /home/cvs/jakarta-james/phoenix-bin/bin/run.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- run.bat 23 Aug 2002 06:48:29 -0000 1.2
+++ run.bat 25 Sep 2002 21:14:55 -0000 1.3
@@ -82,7 +82,10 @@
rem thus breaking Phoenix
rem
+rem uncomment to get enable remote debugging
+rem set DEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
+
rem Kicking the tires and lighting the fires!!!
-"%PHOENIX_JAVACMD%" "-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_SM% -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"
"-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
:end
1.3 +1 -66 jakarta-james/phoenix-bin/bin/run.sh
Index: run.sh
===================================================================
RCS file: /home/cvs/jakarta-james/phoenix-bin/bin/run.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- run.sh 13 Aug 2002 05:43:03 -0000 1.2
+++ run.sh 25 Sep 2002 21:14:55 -0000 1.3
@@ -3,23 +3,6 @@
# -----------------------------------------------------------------------------
# Phoenix start script.
#
-# Author: Peter Donald <peter at apache.org>
-
-# Environment Variable Prequisites
-#
-# 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.
-#
-# JAVA_HOME Must point at your Java Development Kit installation.
-#
-# PHOENIX_JVM_OPTS (Optional) Java runtime options used when the command is
-# executed.
-#
-# -----------------------------------------------------------------------------
# OS specific support. $var _must_ be set to either true or false.
cygwin=false
@@ -27,16 +10,6 @@
CYGWIN*) cygwin=true;;
esac
-# Checking for JAVA_HOME is required on *nix due
-# to some distributions stupidly including kaffe in /usr/bin
-if [ "$JAVA_HOME" = "" ] ; then
- echo "ERROR: JAVA_HOME not found in your environment."
- echo
- echo "Please, set the JAVA_HOME variable in your environment to match the"
- echo "location of the Java Virtual Machine you want to use."
- exit 1
-fi
-
# resolve links - $0 may be a softlink
THIS_PROG="$0"
@@ -61,42 +34,4 @@
[ -n "$PHOENIX_HOME" ] && PHOENIX_HOME=`cygpath --unix "$PHOENIX_HOME"`
fi
-if [ -z "$PHOENIX_TMPDIR" ] ; then
- # Define the java.io.tmpdir to use for Phoenix
- PHOENIX_TMPDIR="$PHOENIX_HOME"/temp
- mkdir -p "$PHOENIX_TMPDIR"
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- PHOENIX_HOME=`cygpath --path --windows "$PHOENIX_HOME"`
-fi
-
-# ----- Execute The Requested Command -----------------------------------------
-
-echo "Using PHOENIX_HOME: $PHOENIX_HOME"
-echo "Using PHOENIX_TMPDIR: $PHOENIX_TMPDIR"
-echo "Using JAVA_HOME: $JAVA_HOME"
-
-#
-# Command to overide JVM ext dir
-#
-# This is needed as some JVM vendors do foolish things
-# like placing jaxp/jaas/xml-parser jars in ext dir
-# thus breaking Phoenix
-#
-JVM_OPTS="-Djava.ext.dirs=$PHOENIX_HOME/lib"
-
-if [ "$PHOENIX_SECURE" != "false" ] ; then
- # Make phoenix run with security manager enabled
- JVM_OPTS="$JVM_OPTS -Djava.security.manager"
-fi
-
-# Kicking the tires and lighting the fires!!!
-$JAVA_HOME/bin/java $JVM_OPTS \
- $JVM_OPTS \
-
-Djava.security.policy=jar:file:$PHOENIX_HOME/bin/phoenix-loader.jar!/META-INF/java.policy
\
- $PHOENIX_JVM_OPTS \
- -Dphoenix.home="$PHOENIX_HOME" \
- -Djava.io.tmpdir="$PHOENIX_TMPDIR" \
- -jar "$PHOENIX_HOME/bin/phoenix-loader.jar" $*
+$PHOENIX_HOME/bin/phoenix.sh run $*
1.1 jakarta-james/phoenix-bin/bin/Wrapper.dll
<<Binary file>>
1.1 jakarta-james/phoenix-bin/bin/Wrapper.exe
<<Binary file>>
1.1 jakarta-james/phoenix-bin/bin/phoenix.sh
Index: phoenix.sh
===================================================================
#! /bin/sh
#
# -----------------------------------------------------------------------------
# Phoenix start script.
#
# Author: Alexis Agahi <[EMAIL PROTECTED]>
# Peter Donald <peter at apache.org>
#
# Environment Variable Prequisites
#
# 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.
#
# JAVA_HOME Must point at your Java Development Kit installation.
#
# PHOENIX_JVM_OPTS (Optional) Java runtime options used when the command is
# executed.
#
# -----------------------------------------------------------------------------
usage()
{
echo "Usage: $0 {start|stop|run|restart|check}"
exit 1
}
[ $# -gt 0 ] || usage
##################################################
# Get the action & configs
##################################################
ACTION=$1
shift
ARGS="$*"
# OS specific support. $var _must_ be set to either true or false.
cygwin=false
case "`uname`" in
CYGWIN*) cygwin=true;;
esac
# resolve links - $0 may be a softlink
THIS_PROG="$0"
while [ -h "$THIS_PROG" ]; do
ls=`ls -ld "$THIS_PROG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '.*/.*' > /dev/null; then
THIS_PROG="$link"
else
THIS_PROG=`dirname "$THIS_PROG"`/"$link"
fi
done
# Get standard environment variables
PRGDIR=`dirname "$THIS_PROG"`
PHOENIX_HOME=`cd "$PRGDIR/.." ; pwd`
unset THIS_PROG
if [ -r "$PHOENIX_HOME"/bin/setenv.sh ]; then
. "$PHOENIX_HOME"/bin/setenv.sh
fi
# Checking for JAVA_HOME is required on *nix due
# to some distributions stupidly including kaffe in /usr/bin
if [ "$JAVA_HOME" = "" ] ; then
echo "ERROR: JAVA_HOME not found in your environment."
echo
echo "Please, set the JAVA_HOME variable in your environment to match the"
echo "location of the Java Virtual Machine you want to use."
exit 1
fi
# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin; then
[ -n "$PHOENIX_HOME" ] && PHOENIX_HOME=`cygpath --unix "$PHOENIX_HOME"`
fi
if [ -z "$PHOENIX_TMPDIR" ] ; then
# Define the java.io.tmpdir to use for Phoenix
PHOENIX_TMPDIR="$PHOENIX_HOME"/temp
mkdir -p "$PHOENIX_TMPDIR"
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
PHOENIX_HOME=`cygpath --path --windows "$PHOENIX_HOME"`
fi
# ----- Execute The Requested Command -----------------------------------------
echo "Using PHOENIX_HOME: $PHOENIX_HOME"
echo "Using PHOENIX_TMPDIR: $PHOENIX_TMPDIR"
echo "Using JAVA_HOME: $JAVA_HOME"
# Uncomment to get enable remote debugging
# DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"
#
# Command to overide JVM ext dir
#
# This is needed as some JVM vendors do foolish things
# like placing jaxp/jaas/xml-parser jars in ext dir
# thus breaking Phoenix
#
JVM_OPTS="-Djava.ext.dirs=$PHOENIX_HOME/lib"
if [ "$PHOENIX_SECURE" != "false" ] ; then
# Make phoenix run with security manager enabled
JVM_OPTS="$JVM_OPTS -Djava.security.manager"
fi
# Get the run cmd
RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS \
$JVM_OPTS \
$DEBUG \
-Djava.security.policy=jar:file:$PHOENIX_HOME/bin/phoenix-loader.jar!/META-INF/java.policy
\
$PHOENIX_JVM_OPTS \
-Dphoenix.home="$PHOENIX_HOME" \
-Djava.io.tmpdir="$PHOENIX_TMPDIR" \
-jar "$PHOENIX_HOME/bin/phoenix-loader.jar" $*"
#####################################################
# Find a PID for the pid file
#####################################################
if [ -z "$PHOENIX_PID" ]
then
PHOENIX_PID="$PHOENIX_TMPDIR/phoenix.pid"
fi
#####################################################
# Find a location for the phoenix console
#####################################################
PHOENIX_CONSOLE="$PHOENIX_TMPDIR/phoenix.console"
if [ -z "$PHOENIX_CONSOLE" ]
then
if [ -w /dev/console ]
then
PHOENIX_CONSOLE=/dev/console
else
PHOENIX_CONSOLE=/dev/tty
fi
fi
#####################################################
# Action!
#####################################################
case "$ACTION" in
start)
echo "Starting Phoenix: "
if [ -f $PHOENIX_PID ]
then
echo "Already Running!!"
exit 1
fi
echo "STARTED Phoenix `date`" >> $PHOENIX_CONSOLE
nohup sh -c "exec $RUN_CMD >>$PHOENIX_CONSOLE 2>&1" >/dev/null &
echo $! > $PHOENIX_PID
echo "Phoenix running pid="`cat $PHOENIX_PID`
;;
stop)
PID=`cat $PHOENIX_PID 2>/dev/null`
echo "Shutting down Phoenix: $PID"
kill $PID 2>/dev/null
sleep 2
kill -9 $PID 2>/dev/null
rm -f $PHOENIX_PID
echo "STOPPED `date`" >>$PHOENIX_CONSOLE
;;
restart)
$0 stop $*
sleep 5
$0 start $*
;;
supervise)
#
# Under control of daemontools supervise monitor which
# handles restarts and shutdowns via the svc program.
#
exec $RUN_CMD
;;
run|demo)
echo "Running Phoenix: "
if [ -f $PHOENIX_PID ]
then
echo "Already Running!!"
exit 1
fi
exec $RUN_CMD
;;
check)
echo "Checking arguments to Phoenix: "
echo "PHOENIX_HOME: $PHOENIX_HOME"
echo "PHOENIX_TMPDIR: $PHOENIX_TMPDIR"
echo "PHOENIX_JVM_OPTS: $PHOENIX_JVM_OPTS"
echo "JAVA_HOME: $JAVA_HOME"
echo "JVM_OPTS: $JVM_OPTS"
echo "CLASSPATH: $CLASSPATH"
echo "RUN_CMD: $RUN_CMD"
echo
if [ -f $PHOENIX_PID ]
then
echo "Phoenix running pid="`cat $PHOENIX_PID`
exit 0
fi
exit 1
;;
*)
usage
;;
esac
exit 0
1.1 jakarta-james/phoenix-bin/bin/wrapper.jar
<<Binary file>>
1.4 +10 -1 jakarta-james/phoenix-bin/conf/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/jakarta-james/phoenix-bin/conf/kernel.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kernel.xml 13 Aug 2002 05:43:03 -0000 1.3
+++ kernel.xml 25 Sep 2002 21:14:55 -0000 1.4
@@ -34,8 +34,17 @@
class="org.apache.avalon.phoenix.components.manager.MX4JSystemManager"
logger="manager" >
<manager-adaptor-port>8082</manager-adaptor-port>
- <enable-rmi-adaptor>false</enable-rmi-adaptor>
+ <!--
+ <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>
+ -->
+ <!--
+ <user>
+ <name>user</name>
+ <password>password</password>
+ </user>
+ -->
</component>
<!-- There are two kernels
1.1 jakarta-james/phoenix-bin/conf/wrapper.conf
Index: wrapper.conf
===================================================================
#********************************************************************
# Wrapper parameters
#********************************************************************
# Java Application
wrapper.java.command=java
# Java Main class
wrapper.java.mainclass=org.apache.avalon.phoenix.launcher.DaemonLauncher
# Java Classpath (include wrapper.jar) Add class path elements as needed starting
from 1
wrapper.java.classpath.1=phoenix-loader.jar
wrapper.java.classpath.2=wrapper.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path=./
# Java Additional Parameters
wrapper.java.additional.1=-Djava.ext.dirs=../lib
wrapper.java.additional.2=-Dphoenix.home=..
wrapper.java.additional.3=-Djava.security.policy=jar:file:phoenix-loader.jar!/META-INF/java.policy
wrapper.java.additional.4=-Djava.security.manager
# Initial Java Heap Size (in MB)
wrapper.java.initmemory=16
# Maximum Java Heap Size (in MB)
wrapper.java.maxmemory=64
# Application parameters. Add parameters as needed starting from 1
#wrapper.app.parameter.1=--remote-manager
# Port which the native wrapper code will attempt to connect to
wrapper.port=15012
# Number of seconds to allow for the JVM to be launched and contact the wrapper
before the
# wrapper should assume that the JVM is hung and terminate the JVM process. 0
means never
# time out. Defaults to 30 seconds.
wrapper.startup.timeout=30
# Number of seconds to allow between the wrapper pinging the JVM and the response.
0 means
# never time out. Defaults to 30 seconds.
wrapper.ping.timeout=30
# Number of seconds to allow for the JVM to shutdown before the wrapper should
assume that
# the JVM is hung and terminate the JVM process. 0 means never time out. Defaults
to 30
# seconds.
wrapper.shutdown.timeout=30
# The Wrapper detects when an application calls System.exit() and treats this as a
request
# to stop the server by default.
#wrapper.disable_shutdown_hook=TRUE
# Tell the Wrapper to request a JVM thread dump if the JVM fails to exit when
requested.
#wrapper.request_thread_dump_on_failed_jvm_exit=TRUE
#********************************************************************
# Wrapper Logging parameters
#********************************************************************
# Format of output for the console. (See docs for formats)
wrapper.console.format=PM
# Log Level for console output. (See docs for log levels)
wrapper.console.loglevel=INFO
# Log file to use for wrapper output logging.
wrapper.logfile=../logs/wrapper.log
# Format of output for the log file. (See docs for formats)
wrapper.logfile.format=LPTM
# Log Level for log file output. (See docs for log levels)
wrapper.logfile.loglevel=INFO
# Maximum size that the log file will be allowed to grow to before the log is rolled.
# Size is specified in bytes. The default value of 0, disables log rolling. May
# abreviate with the 'k' (kb) or 'm' (mb) suffix. For example: 10m = 10 megabytes.
wrapper.logfile.maxsize=5m
# Maximum number of rolled log files which will be allowed before old files are
deleted.
# The default value of 0 implies no limit.
wrapper.logfile.maxfiles=0
# Log Level for sys/event log output. (See docs for log levels)
wrapper.syslog.loglevel=NONE
#********************************************************************
# Wrapper Unix daemon parameters
#********************************************************************
# File to write process ID to
wrapper.pidfile=/var/run/phoenix.pid
#********************************************************************
# Wrapper NT Service parameters
#********************************************************************
# WARNING - Do not modify any of these parameters when an application
# using this configuration file has been installed as a service.
# Please uninstall the service before modifying this section. The
# service can then be reinstalled.
# Name of the service
wrapper.ntservice.name=James
# Display name of the service
wrapper.ntservice.displayname=Java Apache Mail Server on Phoenix
# Description of the service
wrapper.ntservice.description=Java Apache Mail Server on Phoenix
# Service dependencies. Add dependencies as needed starting from 1
wrapper.ntservice.dependency.1=
# Mode in which the service is installed. AUTO_START or DEMAND_START
wrapper.ntservice.starttype=AUTO_START
# Priority at which the service is run. NORMAL, LOW, HIGH, or REALTIME
wrapper.ntservice.process_priority=NORMAL
1.3 +105 -89 jakarta-james/phoenix-bin/lib/excalibur-i18n-1.0.jar
<<Binary file>>
1.2 +521 -385 jakarta-james/phoenix-bin/lib/excalibur-logger-1.0.jar
<<Binary file>>
1.4 +161 -146 jakarta-james/phoenix-bin/lib/phoenix-client.jar
<<Binary file>>
1.1 jakarta-james/phoenix-bin/lib/logkit-1.1.jar
<<Binary file>>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
