Josias Thoeny wrote:
On Wed, 2005-11-09 at 17:35 +0000, [EMAIL PROTECTED] wrote:
[...]
Modified:
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/config/publication.xconf
URL:
http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/config/publication.xconf?rev=332085&r1=332084&r2=332085&view=diff
==============================================================================
---
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/config/publication.xconf
(original)
+++
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/config/publication.xconf
Wed Nov 9 09:35:30 2005
@@ -27,11 +27,9 @@
<breadcrumb-prefix/>
<!-- NOTE: The configuration of content directories has NOT been fully tested
yet and might lead to unexpected results. Use at own risk;-) -->
- <content-authoring-dir>content/authoring</content-authoring-dir>
- <!--
-
<content-authoring-dir>/home/USERNAME/data/lenya/author</content-authoring-dir>
- -->
- <content-live-dir>content/live</content-live-dir>
+
+ <content-dir area="autoring">/home/edith/data/authoring</content-dir>
+ <content-dir area="live">/home/edith/blabla/live</content-dir>
Does that mean that this file has to be edited manually to set the
correct content path when someone installs Lenya?
no, I think edith accidentally checked in her private settings
Or how does it work if I just want to use the "normal" relative content
path?
I have fixed it.
Michi
- Josias
<!--
For information about these settings, read
Modified:
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/doctypes.xmap
URL:
http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/doctypes.xmap?rev=332085&r1=332084&r2=332085&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/doctypes.xmap
(original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/doctypes.xmap Wed
Nov 9 09:35:30 2005
@@ -47,7 +47,7 @@
<!-- parametrized doctype matcher -->
<!-- pattern="{rendertype}/{area}/{doctype}/{document-path}" -->
<map:match pattern="*/*/*/**.xml">
- <map:generate src="content/{2}/{4}.xml"/>
+ <map:generate
src="{content-dir:{page-envelope:publication-id},{2}}/{4}.xml"/>
<map:transform src="xslt/{3}2xhtml.xsl">
<map:parameter name="rendertype" value="{1}"/>
<map:parameter name="nodeid"
value="{page-envelope:document-node-id}"/>
Modified:
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/parameter-doctype.xmap
URL:
http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/parameter-doctype.xmap?rev=332085&r1=332084&r2=332085&view=diff
==============================================================================
---
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/parameter-doctype.xmap
(original)
+++
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/parameter-doctype.xmap
Wed Nov 9 09:35:30 2005
@@ -56,7 +56,7 @@
<map:pipeline>
<!-- {area}/{uri} -->
<map:match pattern="*/**.html">
- <map:act type="sourcetype"
src="content/{1}/{page-envelope:document-path}">
+ <map:act type="sourcetype"
src="{content-dir:{page-envelope:publication-id},{1}}/{page-envelope:document-path}">
<map:generate type="serverpages"
src="../../config/parameters/default.xsp">
<map:parameter name="value" value="{sourcetype}"/>
</map:generate>
@@ -68,7 +68,7 @@
<map:pipeline>
<!-- {area}/{uri} -->
<map:match pattern="*/**.xml">
- <map:act type="sourcetype" src="content/{1}/{2}.xml">
+ <map:act type="sourcetype"
src="{content-dir:{page-envelope:publication-id},{1}}/{2}.xml">
<map:generate type="serverpages"
src="../../config/parameters/default.xsp">
<map:parameter name="value" value="{sourcetype}"/>
</map:generate>
Modified:
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/usecase-bxeng.xmap
URL:
http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/usecase-bxeng.xmap?rev=332085&r1=332084&r2=332085&view=diff
==============================================================================
---
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/usecase-bxeng.xmap
(original)
+++
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/usecase-bxeng.xmap
Wed Nov 9 09:35:30 2005
@@ -228,7 +228,7 @@
</map:when>
<map:otherwise> <!-- GET -->
- <map:generate
src="content/authoring/{page-envelope:document-path}"/>
+ <map:generate
src="{content-dir:{page-envelope:publication-id},{page-envelope:area}}/{page-envelope:document-path}"/>
<map:transform src="../../xslt/bxeng/change-object-path.xsl">
<map:parameter name="documentid"
value="{page-envelope:document-id}"/>
</map:transform>
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecase.xmap
URL:
http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecase.xmap?rev=332085&r1=332084&r2=332085&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecase.xmap (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecase.xmap Wed Nov 9
09:35:30 2005
@@ -389,11 +389,7 @@
<map:generate type="stream"/>
<map:transform src="xslt/authoring/edit/addSourceTags.xsl">
- <map:parameter name="source"
value="pubs/{1}/content/{2}/{page-envelope:document-path}"/>
-<!-- TODO: Get content-dir from config/publication.xconf -->
-<!--
<map:parameter name="source"
value="{content-dir:{1},{2}}/{page-envelope:document-path}"/>
--->
<!--<map:parameter name="source"
value="pubs/{1}/test-xopus.xml"/>-->
</map:transform>
<map:transform type="write-source">
@@ -413,7 +409,7 @@
<map:parameter name="Cache-Control" value="pre-check=0" />
<map:parameter name="Expires" value="-1" />
</map:act>
- <map:generate
src="pubs/{1}/content/{2}/{page-envelope:document-path}"/>
+ <map:generate
src="{content-dir:{1},{2}}/{page-envelope:document-path}"/>
<map:serialize type="xml"/>
</map:otherwise>
</map:select>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
