cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r490150 - in /cocoon/trunk/core: cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ cocoon-core/src/main/resources/META-INF/ cocoon-core/src/main/reso...
Date Mon, 25 Dec 2006 14:07:31 GMT
Author: cziegeler
Date: Mon Dec 25 06:07:29 2006
New Revision: 490150

URL: http://svn.apache.org/viewvc?view=rev&rev=490150
Log:
Clean up spring module

Added:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonWebApplicationContext.java
      - copied unchanged from r490034, cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonWebApplicationContext.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Container.java
      - copied unchanged from r490034, cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/Container.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapNamespaceHandler.java
  (with props)
    cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/sitemap.xsd
  (contents, props changed)
      - copied, changed from r490021, cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd
    cocoon/trunk/core/cocoon-spring/src/main/resources/
    cocoon/trunk/core/cocoon-spring/src/main/resources/META-INF/
    cocoon/trunk/core/cocoon-spring/src/main/resources/META-INF/spring.handlers
    cocoon/trunk/core/cocoon-spring/src/main/resources/META-INF/spring.schemas
    cocoon/trunk/core/cocoon-spring/src/main/resources/org/
    cocoon/trunk/core/cocoon-spring/src/main/resources/org/apache/
    cocoon/trunk/core/cocoon-spring/src/main/resources/org/apache/cocoon/
    cocoon/trunk/core/cocoon-spring/src/main/resources/org/apache/cocoon/core/
    cocoon/trunk/core/cocoon-spring/src/main/resources/org/apache/cocoon/core/container/
    cocoon/trunk/core/cocoon-spring/src/main/resources/org/apache/cocoon/core/container/spring/
    cocoon/trunk/core/cocoon-spring/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd
  (with props)
Removed:
    cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd
    cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonWebApplicationContext.java
    cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/Container.java
Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
    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
  (props changed)
    cocoon/trunk/core/cocoon-spring/pom.xml
    cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java
    cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java
    cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/Constants.java
    cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ResourceUtils.java
    cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java
    cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java
    cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsProperties.java

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java?view=diff&rev=490150&r1=490149&r2=490150
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java
Mon Dec 25 06:07:29 2006
@@ -39,7 +39,7 @@
  * Add a bean definition for the settings object of a child context to the bean factory
  * and process all includes of spring configurations.
  *
- * @see CocoonNamespaceHandler
+ * @see SitemapNamespaceHandler
  * @see SubSettingsBeanFactoryPostProcessor
  * @version $Id$
  * @since 2.2

Added: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapNamespaceHandler.java?view=auto&rev=490150
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapNamespaceHandler.java
(added)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapNamespaceHandler.java
Mon Dec 25 06:07:29 2006
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.cocoon.core.container.spring;
+
+import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+
+/**
+ * Spring namespace handler for the sitemap namespace.
+ * Currently this namespace defines the following elements
+ * (in the namespace "http://cocoon.apache.org/sitemap"):
+ * "sitemap" : This sets up a sub context for a sitemap.
+ *
+ * @version $Id$
+ * @since 2.2
+ */
+public class SitemapNamespaceHandler extends NamespaceHandlerSupport {
+
+    /**
+     * @see org.springframework.beans.factory.xml.NamespaceHandler#init()
+     */
+    public void init() {
+        registerBeanDefinitionParser("sitemap", new SitemapElementParser());
+    }
+}

Propchange: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapNamespaceHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapNamespaceHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java?view=diff&rev=490150&r1=490149&r2=490150
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
Mon Dec 25 06:07:29 2006
@@ -126,11 +126,11 @@
         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/core\"");
