Author: pier
Date: Wed Nov 3 10:55:04 2004
New Revision: 56510
Modified:
cocoon/whiteboard/kernel/build.xml
cocoon/whiteboard/kernel/etc/webdefault.xml
Log:
Reduced web configuration and allow to run servlets with ANT (even if it does
not do a clean shutdown on CTRL-C)
Modified: cocoon/whiteboard/kernel/build.xml
==============================================================================
--- cocoon/whiteboard/kernel/build.xml (original)
+++ cocoon/whiteboard/kernel/build.xml Wed Nov 3 10:55:04 2004
@@ -215,10 +215,13 @@
<target name="kernel.components">
<antcall target="kernel.component"><param name="name"
value="extensions/logging"/></antcall>
- <antcall target="kernel.component"><param name="name"
value="interfaces/jdbc-datasource"/></antcall>
+ <antcall target="kernel.component"><param name="name"
value="interfaces/datasource"/></antcall>
+ <antcall target="kernel.component"><param name="name"
value="interfaces/servlet"/></antcall>
+ <antcall target="kernel.component"><param name="name"
value="modules/ant"/></antcall>
<antcall target="kernel.component"><param name="name"
value="modules/commons-collections"/></antcall>
<antcall target="kernel.component"><param name="name"
value="modules/commons-pool"/></antcall>
<antcall target="kernel.component"><param name="name"
value="blocks/commons-dbcp"/></antcall>
+ <antcall target="kernel.component"><param name="name"
value="blocks/jasper"/></antcall>
</target>
<!--
=========================================================================== +
@@ -237,6 +240,24 @@
<target name="all" depends="webapp.root,webapp.docs"
description="Build all the web applications"/>
+
+ <!--
========================================================================== -->
+
+ <target name="run" depends="all" description="Run the servlet environment">
+ <java classname="org.mortbay.jetty.Server" fork="true">
+ <sysproperty key="java.endorsed.dirs"
value="${basedir}/lib/endorsed"/>
+ <sysproperty key="org.mortbay.util.URI.charset" value="UTF-8"/>
+ <sysproperty key="jetty.home" value="${basedir}"/>
+ <sysproperty key="LOG_DATE_FORMAT" value="[yyyy/MM/dd
hh:mm:ss.SSS]"/>
+
+ <arg value="${basedir}/etc/admin.xml"/>
+ <arg value="${basedir}/etc/jetty.xml"/>
+
+ <classpath>
+ <fileset dir="${basedir}/lib" includes="**/*.jar"/>
+ </classpath>
+ </java>
+ </target>
<!--
========================================================================== -->
Modified: cocoon/whiteboard/kernel/etc/webdefault.xml
==============================================================================
--- cocoon/whiteboard/kernel/etc/webdefault.xml (original)
+++ cocoon/whiteboard/kernel/etc/webdefault.xml Wed Nov 3 10:55:04 2004
@@ -162,11 +162,11 @@
<!-- * Set the "jspCompilerPlugin" initialization parameter to -->
<!-- "org.apache.jasper.compiler.JikesJavaCompiler". -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <servlet>
+ <!--servlet>
<servlet-name>jsp</servlet-name>
<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
<load-on-startup>0</load-on-startup>
- </servlet>
+ </servlet-->
<!-- ==================================================================== -->
<!-- Dynamic Servlet Invoker. -->
@@ -187,7 +187,7 @@
<!-- * All other parameters are copied to the -->
<!-- each dynamic servlet as init parameters -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <servlet>
+ <!--servlet>
<servlet-name>invoker</servlet-name>
<servlet-class>org.mortbay.jetty.servlet.Invoker</servlet-class>
<init-param>
@@ -203,7 +203,7 @@
<param-value>anyValue</param-value>
</init-param>
<load-on-startup>0</load-on-startup>
- </servlet>
+ </servlet-->
<!-- ==================================================================== -->
<servlet-mapping>
@@ -212,22 +212,22 @@
</servlet-mapping>
<!-- ==================================================================== -->
- <servlet-mapping>
+ <!--servlet-mapping>
<servlet-name>jsp</servlet-name>
<url-pattern>*.jsp</url-pattern>
- </servlet-mapping>
+ </servlet-mapping-->
<!-- ==================================================================== -->
- <servlet-mapping>
+ <!--servlet-mapping>
<servlet-name>jsp</servlet-name>
<url-pattern>*.jspf</url-pattern>
- </servlet-mapping>
+ </servlet-mapping-->
<!-- ==================================================================== -->
- <servlet-mapping>
+ <!--servlet-mapping>
<servlet-name>invoker</servlet-name>
<url-pattern>/servlet/*</url-pattern>
- </servlet-mapping>
+ </servlet-mapping-->
<!-- ==================================================================== -->
