Skip to content

Commit

Permalink
Merged rename changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
ajenhl committed Nov 17, 2011
2 parents 4f46711 + e711bd3 commit 396644f
Show file tree
Hide file tree
Showing 103 changed files with 236 additions and 230 deletions.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
applied to an XML file. -->
<map:match pattern="*/*/*.xsl">
<map:generate src="cocoon:/schema/{1}.sch"/>
<map:transform src="../../stylesheets/xmod/schematron/iso_dsdl_include.xsl"/>
<map:transform src="../../stylesheets/xmod/schematron/iso_abstract_expand.xsl"/>
<map:transform src="../../stylesheets/xmod/schematron/{3}.xsl">
<map:transform src="../stylesheets/schematron/iso_dsdl_include.xsl"/>
<map:transform src="../stylesheets/schematron/iso_abstract_expand.xsl"/>
<map:transform src="../stylesheets/schematron/{3}.xsl">
<map:parameter name="phase" value="{2}"/>
<map:parameter name="allow-foreign" value="true"/>
</map:transform>
Expand Down

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion webapp/root/mount-table.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Cocoon mount table. -->
<mount-table>
<mount uri-prefix="" check-reload="yes" src="config.xmap"/>
<mount uri-prefix="" check-reload="yes" src="sitemaps/config.xmap"/>
</mount-table>
6 changes: 4 additions & 2 deletions webapp/root/config.xmap → webapp/root/sitemaps/config.xmap
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@

<!-- Mount sub-sitemaps. -->
<map:pipeline>
<!-- Main project-specific sitemap, matching on the remaining URL space.. -->
<!-- Main project-specific sitemap, matching on the remaining
URL space. -->
<map:match pattern="**">
<map:mount check-reload="yes" src="sitemap/xmod/" uri-prefix="" />
<map:mount check-reload="yes" src="../kiln/sitemaps/sitemap.xmap"
uri-prefix="" />
</map:match>
</map:pipeline>
</map:pipelines>
Expand Down
6 changes: 3 additions & 3 deletions webapp/root/main.xmap → webapp/root/sitemaps/main.xmap
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<map:part src="cocoon://_internal/metadata/files.xml" />
<map:part src="xml/content/{1}.xml" label="tei" />
</map:aggregate>
<map:transform src="stylesheets/local/default.xsl">
<map:transform src="../stylesheets/default.xsl">
<map:parameter name="filedir" value="." />
<map:parameter name="filename" value="{1}.xml" />
<map:parameter name="fileextension" value="html" />
Expand All @@ -96,7 +96,7 @@
<map:part src="cocoon://_internal/metadata/files.xml" />
<map:part src="xml/content/doc/{1}.xml" label="tei" />
</map:aggregate>
<map:transform src="stylesheets/local/doc.xsl">
<map:transform src="../stylesheets/doc.xsl">
<map:parameter name="filedir" value="{1}" />
<map:parameter name="filename" value="{2}.xml" />
<map:parameter name="fileextension" value="html" />
Expand All @@ -110,7 +110,7 @@
<map:part src="cocoon://_internal/metadata/files.xml" />
<map:part src="xml/content/{1}/{2}.xml" label="tei" />
</map:aggregate>
<map:transform src="stylesheets/local/default.xsl">
<map:transform src="../stylesheets/default.xsl">
<map:parameter name="filedir" value="{1}" />
<map:parameter name="filename" value="{2}.xml" />
<map:parameter name="fileextension" value="html" />
Expand Down
18 changes: 9 additions & 9 deletions webapp/root/private.xmap → webapp/root/sitemaps/private.xmap
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<map:match pattern="xml/index.html">
<map:generate src="xml/content" type="directory">
<map:parameter name="depth" value="99" />
<map:parameter name="exclude" value="\.svn" />
<map:parameter name="exclude" value="\..*" />
</map:generate>
<map:transform src="stylesheets/local/private/xml-dirs-to-process-list-html.xsl">
<map:transform src="../stylesheets/private/xml-dirs-to-process-list-html.xsl">
<map:parameter name="initial_path" value="content/" />
</map:transform>
<map:serialize type="xhtml" />
Expand All @@ -30,7 +30,7 @@
<map:parameter name="depth" value="99"/>
<map:parameter name="exclude" value="^\..*"/>
</map:generate>
<map:transform src="stylesheets/local/private/xml-dirs-to-index-list-html.xsl"/>
<map:transform src="../stylesheets/private/xml-dirs-to-index-list-html.xsl"/>
<map:serialize type="xhtml"/>
</map:match>