+        buffer.append(" xmlns:cocoon=\"http://cocoon.apache.org/sitemap\"");
         buffer.append(" xmlns:avalon=\"http://cocoon.apache.org/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/core http://cocoon.apache.org/core.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");
     }
 

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=490150&r1=490149&r2=490150
==============================================================================
--- 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 Mon Dec 25 06:07:29
2006
@@ -13,9 +13,5 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-# This file contains the default settings for Cocoon.
-# You should NOT change this file directly. Create your own properties
-# file and put it in the sub directories for the mode you are running
-# Cocoon in.
-http\://cocoon.apache.org/core=org.apache.cocoon.core.container.spring.CocoonNamespaceHandler
+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

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=490150&r1=490149&r2=490150
==============================================================================
--- 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 Mon Dec 25 06:07:29
2006
@@ -13,9 +13,5 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-# This file contains the default settings for Cocoon.
-# You should NOT change this file directly. Create your own properties
-# file and put it in the sub directories for the mode you are running
-# Cocoon in.
-http\://cocoon.apache.org/core.xsd=org/apache/cocoon/core/container/spring/cocoon.xsd
+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

Propchange: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd
------------------------------------------------------------------------------
    svn:keywords = Id

Copied: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/sitemap.xsd
(from r490021, cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.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=490150&p1=cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd&r1=490021&p2=cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/sitemap.xsd&r2=490150
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/sitemap.xsd
Mon Dec 25 06:07:29 2006
@@ -17,15 +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">
-
-    <xsd:element name="settings" type="tns:settingsType"/>
-
-    <xsd:complexType name="settingsType">
-    	<xsd:attribute name="processorClassName" type="xsd:string" use="optional"></xsd:attribute>
-    	<xsd:attribute name="runningMode" type="xsd:string" use="optional"></xsd:attribute>
-    </xsd:complexType>
+            targetNamespace="http://cocoon.apache.org/sitemap"
+            xmlns:tns="http://cocoon.apache.org/sitemap">
 
     <xsd:element name="sitemap" type="tns:sitemapType"/>
     <xsd:complexType name="sitemapType">

Propchange: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/sitemap.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/sitemap.xsd
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/core/cocoon-spring/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/pom.xml?view=diff&rev=490150&r1=490149&r2=490150
==============================================================================
--- cocoon/trunk/core/cocoon-spring/pom.xml (original)
+++ cocoon/trunk/core/cocoon-spring/pom.xml Mon Dec 25 06:07:29 2006
@@ -38,115 +38,6 @@
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-environment-impl</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-pipeline-api</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-thread-api</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-    </dependency>
-    <!--  excalibur -->
-    <dependency>
-      <groupId>org.apache.excalibur.components.pool</groupId>
-      <artifactId>excalibur-pool-api</artifactId>
-      <version>2.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.avalon.logkit</groupId>
-          <artifactId>avalon-logkit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.containerkit.logger</groupId>
-      <artifactId>excalibur-logger</artifactId>
-      <version>2.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>avalon-logkit</groupId>
-          <artifactId>avalon-logkit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.avalon.logkit</groupId>
-          <artifactId>avalon-logkit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components.store</groupId>
-      <artifactId>excalibur-store</artifactId>
-      <version>2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-impl</artifactId>
-      <version>4.3</version>
-      <exclusions>
-        <exclusion>
-          <groupId>avalon-logkit</groupId>
-          <artifactId>avalon-logkit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <!-- commons -->
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.2</version>
-    </dependency>
-    <!--dependency>
-      <groupId>org.apache.commons</groupId> 
-      <artifactId>commons-jci-core</artifactId> 
-      <version>1.0-SNAPSHOT</version> 
-    </dependency-->
-    <dependency>
-      <groupId>commons-jxpath</groupId>
-      <artifactId>commons-jxpath</artifactId>
-      <version>1.2</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>ant-optional</artifactId>
-          <groupId>ant-optional</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>commons-beanutils</artifactId>
-          <groupId>commons-beanutils</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jdom</artifactId>
-          <groupId>jdom</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>servlet</artifactId>
-          <groupId>javax.servlet</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>servletapi</artifactId>
-          <groupId>servletapi</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>xerces</artifactId>
-          <groupId>xerces</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>ant-optional</artifactId>
-          <groupId>ant</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0.4</version>
@@ -162,58 +53,12 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>commons-jexl</groupId>
-      <artifactId>commons-jexl</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-      <version>2.7.0</version>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.8.0</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>xml-apis</artifactId>
-          <groupId>xml-apis</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.3.02</version>
-    </dependency>
-    <dependency>
-      <groupId>xml-resolver</groupId>
-      <artifactId>xml-resolver</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>jakarta-regexp</groupId>
-      <artifactId>jakarta-regexp</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.13</version>
-    </dependency>
-    <dependency>
-      <groupId>jakarta-bcel</groupId>
-      <artifactId>jakarta-bcel</artifactId>
-      <version>20040329</version>
-    </dependency>
-    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
       <version>2.0.1</version>
@@ -238,50 +83,6 @@
       <artifactId>spring-web</artifactId>
       <version>2.0.1</version>
     </dependency>             
-    <!--  test dependencies  -->
-    <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
-      <version>0.8</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>jmock</groupId>
-      <artifactId>jmock</artifactId>
-      <version>1.0.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
-    <!--  runtime dependencies  -->
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-pipeline-impl</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-store-impl</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-thread-impl</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
   <reporting>
     <plugins>

Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java?view=diff&rev=490150&r1=490149&r2=490150
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java
(original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java
Mon Dec 25 06:07:29 2006
@@ -38,7 +38,7 @@
 import org.w3c.dom.Element;
 
 /**
- * This is a base class for all bean definition parser used in Cocoon. It
+ * This is a base class for all bean definition parsers used in Cocoon. It
  * provides some utility methods.
  * 
  * @version $Id: AbstractElementParser.java 463297 2006-10-12 16:03:45Z

Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java?view=diff&rev=490150&r1=490149&r2=490150
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java
(original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java
Mon Dec 25 06:07:29 2006
@@ -18,8 +18,6 @@
  */
 package org.apache.cocoon.core.container.spring;
 
-import org.apache.cocoon.util.ClassUtils;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
@@ -41,11 +39,5 @@
      */
     public void init() {
         registerBeanDefinitionParser("settings", new SettingsElementParser());
-        try {
-            registerBeanDefinitionParser("sitemap", (BeanDefinitionParser) ClassUtils.newInstance("org.apache.cocoon.core.container.spring.SitemapElementParser"));
-        } catch (Exception e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
     }
 }

Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/Constants.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/Constants.java?view=diff&rev=490150&r1=490149&r2=490150
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/Constants.java
(original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/Constants.java
Mon Dec 25 06:07:29 2006
@@ -22,8 +22,10 @@
  * Some constants for the spring integration.
  * 
  * @version $Id$
+ * @since 2.2
  */
-public class Constants {
+public abstract class Constants {
+
     /** The default location of spring related configuration files. */
     public static final String DEFAULT_SPRING_CONFIGURATION_LOCATION = "classpath*:META-INF/cocoon/spring";
     public static final String DEFAULT_PROPERTIES_LOCATION = "classpath*:META-INF/cocoon/properties";

Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ResourceUtils.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ResourceUtils.java?view=diff&rev=490150&r1=490149&r2=490150
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ResourceUtils.java
(original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ResourceUtils.java
Mon Dec 25 06:07:29 2006
@@ -36,6 +36,7 @@
  * Utility class for Spring resource handling
  * 
  * @version $Id$
+ * @since 2.2
  */
 public class ResourceUtils {
 

Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java?view=diff&rev=490150&r1=490149&r2=490150
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java
(original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java
Mon Dec 25 06:07:29 2006
@@ -25,14 +25,12 @@
 import java.util.Iterator;
 import java.util.Properties;
 
-import org.apache.cocoon.Constants;
 import org.apache.cocoon.configuration.PropertyProvider;
 import org.apache.cocoon.configuration.Settings;
 import org.apache.cocoon.configuration.SettingsDefaults;
 import org.apache.cocoon.configuration.impl.DeploymentUtil;
 import org.apache.cocoon.configuration.impl.MutableSettings;
 import org.apache.cocoon.configuration.impl.PropertyHelper;
-import org.apache.cocoon.util.ClassUtils;
 
 /**
  * This is a bean factory post processor which handles all the settings stuff
@@ -156,7 +154,7 @@
             throw new IllegalArgumentException(msg);
         }
         */
-        this.servletContext.log("Apache Cocoon " + Constants.VERSION + " is running in mode:
" + mode);
+        this.servletContext.log("Apache Cocoon is running in mode: " + mode);
 
         // create an empty settings objects
         final MutableSettings s = new MutableSettings(mode);
@@ -274,7 +272,7 @@
                 if (this.logger.isDebugEnabled()) {
                     this.logger.debug("Loading class: " + fqcn);
                 }
-                ClassUtils.loadClass(fqcn).newInstance();
+                Thread.currentThread().getContextClassLoader().loadClass(fqcn).newInstance();
             } catch (Exception e) {
                 if (this.logger.isWarnEnabled()) {
                     this.logger.warn("Could not load class: " + fqcn + ". Continuing initialization.",
e);

Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java?view=diff&rev=490150&r1=490149&r2=490150
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java
(original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java
Mon Dec 25 06:07:29 2006
@@ -30,7 +30,7 @@
 /**
  * Add a bean definition for the settings object to the bean factory.
  * 
- * @see CocoonNamespaceHandler
+ * @see SitemapNamespaceHandler
  * @see SettingsBeanFactoryPostProcessor
  * @version $Id: SettingsElementParser.java 470732 2006-11-03 09:10:13Z
  *          cziegeler $

Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsProperties.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsProperties.java?view=diff&rev=490150&r1=490149&r2=490150
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsProperties.java
(original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsProperties.java
Mon Dec 25 06:07:29 2006
@@ -24,6 +24,7 @@
 
 /**
  * A properties implementation using the settings object.
+ * @since 2.2
  * @version $Id$
  */
 public class SettingsProperties extends Properties {

Added: cocoon/trunk/core/cocoon-spring/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/resources/META-INF/spring.handlers?view=auto&rev=490150
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/resources/META-INF/spring.handlers (added)
+++ cocoon/trunk/core/cocoon-spring/src/main/resources/META-INF/spring.handlers Mon Dec 25
06:07:29 2006
@@ -0,0 +1,16 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You 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.
+#
+http\://cocoon.apache.org/core=org.apache.cocoon.core.container.spring.CocoonNamespaceHandler

Added: cocoon/trunk/core/cocoon-spring/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/resources/META-INF/spring.schemas?view=auto&rev=490150
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/resources/META-INF/spring.schemas (added)
+++ cocoon/trunk/core/cocoon-spring/src/main/resources/META-INF/spring.schemas Mon Dec 25
06:07:29 2006
@@ -0,0 +1,16 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You 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.
+#
+http\://cocoon.apache.org/core.xsd=org/apache/cocoon/core/container/spring/cocoon.xsd

Added: cocoon/trunk/core/cocoon-spring/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd?view=auto&rev=490150
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd
(added)
+++ cocoon/trunk/core/cocoon-spring/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd
Mon Dec 25 06:07:29 2006
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<!-- @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">
+
+    <xsd:element name="settings" type="tns:settingsType"/>
+
+    <xsd:complexType name="settingsType">
+    	<xsd:attribute name="processorClassName" type="xsd:string" use="optional"></xsd:attribute>
+    	<xsd:attribute name="runningMode" type="xsd:string" use="optional"></xsd:attribute>
+    </xsd:complexType>
+</xsd:schema>
\ No newline at end of file

Propchange: cocoon/trunk/core/cocoon-spring/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/core/cocoon-spring/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message