You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2006/06/04 15:28:38 UTC
svn commit: r411554 - in
/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF:
legacy/cocoon.xconf spring/ spring/cocoon-core-applicationContext.xml
Author: reinhard
Date: Sun Jun 4 06:28:38 2006
New Revision: 411554
URL: http://svn.apache.org/viewvc?rev=411554&view=rev
Log:
add an empty Spring bean configuration file and include all .xml files in WEB-INF\spring as beans
Added:
cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring/
cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring/cocoon-core-applicationContext.xml
Modified:
cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/cocoon.xconf
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/cocoon.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/cocoon.xconf?rev=411554&r1=411553&r2=411554&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/cocoon.xconf (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/cocoon.xconf Sun Jun 4 06:28:38 2006
@@ -36,6 +36,11 @@
| from the sitemap-additions directory.
+-->
<include dir="context://WEB-INF/sitemap-additions" pattern="*.xmap"/>
-
+ <!--+
+ | Include Spring beans definition files ending with ".xml" from
+ | the spring directory.
+ +-->
+ <include-beans dir="context://WEB-INF/spring" pattern="*.xml"/>
+
</cocoon>
Added: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring/cocoon-core-applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring/cocoon-core-applicationContext.xml?rev=411554&view=auto
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring/cocoon-core-applicationContext.xml (added)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring/cocoon-core-applicationContext.xml Sun Jun 4 06:28:38 2006
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed 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.
+-->
+
+<!-- @version $Id: applicationContext.xml 387946 2006-03-22 21:07:56Z cziegeler $ -->
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans/>
\ No newline at end of file