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/24 00:52:42 UTC
svn commit: r747223 - in /lenya/trunk:
org.apache.lenya.core.acusecases/src/main/resources/COB-INF/jx/
org.apache.lenya.core.linking/src/main/resources/META-INF/cocoon/spring/
org.apache.lenya.core.metadata/src/main/resources/
org.apache.lenya.core.met...
Author: andreas
Date: Mon Feb 23 23:52:40 2009
New Revision: 747223
URL: http://svn.apache.org/viewvc?rev=747223&view=rev
Log:
Fix SVG module.
Added:
lenya/trunk/org.apache.lenya.core.metadata/src/main/resources/
lenya/trunk/org.apache.lenya.core.metadata/src/main/resources/META-INF/
lenya/trunk/org.apache.lenya.core.metadata/src/main/resources/META-INF/cocoon/
lenya/trunk/org.apache.lenya.core.metadata/src/main/resources/META-INF/cocoon/spring/
lenya/trunk/org.apache.lenya.core.metadata/src/main/resources/META-INF/cocoon/spring/lenya-core-metadata-components.xml
Modified:
lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/COB-INF/jx/login.jx
lenya/trunk/org.apache.lenya.core.linking/src/main/resources/META-INF/cocoon/spring/lenya-core-linking-components.xml
lenya/trunk/org.apache.lenya.module.svg/pom.xml
lenya/trunk/org.apache.lenya.module.svg/src/main/resources/COB-INF/sitemap.xmap
lenya/trunk/org.apache.lenya.module.svg/src/main/resources/META-INF/cocoon/spring/lenya-module-svg-blockServlet.xml
lenya/trunk/org.apache.lenya.parent/pom.xml
lenya/trunk/org.apache.lenya.webapp/pom.xml
Modified: lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/COB-INF/jx/login.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/COB-INF/jx/login.jx?rev=747223&r1=747222&r2=747223&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/COB-INF/jx/login.jx (original)
+++ lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/COB-INF/jx/login.jx Mon Feb 23 23:52:40 2009
@@ -89,7 +89,7 @@
<div class="lenya-box-body">
<jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
- <form name="login" id="login" method="post" action="?lenya.continuation=${continuation.id}&lenya.usecase=${request.getParameter('lenya.usecase')}">
+ <form name="login" id="login" method="post" action="?lenya.continuation=${continuation.id}&lenya.usecase=${usecase.getName()}">
<table class="lenya-table-noborder">
<tr>
<td><label for="name"><i18n:text>Username</i18n:text>: </label></td>
Modified: lenya/trunk/org.apache.lenya.core.linking/src/main/resources/META-INF/cocoon/spring/lenya-core-linking-components.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/resources/META-INF/cocoon/spring/lenya-core-linking-components.xml?rev=747223&r1=747222&r2=747223&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/resources/META-INF/cocoon/spring/lenya-core-linking-components.xml (original)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/resources/META-INF/cocoon/spring/lenya-core-linking-components.xml Mon Feb 23 23:52:40 2009
@@ -28,6 +28,8 @@
</bean>
<bean name="org.apache.cocoon.components.modules.input.InputModule/uuid2url"
class="org.apache.lenya.cms.cocoon.components.modules.input.UuidToUrlModule"/>
+ <bean name="org.apache.cocoon.components.modules.input.InputModule/link"
+ class="org.apache.lenya.cms.cocoon.components.modules.input.LinkingModule"/>
<!-- Lenya can rewrite the links to cater to special proxy setups.
Make sure to update the proxy configuration in publication.xml as well.
Added: lenya/trunk/org.apache.lenya.core.metadata/src/main/resources/META-INF/cocoon/spring/lenya-core-metadata-components.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata/src/main/resources/META-INF/cocoon/spring/lenya-core-metadata-components.xml?rev=747223&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.metadata/src/main/resources/META-INF/cocoon/spring/lenya-core-metadata-components.xml (added)
+++ lenya/trunk/org.apache.lenya.core.metadata/src/main/resources/META-INF/cocoon/spring/lenya-core-metadata-components.xml Mon Feb 23 23:52:40 2009
@@ -0,0 +1,29 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:configurator="http://cocoon.apache.org/schema/configurator"
+ 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.cocoon.transformation.Transformer/metaData"
+ class="org.apache.lenya.modules.metadata.MetaDataTransformer">
+ <property name="repository" ref="org.apache.lenya.cms.publication.Repository"/>
+ </bean>
+
+</beans>
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=747223&r1=747222&r2=747223&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.svg/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.svg/pom.xml Mon Feb 23 23:52:40 2009
@@ -16,17 +16,22 @@
<packaging>jar</packaging>
<name>Apache Lenya Module SVG</name>
<dependencies>
+
+ <!-- Cocoon -->
<dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-api</artifactId>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-batik-impl</artifactId>
</dependency>
+
+ <!-- Lenya -->
<dependency>
- <groupId>batik</groupId>
- <artifactId>batik-util</artifactId>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-batik-impl</artifactId>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-metadata</artifactId>
</dependency>
+
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.svg/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.svg/src/main/resources/COB-INF/sitemap.xmap?rev=747223&r1=747222&r2=747223&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.svg/src/main/resources/COB-INF/sitemap.xmap (original)
+++ lenya/trunk/org.apache.lenya.module.svg/src/main/resources/COB-INF/sitemap.xmap Mon Feb 23 23:52:40 2009
@@ -27,7 +27,9 @@
<map:pipeline>
<!-- enable client side caching of resources -->
- <map:parameter name="expires" value="{global:pipeline-expiration}"/>
+ <!-- FIXME: declaration missing?
+ <map:parameter name="expires" value="{global:pipeline-expiration}"/>
+ -->
<!--
Views for shape flowscripts.
Modified: 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=747223&r1=747222&r2=747223&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.svg/src/main/resources/META-INF/cocoon/spring/lenya-module-svg-blockServlet.xml (original)
+++ lenya/trunk/org.apache.lenya.module.svg/src/main/resources/META-INF/cocoon/spring/lenya-module-svg-blockServlet.xml Mon Feb 23 23:52:40 2009
@@ -25,6 +25,6 @@
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/"/>
+ <servlet:context mount-path="/modules/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=747223&r1=747222&r2=747223&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.parent/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.parent/pom.xml Mon Feb 23 23:52:40 2009
@@ -364,11 +364,13 @@
<artifactId>avalon-framework-impl</artifactId>
<version>${avalon.version}</version>
</dependency>
+ <!--
<dependency>
<groupId>batik</groupId>
<artifactId>batik-util</artifactId>
<version>1.6-1</version>
</dependency>
+ -->
<dependency>
<groupId>xmldb</groupId>
<artifactId>xmldb-common</artifactId>
Modified: lenya/trunk/org.apache.lenya.webapp/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.webapp/pom.xml?rev=747223&r1=747222&r2=747223&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.webapp/pom.xml Mon Feb 23 23:52:40 2009
@@ -139,6 +139,10 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-metadata</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-webapp-welcome</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org