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 20:14:55 UTC
svn commit: r491077 - in /cocoon/trunk:
core/cocoon-core/src/main/resources/META-INF/
core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/
core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/
core/...
Author: cziegeler
Date: Fri Dec 29 11:14:54 2006
New Revision: 491077
URL: http://svn.apache.org/viewvc?view=rev&rev=491077
Log:
Use better namespace for other elements as well
Modified:
cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.handlers
cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas
cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd
cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/sitemap.xsd
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/SitemapNamespaceHandler.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonNamespaceHandler.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
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-core/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.handlers?view=diff&rev=491077&r1=491076&r2=491077
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.handlers (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.handlers Fri Dec 29 11:14:54 2006
@@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-http\://cocoon.apache.org/sitemap=org.apache.cocoon.core.container.spring.SitemapNamespaceHandler
-http\://cocoon.apache.org/avalon=org.apache.cocoon.core.container.spring.avalon.AvalonNamespaceHandler
+http\://cocoon.apache.org/schema/sitemap=org.apache.cocoon.core.container.spring.SitemapNamespaceHandler
+http\://cocoon.apache.org/schema/avalon=org.apache.cocoon.core.container.spring.avalon.AvalonNamespaceHandler
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas?view=diff&rev=491077&r1=491076&r2=491077
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas Fri Dec 29 11:14:54 2006
@@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-http\://cocoon.apache.org/sitemap.xsd=org/apache/cocoon/core/container/spring/sitemap.xsd
-http\://cocoon.apache.org/avalon.xsd=org/apache/cocoon/core/container/spring/avalon/avalon.xsd
+http\://cocoon.apache.org/schema/sitemap/cocoon-sitemap-1.0.xsd=org/apache/cocoon/core/container/spring/sitemap.xsd
+http\://cocoon.apache.org/schema/avalon/cocoon-avalon-1.0.xsd=org/apache/cocoon/core/container/spring/avalon/avalon.xsd
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd?view=diff&rev=491077&r1=491076&r2=491077
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd Fri Dec 29 11:14:54 2006
@@ -16,8 +16,8 @@
limitations under the License.
-->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://cocoon.apache.org/avalon"
- xmlns:tns="http://cocoon.apache.org/avalon">
+ targetNamespace="http://cocoon.apache.org/schema/avalon"
+ xmlns:tns="http://cocoon.apache.org/schema/avalon">
<xsd:element name="avalon" type="tns:avalonType"/>
<xsd:element name="sitemap" type="tns:sitemapType"/>
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/sitemap.xsd
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/sitemap.xsd?view=diff&rev=491077&r1=491076&r2=491077
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/sitemap.xsd (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/sitemap.xsd Fri Dec 29 11:14:54 2006
@@ -17,8 +17,8 @@
-->
<!-- @version $Id$ -->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://cocoon.apache.org/sitemap"
- xmlns:tns="http://cocoon.apache.org/sitemap">
+ targetNamespace="http://cocoon.apache.org/schema/sitemap"
+ xmlns:tns="http://cocoon.apache.org/schema/sitemap">
<xsd:element name="sitemap" type="tns:sitemapType"/>
<xsd:complexType name="sitemapType">
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/SitemapNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/SitemapNamespaceHandler.java?view=diff&rev=491077&r1=491076&r2=491077
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/SitemapNamespaceHandler.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/SitemapNamespaceHandler.java Fri Dec 29 11:14:54 2006
@@ -23,7 +23,7 @@
/**
* Spring namespace handler for the sitemap namespace.
* Currently this namespace defines the following elements
- * (in the namespace "http://cocoon.apache.org/sitemap"):
+ * (in the namespace "http://cocoon.apache.org/schema/sitemap"):
* "sitemap" : This sets up a sub context for a sitemap.
*
* @version $Id$
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonNamespaceHandler.java?view=diff&rev=491077&r1=491076&r2=491077
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonNamespaceHandler.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonNamespaceHandler.java Fri Dec 29 11:14:54 2006
@@ -29,7 +29,7 @@
/**
* Spring namespace handler for the cocoon avalon namespace.
* Currently this namespace defines the following elements
- * (in the namespace "http://cocoon.apache.org/avalon"):
+ * (in the namespace "http://cocoon.apache.org/schema/avalon"):
* "avalon" : This adds all Avalon configured components to the bean factory.
* (Attribute location is required)
*
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java?view=diff&rev=491077&r1=491076&r2=491077
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java Fri Dec 29 11:14:54 2006
@@ -126,12 +126,12 @@
buffer.append("<beans xmlns=\"http://www.springframework.org/schema/beans\"");
buffer.append(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");
buffer.append(" xmlns:util=\"http://www.springframework.org/schema/util\"");
- buffer.append(" xmlns:cocoon=\"http://cocoon.apache.org/sitemap\"");
- buffer.append(" xmlns:avalon=\"http://cocoon.apache.org/avalon\"");
+ buffer.append(" xmlns:cocoon=\"http://cocoon.apache.org/schema/sitemap\"");
+ buffer.append(" xmlns:avalon=\"http://cocoon.apache.org/schema/avalon\"");
buffer.append(" xsi:schemaLocation=\"http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd");
buffer.append(" http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd");
- buffer.append(" http://cocoon.apache.org/sitemap http://cocoon.apache.org/sitemap.xsd");
- buffer.append(" http://cocoon.apache.org/avalon http://cocoon.apache.org/avalon.xsd\">\n");
+ buffer.append(" http://cocoon.apache.org/schema/sitemap http://cocoon.apache.org/schema/sitemap/cocoon-sitemap-1.0.xsd");
+ buffer.append(" http://cocoon.apache.org/schema/avalon http://cocoon.apache.org/schema/avalon/cocoon-avalon-1.0.xsd\">\n");
}
protected static void addFooter(StringBuffer buffer) {
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=491077&r1=491076&r2=491077
==============================================================================
--- 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 11:14:54 2006
@@ -20,11 +20,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:configurator="http://cocoon.apache.org/schema/configurator"
- xmlns:avalon="http://cocoon.apache.org/avalon"
+ xmlns:avalon="http://cocoon.apache.org/schema/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/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.xsd
- http://cocoon.apache.org/avalon http://cocoon.apache.org/avalon.xsd">
+ http://cocoon.apache.org/schema/avalon http://cocoon.apache.org/schema/avalon/cocoon-avalon-1.0.xsd">
<!-- Activate Cocoon Spring Configurator -->
<configurator:settings/>
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=491077&r1=491076&r2=491077
==============================================================================
--- 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 11:14:54 2006
@@ -20,11 +20,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:configurator="http://cocoon.apache.org/schema/configurator"
- xmlns:avalon="http://cocoon.apache.org/avalon"
+ xmlns:avalon="http://cocoon.apache.org/schema/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/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.xsd
- http://cocoon.apache.org/avalon http://cocoon.apache.org/avalon.xsd">
+ http://cocoon.apache.org/schema/avalon http://cocoon.apache.org/schema/avalon/cocoon-avalon-1.0.xsd">
<!-- Activate Cocoon Spring Configurator -->
<configurator:settings/>
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=491077&r1=491076&r2=491077
==============================================================================
--- 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 11:14:54 2006
@@ -20,11 +20,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:configurator="http://cocoon.apache.org/schema/configurator"
- xmlns:avalon="http://cocoon.apache.org/avalon"
+ xmlns:avalon="http://cocoon.apache.org/schema/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/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.xsd
- http://cocoon.apache.org/avalon http://cocoon.apache.org/avalon.xsd">
+ http://cocoon.apache.org/schema/avalon http://cocoon.apache.org/schema/avalon/cocoon-avalon-1.0.xsd">
<!-- Activate Cocoon Spring Configurator -->
<configurator:settings/>
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=491077&r1=491076&r2=491077
==============================================================================
--- 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 11:14:54 2006
@@ -20,11 +20,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:configurator="http://cocoon.apache.org/schema/configurator"
- xmlns:avalon="http://cocoon.apache.org/avalon"
+ xmlns:avalon="http://cocoon.apache.org/schema/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/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.xsd
- http://cocoon.apache.org/avalon http://cocoon.apache.org/avalon.xsd">
+ http://cocoon.apache.org/schema/avalon http://cocoon.apache.org/schema/avalon/cocoon-avalon-1.0.xsd">
<!-- Activate Cocoon Spring Configurator -->
<configurator:settings/>