hammant 2002/10/08 23:07:17
Modified: sevak ant.properties.sample catalina.xml
sevak/src/demo/conf catalina-config.xml
sevak/src/java/org/apache/avalon/apps/sevak/blocks/catalina
CatalinaSevak.java
Log:
Upgraded Catalina from Daniel Krieg
Revision Changes Path
1.3 +4 -1 jakarta-avalon-apps/sevak/ant.properties.sample
Index: ant.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/sevak/ant.properties.sample,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ant.properties.sample 30 Sep 2002 22:03:11 -0000 1.2
+++ ant.properties.sample 9 Oct 2002 06:07:17 -0000 1.3
@@ -37,3 +37,6 @@
# -----------------------------------------------------------------------------
#catalina-zip-suffix=-LE-jdk14
+
+phoenix.home=/local/phoenix
+
1.7 +1 -1 jakarta-avalon-apps/sevak/catalina.xml
Index: catalina.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/sevak/catalina.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- catalina.xml 5 Oct 2002 06:57:34 -0000 1.6
+++ catalina.xml 9 Oct 2002 06:07:17 -0000 1.7
@@ -9,7 +9,7 @@
<!-- set up properties -->
<property file="${user.home}/build.properties"/>
<property file="${user.home}/.ant.properties"/>
- <property file="${basedir}/.ant.properties"/>
+ <property file="${basedir}/ant.properties"/>
<property file="${basedir}/../ant.properties"/>
<property file="${basedir}/default.properties"/>
<property file="${basedir}/../default.properties"/>
1.4 +1 -1 jakarta-avalon-apps/sevak/src/demo/conf/catalina-config.xml
Index: catalina-config.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/sevak/src/demo/conf/catalina-config.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- catalina-config.xml 30 Sep 2002 22:03:11 -0000 1.3
+++ catalina-config.xml 9 Oct 2002 06:07:17 -0000 1.4
@@ -8,7 +8,7 @@
<config>
<sevak>
- <config-file>conf/server-noexamples.xml.config</config-file>
+ <config-file>conf/server.xml</config-file>
</sevak>
<multihost-sevak-test>
<Context docBase="/multihost-sevak" path="sevak-demo.war"/>
1.4 +1 -1
jakarta-avalon-apps/sevak/src/java/org/apache/avalon/apps/sevak/blocks/catalina/CatalinaSevak.java
Index: CatalinaSevak.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/sevak/src/java/org/apache/avalon/apps/sevak/blocks/catalina/CatalinaSevak.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CatalinaSevak.java 30 Sep 2002 22:03:12 -0000 1.3
+++ CatalinaSevak.java 9 Oct 2002 06:07:17 -0000 1.4
@@ -307,7 +307,7 @@
digester.addRuleSet( new NamingRuleSet(
"Server/Service/Engine/Host/Context/" ) );
digester.addRule( "Server/Service/Engine",
- new SetParentClassLoaderRule( digester,
+ new ParentClassLoaderRule( digester,
m_parentLoader ) );
return ( digester );
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