Expand All @@ -56,7 +56,7 @@
the project's encoding guidelines. #ALL means that all
phases specified in the schema are used. -->
<map:generate src="cocoon://_internal/schematron/validate/#PROJECT/#ALL/{1}.xml" />
<map:transform src="stylesheets/local/schematron/svrl_to_html.xsl">
<map:transform src="../stylesheets/schematron/svrl_to_html.xsl">
<map:parameter name="file" value="{1}.xml"/>
</map:transform>
<map:serialize type="xhtml" />
Expand All @@ -68,7 +68,7 @@
<map:pipeline id="local-resource-check">
<map:match pattern="xml/resource-check/images/**.html">
<map:generate src="cocoon:/xml/resource-check/images/{1}.xml" />
<map:transform src="stylesheets/xmod/resource-check/report-to-html.xsl" />
<map:transform src="../kiln/stylesheets/resource-check/report-to-html.xsl" />
<map:serialize type="xhtml" />
</map:match>
</map:pipeline>
Expand All @@ -83,7 +83,7 @@
<map:part src="cocoon://private/xml/resource-check/image-refs/{1}.xml" />
<map:part src="cocoon://private/xml/resource-check/image-files.xml" />
</map:aggregate>
<map:transform src="stylesheets/xmod/resource-check/check-missing-resources.xsl" />
<map:transform src="../kiln/stylesheets/resource-check/check-missing-resources.xsl" />
<map:serialize type="xml" />
</map:match>

Expand All @@ -94,17 +94,17 @@
thumbnails) of each image. -->
<map:match pattern="xml/resource-check/image-refs/content/**.xml">
<map:generate src="cocoon://_internal/metadata/images/{1}.xml" />
<map:transform src="stylesheets/local/private/expand-image-refs.xsl" />
<map:transform src="../stylesheets/private/expand-image-refs.xsl" />
<map:serialize type="xml" />
</map:match>

<!-- Generate a list of image files from the filesystem. -->
<map:match pattern="xml/resource-check/image-files.xml">
<map:generate src="images" type="imagedirectory">
<map:parameter name="depth" value="99" />
<map:parameter name="exclude" value="\.svn" />
<map:parameter name="exclude" value="\..*" />
</map:generate>
<map:transform src="stylesheets/xmod/resource-check/flatten-dir-list.xsl" />
<map:transform src="../kiln/stylesheets/resource-check/flatten-dir-list.xsl" />
<map:serialize type="xml" />
</map:match>
</map:pipeline>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
needed. Project-wide changes should be made here.
-->

<xsl:import href="../xmod/views/screen.xsl" />
<xsl:import href="../xmod/tei/p5.xsl" />
<xsl:import href="../kiln/stylesheets/views/screen.xsl" />
<xsl:import href="../kiln/stylesheets/tei/p5.xsl" />

<xsl:param name="filedir" />
<xsl:param name="filename" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
should be imported by other project specific stylesheets, where
the variables/templates should be overriden as needed. -->

<xsl:import href="../../xmod/views/private.xsl"/>
<xsl:import href="../../kiln/stylesheets/views/private.xsl"/>

<xsl:param name="filedir"/>
<xsl:param name="filename"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- Import the xMod version of this XSLT for default HTML
rendering. Project-specific customisations are made in this
file. -->
<xsl:import href="../../xmod/schematron/svrl_to_html.xsl"/>
<xsl:import href="../../kiln/stylesheets/schematron/svrl_to_html.xsl"/>

<!-- File path of document being validated. -->
<xsl:param name="file" select="''"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet exclude-result-prefixes="#all" version="2.0" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:import href="../../xmod/solr/delete.xsl" />
<xsl:import href="../../kiln/stylesheets/solr/delete.xsl" />

<xd:doc scope="stylesheet">
<xd:desc>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet exclude-result-prefixes="#all" version="2.0" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:import href="../../xmod/solr/tei-eats-to-solr.xsl" />
<xsl:import href="../../kiln/stylesheets/solr/tei-eats-to-solr.xsl" />

<xd:doc scope="stylesheet">
<xd:desc>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet exclude-result-prefixes="#all" version="2.0" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:import href="../../xmod/solr/tei-to-solr.xsl" />
<xsl:import href="../../kiln/stylesheets/solr/tei-to-solr.xsl" />

<xd:doc scope="stylesheet">
<xd:desc>
Expand Down

0 comments on commit 396644f

Please sign in to comment.