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 pg...@apache.org on 2002/10/30 21:54:14 UTC
cvs commit: jakarta-james/phoenix-bin/logs readme.txt dummy.txt
pgoldstein 2002/10/30 12:54:14
Modified: phoenix-bin/bin Wrapper.dll Wrapper.exe phoenix-loader.jar
run.bat wrapper.jar
phoenix-bin/bin/lib mx4j-jmx.jar mx4j-tools.jar
phoenix-engine.jar
phoenix-bin/conf kernel.xml wrapper.conf
phoenix-bin/lib excalibur-logger-1.0.jar phoenix-client.jar
Added: phoenix-bin/ext README.txt
phoenix-bin/lib avalon-framework-4.1.3.jar logkit-1.1.1.jar
phoenix-bsh-commands.jar
phoenix-bin/logs readme.txt
Removed: phoenix-bin/ext dummy.txt
phoenix-bin/lib avalon-framework-20020713.jar logkit-1.1.jar
phoenix-bin/logs dummy.txt
Log:
Upgrading Phoenix to Phoenix 4.0.1
Revision Changes Path
1.2 +56 -45 jakarta-james/phoenix-bin/bin/Wrapper.dll
<<Binary file>>
1.2 +103 -135 jakarta-james/phoenix-bin/bin/Wrapper.exe
<<Binary file>>
1.5 +41 -45 jakarta-james/phoenix-bin/bin/phoenix-loader.jar
<<Binary file>>
1.4 +91 -91 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- run.bat 25 Sep 2002 21:14:55 -0000 1.3
+++ run.bat 30 Oct 2002 20:54:12 -0000 1.4
@@ -1,91 +1,91 @@
-@echo off
-rem
-rem Phoenix start script.
-rem
-rem Author: Peter Donald [donaldp@apache.org]
-rem
-rem Environment Variable Prequisites
-rem
-rem PHOENIX_OPTS (Optional) Java runtime options used when the command is
-rem executed.
-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
-rem JAVA_HOME Must point at your Java Development Kit installation.
-rem
-rem PHOENIX_JVM_OPTS (Optional) Java runtime options used when the command is
-rem executed.
-rem
-rem -----------------------------------------------------------------------------
-
-rem
-rem Determine if JAVA_HOME is set and if so then use it
-rem
-if not "%JAVA_HOME%"=="" goto found_java
-
-set PHOENIX_JAVACMD=java
-goto file_locate
-
-:found_java
-set PHOENIX_JAVACMD=%JAVA_HOME%\bin\java
-
-:file_locate
-
-rem
-rem Locate where phoenix is in filesystem
-rem
-if not "%OS%"=="Windows_NT" goto start
-
-rem %~dp0 is name of current script under NT
-set PHOENIX_HOME=%~dp0
-
-rem : operator works similar to make : operator
-set PHOENIX_HOME=%PHOENIX_HOME:\bin\=%
-
-:start
-
-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.
-goto end
-
-:phoenix_home
-
-if not "%PHOENIX_TMPDIR%"=="" goto afterTmpDir
-set PHOENIX_TMPDIR=%PHOENIX_HOME%\temp
-if not exist "%PHOENIX_TMPDIR%" mkdir %PHOENIX_TMPDIR%
-
-:afterTmpDir
-
-echo Using PHOENIX_HOME: %PHOENIX_HOME%
-echo Using PHOENIX_TMPDIR: %PHOENIX_TMPDIR%
-echo Using JAVA_HOME: %JAVA_HOME%
-
-set PHOENIX_SM=
-
-if "%PHOENIX_SECURE%" == "false" goto postSecure
-
-rem Make Phoenix run with security Manager enabled
-set PHOENIX_SM="-Djava.security.manager"
-
-:postSecure
-
-rem
-rem -Djava.ext.dirs= is needed as some JVM vendors do foolish things
-rem like placing jaxp/jaas/xml-parser jars in ext dir
-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%" %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
+@echo off
+rem
+rem Phoenix start script.
+rem
+rem Author: Peter Donald [donaldp@apache.org]
+rem
+rem Environment Variable Prequisites
+rem
+rem PHOENIX_OPTS (Optional) Java runtime options used when the command is
+rem executed.
+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
+rem JAVA_HOME Must point at your Java Development Kit installation.
+rem
+rem PHOENIX_JVM_OPTS (Optional) Java runtime options used when the command is
+rem executed.
+rem
+rem -----------------------------------------------------------------------------
+
+rem
+rem Determine if JAVA_HOME is set and if so then use it
+rem
+if not "%JAVA_HOME%"=="" goto found_java
+
+set PHOENIX_JAVACMD=java
+goto file_locate
+
+:found_java
+set PHOENIX_JAVACMD=%JAVA_HOME%\bin\java
+
+:file_locate
+
+rem
+rem Locate where phoenix is in filesystem
+rem
+if not "%OS%"=="Windows_NT" goto start
+
+rem %~dp0 is name of current script under NT
+set PHOENIX_HOME=%~dp0
+
+rem : operator works similar to make : operator
+set PHOENIX_HOME=%PHOENIX_HOME:\bin\=%
+
+:start
+
+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.
+goto end
+
+:phoenix_home
+
+if not "%PHOENIX_TMPDIR%"=="" goto afterTmpDir
+set PHOENIX_TMPDIR=%PHOENIX_HOME%\temp
+if not exist "%PHOENIX_TMPDIR%" mkdir %PHOENIX_TMPDIR%
+
+:afterTmpDir
+
+echo Using PHOENIX_HOME: %PHOENIX_HOME%
+echo Using PHOENIX_TMPDIR: %PHOENIX_TMPDIR%
+echo Using JAVA_HOME: %JAVA_HOME%
+
+set PHOENIX_SM=
+
+if "%PHOENIX_SECURE%" == "false" goto postSecure
+
+rem Make Phoenix run with security Manager enabled
+set PHOENIX_SM="-Djava.security.manager"
+
+:postSecure
+
+rem
+rem -Djava.ext.dirs= is needed as some JVM vendors do foolish things
+rem like placing jaxp/jaas/xml-parser jars in ext dir
+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%" %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.2 +69 -49 jakarta-james/phoenix-bin/bin/wrapper.jar
<<Binary file>>
1.2 +1069 -898 jakarta-james/phoenix-bin/bin/lib/mx4j-jmx.jar
<<Binary file>>
1.3 +954 -729 jakarta-james/phoenix-bin/bin/lib/mx4j-tools.jar
<<Binary file>>
1.3 +583 -616 jakarta-james/phoenix-bin/bin/lib/phoenix-engine.jar
<<Binary file>>
1.5 +97 -97 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kernel.xml 25 Sep 2002 21:14:55 -0000 1.4
+++ kernel.xml 30 Oct 2002 20:54:13 -0000 1.5
@@ -1,97 +1,97 @@
-<?xml version="1.0"?>
-
-<phoenix>
- <embeddor role="org.apache.avalon.phoenix.interfaces.Embeddor"
- class="org.apache.avalon.phoenix.components.embeddor.DefaultEmbeddor">
-
- <component role="org.apache.avalon.phoenix.interfaces.Deployer"
- class="org.apache.avalon.phoenix.components.deployer.DefaultDeployer"
- logger="deployer"/>
-
- <component role="org.apache.avalon.phoenix.interfaces.LogManager"
- class="org.apache.avalon.phoenix.components.logger.DefaultLogManager"
- logger="logs"/>
-
- <!-- There is one JMX MBeanServer infrastructure currently
- supported by Avalon, namely MX4J. Previously the JMX RI
- was supported but due to severe bugs and lack of implementation
- of certain features (such as ModelMBeans), support has been
- dropped for the JMX RI implementation.
-
- The MX4J manager using the MX4J adapter devewloped at SourceForge
- 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.
- -->
-
- <component role="org.apache.avalon.phoenix.interfaces.SystemManager"
- class="org.apache.avalon.phoenix.components.manager.MX4JSystemManager"
- logger="manager" >
- <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>
- -->
- <!--
- <user>
- <name>user</name>
- <password>password</password>
- </user>
- -->
- </component>
-
- <!-- There are two kernels
- org.apache.avalon.phoenix.components.kernel.DefaultKernel
- - The default one.
- org.apache.avalon.phoenix.components.kernel.beanshell.BeanShellKernel
- - One with a beanshell view at the application level.
- -->
- <component role="org.apache.avalon.phoenix.interfaces.Kernel"
- class="org.apache.avalon.phoenix.components.kernel.DefaultKernel"
- logger="kernel"/>
-
- <component role="org.apache.avalon.phoenix.interfaces.ConfigurationRepository"
- class="org.apache.avalon.phoenix.components.configuration.DefaultConfigurationRepository"
- logger="config"/>
-
- <!--
- <component role="org.apache.avalon.phoenix.interfaces.ConfigurationRepository"
- class="org.apache.avalon.phoenix.components.configuration.FileSystemPersistentConfigurationRepository"
- logger="config"/>
- -->
-
- <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"
- 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>
- </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"
- 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"/>
--->
- </embeddor>
-</phoenix>
+<?xml version="1.0"?>
+
+<phoenix>
+ <embeddor role="org.apache.avalon.phoenix.interfaces.Embeddor"
+ class="org.apache.avalon.phoenix.components.embeddor.DefaultEmbeddor">
+
+ <component role="org.apache.avalon.phoenix.interfaces.Deployer"
+ class="org.apache.avalon.phoenix.components.deployer.DefaultDeployer"
+ logger="deployer"/>
+
+ <component role="org.apache.avalon.phoenix.interfaces.LogManager"
+ class="org.apache.avalon.phoenix.components.logger.DefaultLogManager"
+ logger="logs"/>
+
+ <!-- There is one JMX MBeanServer infrastructure currently
+ supported by Avalon, namely MX4J. Previously the JMX RI
+ was supported but due to severe bugs and lack of implementation
+ of certain features (such as ModelMBeans), support has been
+ dropped for the JMX RI implementation.
+
+ The MX4J manager using the MX4J adapter devewloped at SourceForge
+ 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.
+ -->
+
+ <component role="org.apache.avalon.phoenix.interfaces.SystemManager"
+ class="org.apache.avalon.phoenix.components.manager.MX4JSystemManager"
+ logger="manager" >
+ <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>
+ -->
+ <!--
+ <user>
+ <name>user</name>
+ <password>password</password>
+ </user>
+ -->
+ </component>
+
+ <!-- There are two kernels
+ org.apache.avalon.phoenix.components.kernel.DefaultKernel
+ - The default one.
+ org.apache.avalon.phoenix.components.kernel.beanshell.BeanShellKernel
+ - One with a beanshell view at the application level.
+ -->
+ <component role="org.apache.avalon.phoenix.interfaces.Kernel"
+ class="org.apache.avalon.phoenix.components.kernel.DefaultKernel"
+ logger="kernel"/>
+
+ <component role="org.apache.avalon.phoenix.interfaces.ConfigurationRepository"
+ class="org.apache.avalon.phoenix.components.configuration.DefaultConfigurationRepository"
+ logger="config"/>
+
+ <!--
+ <component role="org.apache.avalon.phoenix.interfaces.ConfigurationRepository"
+ class="org.apache.avalon.phoenix.components.configuration.FileSystemPersistentConfigurationRepository"
+ logger="config"/>
+ -->
+
+ <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"
+ 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>
+ </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"
+ 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"/>
+-->
+ </embeddor>
+</phoenix>
1.2 +3 -3 jakarta-james/phoenix-bin/conf/wrapper.conf
Index: wrapper.conf
===================================================================
RCS file: /home/cvs/jakarta-james/phoenix-bin/conf/wrapper.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wrapper.conf 25 Sep 2002 21:14:55 -0000 1.1
+++ wrapper.conf 30 Oct 2002 20:54:13 -0000 1.2
@@ -98,13 +98,13 @@
# service can then be reinstalled.
# Name of the service
-wrapper.ntservice.name=James
+wrapper.ntservice.name=James 2.1
# Display name of the service
-wrapper.ntservice.displayname=Java Apache Mail Server on Phoenix
+wrapper.ntservice.displayname=James Mail Server 2.1
# Description of the service
-wrapper.ntservice.description=Java Apache Mail Server on Phoenix
+wrapper.ntservice.description=James Mail Server 2.1
# Service dependencies. Add dependencies as needed starting from 1
wrapper.ntservice.dependency.1=
1.1 jakarta-james/phoenix-bin/ext/README.txt
Index: README.txt
===================================================================
Place extension jars here.
1.3 +375 -378 jakarta-james/phoenix-bin/lib/excalibur-logger-1.0.jar
<<Binary file>>
1.5 +175 -163 jakarta-james/phoenix-bin/lib/phoenix-client.jar
<<Binary file>>
1.1 jakarta-james/phoenix-bin/lib/avalon-framework-4.1.3.jar
<<Binary file>>
1.1 jakarta-james/phoenix-bin/lib/logkit-1.1.1.jar
<<Binary file>>
1.1 jakarta-james/phoenix-bin/lib/phoenix-bsh-commands.jar
<<Binary file>>
1.1 jakarta-james/phoenix-bin/logs/readme.txt
Index: readme.txt
===================================================================
The Phoenix Kernel Logs will be placed here.
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>