hammant 2002/11/29 13:12:03
Modified: sevak build.xml catalina.xml
sevak/src/demo/conf catalina-assembly.xml
Log:
Changes from Richard Wallace
Revision Changes Path
1.20 +2 -9 jakarta-avalon-apps/sevak/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/sevak/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.xml 5 Nov 2002 22:44:38 -0000 1.19
+++ build.xml 29 Nov 2002 21:12:03 -0000 1.20
@@ -214,19 +214,12 @@
<jar jarfile="${build.lib}/sevak-catalina.jar">
<fileset dir="${build.classes}">
- <include name="org/apache/avalon/apps/sevak/blocks/catalina/startup/*"/>
+ <include name="org/apache/avalon/apps/sevak/blocks/catalina/**"/>
</fileset>
<fileset dir="${build.metagenerate}/catalina">
- <include
name="org/apache/avalon/apps/sevak/blocks/catalina/startup/**/*.xinfo"/>
+ <include name="org/apache/avalon/apps/sevak/blocks/catalina/**/*.xinfo"/>
</fileset>
</jar>
-
- <jar jarfile="${build.lib}/sevak-catalina-impl.jar">
- <fileset dir="${build.classes}">
- <include name="org/apache/avalon/apps/sevak/blocks/catalina/**"/>
- <exclude
name="org/apache/avalon/apps/sevak/blocks/catalina/startup/**"/>
- </fileset>
- </jar>
<jar jarfile="${build.lib}/sevak-jo.jar">
<fileset dir="${build.classes}">
1.10 +0 -3 jakarta-avalon-apps/sevak/catalina.xml
Index: catalina.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/sevak/catalina.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- catalina.xml 5 Nov 2002 22:44:38 -0000 1.9
+++ catalina.xml 29 Nov 2002 21:12:03 -0000 1.10
@@ -194,9 +194,6 @@
<zipfileset dir="${catalina.download}/bin" prefix="common/lib">
<include name="*.jar"/>
</zipfileset>
- <zipfileset dir="${build.lib}" prefix="server/lib">
- <include name="sevak-catalina-impl.jar"/>
- </zipfileset>
<zipfileset dir="${conf.demo.dir}" prefix="conf">
<include name="tomcat-users.xml"/>
</zipfileset>
1.5 +1 -1 jakarta-avalon-apps/sevak/src/demo/conf/catalina-assembly.xml
Index: catalina-assembly.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/sevak/src/demo/conf/catalina-assembly.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- catalina-assembly.xml 20 Oct 2002 22:02:34 -0000 1.4
+++ catalina-assembly.xml 29 Nov 2002 21:12:03 -0000 1.5
@@ -3,7 +3,7 @@
"http://jakarta.apache.org/phoenix/assembly_1_0.dtd";>
<assembly>
- <block class="org.apache.avalon.apps.sevak.blocks.catalina.startup.Bootstrap"
name="sevak"/>
+ <block
class="org.apache.avalon.apps.sevak.blocks.catalina.CatalinaSevakBootstrap"
name="sevak"/>
<block class="org.apache.avalon.apps.sevak.demo.MultihostSevakTest"
name="multihost-sevak-test">
<provide name="sevak" role="org.apache.avalon.apps.sevak.MultihostSevak"/>
</block>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
