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/05 22:46:50 UTC

svn commit: r741309 - in /lenya/trunk: org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/ org.apache.lenya.welcome/ org.apache.lenya.welcome/src/main/resources/COB-INF/

Author: andreas
Date: Thu Feb  5 21:46:49 2009
New Revision: 741309

URL: http://svn.apache.org/viewvc?rev=741309&view=rev
Log:
Adding sitemap component declarations and dependencies for global sitemap.

Added:
    lenya/trunk/org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/
    lenya/trunk/org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/lenya-core-components.xml
Modified:
    lenya/trunk/org.apache.lenya.welcome/pom.xml
    lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/sitemap.xmap

Added: lenya/trunk/org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/lenya-core-components.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/lenya-core-components.xml?rev=741309&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/lenya-core-components.xml (added)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/lenya-core-components.xml Thu Feb  5 21:46:49 2009
@@ -0,0 +1,26 @@
+<?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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  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">
+  <bean name="org.apache.cocoon.components.modules.input.InputModule/fallback"
+    class="org.apache.lenya.cms.cocoon.components.modules.input.FallbackModule">
+    <property name="protocol" value="fallback"/>
+  </bean>  
+</beans>

Modified: lenya/trunk/org.apache.lenya.welcome/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.welcome/pom.xml?rev=741309&r1=741308&r2=741309&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.welcome/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.welcome/pom.xml Thu Feb  5 21:46:49 2009
@@ -52,6 +52,8 @@
   </build>
   
   <dependencies>
+    
+    <!-- Cocoon -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
@@ -64,6 +66,8 @@
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
     </dependency>
+    
+    <!-- Lenya -->
     <dependency>
       <groupId>org.apache.lenya</groupId>
       <artifactId>lenya-core-api</artifactId>
@@ -76,5 +80,9 @@
       <groupId>org.apache.lenya</groupId>
       <artifactId>lenya-core-linking</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-usecase</artifactId>
+    </dependency>
   </dependencies>
 </project>

Modified: lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/sitemap.xmap?rev=741309&r1=741308&r2=741309&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/sitemap.xmap (original)
+++ lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/sitemap.xmap Thu Feb  5 21:46:49 2009
@@ -24,7 +24,7 @@
         <map:parameter name="locale" value="{request:locale}"/>
       </map:transform>    
       <map:transform src="fallback://lenya/xslt/util/page2xhtml.xsl"/>
-      <map:transform type="proxy"/>
+      <map:transform type="proxy-xhtml"/>
       <map:transform src="context://lenya/xslt/util/strip_namespaces.xsl"/>
     </map:resource>
   </map:resources>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org