In the README for the osgi code in whiteboard I have some instructions
about how to modify the webapp in trunk to get it to work with the OSGi
code. I attache a patch that do the work.
/Daniel
Index: sitemap.xmap
===================================================================
--- sitemap.xmap (revision 219197)
+++ sitemap.xmap (working copy)
@@ -661,9 +661,9 @@
| Note that other mount-tables can be added here using the xpatch ant
task
| (see src/confpatch/mount-table.xmap)
+-->
- <map:match type="mount-table" pattern="../../mount-table.xml">
+ <!--map:match type="mount-table" pattern="../../mount-table.xml">
<map:mount src="{src}" uri-prefix="{uri-prefix}"/>
- </map:match>
+ </map:match-->
<!--+
| Call blocks deployed in wiring.xml. The blocks protocol
Index: WEB-INF/logkit.xconf
===================================================================
--- WEB-INF/logkit.xconf (revision 219197)
+++ WEB-INF/logkit.xconf (working copy)
@@ -176,6 +176,6 @@
<!--+
| Include logging confs from different blocks
+-->
- <include dir="context://WEB-INF/xconf" pattern="*.logkit"/>
+ <!--include dir="context://WEB-INF/xconf" pattern="*.logkit"/-->
</logkit>
Index: WEB-INF/cocoon.xconf
===================================================================
--- WEB-INF/cocoon.xconf (revision 219197)
+++ WEB-INF/cocoon.xconf (working copy)
@@ -32,11 +32,12 @@
| Include all configuration files ending with ".xconf"
| from the xconf directory.
+-->
- <include dir="context://WEB-INF/xconf" pattern="*.xconf"/>
+ <include src="context://WEB-INF/xconf/cocoon-blocks.xconf"/>
+ <!--include dir="context://WEB-INF/xconf" pattern="*.xconf"/-->
<!--+
| Include all configuration files ending with ".samplesxconf"
| from the xconf directory.
+-->
- <include dir="context://WEB-INF/xconf" pattern="*.samplesxconf"/>
+ <!--include dir="context://WEB-INF/xconf" pattern="*.samplesxconf"/-->
</cocoon>
