You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@locus.apache.org on 2000/09/08 00:46:34 UTC
cvs commit: xml-cocoon/webapp/stylesheets slides-apachecon.xsl
giacomo 00/09/07 15:46:33
Modified: webapp Tag: xml-cocoon2 sitemap.xmap
webapp/docs/samples/slides Tag: xml-cocoon2 slides.xml
webapp/resources/styles Tag: xml-cocoon2
slides-apachecon.css
webapp/stylesheets Tag: xml-cocoon2 slides-apachecon.xsl
Log:
made the slide show now working (including source colorizer)
Revision Changes Path
No revision
No revision
1.1.2.11 +132 -114 xml-cocoon/webapp/Attic/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/Attic/sitemap.xmap,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- sitemap.xmap 2000/09/05 17:23:33 1.1.2.10
+++ sitemap.xmap 2000/09/07 22:46:31 1.1.2.11
@@ -1,53 +1,53 @@
<?xml version="1.0"?>
-
+
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-<!-- =========================== Components ================================ -->
+<!-- =========================== Components ================================ -->
<map:components>
- <map:generators default="file">
- <map:generator name="file" src="org.apache.cocoon.generation.FileGenerator" label="content"/>
- <map:generator name="directory" src="org.apache.cocoon.generation.DirectoryGenerator" label="content"/>
- <map:generator name="serverpages" src="org.apache.cocoon.generation.ServerPagesGenerator" label="content"/>
- <map:generator name="request" src="org.apache.cocoon.generation.RequestGenerator"/>
+ <map:generators default="file">
+ <map:generator name="file" src="org.apache.cocoon.generation.FileGenerator" label="content"/>
+ <map:generator name="directory" src="org.apache.cocoon.generation.DirectoryGenerator" label="content"/>
+ <map:generator name="serverpages" src="org.apache.cocoon.generation.ServerPagesGenerator" label="content"/>
+ <map:generator name="request" src="org.apache.cocoon.generation.RequestGenerator"/>
<map:generator name="status" src="org.apache.cocoon.generation.StatusGenerator"/>
- </map:generators>
-
- <map:transformers default="xslt">
- <map:transformer name="xslt" src="org.apache.cocoon.transformation.XalanTransformer"/>
- <map:transformer name="xt" src="org.apache.cocoon.transformation.XTTransformer"/>
- <map:transformer name="log" src="org.apache.cocoon.transformation.LogTransformer"/>
- <map:transformer name="sql" src="org.apache.cocoon.transformation.SQLTransformer"/>
- <map:transformer name="xinclude" src="org.apache.cocoon.transformation.XIncludeTransformer"/>
- <!-- <map:transformer name="xlink" src="org.apache.cocoon.transformation.XLinkTranslator"/> -->
- </map:transformers>
-
- <map:readers default="resource">
- <map:reader name="resource" src="org.apache.cocoon.reading.ResourceReader"/>
- </map:readers>
-
- <map:serializers default="html">
- <map:serializer name="xlink" src="org.apache.cocoon.serialization.XLinkSerializer"/>
- <map:serializer name="xml" mime-type="text/xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
- <map:serializer name="html" mime-type="text/html" src="org.apache.cocoon.serialization.HTMLSerializer"/>
+ </map:generators>
+
+ <map:transformers default="xslt">
+ <map:transformer name="xslt" src="org.apache.cocoon.transformation.XalanTransformer">
+ <compile-stylesheets map:value="true"/>
+ </map:transformer>
+ <map:transformer name="log" src="org.apache.cocoon.transformation.LogTransformer"/>
+ <map:transformer name="sql" src="org.apache.cocoon.transformation.SQLTransformer"/>
+ <map:transformer name="xinclude" src="org.apache.cocoon.transformation.XIncludeTransformer"/>
+ </map:transformers>
+
+ <map:readers default="resource">
+ <map:reader name="resource" src="org.apache.cocoon.reading.ResourceReader"/>
+ </map:readers>
+
+ <map:serializers default="html">
+ <map:serializer name="links" src="org.apache.cocoon.serialization.XLinkSerializer"/>
+ <map:serializer name="xml" mime-type="text/xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
+ <map:serializer name="html" mime-type="text/html" src="org.apache.cocoon.serialization.HTMLSerializer"/>
<map:serializer name="fo2pdf" mime-type="application/pdf" src="org.apache.cocoon.serialization.FOPSerializer"/>
<map:serializer name="vrml" mime-type="model/vrml" src="org.apache.cocoon.serialization.TextSerializer"/>
<map:serializer name="wap" mime-type="text/vnd.wap.wml" src="org.apache.cocoon.serialization.XMLSerializer">
<doctype-public>-//WAPFORUM//DTD WML 1.1//EN</doctype-public>
<doctype-system>http://www.wapforum.org/DTD/wml_1.1.xml</doctype-system>
- </map:serializer>
+ </map:serializer>
<map:serializer name="svgxml" mime-type="image/svg-xml" src="org.apache.cocoon.serialization.XMLSerializer">
<doctype-public>-//W3C//DTD SVG 20000303 Stylable//EN</doctype-public>
<doctype-system>http://www.w3.org/TR/2000/03/WD-SVG-20000303/</doctype-system>
- </map:serializer>
+ </map:serializer>
<map:serializer name="svg2jpeg" mime-type="image/jpeg" src="org.apache.cocoon.serialization.SVGSerializer">
<encoder>jpegencoder</encoder>
<transparent>false</transparent>
<background>#FFFFFF</background>
- </map:serializer>
+ </map:serializer>
</map:serializers>
-
+
<map:selectors default="browser">
</map:selectors>
@@ -58,7 +58,7 @@
</map:components>
-<!-- =========================== Views =================================== -->
+<!-- =========================== Views =================================== -->
<map:views>
<map:view name="content" generate-from="content">
@@ -66,88 +66,88 @@
</map:view>
<map:view name="links" generate-from="content">
- <map:serialize type="xlink"/>
+ <map:serialize type="links"/>
</map:view>
</map:views>
-<!-- =========================== Resources ================================= -->
+<!-- =========================== Resources ================================= -->
<map:resources>
<map:resource name="slides">
- <map:generate src="docs/samples/slides/slides.xml"/>
- <map:transform src="stylesheets/slides-navigation.xsl"/>
- <map:transform src="stylesheets/slides-apachecon.xsl"/>
- <map:serialize/>
+ <map:generate src="docs/samples/slides/slides.xml"/>
+ <map:transform src="stylesheets/slides-navigation.xsl"/>
+ <map:transform src="stylesheets/slides-apachecon.xsl"/>
+ <map:serialize/>
</map:resource>
</map:resources>
-
-<!-- =========================== Pipelines ================================= -->
-
+
+<!-- =========================== Pipelines ================================= -->
+
<map:pipelines>
<map:pipeline>
- <map:match pattern="welcome">
- <map:generate src="docs/samples/samples.xml"/>
- <map:transform type="xt" src="stylesheets/simple-samples2html.xsl"/>
- <map:serialize/>
+ <map:match pattern="welcome">
+ <map:generate src="docs/samples/samples.xml"/>
+ <map:transform src="stylesheets/simple-samples2html.xsl"/>
+ <map:serialize/>
</map:match>
- <!-- ================ Hello =========================== -->
-
+ <!-- ================ Hello =========================== -->
+
<map:match pattern="hello.html">
- <map:generate src="docs/samples/hello-page.xml"/>
- <map:transform src="stylesheets/page/simple-page2html.xsl"/>
- <map:serialize type="html"/>
+ <map:generate src="docs/samples/hello-page.xml"/>
+ <map:transform src="stylesheets/page/simple-page2html.xsl"/>
+ <map:serialize type="html"/>
</map:match>
<map:match pattern="hello.wml">
- <map:generate src="docs/samples/hello-page.xml"/>
- <map:transform src="stylesheets/page/simple-page2wml.xsl"/>
- <map:serialize type="wap"/>
+ <map:generate src="docs/samples/hello-page.xml"/>
+ <map:transform src="stylesheets/page/simple-page2wml.xsl"/>
+ <map:serialize type="wap"/>
</map:match>
<map:match pattern="hello.vml">
- <map:generate src="docs/samples/hello-page.xml"/>
- <map:transform src="stylesheets/page/simple-page2vml.xsl"/>
- <map:serialize type="xml"/>
+ <map:generate src="docs/samples/hello-page.xml"/>
+ <map:transform src="stylesheets/page/simple-page2vml.xsl"/>
+ <map:serialize type="xml"/>
</map:match>
<map:match pattern="hello.svg">
- <map:generate src="docs/samples/hello-page.xml"/>
- <map:transform src="stylesheets/page/simple-page2svg.xsl"/>
+ <map:generate src="docs/samples/hello-page.xml"/>
+ <map:transform src="stylesheets/page/simple-page2svg.xsl"/>
<map:serialize type="svg2jpeg"/>
</map:match>
<map:match pattern="hello.wrl">
- <map:generate src="docs/samples/hello-page.xml"/>
- <map:transform src="stylesheets/page/simple-page2vrml.xsl"/>
- <map:serialize type="vrml"/>
+ <map:generate src="docs/samples/hello-page.xml"/>
+ <map:transform src="stylesheets/page/simple-page2vrml.xsl"/>
+ <map:serialize type="vrml"/>
</map:match>
<map:match pattern="hello.pdf">
- <map:generate src="docs/samples/hello-page.xml"/>
- <map:transform src="stylesheets/page/simple-page2fo.xsl"/>
- <map:serialize type="fo2pdf"/>
+ <map:generate src="docs/samples/hello-page.xml"/>
+ <map:transform src="stylesheets/page/simple-page2fo.xsl"/>
+ <map:serialize type="fo2pdf"/>
</map:match>
- <!-- ================ Sites =========================== -->
+ <!-- ================ Sites =========================== -->
- <map:match pattern="sites/*.apache.org">
- <map:generate src="docs/samples/sites/{1}_apache_org.xml"/>
- <map:transform src="stylesheets/sites/{1}_apache_org-html.xsl"/>
- <map:serialize/>
+ <map:match pattern="sites/*.apache.org">
+ <map:generate src="docs/samples/sites/{1}_apache_org.xml"/>
+ <map:transform src="stylesheets/sites/{1}_apache_org-html.xsl"/>
+ <map:serialize/>
</map:match>
- <map:match pattern="sites/images/*.gif">
- <map:read src="resources/images/{1}.gif"/>
+ <map:match pattern="sites/images/*.gif">
+ <map:read src="resources/images/{1}.gif"/>
</map:match>
- <!-- ================ Static =========================== -->
+ <!-- ================ Static =========================== -->
- <map:match pattern="fo">
- <map:generate src="docs/samples/fo/readme.fo"/>
- <map:serialize type="fo2pdf"/>
+ <map:match pattern="fo">
+ <map:generate src="docs/samples/fo/readme.fo"/>
+ <map:serialize type="fo2pdf"/>
</map:match>
<map:match pattern="svg">
@@ -159,82 +159,100 @@
<map:redirect-to resource="slides"/>
</map:match>
- <!-- <map:match pattern="slides/">
+ <map:match pattern="slides/view-source/*">
+ <map:read src="docs/samples/slides/{1}" mime-type="text/plain"/>
+ </map:match>
+ <map:match pattern="slides/view-source">
+ <map:generate type="serverpages" src="docs/samples/slides/view-source.xsp"/>
+ <map:serialize/>
+ </map:match>
+
+ <map:match pattern="slides/">
+ <map:redirect-to resource="slides"/>
+ </map:match>
+
+<!--
+ <map:match pattern="slides/">
<map:redirect-to uri="slides/slides"/>
- </map:match> -->
+ </map:match>
+-->
- <map:match pattern="slides/style">
- <map:read src="resources/styles/slides-apachecon.css" mime-type="text/css"/>
+ <map:match pattern="slides/style">
+ <map:read src="resources/styles/slides-apachecon.css" mime-type="text/css"/>
</map:match>
<map:match pattern="slides/**.gif">
- <map:read src="documents/slides/{1}.gif" mime-type="image/gif"/>
+ <map:read src="docs/samples/{1}.gif" mime-type="image/gif"/>
</map:match>
<map:match pattern="slides/**.jpg">
- <map:read src="documents/slides/{1}.jpg" mime-type="image/jpg"/>
+ <map:read src="docs/samples/{1}.jpg" mime-type="image/jpg"/>
</map:match>
- <map:match pattern="xsp/*">
- <map:generate type="serverpages" src="docs/samples/xsp/{1}.xsp"/>
+ <map:match pattern="xsp/*">
+ <map:generate type="serverpages" src="docs/samples/xsp/{1}.xsp"/>
<map:transform src="stylesheets/dynamic-page2html.xsl"/>
- <map:serialize/>
+ <map:serialize/>
</map:match>
- <map:match pattern="sql/*">
- <map:generate src="docs/samples/sql/{1}.xml"/>
- <map:transform type="sql">
+ <map:match pattern="sql/*">
+ <map:generate src="docs/samples/sql/{1}.xml"/>
+ <map:transform type="sql">
<parameter name="driver" value="org.gjt.mm.mysql.Driver"/>
<parameter name="dburl" value="jdbc:mysql://localhost/test"/>
<parameter name="username" value="test"/>
<parameter name="password" value="test"/>
</map:transform>
- <map:transform src="stylesheets/simple-sql2html.xsl"/>
- <map:serialize/>
+ <map:transform src="stylesheets/simple-sql2html.xsl"/>
+ <map:serialize/>
+ </map:match>
+
+ <map:match pattern="generror">
+ <map:generate src="docs/samples/error-giving-page.xml"/>
+ <map:transform src="stylesheets/simple-samples2html.xsl"/>
+ <map:serialize/>
</map:match>
-
- <map:match pattern="generror">
- <map:generate src="docs/samples/error-giving-page.xml"/>
- <map:transform src="stylesheets/simple-samples2html.xsl"/>
- <map:serialize/>
- </map:match>
-
- <map:match pattern="status">
- <map:generate type="status" src="status"/>
+
+ <map:match pattern="status">
+ <map:generate type="status" src="status"/>
<map:transform src="stylesheets/system/status2html.xsl"/>
- <map:serialize/>
+ <map:serialize/>
+ </map:match>
+
+ <map:match pattern="sites/styles/*.css">
+ <map:read src="resources/styles/{1}.css" mime-type="text/css"/>
</map:match>
- <map:match pattern="sites/styles/*.css">
- <map:read src="resources/styles/{1}.css" mime-type="text/css"/>
+ <map:match pattern="images/*.gif">
+ <map:read src="resources/images/{1}.gif" mime-type="image/gif"/>
</map:match>
- <map:match pattern="images/*.gif">
- <map:read src="resources/images/{1}.gif" mime-type="image/gif"/>
+ <map:match pattern="images/*.jpg">
+ <map:read src="resources/images/{1}.jpg" mime-type="image/jpg"/>
</map:match>
- <map:match pattern="images/*.jpg">
- <map:read src="resources/images/{1}.jpg" mime-type="image/jpg"/>
+ <map:match pattern="images/**/*.png">
+ <map:read src="resources/images/{1}/{2}.png" mime-type="image/png"/>
</map:match>
- <map:match pattern="images/*.png">
- <map:read src="resources/images/{1}.png" mime-type="image/png"/>
+ <map:match pattern="images/*.png">
+ <map:read src="resources/images/{1}.png" mime-type="image/png"/>
</map:match>
- <map:match pattern="*">
- <map:generate type="directory" src="{1}"/>
- <map:transform src="stylesheets/system/directory2html.xsl"/>
- <map:serialize/>
+ <map:match pattern="*">
+ <map:generate type="directory" src="{1}"/>
+ <map:transform src="stylesheets/system/directory2html.xsl"/>
+ <map:serialize/>
</map:match>
- <map:handle-errors>
+ <map:handle-errors>
<map:transform src="stylesheets/system/error2html.xsl"/>
- <map:serialize status-code="500"/>
- </map:handle-errors>
+ <map:serialize status-code="500"/>
+ </map:handle-errors>
</map:pipeline>
</map:pipelines>
-
+
</map:sitemap>
<!-- end of file -->
No revision
No revision
1.1.2.2 +12 -11 xml-cocoon/webapp/docs/samples/slides/Attic/slides.xml
Index: slides.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/docs/samples/slides/Attic/slides.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- slides.xml 2000/08/21 17:48:42 1.1.2.1
+++ slides.xml 2000/09/07 22:46:32 1.1.2.2
@@ -119,7 +119,7 @@
<slide>
<title>Hard to believe?</title>
- <p><fork uri="../index">Let's take the tour.</fork></p>
+ <p><fork uri="../welcome">Let's take the tour.</fork></p>
</slide>
</section>
@@ -180,7 +180,7 @@
<slide>
<title>Cocoon General Vision</title>
- <figure src="schema.jpg"/>
+ <figure src="slides/schema.jpg"/>
</slide>
<slide>
@@ -304,7 +304,7 @@
<page>
<p>Current time is <util:date/></p>
</page>
-</xsp:page
+</xsp:page>
]]></source>
<p>then you let Cocoon transform this with</p>
@@ -318,18 +318,18 @@
<slide>
<title>Possible different scenarios</title>
- <ul>
- <li><link uri="../xsp/view-source.xml?filename=page.xml">integrated xsp tags</link></li>
- <li><link uri="../xsp/view-source.xml?filename=clean-page.xml">custom tags transformed by your stylesheets</link></li>
- <li><link uri="../xsp/view-source.xml?filename=lib-page.xml">use of cocoon taglibs</link></li>
+ <ul>
+ <li><link uri="view-source?filename=../docs/samples/slides/page.xml">integrated xsp tags</link></li>
+ <li><link uri="view-source?filename=../docs/samples/slides/clean-page.xml">custom tags transformed by your stylesheets</link></li>
+ <li><link uri="view-source?filename=../docs/samples/slides/lib-page.xml">use of cocoon taglibs</link></li>
</ul>
</slide>
<slide>
<title>Other dynamic possibilities</title>
<ul>
- <li><link uri="../xsp/view-source.xml?filename=../sql/database-page.xml">SQLProcessor</link></li>
- <li><link uri="../xsp/view-source.xml?filename=../ldap/ldap.xml">LDAPProcessor</link></li>
+ <li><link uri="view-source?filename=../docs/samples/slides/database-page.xml">SQLProcessor</link></li>
+ <li><link uri="view-source?filename=../docs/samples/slides/ldap.xml">LDAPProcessor</link></li>
<li>... add yours</li>
</ul>
</slide>
@@ -389,7 +389,7 @@
<slide>
<title>The Cocoon pyramid of contracts</title>
- <figure src="pyramid-model.gif"/>
+ <figure src="slides/pyramid-model.gif"/>
</slide>
</section>
@@ -412,7 +412,8 @@
<ul>
<li>Donald Ball</li>
<li>Pierpaolo Fumagalli</li>
- <li>Stefano Mazzocchi</li>
+ <li>Stefano Mazzocchi</li>
+ <li>Giacomo Pati</li>
<li>Ricardo Rocha</li>
</ul>
</slide>
No revision
No revision
1.1.2.2 +11 -2 xml-cocoon/webapp/resources/styles/Attic/slides-apachecon.css
Index: slides-apachecon.css
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/resources/styles/Attic/slides-apachecon.css,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- slides-apachecon.css 2000/08/21 17:48:50 1.1.2.1
+++ slides-apachecon.css 2000/09/07 22:46:32 1.1.2.2
@@ -11,19 +11,26 @@
}
P {
+ font-family: Helvetica;
+ font-size: 16pt;
padding: 10px 10px 10px 10px;
margin: 10px 20px 10px 20px;
}
P.quote {
+ font-family: Helvetica;
+ font-size: 16pt;
font-style: italic;
}
PRE {
- padding: 10px 10px 10px 10px;
+ font-family: Monospace;
+ font-size: 14pt;
+ padding: 0px 0px 0px 50px;
}
H1 {
+ font-family: Helvetica;
font-size: 34pt;
line-height: 36pt;
text-align: center;
@@ -31,6 +38,7 @@
}
H3 {
+ font-family: Helvetica;
font-size: 20pt;
line-height: 24pt;
text-align: center;
@@ -39,11 +47,12 @@
}
UL {
+ font-family: Helvetica;
font-size: 20pt;
line-height: 35pt;
margin: 30px 100px 30px 50px;
}
-
+
A:link { color: #0000A0 }
A:visited { color: #A00000 }
A:active { color: #00A000 }
No revision
No revision
1.1.2.3 +1 -1 xml-cocoon/webapp/stylesheets/Attic/slides-apachecon.xsl
Index: slides-apachecon.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/stylesheets/Attic/slides-apachecon.xsl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- slides-apachecon.xsl 2000/08/21 19:29:05 1.1.2.2
+++ slides-apachecon.xsl 2000/09/07 22:46:33 1.1.2.3
@@ -124,7 +124,7 @@
</xsl:template>
<xsl:template match="source">
- <pre class="source">
+ <pre>
<xsl:apply-templates/>
</pre>
</xsl:template>