svn commit: r742136 - in /lenya/trunk: org.apache.lenya.core.gui/ org.apache.lenya.core.gui/src/main/resources/COB-INF/ org.apache.lenya.core.gui/src/main/resources/COB-INF/resources/images/ org.apache.lenya.core.gui/src/main/resources/COB-INF/xslt/ or...
[email protected] Sun, 08 Feb 2009 18:26:40 -0000
Newsgroups
gmane.comp.cms.lenya.cvs
Message-ID
<[email protected] >
Author: andreas
Date: Sun Feb 8 18:26:40 2009
New Revision: 742136
URL: http://svn.apache.org/viewvc?rev=742136&view=rev
Log:
Moving some resources from welcome to gui block.
Added:
lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/resources/images/project-logo-small.png
- copied unchanged from r742133, lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/lenya/resources/images/project-logo-small.png
lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/resources/images/project-logo.png
- copied unchanged from r742133, lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/lenya/resources/images/project-logo.png
lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/xslt/
lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/xslt/page2xhtml.xsl
- copied, changed from r742133, lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/lenya/xslt/util/page2xhtml.xsl
lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/xslt/strip_namespaces.xsl
- copied unchanged from r742133, lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/lenya/xslt/util/strip_namespaces.xsl
lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/xslt/toggle.xsl
- copied unchanged from r742133, lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/lenya/xslt/util/toggle.xsl
Removed:
lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/lenya/resources/images/project-logo-small.png
lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/lenya/resources/images/project-logo.png
lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/lenya/xslt/util/page2xhtml.xsl
lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/lenya/xslt/util/strip_namespaces.xsl
lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/lenya/xslt/util/toggle.xsl
Modified:
lenya/trunk/org.apache.lenya.core.gui/ (props changed)
lenya/trunk/org.apache.lenya.core.gui/pom.xml
lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/sitemap.xmap
lenya/trunk/org.apache.lenya.core.gui/src/main/resources/META-INF/cocoon/spring/lenya-core-gui-blockServlet.xml
lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/global-sitemap.xmap
lenya/trunk/org.apache.lenya.welcome/src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml
Propchange: lenya/trunk/org.apache.lenya.core.gui/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Feb 8 18:26:40 2009
@@ -0,0 +1,6 @@
+target
+.project
+.classpath
+.settings
+profiles.xml
+
Modified: lenya/trunk/org.apache.lenya.core.gui/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.gui/pom.xml?rev=742136&r1=742135&r2=742136&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.gui/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.gui/pom.xml Sun Feb 8 18:26:40 2009
@@ -16,14 +16,6 @@
<name>Apache Lenya Core GUI</name>
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core</artifactId>
</dependency>
@@ -31,9 +23,5 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/sitemap.xmap?rev=742136&r1=742135&r2=742136&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/sitemap.xmap (original)
+++ lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/sitemap.xmap Sun Feb 8 18:26:40 2009
@@ -30,14 +30,20 @@
- when making use of servlet services from other blocks
-->
-<!--
- <map:match pattern="service/blocks/*">
+ <map:match pattern="service/style-cms-page">
<map:generate src="service-consumer:"/>
- <map:transform src="blocks/{1}.xsl"/>
- <map:transform type="servletLinkRewriter"/>
- <map:serialize type="html"/>
+ <map:transform type="i18n">
+ <map:parameter name="locale" value="{request:locale}"/>
+ </map:transform>
+ <map:transform src="xslt/page2xhtml.xsl"/>
+ <map:transform type="servletLinkRewriter-xhtml"/>
+ <map:transform type="proxy-xhtml"/>
+ <map:transform src="xslt/strip_namespaces.xsl"/>
+ <map:transform type="servletService">
+ <map:parameter name="service" value="servlet:prettyprinting:/xml2nicexml"/>
+ </map:transform>
+ <map:serialize type="xhtml"/>
</map:match>
--->
</map:pipeline>
<map:pipeline id="resources">
@@ -47,6 +53,9 @@
<map:match pattern="**.jpg">
<map:read src="resources/{1}.jpg"/>
</map:match>
+ <map:match pattern="**.png">
+ <map:read src="resources/{1}.png"/>
+ </map:match>
<map:match pattern="**.ico">
<map:read src="resources/{1}.ico"/>
</map:match>
Copied: lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/xslt/page2xhtml.xsl (from r742133, lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/lenya/xslt/util/page2xhtml.xsl)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/xslt/page2xhtml.xsl?p2=lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/xslt/page2xhtml.xsl&p1=lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/lenya/xslt/util/page2xhtml.xsl&r1=742133&r2=742136&rev=742136&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/lenya/xslt/util/page2xhtml.xsl (original)
+++ lenya/trunk/org.apache.lenya.core.gui/src/main/resources/COB-INF/xslt/page2xhtml.xsl Sun Feb 8 18:26:40 2009
@@ -33,9 +33,9 @@
<html>
<head>
<title><xsl:apply-templates select="page:title/node()" mode="htmlTitle"/></title>
- <link rel="stylesheet" type="text/css" href="servlet:gui:/css/default.css" title="default css"/>
+ <link rel="stylesheet" type="text/css" href="servlet:/css/default.css" title="default css"/>
<xsl:comment>[if IE 6]<![CDATA[>]]><link rel="stylesheet" type="text/css" href="/modules/gui/css/ie6hacksonly.css" /><![CDATA[<![endif]]]></xsl:comment>
- <link rel="icon" href="/favicon.ico" type="image/ico"/>
+ <link rel="icon" href="servlet:/icons/favicon.ico" type="image/ico"/>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/>
<xsl:apply-templates select="xhtml:script"/>
<xsl:copy-of select="page:head/*"/>
@@ -84,7 +84,7 @@
<h1><xsl:apply-templates select="node()"/></h1>
</td>
<td class="lenya-project-logo">
- <img src="/lenya/images/project-logo-small.png" alt="Apache Lenya Project Logo"/>
+ <img src="servlet:/images/project-logo-small.png" alt="Apache Lenya Project Logo"/>
</td>
</tr>
</table>
Modified: lenya/trunk/org.apache.lenya.core.gui/src/main/resources/META-INF/cocoon/spring/lenya-core-gui-blockServlet.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.gui/src/main/resources/META-INF/cocoon/spring/lenya-core-gui-blockServlet.xml?rev=742136&r1=742135&r2=742136&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.gui/src/main/resources/META-INF/cocoon/spring/lenya-core-gui-blockServlet.xml (original)
+++ lenya/trunk/org.apache.lenya.core.gui/src/main/resources/META-INF/cocoon/spring/lenya-core-gui-blockServlet.xml Sun Feb 8 18:26:40 2009
@@ -25,6 +25,10 @@
http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
<bean name="org.apache.lenya.core.gui.block" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/gui" context-path="blockcontext:/lenya-core-gui-2.2.0-SNAPSHOT/"/>
+ <servlet:context mount-path="/gui" context-path="blockcontext:/lenya-core-gui-2.2.0-SNAPSHOT/">
+ <servlet:connections>
+ <entry key="prettyprinting" value-ref="org.apache.lenya.module.prettyprinting.block"/>
+ </servlet:connections>
+ </servlet:context>
</bean>
</beans>
Modified: lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/global-sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/global-sitemap.xmap?rev=742136&r1=742135&r2=742136&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/global-sitemap.xmap (original)
+++ lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/global-sitemap.xmap Sun Feb 8 18:26:40 2009
@@ -20,19 +20,6 @@
<map:resources>
- <map:resource name="style-cms-page">
- <map:transform type="i18n">
- <map:parameter name="locale" value="{request:locale}"/>
- </map:transform>
- <map:transform src="lenya/xslt/util/page2xhtml.xsl"/>
- <map:transform type="servletLinkRewriter-xhtml"/>
- <map:transform type="proxy-xhtml"/>
- <map:transform src="lenya/xslt/util/strip_namespaces.xsl"/>
- <map:transform type="servletService">
- <map:parameter name="service" value="servlet:prettyprinting:/xml2nicexml"/>
- </map:transform>
- </map:resource>
-
<map:resource name="i18n">
<map:transform type="i18n">
<map:parameter name="locale" value="{request:locale}"/>
@@ -228,8 +215,9 @@
<map:part src="content/readme.xml"/>
</map:aggregate>
<map:transform src="xslt/welcome.xsl"/>
- <map:call resource="style-cms-page"/>
- <map:serialize />
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:gui:/service/style-cms-page"/>
+ </map:serialize>
</map:match>
<!-- any root-level request is directed to the welcome page -->
Modified: lenya/trunk/org.apache.lenya.welcome/src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.welcome/src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml?rev=742136&r1=742135&r2=742136&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.welcome/src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml (original)
+++ lenya/trunk/org.apache.lenya.welcome/src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml Sun Feb 8 18:26:40 2009
@@ -28,7 +28,6 @@
<servlet:context mount-path="/" context-path="blockcontext:/lenya-welcome-2.2.0-SNAPSHOT/">
<servlet:connections>
<entry key="gui" value-ref="org.apache.lenya.core.gui.block"/>
- <entry key="prettyprinting" value-ref="org.apache.lenya.module.prettyprinting.block"/>
</servlet:connections>
</servlet:context>
</bean>