Author: crossley
Date: Wed Apr 4 23:41:32 2007
New Revision: 525728
URL: http://svn.apache.org/viewvc?view=rev&rev=525728
Log:
Improve the explanation of entity-catalog parameters.
This was referring to the old default from when this xconf was at Cocoon.
Modified:
forrest/trunk/main/webapp/WEB-INF/properties/dev/core.properties
forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core-webapp.xconf
forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
Modified: forrest/trunk/main/webapp/WEB-INF/properties/dev/core.properties
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/properties/dev/core.properties?view=diff&rev=525728&r1=525727&r2=525728
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/properties/dev/core.properties (original)
+++ forrest/trunk/main/webapp/WEB-INF/properties/dev/core.properties Wed Apr 4
23:41:32 2007
@@ -16,4 +16,5 @@
# FIXME: FOR-917
# Testing gettting a property into forrest-core.xconf
# Try "10" for maximum messages from the catalog entity resolver.
+# See notes about verbosity levels in WEB-INF/xconf/forrest-core.xconf
org.apache.xml.resolver.verbosity=1
Modified: forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core-webapp.xconf
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core-webapp.xconf?view=diff&rev=525728&r1=525727&r2=525728
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core-webapp.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core-webapp.xconf Wed Apr
4 23:41:32 2007
@@ -332,23 +332,27 @@
<!--+
| Entity resolution catalogs
|
- | The default catalog is distributed at WEB-INF/entities/catalog
- | This is the contextual pathname for Cocoon resources.
- | You can override this path, if necessary, using the "catalog"
parameter:
+ | The following parameters are the system-wide configuration for Forrest.
|
- | <parameter name="catalog" value="WEB-INF/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
- | the system catalog.
- |
- | There are various ways to do local configuration.
+ | There are various ways to do local project-based configuration.
| See the Apache Forrest documentation:
| http://forrest.apache.org/docs/your-project.html
| http://forrest.apache.org/docs/validation.html
|
+ | Parameters:
+ |
+ | catalog:
+ | The default catalog for DTDs etc. that are shipped with Forrest.
+ |
+ | <parameter name="catalog" value="resources/schema/catalog.xcat"/>
+ |
+ | However, it is desirable to leave this default catalog config
+ | and declare your own local catalogs, which are loaded in addition to
+ | the system catalog.
+ |
| local-catalog:
| The full filesystem pathname to a single local catalog file.
+ | This catalog could also include nextCatalog instructions.
|
| <parameter name="local-catalog" value="/usr/local/sgml/mycatalog"/>
|
Modified: forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf?view=diff&rev=525728&r1=525727&r2=525728
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf Wed Apr 4
23:41:32 2007
@@ -326,23 +326,27 @@
<!--+
| Entity resolution catalogs
|
- | The default catalog is distributed at WEB-INF/entities/catalog
- | This is the contextual pathname for Cocoon resources.
- | You can override this path, if necessary, using the "catalog"
parameter:
+ | The following parameters are the system-wide configuration for Forrest.
|
- | <parameter name="catalog" value="WEB-INF/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
- | the system catalog.
- |
- | There are various ways to do local configuration.
+ | There are various ways to do local project-based configuration.
| See the Apache Forrest documentation:
| http://forrest.apache.org/docs/your-project.html
| http://forrest.apache.org/docs/validation.html
|
+ | Parameters:
+ |
+ | catalog:
+ | The default catalog for DTDs etc. that are shipped with Forrest.
+ |
+ | <parameter name="catalog" value="resources/schema/catalog.xcat"/>
+ |
+ | However, it is desirable to leave this default catalog config
+ | and declare your own local catalogs, which are loaded in addition to
+ | the system catalog.
+ |
| local-catalog:
| The full filesystem pathname to a single local catalog file.
+ | This catalog could also include nextCatalog instructions.
|
| <parameter name="local-catalog" value="/usr/local/sgml/mycatalog"/>
|
