You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@apache.org on 2006/07/14 20:15:24 UTC
svn commit: r421974 - in
/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF:
./ cocoon/ cocoon/properties/ properties/
Author: giacomo
Date: Fri Jul 14 11:15:23 2006
New Revision: 421974
URL: http://svn.apache.org/viewvc?rev=421974&view=rev
Log:
has been moved recently
Added:
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/cocoon.xconf (contents, props changed)
- copied, changed from r421582, cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon.xconf
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/log4j.xconf (props changed)
- copied unchanged from r421582, cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/log4j.xconf
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/properties/
- copied from r421582, cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/properties/
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/properties/core.properties
- copied unchanged from r421972, cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/properties/core.properties
Removed:
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon.xconf
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/log4j.xconf
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/properties/
Copied: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/cocoon.xconf (from r421582, cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon.xconf)
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/cocoon.xconf?p2=cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/cocoon.xconf&p1=cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon.xconf&r1=421582&r2=421974&rev=421974&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon.xconf (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/cocoon.xconf Fri Jul 14 11:15:23 2006
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<cocoon version="2.2">
-
- <!--+
- | Include the core roles definitions. This is for the sake of clarity,
- | as they are implicitely loaded at startup, but we may want to remove
- | this implicit behaviour in the future now that we have the include
- | mechanism.
- +-->
- <include src="resource://org/apache/cocoon/cocoon.roles"/>
-
- <!--+
- | Include all configuration files ending with ".xconf"
- | from the xconf directory.
- +-->
- <include dir="context://WEB-INF/xconf" pattern="*.xconf"/>
-
- <!--+
- | Include all configuration files ending with ".xmap"
- | 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"/>
-
- $devblocks:{ devblock |
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<cocoon version="2.2">
+
+ <!--+
+ | Include the core roles definitions. This is for the sake of clarity,
+ | as they are implicitely loaded at startup, but we may want to remove
+ | this implicit behaviour in the future now that we have the include
+ | mechanism.
+ +-->
+ <include src="resource://org/apache/cocoon/cocoon.roles"/>
+
+ <!--+
+ | Include all configuration files ending with ".xconf"
+ | from the xconf directory.
+ +-->
+ <include dir="context://WEB-INF/xconf" pattern="*.xconf"/>
+
+ <!--+
+ | Include all configuration files ending with ".xmap"
+ | 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"/>
+
+ $devblocks:{ devblock |
$if(devblock.springConfPath)$
<include-beans dir="$devblock.springConfPath$" pattern="*.xml"/>
$endif$
@@ -51,7 +51,7 @@
$if(devblock.sitemapAdditionsConfPath)$
<include dir="$devblock.sitemapAdditionsConfPath$" pattern="*.xmap"/>
- $endif$
- }$
-
-</cocoon>
+ $endif$
+ }$
+
+</cocoon>
Propchange: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/cocoon.xconf
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/log4j.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/log4j.xconf
------------------------------------------------------------------------------
svn:keywords = Id