Author: andreas
Date: Sat Feb 7 00:36:21 2009
New Revision: 741802
URL: http://svn.apache.org/viewvc?rev=741802&view=rev
Log:
Use servlet service for prettyprinting.
Added:
lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/
lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/COB-INF/
lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/COB-INF/sitemap.xmap
lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/COB-INF/xslt/
- copied from r741800, lenya/branches/BRANCH_2_0_X/src/modules/prettyprinting/xslt/
lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/META-INF/
lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/META-INF/cocoon/
lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/META-INF/cocoon/spring/
lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/META-INF/cocoon/spring/lenya-module-prettyprinting-blockServlet.xml
Modified:
lenya/trunk/org.apache.lenya.parent/pom.xml
lenya/trunk/org.apache.lenya.webapp/rcl.properties
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
Added: lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/COB-INF/sitemap.xmap?rev=741802&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/COB-INF/sitemap.xmap (added)
+++ lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/COB-INF/sitemap.xmap Sat Feb 7 00:36:21 2009
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <map:pipelines>
+ <map:pipeline>
+
+ <map:match pattern="xml2nicexml">
+ <map:generate src="service-consumer:"/>
+ <map:transform src="xslt/xml2nicexml.xsl"/>
+ <map:serialize type="xml"/>
+ </map:match>
+
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>
Added: lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/META-INF/cocoon/spring/lenya-module-prettyprinting-blockServlet.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/META-INF/cocoon/spring/lenya-module-prettyprinting-blockServlet.xml?rev=741802&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/META-INF/cocoon/spring/lenya-module-prettyprinting-blockServlet.xml (added)
+++ lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/META-INF/cocoon/spring/lenya-module-prettyprinting-blockServlet.xml Sat Feb 7 00:36:21 2009
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ und
+-->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:servlet="http://cocoon.apache.org/schema/servlet"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
+
+ <bean name="org.apache.lenya.module.prettyprinting.block" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/prettyprinting" context-path="blockcontext:/lenya-module-prettyprinting"/>
+ </bean>
+</beans>
Modified: lenya/trunk/org.apache.lenya.parent/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.parent/pom.xml?rev=741802&r1=741801&r2=741802&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.parent/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.parent/pom.xml Sat Feb 7 00:36:21 2009
@@ -361,6 +361,11 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-module-prettyprinting</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-module-resource</artifactId>
<version>${project.version}</version>
</dependency>
Modified: lenya/trunk/org.apache.lenya.webapp/rcl.properties
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.webapp/rcl.properties?rev=741802&r1=741801&r2=741802&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp/rcl.properties (original)
+++ lenya/trunk/org.apache.lenya.webapp/rcl.properties Sat Feb 7 00:36:21 2009
@@ -14,4 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-org.apache.lenya-welcome.block%classes-dir=../org.apache.lenya.welcome/target/classes
+org.apache.lenya.welcome.block%classes-dir=../org.apache.lenya.welcome/target/classes
+org.apache.lenya.module.prettyprinting.block%classes-dir=../org.apache.lenya.module.prettyprinting/target/classes
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=741802&r1=741801&r2=741802&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 Sat Feb 7 00:36:21 2009
@@ -26,14 +26,10 @@
</map:transform>
<map:transform src="lenya/xslt/util/page2xhtml.xsl"/>
<map:transform type="proxy-xhtml"/>
- <!--
<map:transform src="lenya/xslt/util/strip_namespaces.xsl"/>
- -->
- <!--
<map:transform type="servletService">
- <map:parameter name="service" value="servlet:org.apache.lenya.module.prettyprinting:/xml2nicexml"/>
+ <map:parameter name="service" value="servlet:prettyprinting:/xml2nicexml"/>
</map:transform>
- -->
</map:resource>
<map:resource name="i18n">
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=741802&r1=741801&r2=741802&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 Sat Feb 7 00:36:21 2009
@@ -24,10 +24,10 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
- <bean name="org.apache.lenya-welcome.block" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <bean name="org.apache.lenya.welcome.block" class="org.apache.cocoon.sitemap.SitemapServlet">
<servlet:context mount-path="/" context-path="blockcontext:/lenya-welcome-2.2.0-SNAPSHOT/">
<servlet:connections>
- <entry key="style" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
+ <entry key="prettyprinting" value-ref="org.apache.lenya.module.prettyprinting.block"/>
</servlet:connections>
</servlet:context>
</bean>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.