Author: thorsten
Date: Wed Dec 12 04:30:48 2007
New Revision: 603594
URL: http://svn.apache.org/viewvc?rev=603594&view=rev
Log:
Finishing up the block by adding components definitions
Added:
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/avalon/
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf
(with props)
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/properties/
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/properties/dispatcher.properties
(with props)
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml
(with props)
Modified:
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
Added:
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf?rev=603594&view=auto
==============================================================================
---
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf
(added)
+++
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf
Wed Dec 12 04:30:48 2007
@@ -0,0 +1,32 @@
+<?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:components xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
+ <map:transformers default="xslt">
+ <map:transformer name="i18n"
+ src="org.apache.cocoon.transformation.I18nTransformer">
+ <catalogues default="contracts">
+ <catalogue id="other" name="OtherMessages"
+ location="{lm:project.translations}"/>
+ <catalogue id="contracts" name="ContractsMessages"
+ location="{lm:project.translations}"/>
+ </catalogues>
+ <cache-at-startup>true</cache-at-startup>
+ </map:transformer>
+ </map:transformers>
+</map:components>
\ No newline at end of file
Propchange:
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Added:
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/properties/dispatcher.properties
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/properties/dispatcher.properties?rev=603594&view=auto
==============================================================================
---
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/properties/dispatcher.properties
(added)
+++
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/properties/dispatcher.properties
Wed Dec 12 04:30:48 2007
@@ -0,0 +1,7 @@
+dispatcher.theme=common
+dispatcher.theme-ext=.structurer.xml
+dispatcher.fallback.theme=common
+dispatcher.fallback.theme-ext=.structurer.xml
+dispatcher.caching=on
+dispatcher.contract.ext=.contract.xml
+dispatcher.panel.ext=.panel.xml
\ No newline at end of file
Propchange:
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/properties/dispatcher.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added:
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml?rev=603594&view=auto
==============================================================================
---
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml
(added)
+++
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml
Wed Dec 12 04:30:48 2007
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
+ "http://www.springframework.org/dtd/spring-beans-2.0.dtd";>
+<!--
+ 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>
+ <bean id="dispatcher"
+ name="org.apache.cocoon.transformation.Transformer/dispatcher"
+ class="org.apache.forrest.dispatcher.transformation.DispatcherTransformer">
+ <property name="manager"
ref="org.apache.avalon.framework.service.ServiceManager"/>
+ </bean>
+</beans>
Propchange:
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/spring/servlet-service.xml?rev=603594&r1=603593&r2=603594&view=diff
==============================================================================
---
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
(original)
+++
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
Wed Dec 12 04:30:48 2007
@@ -18,16 +18,20 @@
und
-->
<!--+
- | @version $Id: servlet-service.xml 578865 2007-09-24 16:09:46Z reinhard $
+ | @version $Id: servlet-service.xml 523714 2007-03-29 13:54:20Z
gkossakowski $
+-->
<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.0.xsd
http://cocoon.apache.org/schema/servlet
http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd";>
-
- <bean id="org.apache.forrest.dispatcher.service"
class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/dispatcher"
context-path="blockcontext:/dispatcher/"/>
+
+ <bean id="org.apache.forrest.dispatcher.block"
class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/dispatcher"
context-path="blockcontext:/dispatcher/">
+ <servlet:connections>
+ <entry key="propertiesGenerator"
value-ref="org.apache.forrest.propertiesGenerator.block"/>
+ </servlet:connections>
+ </servlet:context>
</bean>
-
+
</beans>
