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/24 16:30:44 UTC
svn commit: r490034 - in /cocoon/trunk/core: ./ cocoon-core/
cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/
cocoon-core/src/main/java/org/apache/cocoon/util/ cocoon-spring/
cocoon-spring/src/ cocoon-spring/src/main/ cocoon-spring/sr...
Author: cziegeler
Date: Sun Dec 24 07:30:42 2006
New Revision: 490034
URL: http://svn.apache.org/viewvc?view=rev&rev=490034
Log:
Start making the spring support an own module.
This is only the initial commit which is still compilable/usable. The updates will follow in the next days.
Added:
cocoon/trunk/core/cocoon-spring/ (with props)
cocoon/trunk/core/cocoon-spring/pom.xml (with props)
cocoon/trunk/core/cocoon-spring/src/
cocoon/trunk/core/cocoon-spring/src/main/
cocoon/trunk/core/cocoon-spring/src/main/java/
cocoon/trunk/core/cocoon-spring/src/main/java/org/
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java
- copied unchanged from r490021, cocoon/trunk/core/cocoon-core/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/AbstractSettingsBeanFactoryPostProcessor.java
- copied unchanged from r490021, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AbstractSettingsBeanFactoryPostProcessor.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java
- copied, changed from r490021, cocoon/trunk/core/cocoon-core/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/CocoonPropertyOverrideConfigurer.java
- copied unchanged from r490021, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonWebApplicationContext.java
- copied unchanged from r490021, cocoon/trunk/core/cocoon-core/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/Constants.java
- copied unchanged from r490021, cocoon/trunk/core/cocoon-core/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/Container.java
- copied unchanged from r490021, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Container.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ResourceUtils.java
- copied unchanged from r490021, cocoon/trunk/core/cocoon-core/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/RunningModeHelper.java
- copied unchanged from r490021, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/RunningModeHelper.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ServletContextFactoryBean.java
- copied unchanged from r490021, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ServletContextFactoryBean.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java
- copied unchanged from r490021, cocoon/trunk/core/cocoon-core/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
- copied unchanged from r490021, cocoon/trunk/core/cocoon-core/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
- copied unchanged from r490021, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsProperties.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java
- copied unchanged from r490021, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java
cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/ClassUtils.java
- copied unchanged from r490021, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/ClassUtils.java
Removed:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AbstractSettingsBeanFactoryPostProcessor.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
cocoon/trunk/core/cocoon-core/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/Constants.java
cocoon/trunk/core/cocoon-core/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/ResourceUtils.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/RunningModeHelper.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ServletContextFactoryBean.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsProperties.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/ClassUtils.java
Modified:
cocoon/trunk/core/cocoon-core/pom.xml
cocoon/trunk/core/pom.xml
Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/pom.xml?view=diff&rev=490034&r1=490033&r2=490034
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Sun Dec 24 07:30:42 2006
@@ -107,6 +107,11 @@
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-spring</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-configuration-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
Propchange: cocoon/trunk/core/cocoon-spring/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Dec 24 07:30:42 2006
@@ -0,0 +1,4 @@
+.project
+.settings
+.classpath
+target
Added: cocoon/trunk/core/cocoon-spring/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/pom.xml?view=auto&rev=490034
==============================================================================
--- cocoon/trunk/core/cocoon-spring/pom.xml (added)
+++ cocoon/trunk/core/cocoon-spring/pom.xml Sun Dec 24 07:30:42 2006
@@ -0,0 +1,301 @@
+<?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$
+ +-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+ <parent>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core-modules</artifactId>
+ <version>3-SNAPSHOT</version>
+ </parent>
+ <artifactId>cocoon-spring</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>Cocoon Spring</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-configuration-impl</artifactId>
+ <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>
+ <exclusions>
+ <exclusion>
+ <artifactId>logkit</artifactId>
+ <groupId>logkit</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>avalon-framework</artifactId>
+ <groupId>avalon-framework</groupId>
+ </exclusion>
+ </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>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <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>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: cocoon/trunk/core/cocoon-spring/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/core/cocoon-spring/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Copied: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java (from r490021, cocoon/trunk/core/cocoon-core/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=490034&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java&r1=490021&p2=cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java&r2=490034
==============================================================================
--- cocoon/trunk/core/cocoon-core/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 Sun Dec 24 07:30:42 2006
@@ -18,6 +18,8 @@
*/
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;
/**
@@ -39,6 +41,11 @@
*/
public void init() {
registerBeanDefinitionParser("settings", new SettingsElementParser());
- registerBeanDefinitionParser("sitemap", new SitemapElementParser());
+ 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/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/pom.xml?view=diff&rev=490034&r1=490033&r2=490034
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Sun Dec 24 07:30:42 2006
@@ -38,6 +38,7 @@
<module>cocoon-core</module>
<module>cocoon-environment</module>
<module>cocoon-pipeline</module>
+ <module>cocoon-spring</module>
<module>cocoon-store</module>
<module>cocoon-thread</module>
<module>cocoon-util</module>