You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/07/12 14:12:21 UTC
svn commit: r421253 - in /cocoon/trunk/core:
cocoon-core/src/main/java/org/apache/cocoon/components/resolver/
cocoon-core/src/main/resources/META-INF/legacy/xconf/
cocoon-webapp/src/main/webapp/WEB-INF/classes/
cocoon-webapp/src/main/webapp/WEB-INF/coc...
Author: cziegeler
Date: Wed Jul 12 05:12:20 2006
New Revision: 421253
URL: http://svn.apache.org/viewvc?rev=421253&view=rev
Log:
Move entities into cocoon sub directory
Added:
cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/
- copied from r421171, cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/entities/
Removed:
cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/entities/
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/resolver/DefaultResolver.java
cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-entity-resolver.xconf
cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/classes/CatalogManager.properties
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/resolver/DefaultResolver.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/resolver/DefaultResolver.java?rev=421253&r1=421252&r2=421253&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/resolver/DefaultResolver.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/resolver/DefaultResolver.java Wed Jul 12 05:12:20 2006
@@ -57,6 +57,6 @@
* Default catalog path
*/
protected String defaultCatalog() {
- return "WEB-INF/entities/catalog";
+ return "WEB-INF/cocoon/entities/catalog";
}
}
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-entity-resolver.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-entity-resolver.xconf?rev=421253&r1=421252&r2=421253&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-entity-resolver.xconf (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-entity-resolver.xconf Wed Jul 12 05:12:20 2006
@@ -24,7 +24,7 @@
| This is the contextual pathname for Cocoon resources.
| You can override this path, if necessary, using the "catalog" parameter:
|
- | <parameter name="catalog" value="WEB-INF/entities/catalog"/>
+ | <parameter name="catalog" value="WEB-INF/cocoon/entities/catalog"/>
|
| However, it is probably desirable to leave this default catalog config
| and declare your own local catalogs, which are loaded in addition to
@@ -53,7 +53,7 @@
| <parameter name="verbosity" value="2"/>
+-->
<entity-resolver logger="core.resolver">
- <parameter name="catalog" value="WEB-INF/entities/catalog"/>
+ <parameter name="catalog" value="WEB-INF/cocoon/entities/catalog"/>
<parameter name="verbosity" value="1"/>
</entity-resolver>
Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/classes/CatalogManager.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/classes/CatalogManager.properties?rev=421253&r1=421252&r2=421253&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/classes/CatalogManager.properties (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/classes/CatalogManager.properties Wed Jul 12 05:12:20 2006
@@ -40,7 +40,7 @@
# catalogs ... list of additional catalogs to load
# Note that Apache Cocoon will automatically load its own default catalog
-# from WEB-INF/entities/catalog
+# from WEB-INF/cocoon/entities/catalog
# use full pathnames
# pathname separator is always semi-colon (;) regardless of operating system
# directory separator is always slash (/) regardless of operating system