Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml Sun Aug 13 14:41:37 2006 @@ -115,11 +115,11 @@ <locator> <!-- Base location of the builded dispatcher plugin--> <match pattern="dispatcher.home"> - <location src="{defaults:plugins}/{project:dispatcher.home}" /> + <location src="{properties:forrest.plugins}/{properties:dispatcher.home}" /> </match> <!-- Base location of the builded themer plugin--> <match pattern="dispatcher.themer"> - <location src="{defaults:plugins}/{project:dispatcher.themer}" /> + <location src="{properties:forrest.plugins}/{properties:dispatcher.themer}" /> </match> <!-- xhtml2 to html core transformation --> <match pattern="transform.xhtml2.html.structurer"> @@ -131,10 +131,10 @@ <match pattern="dispatcher.structurer.resourceType.**"> <select> <location - src="{project:resources}/structurer/resource-types/{1}{project:dispatcher.theme-ext}" + src="{properties:resources}/structurer/resource-types/{1}{properties:dispatcher.theme-ext}" /> <location - src="{lm:dispatcher.themer}/structurer/resource-types/{1}{project:dispatcher.theme-ext}" + src="{lm:dispatcher.themer}/structurer/resource-types/{1}{properties:dispatcher.theme-ext}" /> </select> </match> @@ -166,22 +166,22 @@ a) custom implementation of the themes.core plugin b) themes.core plugin where we test for - 1) {project:dispatcher.theme}{project:dispatcher.theme-ext} - 2) {project:dispatcher.fallback.theme}{project:dispatcher.fallback.theme-ext} + 1) {properties:dispatcher.theme}{properties:dispatcher.theme-ext} + 2) {properties:dispatcher.fallback.theme}{properties:dispatcher.fallback.theme-ext} --> <match pattern="resolve.structurer.**"> <select type="exists"> <!-- project-based url-based (url location) --> <location - src="{project:resources}/structurer/url/{1}{project:dispatcher.theme-ext}" + src="{properties:resources}/structurer/url/{1}{properties:dispatcher.theme-ext}" /> <!-- project-based url-based (xdocs location) [depreciated]--> <location - src="{project:content.xdocs}{1}{project:dispatcher.theme-ext}" /> + src="{properties:content.xdocs}{1}{properties:dispatcher.theme-ext}" /> <act type="sourcetype" - src="{project:content.xdocs}{1}.xml"> + src="{properties:content.xdocs}{1}.xml"> <!-- Sourcetype based http://forrest.apache.org/docs/cap.html--> <location @@ -190,7 +190,7 @@ </act> <act type="resourceTypeAction"> <parameter value="{../1}{1}" name="request"/> - <parameter value="{project:content.xdocs}" + <parameter value="{properties:content.xdocs}" name="projectDir"/> <parameter value="lm://dispatcher.structurer.resourceType." name="resourceTypeBase"/> @@ -204,10 +204,10 @@ </act> <act type="RecursiveDirectoryTraversalAction"> <parameter value="{../1}{1}" name="request"/> - <parameter value="{project:dispatcher.theme}" name="projectFallback"/> - <parameter value="{project:dispatcher.theme-ext}" + <parameter value="{properties:dispatcher.theme}" name="projectFallback"/> + <parameter value="{properties:dispatcher.theme-ext}" name="projectExtension"/> - <parameter value="{project:resources}structurer/url/" + <parameter value="{properties:resources}structurer/url/" name="projectDir"/> <!-- url project-based theme-based = directory-based / parent-directory based (recursively) --> @@ -215,10 +215,10 @@ </act> <act type="RecursiveDirectoryTraversalAction"> <parameter value="{../1}{1}" name="request"/> - <parameter value="{project:dispatcher.theme}" name="projectFallback"/> - <parameter value="{project:dispatcher.theme-ext}" + <parameter value="{properties:dispatcher.theme}" name="projectFallback"/> + <parameter value="{properties:dispatcher.theme-ext}" name="projectExtension"/> - <parameter value="{project:content.xdocs}" + <parameter value="{properties:content.xdocs}" name="projectDir"/> <!-- xdocs [depreciated] project-based theme-based = directory-based / parent-directory based (recursively) --> @@ -226,19 +226,19 @@ </act> <!-- themes-dir: project-application-based theme-dir-based --> <location - src="{lm:themer.project.dir}/{project:dispatcher.theme}{project:dispatcher.theme-ext}" + src="{lm:themer.project.dir}/{properties:dispatcher.theme}{properties:dispatcher.theme-ext}" /> <!-- themes-dir: project-application-based default --> <location - src="{lm:themer.project.dir}/{project:dispatcher.fallback.theme}{project:dispatcher.fallback.theme-ext}" + src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}{properties:dispatcher.fallback.theme-ext}" /> <!-- themer: forrest-application-based theme-based --> <location - src="{lm:dispatcher.themer}/themes/{project:dispatcher.theme}{project:dispatcher.theme-ext}" + src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}{properties:dispatcher.theme-ext}" /> <!-- themer: forrest-application-based default --> <location - src="{lm:dispatcher.themer}/themes/{project:dispatcher.fallback.theme}{project:dispatcher.fallback.theme-ext}" + src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}{properties:dispatcher.fallback.theme-ext}" /> </select> </match> @@ -246,16 +246,16 @@ <match pattern="resolve.tiles.**"> <select type="exists"> <location - src="{project:resources}/themes/{project:dispatcher.theme}/html/{1}.vt.xml" + src="{properties:resources}/themes/{properties:dispatcher.theme}/html/{1}.vt.xml" /> <location - src="{project:resources}/themes/{project:dispatcher.fallback.theme}/html/{1}.vt.xml" + src="{properties:resources}/themes/{properties:dispatcher.fallback.theme}/html/{1}.vt.xml" /> <location - src="{lm:dispatcher.themer}/themes/{project:dispatcher.theme}/html/{1}.vt.xml" + src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/html/{1}.vt.xml" /> <location - src="{lm:dispatcher.themer}/themes/{project:dispatcher.fallback.theme}/html/{1}.vt.xml" + src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/html/{1}.vt.xml" /> </select> </match> @@ -275,22 +275,22 @@ <select type="exists"> <!-- project-based theme --> <location - src="{lm:themer.project.dir}/{project:dispatcher.theme}/{1}/{2}.ft" /> + src="{lm:themer.project.dir}/{properties:dispatcher.theme}/{1}/{2}.ft" /> <!-- project-based default fallback --> <location - src="{lm:themer.project.dir}/{project:dispatcher.fallback.theme}/{1}/{2}.ft" /> + src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/{1}/{2}.ft" /> <!-- plugin provided contracts --> <location src="{lm:resolvePluginContract.{1}.{2}}" /> <!-- forrest-application-based theme --> <location - src="{lm:dispatcher.themer}/themes/{project:dispatcher.theme}/{1}/{2}.ft" /> + src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/{1}/{2}.ft" /> <!-- forrest-application-based default fallback --> <location - src="{lm:dispatcher.themer}/themes/{project:dispatcher.fallback.theme}/{1}/{2}.ft" + src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{1}/{2}.ft" /> <!-- forrest-application-based no found --> <location - src="{lm:dispatcher.themer}/themes/{project:dispatcher.fallback.theme}/{1}/noFt.ft" + src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{1}/noFt.ft" /> </select> </match> @@ -304,7 +304,7 @@ <match pattern="dataModel-xml-document-to-**.xsl"> <select type="exists"> <location - src="{project:resources}stylesheets/xslt/xml/document-to-{1}.xsl" + src="{properties:resources}stylesheets/xslt/xml/document-to-{1}.xsl" /> <location src="{lm:std-dataModel-xml-document-to-{1}.xsl}" @@ -314,7 +314,7 @@ <match pattern="dataModel-html-**.xsl"> <select type="exists"> <location - src="{project:resources}stylesheets/xslt/html/{1}.xsl" + src="{properties:resources}stylesheets/xslt/html/{1}.xsl" /> <location src="{lm:std-dataModel-html-{1}.xsl}" @@ -362,9 +362,9 @@ <!--Theme dir--> <match pattern="themer.project.dir"> <select type="exists"> - <location src="{project:resources}themes"/> + <location src="{properties:resources}themes"/> <!-- v1 location --> - <location src="{project:resources}templates" /> + <location src="{properties:resources}templates" /> </select> </match> <!-- contracts (e.g. html) that can be used in the project. --> @@ -379,16 +379,16 @@ <match pattern="themes/images/**.*"> <select type="exists"> <location - src="{lm:themer.project.dir}/{project:dispatcher.theme}/images/{1}.{2}" + src="{lm:themer.project.dir}/{properties:dispatcher.theme}/images/{1}.{2}" /> <location - src="{lm:themer.project.dir}/{project:dispatcher.fallback.theme}/images/{1}.{2}" + src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/images/{1}.{2}" /> <location - src="{lm:dispatcher.themer}/themes/{project:dispatcher.theme}/images/{1}.{2}" + src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/images/{1}.{2}" /> <location - src="{lm:dispatcher.themer}/themes/{project:dispatcher.fallback.theme}/images/{1}.{2}" + src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/images/{1}.{2}" /> </select> </match> @@ -400,15 +400,15 @@ <match pattern="themes/**.*"> <select type="exists"> <location - src="{lm:themer.project.dir}/{project:dispatcher.theme}/{2}/{1}.{2}" /> + src="{lm:themer.project.dir}/{properties:dispatcher.theme}/{2}/{1}.{2}" /> <location - src="{lm:themer.project.dir}/{project:dispatcher.fallback.theme}/{2}/{1}.{2}" + src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/{2}/{1}.{2}" /> <location - src="{lm:dispatcher.themer}/themes/{project:dispatcher.theme}/{2}/{1}.{2}" + src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/{2}/{1}.{2}" /> <location - src="{lm:dispatcher.themer}/themes/{project:dispatcher.fallback.theme}/{2}/{1}.{2}" + src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{2}/{1}.{2}" /> </select> </match>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources.xmap (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources.xmap Sun Aug 13 14:41:37 2006 @@ -63,51 +63,51 @@ <map:resource name="skin-read"> <map:select type="exists"> <!-- First location: project skin dir --> - <map:when test="{project:skins-dir}{path}/{name}.css"> + <map:when test="{properties:skins-dir}{path}/{name}.css"> <map:call resource="read-linked-text"> <map:parameter name="path" - value="{project:skins-dir}{path}/{name}.css" /> + value="{properties:skins-dir}{path}/{name}.css" /> </map:call> </map:when> - <map:when test="{project:skins-dir}{path}/{name}.{ext}"> - <map:read src="{project:skins-dir}{path}/{name}.{ext}" + <map:when test="{properties:skins-dir}{path}/{name}.{ext}"> + <map:read src="{properties:skins-dir}{path}/{name}.{ext}" mime-type="{mime-type}" /> </map:when> - <map:when test="{project:skins-dir}{path}/{name}.css.xslt"> + <map:when test="{properties:skins-dir}{path}/{name}.css.xslt"> <map:call resource="pipe-text-resource"> <map:parameter name="path" - value="{project:skins-dir}{path}/{name}.css.xslt" /> + value="{properties:skins-dir}{path}/{name}.css.xslt" /> <map:parameter name="mime-type" value="text/css" /> </map:call> </map:when> - <map:when test="{project:skins-dir}{path}/{name}.svg.xslt"> + <map:when test="{properties:skins-dir}{path}/{name}.svg.xslt"> <map:call resource="pipe-transformed-svg2png-resource"> <map:parameter name="path" - value="{project:skins-dir}{path}/{name}.svg.xslt" /> + value="{properties:skins-dir}{path}/{name}.svg.xslt" /> </map:call> </map:when> <!-- Second location: skin dir --> - <map:when test="resources/skin/{path}/{project:dispatcher.theme}/{name}.css"> + <map:when test="resources/skin/{path}/{properties:dispatcher.theme}/{name}.css"> <map:call resource="read-linked-text"> <map:parameter name="path" - value="resources/skin/{path}/{project:dispatcher.theme}/{name}.css" /> + value="resources/skin/{path}/{properties:dispatcher.theme}/{name}.css" /> </map:call> </map:when> - <map:when test="resources/skin/{path}/{project:dispatcher.theme}/{name}.{ext}"> - <map:read src="resources/skin/{path}/{project:dispatcher.theme}/{name}.{ext}" + <map:when test="resources/skin/{path}/{properties:dispatcher.theme}/{name}.{ext}"> + <map:read src="resources/skin/{path}/{properties:dispatcher.theme}/{name}.{ext}" mime-type="{mime-type}" /> </map:when> - <map:when test="resources/skin/{path}/{project:dispatcher.theme}/{name}.css.xslt"> + <map:when test="resources/skin/{path}/{properties:dispatcher.theme}/{name}.css.xslt"> <map:call resource="pipe-text-resource"> <map:parameter name="path" - value="resources/skin/{path}/{project:dispatcher.theme}/{name}.css.xslt" /> + value="resources/skin/{path}/{properties:dispatcher.theme}/{name}.css.xslt" /> <map:parameter name="mime-type" value="text/css" /> </map:call> </map:when> - <map:when test="resources/skin/{path}/{project:dispatcher.theme}/{name}.svg.xslt"> + <map:when test="resources/skin/{path}/{properties:dispatcher.theme}/{name}.svg.xslt"> <map:call resource="pipe-transformed-svg2png-resource"> <map:parameter name="path" - value="resources/skin/{path}/{project:dispatcher.theme}/{name}.svg.xslt" /> + value="resources/skin/{path}/{properties:dispatcher.theme}/{name}.svg.xslt" /> </map:call> </map:when> <!-- Third location: leather skin dir --> @@ -135,27 +135,27 @@ </map:call> </map:when> <!-- Fourth location: forrest common skin dir --> - <map:when test="{forrest:context}/skins/common/{path}/{name}.css"> + <map:when test="{forrest:forrest.context}/skins/common/{path}/{name}.css"> <map:call resource="read-linked-text"> <map:parameter name="path" - value="{forrest:context}/skins/common/{path}/{name}.css" /> + value="{forrest:forrest.context}/skins/common/{path}/{name}.css" /> </map:call> </map:when> - <map:when test="{forrest:context}/skins/common/{path}/{name}.{ext}"> - <map:read src="{forrest:context}/skins/common/{path}/{name}.{ext}" + <map:when test="{forrest:forrest.context}/skins/common/{path}/{name}.{ext}"> + <map:read src="{forrest:forrest.context}/skins/common/{path}/{name}.{ext}" mime-type="{mime-type}" /> </map:when> - <map:when test="{forrest:context}/skins/common/{path}/{name}.css.xslt"> + <map:when test="{forrest:forrest.context}/skins/common/{path}/{name}.css.xslt"> <map:call resource="pipe-text-resource"> <map:parameter name="path" - value="{forrest:context}/skins/common/{path}/{name}.css.xslt" /> + value="{forrest:forrest.context}/skins/common/{path}/{name}.css.xslt" /> <map:parameter name="mime-type" value="text/css" /> </map:call> </map:when> - <map:when test="{forrest:context}/skins/common/{path}/{name}.svg.xslt"> + <map:when test="{forrest:forrest.context}/skins/common/{path}/{name}.svg.xslt"> <map:call resource="pipe-transformed-svg2png-resource"> <map:parameter name="path" - value="{forrest:context}/skins/common/{path}/{name}.svg.xslt" /> + value="{forrest:forrest.context}/skins/common/{path}/{name}.svg.xslt" /> </map:call> </map:when> <map:otherwise> @@ -167,10 +167,10 @@ <map:resource name="read-svg2png-corner-resource"> <map:select type="exists"> <map:when - test="{project:skins-dir}{forrest:skin}/{path}/{name}.svg.xslt"> + test="{properties:skins-dir}{forrest:forrest.skin}/{path}/{name}.svg.xslt"> <map:call resource="pipe-transformed-svg2png-corner-resource"> <map:parameter name="path" - value="{project:skins-dir}{forrest:skin}/{path}/{name}.svg.xslt" + value="{properties:skins-dir}{forrest:forrest.skin}/{path}/{name}.svg.xslt" /> <map:parameter name="orientation-tb" value="{orientation-tb}"/> <map:parameter name="orientation-lr" value="{orientation-lr}"/> @@ -197,7 +197,7 @@ <map:otherwise> <map:call resource="pipe-svg2png-corner-resource"> <map:parameter name="path" - value="{forrest:context}/skins/common/{path}/{name}.svg.xslt" /> + value="{forrest:forrest.context}/skins/common/{path}/{name}.svg.xslt" /> <map:parameter name="orientation-tb" value="{orientation-tb}"/> <map:parameter name="orientation-lr" value="{orientation-lr}"/> <map:parameter name="size" value="{size}"/> @@ -220,7 +220,7 @@ <map:parameter name="path" value="{path}" /> </map:call> <map:call resource="transform-project2text"/> - <map:transform src="{forrest:stylesheets}/extract-svg.xsl"/> + <map:transform src="{forrest:forrest.stylesheets}/extract-svg.xsl"/> <map:serialize type="svg2png" /> </map:resource> <map:resource name="pipe-transformed-svg2png-resource"> @@ -254,14 +254,14 @@ <map:transform src="{path}"/> </map:resource> <map:resource name="transform-project2text"> - <map:transform src="{forrest:stylesheets}/project2text.xsl"/> + <map:transform src="{forrest:forrest.stylesheets}/project2text.xsl"/> </map:resource> <map:resource name="read-linked-text"> <map:generate type="text" src="{path}" /> <map:transform type="pattern" - src="{forrest:context}/resources/chaperon/grammars/link.xlex"/> + src="{forrest:forrest.context}/resources/chaperon/grammars/link.xlex"/> <map:transform - src="{forrest:context}/resources/chaperon/stylesheets/pattern2link.xsl"/> + src="{forrest:forrest.context}/resources/chaperon/stylesheets/pattern2link.xsl"/> <map:serialize type="text" mime-type="text/css"/> </map:resource> </map:resources> @@ -320,21 +320,21 @@ </map:match> <!-- handles images local to a contributor directory --> <map:match pattern="**my-images/**.*"> - <map:read src="{project:content.xdocs}{1}my-images/{2}.{3}" + <map:read src="{properties:content.xdocs}{1}my-images/{2}.{3}" mime-type="image/{3}" /> </map:match> <map:match pattern="images/**.png"> <map:select type="exists"> - <map:when test="{project:content.xdocs}/images/{1}.svg"> + <map:when test="{properties:content.xdocs}/images/{1}.svg"> <map:call resource="pipe-aggregate-svg2png-resource"> <map:parameter name="path" - value="{project:content.xdocs}/images/{1}.svg" /> + value="{properties:content.xdocs}/images/{1}.svg" /> </map:call> </map:when> - <map:when test="{project:resources.images}/{1}.svg"> + <map:when test="{properties:resources.images}/{1}.svg"> <map:call resource="pipe-aggregate-svg2png-resource"> <map:parameter name="path" - value="{project:resources.images}/{1}.svg" /> + value="{properties:resources.images}/{1}.svg" /> </map:call> </map:when> <map:when test="resources/images/{1}.svg"> @@ -342,15 +342,15 @@ <map:parameter name="path" value="resources/images/{1}.svg" /> </map:call> </map:when> - <map:when test="{project:content.xdocs}/images/{1}.png"> - <map:read src="{project:content.xdocs}/images/{1}.png" + <map:when test="{properties:content.xdocs}/images/{1}.png"> + <map:read src="{properties:content.xdocs}/images/{1}.png" mime-type="image/png" /> </map:when> <map:when test="resources/images/{1}.png"> <map:read src="resources/images/{1}.png" mime-type="image/png" /> </map:when> - <map:when test="{project:resources.images}/{1}.png"> - <map:read src="{project:resources.images}/{1}.png" + <map:when test="{properties:resources.images}/{1}.png"> + <map:read src="{properties:resources.images}/{1}.png" mime-type="image/png" /> </map:when> <map:otherwise> @@ -367,15 +367,15 @@ </map:match> <map:match pattern="images/**.*"> <map:select type="exists"> - <map:when test="{project:content.xdocs}/images/{1}.{2}"> - <map:read src="{project:content.xdocs}/images/{1}.{2}" + <map:when test="{properties:content.xdocs}/images/{1}.{2}"> + <map:read src="{properties:content.xdocs}/images/{1}.{2}" mime-type="image/{2}" /> </map:when> <map:when test="resources/images/{1}.{2}"> <map:read src="resources/images/{1}.{2}" mime-type="image/{2}" /> </map:when> - <map:when test="{project:resources.images}/{1}.{2}"> - <map:read src="{project:resources.images}/{1}.{2}" + <map:when test="{properties:resources.images}/{1}.{2}"> + <map:read src="{properties:resources.images}/{1}.{2}" mime-type="image/{2}" /> </map:when> <map:otherwise> @@ -392,43 +392,43 @@ </map:match> <map:match pattern="**/images/**.*"> <map:select type="exists"> - <map:when test="{project:content.xdocs}/{1}/images/{2}.{3}"> - <map:read src="{project:content.xdocs}/{1}/images/{2}.{3}" + <map:when test="{properties:content.xdocs}/{1}/images/{2}.{3}"> + <map:read src="{properties:content.xdocs}/{1}/images/{2}.{3}" mime-type="image/{3}" /> </map:when> <map:when test="resources/images/{2}.{3}"> <map:read src="resources/images/{2}.{3}" mime-type="image/{3}" /> </map:when> <map:otherwise> - <map:read src="{project:resources.images}/{2}.{3}" + <map:read src="{properties:resources.images}/{2}.{3}" mime-type="image/{3}" /> </map:otherwise> </map:select> </map:match> <map:match pattern="**.png"> <map:select type="exists"> - <map:when test="{project:content.xdocs}/{1}.svg"> + <map:when test="{properties:content.xdocs}/{1}.svg"> <map:call resource="pipe-aggregate-svg2png-resource"> <map:parameter name="path" - value="{project:content.xdocs}/{1}.svg" /> + value="{properties:content.xdocs}/{1}.svg" /> </map:call> </map:when> - <map:when test="{project:content.xdocs}/{1}.aart"> + <map:when test="{properties:content.xdocs}/{1}.aart"> <map:generate type="asciiart-svg" - src="{project:content.xdocs}/{1}.aart" /> + src="{properties:content.xdocs}/{1}.aart" /> <map:call resource="transform-project2text"/> <map:serialize type="svg2png" /> </map:when> <map:otherwise> - <map:read src="{project:content.xdocs}/{1}.png" + <map:read src="{properties:content.xdocs}/{1}.png" mime-type="image/png" /> </map:otherwise> </map:select> </map:match> <map:match pattern="**.ico"> <map:select type="exists"> - <map:when test="{project:content.xdocs}/{1}.ico"> - <map:read src="{project:content.xdocs}/{1}.ico" + <map:when test="{properties:content.xdocs}/{1}.ico"> + <map:read src="{properties:content.xdocs}/{1}.ico" mime-type="image/x-icon" /> </map:when> <map:otherwise> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-structurer.xml URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-structurer.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-structurer.xml (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-structurer.xml Sun Aug 13 14:41:37 2006 @@ -78,7 +78,7 @@ <p> In this section we will create a new structurer. We will override the default structurer of the core themes for the index page of a new seed. For that we will create a file called <code>index.fv</code> and save it - in the directory <code>{project:resources}/structurer/url</code> + in the directory <code>{properties:resources}/structurer/url</code> (create it if needed). This will make <strong>only</strong> the index.html page look different from the rest of the project. </p> @@ -224,7 +224,7 @@ {1} name {2} extension (note we assume e.g. PATH/css/{1}.css) -#-> -<location src="{project:themer}/resources/themes/{project:theme}/{2}/{1}.{2}" />]]></code>. In our case +<location src="{properties:themer}/resources/themes/{properties:theme}/{2}/{1}.{2}" />]]></code>. In our case we will save a file called howTo.css in v2/src/documentation/resources/themes/common/css/howTo.css containing only the following css: </p>--> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml Sun Aug 13 14:41:37 2006 @@ -83,26 +83,26 @@ a) custom implementation of the themes.core plugin b) themes.core plugin where we test for - 1) {project:dispatcher.theme}{project:dispatcher.theme-ext} - 2) {project:dispatcher.fallback.theme}{project:dispatcher.fallback.theme-ext} + 1) {properties:dispatcher.theme}{properties:dispatcher.theme-ext} + 2) {properties:dispatcher.fallback.theme}{properties:dispatcher.fallback.theme-ext} --> <select type="exists"> <!-- project-based url-based (url location) --> <location - src="{project:resources}/structurer/url/{1}{project:dispatcher.theme-ext}" + src="{properties:resources}/structurer/url/{1}{properties:dispatcher.theme-ext}" /> <!-- project-based url-based (xdocs location) [depreciated]--> - <location src="{project:content.xdocs}{1}{project:dispatcher.theme-ext}" /> - <act type="sourcetype" src="{project:content.xdocs}{1}.xml"> + <location src="{properties:content.xdocs}{1}{properties:dispatcher.theme-ext}" /> + <act type="sourcetype" src="{properties:content.xdocs}{1}.xml"> <!-- Sourcetype based http://forrest.apache.org/docs/cap.html--> <location src="lm://dispatcher.structurer.resourceType.{sourcetype}" /> </act> <act type="resourceTypeAction"> <parameter value="{../1}{1}" name="request"/> - <parameter value="{project:content.xdocs}" name="projectDir"/> + <parameter value="{properties:content.xdocs}" name="projectDir"/> <parameter value="lm://dispatcher.structurer.resourceType." name="resourceTypeBase"/> <parameter value=".xml.meta" name="metaExtension"/> @@ -114,39 +114,39 @@ </act> <act type="RecursiveDirectoryTraversalAction"> <parameter value="{../1}{1}" name="request"/> - <parameter value="{project:dispatcher.theme}" name="projectFallback"/> - <parameter value="{project:dispatcher.theme-ext}" + <parameter value="{properties:dispatcher.theme}" name="projectFallback"/> + <parameter value="{properties:dispatcher.theme-ext}" name="projectExtension"/> - <parameter value="{project:resources}structurer/url/" name="projectDir"/> + <parameter value="{properties:resources}structurer/url/" name="projectDir"/> <!-- url project-based theme-based = directory-based / parent-directory based (recursively) --> <location src="{uri}" /> </act> <act type="RecursiveDirectoryTraversalAction"> <parameter value="{../1}{1}" name="request"/> - <parameter value="{project:dispatcher.theme}" name="projectFallback"/> - <parameter value="{project:dispatcher.theme-ext}" + <parameter value="{properties:dispatcher.theme}" name="projectFallback"/> + <parameter value="{properties:dispatcher.theme-ext}" name="projectExtension"/> - <parameter value="{project:content.xdocs}" name="projectDir"/> + <parameter value="{properties:content.xdocs}" name="projectDir"/> <!-- xdocs [depreciated] project-based theme-based = directory-based / parent-directory based (recursively) --> <location src="{uri}" /> </act> <!-- themes-dir: project-application-based theme-dir-based --> <location - src="{lm:themer.project.dir}/{project:dispatcher.theme}{project:dispatcher.theme-ext}" + src="{lm:themer.project.dir}/{properties:dispatcher.theme}{properties:dispatcher.theme-ext}" /> <!-- themes-dir: project-application-based default --> <location - src="{lm:themer.project.dir}/{project:dispatcher.fallback.theme}{project:dispatcher.fallback.theme-ext}" + src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}{properties:dispatcher.fallback.theme-ext}" /> <!-- themer: forrest-application-based theme-based --> <location - src="{lm:dispatcher.themer}/themes/{project:dispatcher.theme}{project:dispatcher.theme-ext}" + src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}{properties:dispatcher.theme-ext}" /> <!-- themer: forrest-application-based default --> <location - src="{lm:dispatcher.themer}/themes/{project:dispatcher.fallback.theme}{project:dispatcher.fallback.theme-ext}" + src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}{properties:dispatcher.fallback.theme-ext}" /> </select> </match>]]> </source> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap Sun Aug 13 14:41:37 2006 @@ -35,9 +35,9 @@ <map:resource name="read-linked-text"> <map:generate type="text" src="{path}" /> <map:transform type="pattern" - src="{forrest:context}/resources/chaperon/grammars/link.xlex" /> + src="{forrest:forrest.context}/resources/chaperon/grammars/link.xlex" /> <map:transform - src="{forrest:context}/resources/chaperon/stylesheets/pattern2link.xsl" + src="{forrest:forrest.context}/resources/chaperon/stylesheets/pattern2link.xsl" /> <map:serialize type="text" mime-type="text/css" /> </map:resource> @@ -45,10 +45,10 @@ <map:pipelines> <map:pipeline> <map:match pattern="**.props"> - <map:generate src="cocoon://module.project.properties" /> + <map:generate src="cocoon://module.properties.properties" /> <map:transform src="lm://transform.xml.variable.helper"> <map:parameter name="path" value="{1}.html" /> - <map:parameter name="theme" value="{project:dispatcher.theme}" /> + <map:parameter name="theme" value="{properties:dispatcher.theme}" /> </map:transform> <map:serialize type="xml" /> </map:match> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/internal.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/internal.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/internal.xmap (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/internal.xmap Sun Aug 13 14:41:37 2006 @@ -25,7 +25,7 @@ <!-- special matchers (reserved by Forrest) --> <map:match pattern="locationmap.xml"> - <map:generate src="{forrest:locationmap}" /> + <map:generate src="{forrest:forrest.locationmap}" /> <map:serialize type="xml"/> </map:match> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/documentation/content/locationmap.xml URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/documentation/content/locationmap.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/documentation/content/locationmap.xml (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/documentation/content/locationmap.xml Sun Aug 13 14:41:37 2006 @@ -35,7 +35,7 @@ <!-- Source Files --> <match pattern="**.xml"> - <location src="{project:content.xdocs}/{0}" /> + <location src="{properties:content.xdocs}/{0}" /> </match> <!-- Resources --> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/structurer.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/structurer.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/structurer.xmap (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/structurer.xmap Sun Aug 13 14:41:37 2006 @@ -72,8 +72,8 @@ FIXME: The next pipes have to be refactored and then to go into the view-interface (internal plugin) e.g. resources/templates/{1}.ft -> should become - first {project:view-skin}/templates/{1}.ft - then {project:skin}/templates/{1}.ft + first {properties:view-skin}/templates/{1}.ft + then {properties:skin}/templates/{1}.ft --> <!--FIXME:START--> <!-- @@ -83,17 +83,17 @@ {1} name of the contract--> <map:match pattern="resolve.contract.xhtml.*"> <map:select type="exists"> - <map:when test="{project:resources}/templates/{project:theme}/{1}.ft"> - <map:generate src="{project:resources}/templates/{project:theme}/{1}.ft"/> + <map:when test="{properties:resources}/templates/{properties:theme}/{1}.ft"> + <map:generate src="{properties:resources}/templates/{properties:theme}/{1}.ft"/> </map:when> - <map:when test="{project:resources}/templates/{1}.ft"> - <map:generate src="{project:resources}/templates/{1}.ft"/> + <map:when test="{properties:resources}/templates/{1}.ft"> + <map:generate src="{properties:resources}/templates/{1}.ft"/> </map:when> - <map:when test="{forrest:plugins}/templates/{1}.ft"> - <map:generate src="{forrest:plugins}/templates/{1}.ft"/> + <map:when test="{forrest:forrest.plugins}/templates/{1}.ft"> + <map:generate src="{forrest:forrest.plugins}/templates/{1}.ft"/> </map:when> - <map:when test="resources/templates/{project:theme}/{1}.ft"> - <map:generate src="resources/templates/{project:theme}/{1}.ft"/> + <map:when test="resources/templates/{properties:theme}/{1}.ft"> + <map:generate src="resources/templates/{properties:theme}/{1}.ft"/> </map:when> <map:when test="resources/templates/{1}.ft"> <map:generate src="resources/templates/{1}.ft"/> @@ -108,21 +108,21 @@ <!--This activates forrest:call-templates includes into the view.--> <map:match pattern="prepare.view-templates.**"> <map:select type="exists"> - <map:when test="{project:resources}/templates/{project:theme}/{1}.vt.xml"> - <map:generate src="{project:resources}/templates/{project:theme}/{1}.vt.xml"/> + <map:when test="{properties:resources}/templates/{properties:theme}/{1}.vt.xml"> + <map:generate src="{properties:resources}/templates/{properties:theme}/{1}.vt.xml"/> </map:when> - <map:when test="{project:resources}/templates/{1}.vt.xml"> - <map:generate src="{project:resources}/templates/{1}.vt.xml"/> + <map:when test="{properties:resources}/templates/{1}.vt.xml"> + <map:generate src="{properties:resources}/templates/{1}.vt.xml"/> </map:when> - <map:when test="resources/templates/{project:theme}/{1}.vt.xml"> - <map:generate src="resources/templates/{project:theme}/{1}.vt.xml"/> + <map:when test="resources/templates/{properties:theme}/{1}.vt.xml"> + <map:generate src="resources/templates/{properties:theme}/{1}.vt.xml"/> </map:when> <map:when test="resources/templates/{1}.vt.xml"> <map:generate src="resources/templates/{1}.vt.xml"/> </map:when> <!-- FIXME: otherwiser no view Tiles not found, this gives an error because there would be a trasform without a generate --> </map:select> - <map:transform src="{defaults:view-internal}/resources/stylesheets/prepare.include.templates.xsl"/> + <map:transform src="{properties:forrest.view-internal}/resources/stylesheets/prepare.include.templates.xsl"/> <!-- XInclude cannot be cached, can we use the CINCLUDE instead? --> <map:transform type="xinclude"/> <map:serialize type="xml"/> @@ -184,8 +184,8 @@ FIXME: The next pipes have to be refactored and then to go into an input plugin e.g. resources/templates -> should become - first {project:view-skin}/templates - then {project:skin}/templates + first {properties:view-skin}/templates + then {properties:skin}/templates --> <!--FIXME:START--> <!-- ls.fbits @@ -204,7 +204,7 @@ list the project fbits--> <map:pipeline> <map:match pattern="ls.contracts.project"> - <map:generate type="directory" src="{project:resources}/templates/"> + <map:generate type="directory" src="{properties:resources}/templates/"> <map:parameter name="depth" value="1"/> <!-- sorted alphabetically --> <map:parameter name="reverse" value="false"/> @@ -233,11 +233,11 @@ --> <map:match pattern="*.html"> <!-- FIXME: should be <map:generate src="cocoon://{1}/{2}.xml"/> --> - <map:generate src="{project:content.xdocs}/{1}.xml"/> + <map:generate src="{properties:content.xdocs}/{1}.xml"/> <!-- This is an example of RELAX NG validation. Such transformers can go anywhere in the sitemap. --> <!-- - <map:transform type="validate" src="{forrest:context}/resources/schema/relaxng/WD-xhtml2-20050527/xhtml2-forrest.rng" /> + <map:transform type="validate" src="{forrest:forrest.context}/resources/schema/relaxng/WD-xhtml2-20050527/xhtml2-forrest.rng" /> --> <map:transform src="cocoon://getStylesheet.xhtml.{1}"> <map:parameter name="path" value="{0}"/> @@ -251,11 +251,11 @@ <map:match pattern="**/*.html"> <!-- FIXME: should be <map:generate src="cocoon://{1}/{2}.xml"/> --> - <map:generate src="{project:content.xdocs}{1}/{2}.xml"/> + <map:generate src="{properties:content.xdocs}{1}/{2}.xml"/> <!-- This is an example of RELAX NG validation. Such transformers can go anywhere in the sitemap. --> <!-- - <map:transform type="validate" src="{forrest:context}/resources/schema/relaxng/WD-xhtml2-20050527/xhtml2-forrest.rng" /> + <map:transform type="validate" src="{forrest:forrest.context}/resources/schema/relaxng/WD-xhtml2-20050527/xhtml2-forrest.rng" /> --> <map:transform src="cocoon://getStylesheet.xhtml.{1}/{2}"> <map:parameter name="path" value="{0}"/> @@ -292,7 +292,7 @@ <map:pipeline type="noncaching"> <!--Refactor for dir--> <map:match pattern="viewLocationmap.xml"> - <map:generate type="traverse" src="{project:content.xdocs}"> + <map:generate type="traverse" src="{properties:content.xdocs}"> <map:parameter name="depth" value="100"/> <map:parameter name="exclude" value="[\w]*.svn"/> <!--<map:parameter name="include" value="[\w]*.fv"/>--> @@ -311,12 +311,12 @@ <map:match pattern="prepare.view.**"> <map:act type="fallbackResolverAction"> <map:parameter value="{1}" name="request"/> - <map:parameter value="{project:theme}" name="projectFallback"/> - <map:parameter value="{project:theme-ext}" name="projectExtension"/> - <map:parameter value="{project:content.xdocs}" name="projectDir"/> - <map:parameter value="{defaults:view-themes}" name="defaultDir"/> - <map:parameter value="{defaults:theme}" name="defaultFallback"/> - <map:parameter value="{defaults:theme-ext}" name="defaultExtension"/> + <map:parameter value="{properties:theme}" name="projectFallback"/> + <map:parameter value="{properties:theme-ext}" name="projectExtension"/> + <map:parameter value="{properties:content.xdocs}" name="projectDir"/> + <map:parameter value="{properties:forrest.view-themes}" name="defaultDir"/> + <map:parameter value="{properties:forrest.theme}" name="defaultFallback"/> + <map:parameter value="{properties:forrest.theme-ext}" name="defaultExtension"/> <map:generate src="file:/{uri}"/> <map:transform src="resources/stylesheets/prepare.include.templates.xsl"/> @@ -346,7 +346,7 @@ <map:match pattern="prepare.include.*.**"> <map:generate src="cocoon:/prepare.view.{2}"/> <map:transform src="resources/stylesheets/prepare.include.xsl"> - <map:parameter name="config-file" value="{project:skinconf}"/> + <map:parameter name="config-file" value="{properties:skinconf}"/> <!--Which output format?--> <map:parameter name="format" value="{1}"/> </map:transform> @@ -387,7 +387,7 @@ </map:aggregate> <map:transform src="resources/stylesheets/prepare.{1}.xsl"> <map:parameter name="request" value="{2}"/> - <map:parameter name="forrestContext" value="{forrest:context}"/> + <map:parameter name="forrestContext" value="{forrest:forrest.context}"/> </map:transform> <map:transform type="xinclude"/> <map:serialize type="xml"/> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/output.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/output.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/output.xmap (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/output.xmap Sun Aug 13 14:41:37 2006 @@ -55,7 +55,7 @@ <map:parameter name="tags" value="content"/> </map:transform> <map:transform src="resources/stylesheets/doc2write.xsl"> - <map:parameter name="filepath" value="{project:content.xdocs}"/> + <map:parameter name="filepath" value="{properties:content.xdocs}"/> </map:transform> <map:transform type="write-source"/> <map:transform src="resources/stylesheets/result2html.xsl"> @@ -69,7 +69,7 @@ </map:match> <map:match pattern="edit_htmlArea/**.html"> - <map:generate src="{project:content.xdocs}/{1}.html"/> + <map:generate src="{properties:content.xdocs}/{1}.html"/> <map:transform src="resources/stylesheets/html2editor.xsl"> <map:parameter name="filename" value="{1}.html"/> </map:transform> Modified: forrest/trunk/whiteboard/tests/xsltunit/sitemap.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/tests/xsltunit/sitemap.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/whiteboard/tests/xsltunit/sitemap.xmap (original) +++ forrest/trunk/whiteboard/tests/xsltunit/sitemap.xmap Sun Aug 13 14:41:37 2006 @@ -41,9 +41,9 @@ --> <map:match pattern="testsuite/*/*"> <map:generate src="testunits/{1}/{2}-input.xml"/> - <map:transform src="{forrest:stylesheets}/{1}"/> + <map:transform src="{forrest:forrest.stylesheets}/{1}"/> <map:transform src="testunits/{1}/{2}-test.xsl"/> - <map:transform src="{project:content.xdocs}/code/set_id.xsl"> + <map:transform src="{properties:content.xdocs}/code/set_id.xsl"> <map:parameter name="id" value="{1} / {2}"/> </map:transform> <map:serialize type="xml"/>
