vgritsenko 02/01/21 17:32:22
Modified: src/java/org/apache/cocoon/components/deli DeliImpl.java
src/documentation/xdocs/developing deli.xml deliquick.xml
Log:
Patch from Butler, Mark [[EMAIL PROTECTED]]
Revision Changes Path
1.4 +9 -1
xml-cocoon2/src/java/org/apache/cocoon/components/deli/DeliImpl.java
Index: DeliImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/deli/DeliImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeliImpl.java 14 Jan 2002 15:23:39 -0000 1.3
+++ DeliImpl.java 22 Jan 2002 01:32:22 -0000 1.4
@@ -66,7 +66,7 @@
* A Delivery Context Library for CC/PP and UAProf</a>.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Mark H. Butler</a>
- * @version CVS $ $ $Date: 2002/01/14 15:23:39 $
+ * @version CVS $ $ $Date: 2002/01/22 01:32:22 $
*/
public class DeliImpl
@@ -104,6 +104,14 @@
try
{
this.defaultPath = envContext.getRealPath("/");
+ if (this.defaultPath == null)
+ {
+ getLogger().debug("DELI: Could not useGetRealPath /: " + this.defaultPath);
+ this.defaultPath = envContext.getResource("/WEB-INF").toString();
+ getLogger().debug("DELI: getResource for /WEB-INF: " +
this.defaultPath);
+ this.defaultPath =
this.defaultPath.substring(0,this.defaultPath.length() - "WEB-INF".length());
+ getLogger().debug("DELI: Path for Root: " + this.defaultPath);
+ }
}
catch (Exception e)
{
1.3 +9 -10 xml-cocoon2/src/documentation/xdocs/developing/deli.xml
Index: deli.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/developing/deli.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- deli.xml 15 Jan 2002 05:14:14 -0000 1.2
+++ deli.xml 22 Jan 2002 01:32:22 -0000 1.3
@@ -185,15 +185,15 @@
applying the UAProf resolution rules.</p>
</s1>
<s1 title="Configuring DELI">
-<p>In order to use DELI, you need to enable the DELI component in the
<code>cocoon.xconf</code> file
-and configure TraxTransformer in the <code>sitemap.xmap</code> file to supply the
-CC/PP profile to a stylesheet via parameters.
+<p>In order to use DELI, you need to enable the DELI component.
In addition, you may want to configure DELI using
<code>deliCocoonConfig.xml</code>, the DELI
configuration file or <code>legacyDevices.xml</code>, the
DELI legacy device support file.</p>
<s2 title="Cocoon.xconf">
<p>In order to use DELI you need to specify
-the configuration file and set the use-deli parameter to true in
<code>cocoon.xconf</code>:</p>
+the configuration file and set the <code>use-deli</code> parameter to true. You can
either
+do this in <code>deli.xconf</code> in which case you will need to rebuild
+Cocoon or change the deployed <code>cocoon.xconf</code> in the web-server
directory:</p>
<source><![CDATA[
<deli>
<parameter name="deli-config-file" value="deliCocoonConfig.xml"/>
@@ -202,14 +202,13 @@
]]></source>
</s2>
<s2 title="Sitemap.xmap">
- <p>Then to provide the resolved DELI profile as a parameter in stylesheets,
- you need to configure TraxTransformer to use DELI in
- <code>sitemap.xmap</code>:
+ <p>The file <code>sitemap.xmap</code> is already configured to provide a
TraxTransformer for
+use with DELI called <code>xslt-deli</code>:
</p>
<source><![CDATA[
- <map:transformers default="xslt">
- <map:transformer name="xslt"
src="org.apache.cocoon.transformation.TraxTransformer"
- pool-max="32" pool-min="16" pool-grow="4">
+ <map:transformer name="xslt-deli" logger="sitemap.transformer.xslt"
+ src="org.apache.cocoon.transformation.TraxTransformer"
+ pool-max="32" pool-min="16" pool-grow="4">
<use-request-parameters>false</use-request-parameters>
<use-browser-capabilities-db>false</use-browser-capabilities-db>
<use-deli>true</use-deli>
1.2 +9 -21 xml-cocoon2/src/documentation/xdocs/developing/deliquick.xml
Index: deliquick.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/developing/deliquick.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deliquick.xml 9 Jan 2002 22:20:42 -0000 1.1
+++ deliquick.xml 22 Jan 2002 01:32:22 -0000 1.2
@@ -10,37 +10,25 @@
</header>
<body>
<s1 title="DELI Quick Start Guide">
- <p>For more information on DELI, see the <link
href="deli.html">DELI documentation</link>.</p>
-
-<p>In order to enable DELI and try the test pages, you need to enable
-the DELI component in the <code>cocoon.xconf</code> file. Make sure that
-the configuration file is correctly specified and
-set the use-deli parameter to true in <code>cocoon.xconf</code>:</p>
+<p>If you are seeing the 'DELI is switched off' message when you try the test pages
then you need to enable DELI. If you do not
+want to rebuild Cocoon, just
+set the <code>use-deli</code> parameter to true in the deployed
<code>cocoon.xconf</code>:</p>
<source><![CDATA[
<deli>
<parameter name="deli-config-file" value="deliCocoonConfig.xml"/>
<parameter name="use-deli" value="true"/>
</deli>
]]></source>
+<p>However if you are developing with Cocoon and need DELI you may prefer to make
the same change to the <code>deli.xconf</code> file in
+<code>src\java\components\deli</code>. When you build Cocoon, this file is inserted
into the <code>cocoon.xconf</code> file.</p>
-<p>Then configure TraxTransformer in the <code>sitemap.xmap</code> file to supply
the
-CC/PP profile to a stylesheet via parameters e.g.:</p>
-
- <source><![CDATA[
-<map:transformer
- name="xslt"
- src="org.apache.cocoon.transformation.TraxTransformer"
- pool-max="32" pool-min="16" pool-grow="4">
- <use-request-parameters>false</use-request-parameters>
- <use-browser-capabilities-db>false</use-browser-capabilities-db>
- <use-deli>true</use-deli>
-</map:transformer>
-]]></source>
-<p>By default DELI recognises Internet Explorer and the Nokia WAP development kit as
-legacy browsers. If you are using a different browser, you may need to edit the
+<p>By default DELI recognises Internet Explorer, Netscape, Opera, Amaya
+and the Nokia WAP development kit as legacy browsers. If you are
+using a different browser, you may need to edit the
<code>legacyDevices.xml</code>, the DELI legacy device support file. For more
details see the <link href="deli.html">DELI documentation</link>.</p>
</s1>
</body>
</document>
+
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
