You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2009/02/23 23:38:36 UTC
svn commit: r747175 - in /lenya/trunk: org.apache.lenya.core.usecase/
org.apache.lenya.core.usecase/src/main/resources/META-INF/cocoon/spring/
org.apache.lenya.module.svg/
org.apache.lenya.module.svg/src/main/resources/META-INF/cocoon/spring/
org.apach...
Author: andreas
Date: Mon Feb 23 22:38:30 2009
New Revision: 747175
URL: http://svn.apache.org/viewvc?rev=747175&view=rev
Log:
Adding block for SVG module.
Added:
lenya/trunk/org.apache.lenya.module.svg/src/main/resources/META-INF/cocoon/spring/
lenya/trunk/org.apache.lenya.module.svg/src/main/resources/META-INF/cocoon/spring/lenya-module-svg-blockServlet.xml
Modified:
lenya/trunk/org.apache.lenya.core.usecase/pom.xml
lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/META-INF/cocoon/spring/lenya-core-usecase.xml
lenya/trunk/org.apache.lenya.module.svg/pom.xml
lenya/trunk/org.apache.lenya.parent/pom.xml
lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/error.xmap
lenya/trunk/org.apache.lenya.webapp/pom.xml
lenya/trunk/org.apache.lenya.webapp/rcl.properties
Modified: lenya/trunk/org.apache.lenya.core.usecase/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/pom.xml?rev=747175&r1=747174&r2=747175&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/pom.xml Mon Feb 23 22:38:30 2009
@@ -46,6 +46,8 @@
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
+
+ <!-- Cocoon -->
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core</artifactId>
@@ -60,6 +62,10 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-flowscript-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-forms-impl</artifactId>
<scope>runtime</scope>
</dependency>
Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/META-INF/cocoon/spring/lenya-core-usecase.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/META-INF/cocoon/spring/lenya-core-usecase.xml?rev=747175&r1=747174&r2=747175&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/META-INF/cocoon/spring/lenya-core-usecase.xml (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/META-INF/cocoon/spring/lenya-core-usecase.xml Mon Feb 23 22:38:30 2009
@@ -17,9 +17,10 @@
-->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"
- xmlns="http://www.springframework.org/schema/beans">
+ xmlns:configurator="http://cocoon.apache.org/schema/configurator"
+ xmlns="http://www.springframework.org/schema/beans"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
<bean name="org.apache.lenya.cms.module.Module/usecase"
class="org.apache.lenya.cms.module.ModuleImpl">
Modified: lenya/trunk/org.apache.lenya.module.svg/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.svg/pom.xml?rev=747175&r1=747174&r2=747175&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.svg/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.svg/pom.xml Mon Feb 23 22:38:30 2009
@@ -12,6 +12,7 @@
</parent>
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-module-svg</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Lenya Module SVG</name>
<dependencies>
@@ -23,5 +24,9 @@
<groupId>batik</groupId>
<artifactId>batik-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-batik-impl</artifactId>
+ </dependency>
</dependencies>
</project>
Added: lenya/trunk/org.apache.lenya.module.svg/src/main/resources/META-INF/cocoon/spring/lenya-module-svg-blockServlet.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.svg/src/main/resources/META-INF/cocoon/spring/lenya-module-svg-blockServlet.xml?rev=747175&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.module.svg/src/main/resources/META-INF/cocoon/spring/lenya-module-svg-blockServlet.xml (added)
+++ lenya/trunk/org.apache.lenya.module.svg/src/main/resources/META-INF/cocoon/spring/lenya-module-svg-blockServlet.xml Mon Feb 23 22:38:30 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.svg.block" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/svg" context-path="blockcontext:/lenya-module-svg-2.2.0-SNAPSHOT/"/>
+ </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=747175&r1=747174&r2=747175&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.parent/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.parent/pom.xml Mon Feb 23 22:38:30 2009
@@ -451,7 +451,7 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-mail-impl</artifactId>
+ <artifactId>cocoon-batik-impl</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -461,6 +461,11 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-mail-impl</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-servlet-service-impl</artifactId>
<version>1.2.0-SNAPSHOT</version>
</dependency>
@@ -707,6 +712,11 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-module-svg</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-module-xhtml</artifactId>
<version>${project.version}</version>
</dependency>
Modified: lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/error.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/error.xmap?rev=747175&r1=747174&r2=747175&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/error.xmap (original)
+++ lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/error.xmap Mon Feb 23 22:38:30 2009
@@ -21,7 +21,7 @@
<map:pipelines>
<map:pipeline>
<map:match pattern="**">
- <map:generate type="notifying"/>
+ <map:generate type="exception"/>
<map:serialize type="xml"/>
<!--
<map:transform src="fallback://lenya/xslt/exception/generic.xsl"/>
Modified: lenya/trunk/org.apache.lenya.webapp/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.webapp/pom.xml?rev=747175&r1=747174&r2=747175&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.webapp/pom.xml Mon Feb 23 22:38:30 2009
@@ -117,6 +117,11 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-servlet-service-components</artifactId>
</dependency>
+ <!-- transient, but necessary because of cocoon.xconf -->
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-batik-impl</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-block-deployment</artifactId>
Modified: lenya/trunk/org.apache.lenya.webapp/rcl.properties
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.webapp/rcl.properties?rev=747175&r1=747174&r2=747175&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp/rcl.properties (original)
+++ lenya/trunk/org.apache.lenya.webapp/rcl.properties Mon Feb 23 22:38:30 2009
@@ -18,4 +18,5 @@
org.apache.lenya.core.gui.block%classes-dir=../org.apache.lenya.core.gui/target/classes
org.apache.lenya.core.usecase.block%classes-dir=../org.apache.lenya.core.usecase/target/classes
org.apache.lenya.module.prettyprinting.block%classes-dir=../org.apache.lenya.module.prettyprinting/target/classes
+#org.apache.lenya.module.svg.block%classes-dir=../org.apache.lenya.module.svg/target/classes
org.apache.lenya.webapp.welcome.block%classes-dir=../org.apache.lenya.webapp.welcome/target/classes
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org