You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by ni...@apache.org on 2003/11/26 10:15:32 UTC
cvs commit: xml-forrest/src/core/context/skins/forrest-css/xslt/html site2xhtml.xsl
nicolaken 2003/11/26 01:15:32
Modified: src/core/context aggregate.xmap dtd.xmap faq.xmap
forrest.xmap issues.xmap linkmap.xmap menu.xmap
profiler.xmap resources.xmap revisions.xmap
sitemap.xmap status.xmap
src/core/context/WEB-INF cocoon.xconf
src/core forrest.build.xml
src/core/context/skins/forrest-site/xslt/html site2xhtml.xsl
src/core/context/skins/common/xslt/html site2xhtml.xsl
src/core/context/skins/krysalis-site/xslt/html
site2xhtml.xsl
src/core/context/skins/forrest-css/xslt/html site2xhtml.xsl
Log:
<action dev="NKB" type="update" context="core" >
Now also all forrest /resources are editable in forrest.home
and translations in their source space.
</action>
Revision Changes Path
1.2 +6 -6 xml-forrest/src/core/context/aggregate.xmap
Index: aggregate.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/aggregate.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aggregate.xmap 20 Oct 2003 15:37:49 -0000 1.1
+++ aggregate.xmap 26 Nov 2003 09:15:31 -0000 1.2
@@ -33,14 +33,14 @@
<!-- Aggregation of all XML in the site -->
<map:match pattern="*.xml">
<map:generate src="cocoon://abs-linkmap"/>
- <map:transform src="resources/stylesheets/site2book.xsl" />
- <map:transform src="resources/stylesheets/aggregates/book2cinclude.xsl">
+ <map:transform src="{forrest:stylesheets}/site2book.xsl" />
+ <map:transform src="{forrest:stylesheets}/aggregates/book2cinclude.xsl">
<map:parameter name="ignore" value="{1}"/>
<map:parameter name="title" value="{conf:project-name} Documentation"/>
</map:transform>
<map:transform type="cinclude"/>
- <map:transform src="resources/stylesheets/aggregates/doc2doc-uniqueids.xsl"/>
- <map:transform src="resources/stylesheets/aggregates/docs2document.xsl"/>
+ <map:transform src="{forrest:stylesheets}/aggregates/doc2doc-uniqueids.xsl"/>
+ <map:transform src="{forrest:stylesheets}/aggregates/docs2document.xsl"/>
<map:serialize type="xml"/>
</map:match>
@@ -52,7 +52,7 @@
<map:match pattern="linkmap-*.*">
<map:generate src="cocoon://abs-linkmap" />
- <map:transform src="resources/stylesheets/aggregates/relativize-split-linkmap.xsl">
+ <map:transform src="{forrest:stylesheets}/aggregates/relativize-split-linkmap.xsl">
<map:parameter name="path" value="{1}.{2}" />
</map:transform>
<map:serialize type="xml"/>
1.2 +4 -4 xml-forrest/src/core/context/dtd.xmap
Index: dtd.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/dtd.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dtd.xmap 20 Oct 2003 15:37:49 -0000 1.1
+++ dtd.xmap 26 Nov 2003 09:15:31 -0000 1.2
@@ -25,11 +25,11 @@
<map:pipeline>
<map:match pattern="**.dtdx.xml">
- <map:generate type="nekodtd" src="resources/schema/dtd/{1}.dtd">
+ <map:generate type="nekodtd" src="{forrest:home}/context/resources/schema/dtd/{1}.dtd">
<map:parameter name="config-class" value="org.cyberneko.dtd.DTDConfiguration" />
</map:generate>
- <map:transform src="resources/stylesheets/dtdx2flat.xsl" />
- <map:transform src="resources/stylesheets/flat2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/dtdx2flat.xsl" />
+ <map:transform src="{forrest:stylesheets}/flat2document.xsl" />
<map:serialize type="xml-document"/>
</map:match>
1.3 +6 -6 xml-forrest/src/core/context/faq.xmap
Index: faq.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/faq.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- faq.xmap 25 Nov 2003 16:12:51 -0000 1.2
+++ faq.xmap 26 Nov 2003 09:15:31 -0000 1.3
@@ -50,18 +50,18 @@
<map:select type="parameter">
<map:parameter name="parameter-selector-test" value="{sourcetype}" />
<map:when test="faq-v10">
- <map:transform src="resources/stylesheets/faqv10tofaqv11.xsl" />
- <map:transform src="resources/stylesheets/faq2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/faqv10tofaqv11.xsl" />
+ <map:transform src="{forrest:stylesheets}/faq2document.xsl" />
</map:when>
<map:when test="faq-v11">
- <map:transform src="resources/stylesheets/faq2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/faq2document.xsl" />
</map:when>
<map:when test="faq-v12">
- <map:transform src="resources/stylesheets/faq2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/faq2document.xsl" />
</map:when>
<map:when test="faq-v20a">
- <map:transform src="resources/stylesheets/faqv20tofaqv12.xsl" />
- <map:transform src="resources/stylesheets/faq2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/faqv20tofaqv12.xsl" />
+ <map:transform src="{forrest:stylesheets}/faq2document.xsl" />
</map:when>
<map:otherwise />
</map:select>
1.3 +36 -36 xml-forrest/src/core/context/forrest.xmap
Index: forrest.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/forrest.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- forrest.xmap 22 Oct 2003 06:57:04 -0000 1.2
+++ forrest.xmap 26 Nov 2003 09:15:31 -0000 1.3
@@ -101,59 +101,59 @@
<map:when test="document-v10">
<!-- FIXME (JJP): This should use the v12 now-->
- <map:transform src="resources/stylesheets/docv10todocv11.xsl" />
+ <map:transform src="{forrest:stylesheets}/docv10todocv11.xsl" />
</map:when>
<map:when test="document-v20a">
- <map:transform src="resources/stylesheets/docv20todocv12.xsl" />
+ <map:transform src="{forrest:stylesheets}/docv20todocv12.xsl" />
</map:when>
<map:when test="howto-v10">
- <map:transform src="resources/stylesheets/howto2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/howto2document.xsl" />
</map:when>
<map:when test="howto-v11">
- <map:transform src="resources/stylesheets/howto2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/howto2document.xsl" />
</map:when>
<map:when test="howto-v12">
- <map:transform src="resources/stylesheets/howto2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/howto2document.xsl" />
</map:when>
<map:when test="todo-v10">
- <map:transform src="resources/stylesheets/todo2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/todo2document.xsl" />
</map:when>
<map:when test="todo-v11">
- <map:transform src="resources/stylesheets/todo2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/todo2document.xsl" />
</map:when>
<map:when test="todo-v12">
- <map:transform src="resources/stylesheets/todo2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/todo2document.xsl" />
</map:when>
<map:when test="changes-v10">
- <map:transform src="resources/stylesheets/changesv10tochangesv11.xsl" />
- <map:transform src="resources/stylesheets/changes2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/changesv10tochangesv11.xsl" />
+ <map:transform src="{forrest:stylesheets}/changes2document.xsl" />
</map:when>
<map:when test="changes-v11">
- <map:transform src="resources/stylesheets/changes2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/changes2document.xsl" />
</map:when>
<map:when test="changes-v12">
- <map:transform src="resources/stylesheets/changes2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/changes2document.xsl" />
</map:when>
<map:when test="docbook-v4.1.2">
- <map:transform src="resources/stylesheets/docbook2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/docbook2document.xsl" />
</map:when>
<map:when test="docbook-v4.2">
- <map:transform src="resources/stylesheets/docbook2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/docbook2document.xsl" />
</map:when>
<map:when test="sdocbook-v1.0">
- <map:transform src="resources/stylesheets/docbook2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/docbook2document.xsl" />
</map:when>
<map:otherwise />
@@ -173,7 +173,7 @@
<map:select type="exists">
<map:when test="{project:content.xdocs}{1}{2}.ehtml">
<map:generate src="{project:content.xdocs}{1}{2}.ehtml" />
- <map:transform src="resources/stylesheets/html2htmlbody.xsl" />
+ <map:transform src="{forrest:stylesheets}/html2htmlbody.xsl" />
<map:serialize type="xml" />
</map:when>
</map:select>
@@ -189,7 +189,7 @@
<map:when test="{project:content.xdocs}{1}.ihtml">
<map:generate src="{project:content.xdocs}{1}.ihtml" type="html" />
- <map:transform src="resources/stylesheets/html2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/html2document.xsl" />
<map:transform type="idgen" />
<map:serialize type="xml-document"/>
</map:when>
@@ -197,14 +197,14 @@
<map:when test="{project:content.xdocs}{1}.cwiki">
<map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
<map:generate type="text2xml" src="{project:content.xdocs}{1}{2}.cwiki" />
- <map:transform type="lexer" src="resources/grammars/wiki.xlex"/>
- <map:transform type="parser" src="resources/grammars/wiki.xgrm"/>
+ <map:transform type="lexer" src="{forrest:home}/context/resources/grammars/wiki.xlex"/>
+ <map:transform type="parser" src="{forrest:home}/context/resources/grammars/wiki.xgrm"/>
<!-- Dynamically generated equivalents. Matchers need to be added to
the root sitemap for this to work.
<map:transform type="lexer" src="cocoon:/wiki.xlex"/>
<map:transform type="parser" src="cocoon:/wiki.xgrm"/>
-->
- <map:transform src="resources/stylesheets/wiki2document.xsl">
+ <map:transform src="{forrest:stylesheets}/wiki2document.xsl">
<map:parameter name="name" value="{2}" />
</map:transform>
<map:serialize type="xml-document"/>
@@ -214,7 +214,7 @@
<map:when test="{project:content.xdocs}{1}.txt">
<map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
<map:generate type="text2xml" src="{project:content.xdocs}{1}{2}.txt" />
- <map:transform src="resources/stylesheets/text2document.xsl">
+ <map:transform src="{forrest:stylesheets}/text2document.xsl">
<map:parameter name="filename" value="{2}" />
</map:transform>
<map:serialize type="xml-document"/>
@@ -238,24 +238,24 @@
These pipelines dynamically generate the wiki.{xlex,xgrm} files used in
the *.cwiki pipeline. They are not used by default to avoid the overhead.
<map:match pattern="*.xlex">
- <map:generate type="text2xml" src="resources/grammars/{1}.grm"/>
- <map:transform type="lexer" src="resources/grammars/grm.xlex"/>
- <map:transform type="parser" src="resources/grammars/grm.xgrm"/>
- <map:transform src="resources/grammars/text4regex.xsl"/>
- <map:transform type="lexer" src="resources/grammars/regex.xlex"/>
- <map:transform type="parser" src="resources/grammars/regex.xgrm"/>
- <map:transform src="resources/grammars/grm2xlex.xsl"/>
+ <map:generate type="text2xml" src="{forrest:home}/context/resources/grammars/{1}.grm"/>
+ <map:transform type="lexer" src="{forrest:home}/context/resources/grammars/grm.xlex"/>
+ <map:transform type="parser" src="{forrest:home}/context/esources/grammars/grm.xgrm"/>
+ <map:transform src="{forrest:home}/context/resources/grammars/text4regex.xsl"/>
+ <map:transform type="lexer" src="{forrest:home}/context/resources/grammars/regex.xlex"/>
+ <map:transform type="parser" src="{forrest:home}/context/resources/grammars/regex.xgrm"/>
+ <map:transform src="{forrest:home}/context/resources/grammars/grm2xlex.xsl"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="*.xgrm">
- <map:generate type="text2xml" src="resources/grammars/{1}.grm"/>
- <map:transform type="lexer" src="resources/grammars/grm.xlex"/>
- <map:transform type="parser" src="resources/grammars/grm.xgrm"/>
- <map:transform src="resources/grammars/text4regex.xsl"/>
- <map:transform type="lexer" src="resources/grammars/regex.xlex"/>
- <map:transform type="parser" src="resources/grammars/regex.xgrm"/>
- <map:transform src="resources/grammars/grm2xgrm.xsl"/>
+ <map:generate type="text2xml" src="{forrest:home}/context/resources/grammars/{1}.grm"/>
+ <map:transform type="lexer" src="{forrest:home}/context/resources/grammars/grm.xlex"/>
+ <map:transform type="parser" src="{forrest:home}/context/resources/grammars/grm.xgrm"/>
+ <map:transform src="{forrest:home}/context/resources/grammars/text4regex.xsl"/>
+ <map:transform type="lexer" src="{forrest:home}/context/resources/grammars/regex.xlex"/>
+ <map:transform type="parser" src="{forrest:home}/context/resources/grammars/regex.xgrm"/>
+ <map:transform src="{forrest:home}/context/resources/grammars/grm2xgrm.xsl"/>
<map:serialize type="xml"/>
</map:match>
-->
1.2 +2 -2 xml-forrest/src/core/context/issues.xmap
Index: issues.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/issues.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- issues.xmap 20 Oct 2003 15:37:49 -0000 1.1
+++ issues.xmap 26 Nov 2003 09:15:31 -0000 1.2
@@ -24,7 +24,7 @@
<map:match pattern="**.xml">
<map:generate type="file" src="http://issues.cocoondev.org/jira/secure/IssueNavigator.jspa?pid=10000&resolutionIds=-1&view=rss&reset=true" />
- <map:transform src="resources/stylesheets/rssissues2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/rssissues2document.xsl" />
<map:serialize type="xml-document"/>
</map:match>
1.2 +3 -3 xml-forrest/src/core/context/linkmap.xmap
Index: linkmap.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/linkmap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linkmap.xmap 20 Oct 2003 15:37:49 -0000 1.1
+++ linkmap.xmap 26 Nov 2003 09:15:31 -0000 1.2
@@ -28,7 +28,7 @@
<!-- site.xml with @href's appended to be context-relative. -->
<map:match pattern="abs-linkmap">
<map:generate src="{project:content.xdocs}site.xml" />
- <map:transform src="resources/stylesheets/absolutize-linkmap.xsl" />
+ <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
<map:serialize type="xml" />
</map:match>
@@ -36,7 +36,7 @@
<!-- Linkmap for regular pages -->
<map:match pattern="**linkmap-*">
<map:generate src="cocoon://abs-linkmap" />
- <map:transform src="resources/stylesheets/relativize-linkmap.xsl">
+ <map:transform src="{forrest:stylesheets}/relativize-linkmap.xsl">
<map:parameter name="path" value="{1}{2}" />
<map:parameter name="site-root" value="{conf:project-url}" />
</map:transform>
1.2 +10 -10 xml-forrest/src/core/context/menu.xmap
Index: menu.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/menu.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- menu.xmap 20 Oct 2003 15:37:49 -0000 1.1
+++ menu.xmap 26 Nov 2003 09:15:31 -0000 1.2
@@ -21,7 +21,7 @@
<map:transformers default="xslt">
<map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="menu">
- <catalogue id="menu" name="menu" location="translations"/>
+ <catalogue id="menu" name="menu" location="{project:translations}"/>
</catalogues>
<!-- Commented out to verify your translations
<untranslated-text>untranslated</untranslated-text> -->
@@ -47,21 +47,21 @@
<map:match pattern="abs-menulinks">
<map:generate src="{project:content.xdocs}site.xml" />
- <map:transform src="resources/stylesheets/absolutize-linkmap.xsl" />
- <map:transform src="resources/stylesheets/site2site-normalizetabs.xsl" />
+ <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
+ <map:transform src="{forrest:stylesheets}/site2site-normalizetabs.xsl" />
<map:serialize type="xml"/>
</map:match>
<map:match pattern="**menulinks-*">
<map:generate src="{project:content.xdocs}site.xml" />
- <map:transform src="resources/stylesheets/absolutize-linkmap.xsl" />
+ <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
<map:select type="config">
<map:parameter name="value" value="{defaults:menu-scheme}"/>
<map:when test="tab_attributes">
- <map:transform src="resources/stylesheets/site2site-normalizetabs.xsl" />
- <map:transform src="resources/stylesheets/site2site-selectnode.xsl">
+ <map:transform src="{forrest:stylesheets}/site2site-normalizetabs.xsl" />
+ <map:transform src="{forrest:stylesheets}/site2site-selectnode.xsl">
<map:parameter name="path" value="{1}{2}"/>
</map:transform>
</map:when>
@@ -74,7 +74,7 @@
</map:select>
- <map:transform src="resources/stylesheets/relativize-linkmap.xsl">
+ <map:transform src="{forrest:stylesheets}/relativize-linkmap.xsl">
<map:parameter name="path" value="{1}{2}" />
</map:transform>
<map:serialize type="xml" />
@@ -100,7 +100,7 @@
<!-- If no book.xml, generate it from the linkmap. -->
<map:generate src="cocoon:/{1}menulinks-{2}" />
<!-- The above generates the subset of the linkmap relevant to our directory. -->
- <map:transform src="resources/stylesheets/site2book.xsl" />
+ <map:transform src="{forrest:stylesheets}/site2book.xsl" />
</map:otherwise>
</map:select>
@@ -110,7 +110,7 @@
<map:when test="true">
<map:act type="locale">
- <map:transform src="resources/stylesheets/i18n.xsl"/>
+ <map:transform src="{forrest:stylesheets}/i18n.xsl"/>
<map:transform type="i18n">
<!-- We can use a default locale attribute or Request Parameter
<map:parameter name="locale" value="{defaults:locale}"/>
1.2 +3 -3 xml-forrest/src/core/context/profiler.xmap
Index: profiler.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/profiler.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- profiler.xmap 20 Oct 2003 15:37:49 -0000 1.1
+++ profiler.xmap 26 Nov 2003 09:15:31 -0000 1.2
@@ -28,10 +28,10 @@
<map:match pattern="profiler">
<map:generate type="profiler"/>
- <map:transform src="resources/stylesheets/profile2page.xsl">
+ <map:transform src="{forrest:stylesheets}/profile2page.xsl">
<map:parameter name="use-request-parameters" value="true"/>
</map:transform>
- <map:transform src="resources/stylesheets/page2html.xsl">
+ <map:transform src="{forrest:stylesheets}/page2html.xsl">
<map:parameter name="contextPath" value="{request:contextPath}"/>
</map:transform>
1.3 +12 -4 xml-forrest/src/core/context/resources.xmap
Index: resources.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/resources.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- resources.xmap 25 Nov 2003 16:12:51 -0000 1.2
+++ resources.xmap 26 Nov 2003 09:15:31 -0000 1.3
@@ -99,17 +99,23 @@
<map:select type="exists">
<map:when test="{project:content.xdocs}/images/{1}.svg">
<map:generate src="{project:content.xdocs}/images/{1}.svg" />
- <map:transform src="resources/stylesheets/project2text.xsl" />
+ <map:transform src="{forrest:stylesheets}/project2text.xsl">
+ <map:parameter name="config-file" value="{project:skinconf}"/>
+ </map:transform>
<map:serialize type="svg2png" />
</map:when>
<map:when test="{project:resources.images}/{1}.svg">
<map:generate src="{project:resources.images}/{1}.svg" />
- <map:transform src="resources/stylesheets/project2text.xsl" />
+ <map:transform src="{forrest:stylesheets}/project2text.xsl">
+ <map:parameter name="config-file" value="{project:skinconf}"/>
+ </map:transform>
<map:serialize type="svg2png" />
</map:when>
<map:when test="resources/images/{1}.svg">
<map:generate src="resources/images/{1}.svg" />
- <map:transform src="resources/stylesheets/project2text.xsl" />
+ <map:transform src="{forrest:stylesheets}/project2text.xsl">
+ <map:parameter name="config-file" value="{project:skinconf}"/>
+ </map:transform>
<map:serialize type="svg2png" />
</map:when>
<map:when test="{project:content.xdocs}/images/{1}.png">
@@ -172,7 +178,9 @@
<map:select type="exists">
<map:when test="{project:content.xdocs}/{1}.svg">
<map:generate src="{project:content.xdocs}/{1}.svg" />
- <map:transform src="resources/stylesheets/project2text.xsl" />
+ <map:transform src="{forrest:stylesheets}/project2text.xsl">
+ <map:parameter name="config-file" value="{project:skinconf}"/>
+ </map:transform>
<map:serialize type="svg2png" />
</map:when>
<map:otherwise>
1.2 +3 -3 xml-forrest/src/core/context/revisions.xmap
Index: revisions.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/revisions.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- revisions.xmap 20 Oct 2003 15:37:49 -0000 1.1
+++ revisions.xmap 26 Nov 2003 09:15:32 -0000 1.2
@@ -50,7 +50,7 @@
<map:generate type="directory" src="{project:content.xdocs}{1}">
<map:parameter name="dateFormat" value="yyyy-MM-dd hh:mm" />
</map:generate>
- <map:transform src="resources/stylesheets/directory2revisions.xsl">
+ <map:transform src="{forrest:stylesheets}/directory2revisions.xsl">
<map:parameter name="use-request-parameters" value="true" />
<map:parameter name="page" value="{2}" />
</map:transform>
@@ -62,7 +62,7 @@
<map:part src="{project:content.xdocs}{0}" />
<map:part src="cocoon:/{1}/revisions-{2}" />
</map:aggregate>
- <map:transform src="resources/stylesheets/howto2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/howto2document.xsl" />
<map:serialize type="xml-document"/>
</map:match>
1.3 +2 -2 xml-forrest/src/core/context/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 25 Nov 2003 16:12:51 -0000 1.2
+++ sitemap.xmap 26 Nov 2003 09:15:32 -0000 1.3
@@ -115,7 +115,7 @@
Instead of filterlinks.xsl, use cli.xconf include/exclude nodes to define which pages to render.
<map:views>
<map:view name="links" from-position="last">
- <map:transform src="resources/stylesheets/filterlinks.xsl">
+ <map:transform src="{forrest:stylesheets}/filterlinks.xsl">
<map:parameter name="ctxbasedir" value="{realpath:.}/"/>
</map:transform>
<map:serialize type="links"/>
@@ -246,7 +246,7 @@
<map:select type="exists">
<map:when test="{project:content.xdocs}{1}{2}.ehtml">
<map:generate src="{project:content.xdocs}{1}{2}.ehtml" />
- <map:transform src="resources/stylesheets/html2htmlbody.xsl" />
+ <map:transform src="{forrest:stylesheets}/html2htmlbody.xsl" />
<map:transform type="linkrewriter" src="cocoon:/{1}linkmap-{2}.html"/>
<map:serialize type="xml" />
</map:when>
1.2 +4 -4 xml-forrest/src/core/context/status.xmap
Index: status.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/status.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- status.xmap 20 Oct 2003 15:37:49 -0000 1.1
+++ status.xmap 26 Nov 2003 09:15:32 -0000 1.2
@@ -34,7 +34,7 @@
<map:match pattern="changes.xml">
<map:generate type="file" src="status.xml" />
- <map:transform src="resources/stylesheets/changes2document.xsl" >
+ <map:transform src="{forrest:stylesheets}/changes2document.xsl" >
<map:parameter name="bugtracking-url" value="{defaults:bugtracking-url}"/>
</map:transform >
<map:serialize type="xml-document"/>
@@ -42,13 +42,13 @@
<map:match pattern="changes.rss">
<map:generate src="status.xml" />
- <map:transform src="resources/stylesheets/changes2rss.xsl" />
+ <map:transform src="{forrest:stylesheets}/changes2rss.xsl" />
<map:serialize type="rss091" />
</map:match>
<map:match pattern="todo.xml">
<map:generate type="file" src="status.xml" />
- <map:transform src="resources/stylesheets/todo2document.xsl" />
+ <map:transform src="{forrest:stylesheets}/todo2document.xsl" />
<map:serialize type="xml-document"/>
</map:match>
1.3 +3 -1 xml-forrest/src/core/context/WEB-INF/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/WEB-INF/cocoon.xconf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cocoon.xconf 25 Nov 2003 16:13:00 -0000 1.2
+++ cocoon.xconf 26 Nov 2003 09:15:32 -0000 1.3
@@ -165,6 +165,7 @@
<bugtracking-url>@bugtracking-url@</bugtracking-url>
<i18n>@i18n@</i18n>
<home>@forrest.home@/</home>
+ <stylesheets>@forrest.home@/context/resources/stylesheets</stylesheets>
</values>
</component-instance>
@@ -175,6 +176,7 @@
<doc>@project.home@/@project.content-dir@/</doc>
<content>@project.home@/@project.raw-content-dir@/</content>
<content.xdocs>@project.home@/@project.xdocs-dir@/</content.xdocs>
+ <translations>@project.home@/@project.translations-dir@</translations>
<resources.stylesheets>@project.home@/@project.stylesheets-dir@/</resources.stylesheets>
<resources.images>@project.home@/@project.images-dir@/</resources.images>
<skins-dir>@project.home@/@project.skins-dir@/</skins-dir>
@@ -264,7 +266,7 @@
| <parameter name="verbosity" value="2"/>
+-->
<entity-resolver logger="core.resolver">
- <parameter name="catalog" value="resources/schema/catalog.xcat"/>
+ <parameter name="catalog" value="@forrest.home@/context/resources/schema/catalog.xcat"/>
<parameter name="local-catalog" value="@local-catalog@"/>
<parameter name="verbosity" value="@catalog-verbosity@"/>
</entity-resolver>
1.11 +4 -49 xml-forrest/src/core/forrest.build.xml
Index: forrest.build.xml
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/forrest.build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- forrest.build.xml 25 Nov 2003 16:12:24 -0000 1.10
+++ forrest.build.xml 26 Nov 2003 09:15:32 -0000 1.11
@@ -87,11 +87,6 @@
<property name="raw-content-dir" location="${project.home}/${project.content-dir}/content" />
<property name="sitemap-dir" location="${project.home}/${project.sitemap-dir}" />
<property name="xdocs-dir" location="${project.home}/${project.xdocs-dir}" />
- <property name="resources-dir" location="${project.home}/${project.resources-dir}"/>
- <property name="stylesheets-dir" location="${project.home}/${project.stylesheets-dir}" />
- <property name="images-dir" location="${project.home}/${project.images-dir}" />
- <property name="schema-dir" location="${project.home}/${project.schema-dir}" />
- <property name="grammars-dir" location="${project.home}/${project.grammars-dir}" />
<property name="catalog" location="${project.home}/${project.catalog}" />
<property name="forrest.catalog.verbosity" value="1" />
<property name="forrest.maxmemory" value="64m" />
@@ -103,7 +98,7 @@
<property name="classes-dir" location="${project.home}/${project.classes-dir}" />
<property name="translations-dir" location="${project.home}/${project.translations-dir}" />
- <!-- checks for presence of required classes and/or resources -->
+ <!-- checks for presence of tools.jar -->
<property name="tools.jar" location="${java.home}/../lib/tools.jar"/>
<available file="${tools.jar}" property="tools.jar.present"/>
@@ -123,7 +118,6 @@
<available property="raw-content.present" file="${raw-content-dir}" type="dir"/>
<available property="sitemap.present" file="${sitemap-dir}" type="dir"/>
<available property="xdocs.present" file="${xdocs-dir}" type="dir"/>
- <available property="resources.present" file="${resources-dir}" type="dir"/>
<available property="images.present" file="${images-dir}" type="dir"/>
<available property="grammars.present" file="${grammars-dir}" type="dir"/>
<available property="schema.present" file="${schema-dir}" type="dir"/>
@@ -133,7 +127,6 @@
<available property="skins.present" file="${skins-dir}" type="dir"/>
<available property="skinconf.present" file="${skinconf}"/>
<available property="status.present" file="${status}"/>
- <available property="translations.present" file="${translations-dir}" type="dir" />
</target>
<target name="validation-props" depends="examine-proj">
@@ -309,6 +302,7 @@
<fileset dir="${forrest.home}/context" >
<exclude name="*.xmap" />
<exclude name="skins/**" />
+ <exclude name="resources/**" />
<exclude name="WEB-INF/*.xconf" />
</fileset>
</copy>
@@ -337,9 +331,8 @@
param: location to make temporary context-dir ${project.webapp}
=============================================================== -->
<target name="project-context" depends="examine-proj, ensure-content,
- validate, init, bare-context, copy-sitemap, copy-conf,
- copy-stylesheets, copy-images, copy-grammars, copy-resources, copy-lib,
- copy-classes, copy-skinconf, copy-status, copy-translations"/>
+ validate, init, bare-context, copy-sitemap, copy-conf, copy-lib,
+ copy-classes, copy-skinconf, copy-status"/>
<target name="copy-conf" if="conf.present">
<copy toDir="${project.webapp}/WEB-INF" filtering="true"
@@ -373,37 +366,6 @@
</copy>
</target>
- <target name="copy-resources" if="resources.present">
- <copy toDir="${project.webapp}/resources" failonerror="false">
- <fileset dir="${resources-dir}">
- <exclude name="stylesheets"/>
- <exclude name="images"/>
- <exclude name="grammars"/>
- </fileset>
- </copy>
- </target>
-
- <target name="copy-stylesheets" if="stylesheets.present">
- <copy toDir="${project.webapp}/resources/stylesheets"
- overwrite="true" failonerror="false">
- <fileset dir="${stylesheets-dir}"/>
- </copy>
- </target>
-
- <target name="copy-images" if="images.present">
- <copy toDir="${project.webapp}/resources/images"
- overwrite="true" failonerror="false">
- <fileset dir="${images-dir}"/>
- </copy>
- </target>
-
- <target name="copy-grammars" if="grammars.present">
- <copy toDir="${project.webapp}/resources/grammars"
- overwrite="true" failonerror="false">
- <fileset dir="${grammars-dir}"/>
- </copy>
- </target>
-
<target name="copy-lib" if="lib.present">
<copy toDir="${project.webapp}/WEB-INF/lib"
overwrite="true" failonerror="false">
@@ -427,13 +389,6 @@
<target name="copy-status" if="status.present">
<copy file="${status}" todir="${project.webapp}" />
</target>
-
- <target name="copy-translations" if="translations.present" >
- <copy todir="${project.webapp}/translations">
- <fileset dir="${translations-dir}"/>
- </copy>
- </target>
-
<!-- ===============================================================
Makes the Cocoon context dir to work in and fills it completely.
1.3 +0 -0 xml-forrest/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl
Index: site2xhtml.xsl
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.3 +0 -0 xml-forrest/src/core/context/skins/common/xslt/html/site2xhtml.xsl
Index: site2xhtml.xsl
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/skins/common/xslt/html/site2xhtml.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.4 +0 -0 xml-forrest/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl
Index: site2xhtml.xsl
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.3 +0 -0 xml-forrest/src/core/context/skins/forrest-css/xslt/html/site2xhtml.xsl
Index: site2xhtml.xsl
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/skins/forrest-css/xslt/html/site2xhtml.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3