cziegeler 02/02/18 05:29:51
Modified: . build.xml
src/scratchpad/src/org/apache/cocoon/treeprocessor
treeprocessor.xconf
src/webapp cocoon.xconf
Added: src/scratchpad/src/org/apache/cocoon/sunshine sunshine.xconf
Log:
First step of making Cocoon work again without the scratchpad stuff
Revision Changes Path
1.170 +19 -2 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- build.xml 14 Feb 2002 15:52:36 -0000 1.169
+++ build.xml 18 Feb 2002 13:29:50 -0000 1.170
@@ -1051,6 +1051,23 @@
</target>
<!-- =================================================================== -->
+ <!-- Prepares the webapp directories for scratchpad -->
+ <!-- =================================================================== -->
+ <target name="prepare-webapp-scratchpad" depends="copy-webapp"
if="include.scratchpad.libs">
+
+ <!-- Invoke the SitemapToolTask to add optional entries -->
+ <sitemap-tool directory="${build.scratchpad.src}"
+ extension="sitemap"
+ sitemap="${build.war}/sitemap.xmap"/>
+
+ <!-- Invoke the XConfTool to add optional entries -->
+ <xconf-tool directory="${build.scratchpad.src}"
+ extension="xconf"
+ configuration="${build.war}/cocoon.xconf"/>
+
+ </target>
+
+ <!-- =================================================================== -->
<!-- Prepares the libraries for the war package -->
<!-- =================================================================== -->
<target name="prepare-xsp" depends="package" if="build.precompile">
@@ -1123,7 +1140,7 @@
<!-- =================================================================== -->
<!-- Creates the war file -->
<!-- =================================================================== -->
- <target name="webapp" depends="prepare-webapp, prepare-webapp-libs,
prepare-scratchpad-libs, prepare-xsp" description="* Generates the war package">
+ <target name="webapp" depends="prepare-webapp, prepare-webapp-scratchpad,
prepare-webapp-libs, prepare-scratchpad-libs, prepare-xsp" description="* Generates
the war package">
<manifest-tool directory="${build.war}/WEB-INF/lib"
manifest="${build.war}/WEB-INF/Manifest.mf"/>
<jar jarfile="${build.dir}/${name}.war" basedir="${build.war}" includes="**"
manifest="${build.war}/WEB-INF/Manifest.mf"/>
</target>
@@ -1131,7 +1148,7 @@
<!-- =================================================================== -->
<!-- Creates a local webapp directly useable as a servlet context -->
<!-- =================================================================== -->
- <target name="webapp-local" depends="prepare-webapp, prepare-webapp-libs,
prepare-scratchpad-libs"
+ <target name="webapp-local" depends="prepare-webapp, prepare-webapp-scratchpad,
prepare-webapp-libs, prepare-scratchpad-libs"
description="Generates a local webapp directory usable as servlet context for
quicker turn around">
<delete file="${build.war}/WEB-INF/lib/${name}-${version}.jar"/>
<delete file="${build.war}/WEB-INF/lib/${scratchpad.name}.jar"/>
1.1
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunshine.xconf
Index: sunshine.xconf
===================================================================
<component role="org.apache.cocoon.sunshine.SunShine"
class="org.apache.cocoon.sunshine.SunShine"/>
<component role="org.apache.cocoon.sunshine.sunrise.SunRise"
class="org.apache.cocoon.sunshine.sunrise.SunRise">
<mediatypes default="html">
<media name="wap" useragent="Nokia"/>
<media name="wap" useragent="UP"/>
<media name="wap" useragent="Wapalizer"/>
</mediatypes>
</component>
<component role="org.apache.cocoon.sunshine.sunspot.SunSpot"
class="org.apache.cocoon.sunshine.sunspot.SunSpot"/>
<component role="org.apache.cocoon.sunshine.connector.ResourceConnector"
class="org.apache.cocoon.sunshine.connector.ResourceConnectorImpl"/>
1.3 +0 -14
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/treeprocessor/treeprocessor.xconf
Index: treeprocessor.xconf
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/treeprocessor/treeprocessor.xconf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- treeprocessor.xconf 15 Jan 2002 11:10:52 -0000 1.2
+++ treeprocessor.xconf 18 Feb 2002 13:29:51 -0000 1.3
@@ -1,17 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *****************************************************************************
- * Copyright (C) The Apache Software Foundation. All rights reserved. *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *
- * This software is published under the terms of the Apache Software License *
- * version 1.1, a copy of which has been included with this distribution in *
- * the LICENSE file. *
- *****************************************************************************
-
- @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- @version CVS $Revision: 1.2 $ $Date: 2002/01/15 11:10:52 $
--->
-
<tree-processor>
<!-- The sitemap language -->
<language name="sitemap"
class="org.apache.cocoon.treeprocessor.sitemap.SitemapLanguage">
1.30 +0 -16 xml-cocoon2/src/webapp/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/cocoon.xconf,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cocoon.xconf 18 Feb 2002 09:10:10 -0000 1.29
+++ cocoon.xconf 18 Feb 2002 13:29:51 -0000 1.30
@@ -540,20 +540,4 @@
<actions/>
-->
-<!-- ======================== sunShine ============================== -->
-<component role="org.apache.cocoon.sunshine.SunShine"
- class="org.apache.cocoon.sunshine.SunShine"/>
-<component role="org.apache.cocoon.sunshine.sunrise.SunRise"
- class="org.apache.cocoon.sunshine.sunrise.SunRise">
- <mediatypes default="html">
- <media name="wap" useragent="Nokia"/>
- <media name="wap" useragent="UP"/>
- <media name="wap" useragent="Wapalizer"/>
- </mediatypes>
-</component>
-<component role="org.apache.cocoon.sunshine.sunspot.SunSpot"
- class="org.apache.cocoon.sunshine.sunspot.SunSpot"/>
-<component role="org.apache.cocoon.sunshine.connector.ResourceConnector"
- class="org.apache.cocoon.sunshine.connector.ResourceConnectorImpl"/>
-
</cocoon>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
