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/12/29 19:42:37 UTC
svn commit: r491074 - in /cocoon/trunk:
core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/impl/
core/cocoon-configuration/cocoon-spring-configurator/src/main/resources/META-INF/
core/cocoon-configuration/cocoon...
Author: cziegeler
Date: Fri Dec 29 10:42:37 2006
New Revision: 491074
URL: http://svn.apache.org/viewvc?view=rev&rev=491074
Log:
Use better namespace for configurator
Modified:
cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/impl/CocoonNamespaceHandler.java
cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/resources/META-INF/spring.handlers
cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/resources/META-INF/spring.schemas
cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/resources/org/apache/cocoon/spring/impl/cocoon.xsd
cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml
cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/applicationContext.xml
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/applicationContext.xml
Modified: cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/impl/CocoonNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/impl/CocoonNamespaceHandler.java?view=diff&rev=491074&r1=491073&r2=491074
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/impl/CocoonNamespaceHandler.java (original)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/impl/CocoonNamespaceHandler.java Fri Dec 29 10:42:37 2006
@@ -23,7 +23,7 @@
/**
* Spring namespace handler for the cocoon core namespace.
* Currently this namespace defines the following elements
- * (in the namespace "http://cocoon.apache.org/core"):
+ * (in the namespace "http://cocoon.apache.org/schema/configurator"):
* "settings" : This sets up the Cocoon Settings object (by reading the property
* files located under /WEB-INF/cocoon/properties.
* By specifying the attribute "processorClassName" an own implementation
Modified: cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/resources/META-INF/spring.handlers?view=diff&rev=491074&r1=491073&r2=491074
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/resources/META-INF/spring.handlers (original)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/resources/META-INF/spring.handlers Fri Dec 29 10:42:37 2006
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-http\://cocoon.apache.org/core=org.apache.cocoon.spring.impl.CocoonNamespaceHandler
+http\://cocoon.apache.org/schema/configurator=org.apache.cocoon.spring.impl.CocoonNamespaceHandler
Modified: cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/resources/META-INF/spring.schemas?view=diff&rev=491074&r1=491073&r2=491074
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/resources/META-INF/spring.schemas (original)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/resources/META-INF/spring.schemas Fri Dec 29 10:42:37 2006
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-http\://cocoon.apache.org/core.xsd=org/apache/cocoon/spring/impl/cocoon.xsd
+http\://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.xsd=org/apache/cocoon/spring/impl/cocoon.xsd
Modified: cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/resources/org/apache/cocoon/spring/impl/cocoon.xsd
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/resources/org/apache/cocoon/spring/impl/cocoon.xsd?view=diff&rev=491074&r1=491073&r2=491074
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/resources/org/apache/cocoon/spring/impl/cocoon.xsd (original)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/resources/org/apache/cocoon/spring/impl/cocoon.xsd Fri Dec 29 10:42:37 2006
@@ -17,8 +17,8 @@
-->
<!-- @version $Id$ -->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://cocoon.apache.org/core"
- xmlns:tns="http://cocoon.apache.org/core">
+ targetNamespace="http://cocoon.apache.org/schema/configurator"
+ xmlns:tns="http://cocoon.apache.org/schema/configurator">
<xsd:element name="settings" type="tns:settingsType"/>
Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml?view=diff&rev=491074&r1=491073&r2=491074
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml Fri Dec 29 10:42:37 2006
@@ -19,15 +19,15 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
- xmlns:cocoon="http://cocoon.apache.org/core"
+ xmlns:configurator="http://cocoon.apache.org/schema/configurator"
xmlns:avalon="http://cocoon.apache.org/avalon"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
- http://cocoon.apache.org/core http://cocoon.apache.org/core.xsd
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.xsd
http://cocoon.apache.org/avalon http://cocoon.apache.org/avalon.xsd">
- <!-- Load all the properties for Cocoon -->
- <cocoon:settings/>
+ <!-- Activate Cocoon Spring Configurator -->
+ <configurator:settings/>
<!-- Load Avalon configurations
If you want to use a different logger than the default log4j logger,
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml?view=diff&rev=491074&r1=491073&r2=491074
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml Fri Dec 29 10:42:37 2006
@@ -19,15 +19,15 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
- xmlns:cocoon="http://cocoon.apache.org/core"
+ xmlns:configurator="http://cocoon.apache.org/schema/configurator"
xmlns:avalon="http://cocoon.apache.org/avalon"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
- http://cocoon.apache.org/core http://cocoon.apache.org/core.xsd
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.xsd
http://cocoon.apache.org/avalon http://cocoon.apache.org/avalon.xsd">
- <!-- Load all the properties for Cocoon -->
- <cocoon:settings/>
+ <!-- Activate Cocoon Spring Configurator -->
+ <configurator:settings/>
<!-- Load Avalon configurations
If you want to use a different logger than the default log4j logger,
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/applicationContext.xml
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/applicationContext.xml?view=diff&rev=491074&r1=491073&r2=491074
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/applicationContext.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/applicationContext.xml Fri Dec 29 10:42:37 2006
@@ -19,15 +19,15 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
- xmlns:cocoon="http://cocoon.apache.org/core"
+ xmlns:configurator="http://cocoon.apache.org/schema/configurator"
xmlns:avalon="http://cocoon.apache.org/avalon"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
- http://cocoon.apache.org/core http://cocoon.apache.org/core.xsd
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.xsd
http://cocoon.apache.org/avalon http://cocoon.apache.org/avalon.xsd">
- <!-- Load all the properties for Cocoon -->
- <cocoon:settings/>
+ <!-- Activate Cocoon Spring Configurator -->
+ <configurator:settings/>
<!-- Load Avalon configurations
If you want to use a different logger than the default log4j logger,
Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/applicationContext.xml?view=diff&rev=491074&r1=491073&r2=491074
==============================================================================
--- cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/applicationContext.xml (original)
+++ cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/applicationContext.xml Fri Dec 29 10:42:37 2006
@@ -19,15 +19,15 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
- xmlns:cocoon="http://cocoon.apache.org/core"
+ xmlns:configurator="http://cocoon.apache.org/schema/configurator"
xmlns:avalon="http://cocoon.apache.org/avalon"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
- http://cocoon.apache.org/core http://cocoon.apache.org/core.xsd
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.xsd
http://cocoon.apache.org/avalon http://cocoon.apache.org/avalon.xsd">
- <!-- Load all the properties for Cocoon -->
- <cocoon:settings/>
+ <!-- Activate Cocoon Spring Configurator -->
+ <configurator:settings/>
<!-- Load Avalon configurations
If you want to use a different logger than the default log4j logger,