You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2006/12/21 00:36:00 UTC
svn commit: r489224 - in /cocoon/trunk/core: ./
cocoon-blocks-fw/cocoon-blocks-fw-impl/ cocoon-common/ cocoon-common/src/
cocoon-common/src/main/ cocoon-common/src/main/java/
cocoon-common/src/main/java/org/ cocoon-common/src/main/java/org/apache/
coco...
Author: danielf
Date: Wed Dec 20 15:35:57 2006
New Revision: 489224
URL: http://svn.apache.org/viewvc?view=rev&rev=489224
Log:
Further work on splitting the core so that it becomes layered. Created a number of new modules:
* cocoon-common - classes needed everywhere: Constants, ProcessingException and their dependencies.
* cocoon-configuration - The Settings interface and implementation.
* cocoon-environment - The Cocoon environment API and the http implementation and some abstract base classes.
* cocoon-util - Part of the o.a.c.util package that is needed in the modules listed above.
Everything compiles and works for me.
Added:
cocoon/trunk/core/cocoon-common/ (with props)
cocoon/trunk/core/cocoon-common/pom.xml
cocoon/trunk/core/cocoon-common/src/
cocoon/trunk/core/cocoon-common/src/main/
cocoon/trunk/core/cocoon-common/src/main/java/
cocoon/trunk/core/cocoon-common/src/main/java/org/
cocoon/trunk/core/cocoon-common/src/main/java/org/apache/
cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/
cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/Constants.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Constants.java
cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/ConstantsInitializationException.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/ConstantsInitializationException.java
cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/ProcessingException.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/ProcessingException.java
cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/util/
- copied from r488426, cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/util/
cocoon/trunk/core/cocoon-configuration/
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/ (with props)
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/PropertyProvider.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/PropertyProvider.java
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/Settings.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/Settings.java
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/ (with props)
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/pom.xml
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/
- copied from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/
cocoon/trunk/core/cocoon-configuration/pom.xml
cocoon/trunk/core/cocoon-environment/
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/ (with props)
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/pom.xml
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/java/
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/java/org/
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/java/org/apache/
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/java/org/apache/cocoon/
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/java/org/apache/cocoon/environment/
- copied from r488426, cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/environment/
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/java/org/apache/cocoon/environment/Context.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/Context.java
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/java/org/apache/cocoon/environment/Cookie.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/Cookie.java
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/java/org/apache/cocoon/environment/ObjectModelHelper.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/ObjectModelHelper.java
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/java/org/apache/cocoon/environment/PermanentRedirector.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/PermanentRedirector.java
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/java/org/apache/cocoon/environment/Redirector.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/Redirector.java
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/java/org/apache/cocoon/environment/Request.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/Request.java
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/java/org/apache/cocoon/environment/Response.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/Response.java
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/java/org/apache/cocoon/environment/Session.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/Session.java
cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/java/org/apache/cocoon/environment/ValueHolder.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/ValueHolder.java
cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/ (with props)
cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/pom.xml
cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/src/
cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/src/main/
cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/src/main/java/
cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/src/main/java/org/
cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/src/main/java/org/apache/
cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/src/main/java/org/apache/cocoon/
cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/src/main/java/org/apache/cocoon/environment/
cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/src/main/java/org/apache/cocoon/environment/AbstractEnvironment.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/AbstractEnvironment.java
cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java
cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/src/main/java/org/apache/cocoon/environment/http/
- copied from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/http/
cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/src/main/java/org/apache/cocoon/environment/impl/
- copied from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/impl/
cocoon/trunk/core/cocoon-environment/pom.xml
cocoon/trunk/core/cocoon-util/ (with props)
cocoon/trunk/core/cocoon-util/pom.xml
cocoon/trunk/core/cocoon-util/src/
cocoon/trunk/core/cocoon-util/src/main/
cocoon/trunk/core/cocoon-util/src/main/java/
cocoon/trunk/core/cocoon-util/src/main/java/org/
cocoon/trunk/core/cocoon-util/src/main/java/org/apache/
cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/
cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/
cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/BufferedOutputStream.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/BufferedOutputStream.java
cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/NetUtils.java
- copied unchanged from r488426, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/NetUtils.java
Removed:
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/PropertyProvider.java
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/Settings.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Constants.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/ConstantsInitializationException.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/AbstractEnvironment.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/Context.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/Cookie.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/ObjectModelHelper.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/PermanentRedirector.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/Redirector.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/Request.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/Response.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/Session.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/ValueHolder.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/http/
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/impl/
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/BufferedOutputStream.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/NetUtils.java
cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/ProcessingException.java
cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/environment/
cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/util/
Modified:
cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml
cocoon/trunk/core/cocoon-core/pom.xml
cocoon/trunk/core/cocoon-pipeline-api/ (props changed)
cocoon/trunk/core/cocoon-pipeline-api/pom.xml
cocoon/trunk/core/pom.xml
Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml?view=diff&rev=489224&r1=489223&r2=489224
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml Wed Dec 20 15:35:57 2006
@@ -37,6 +37,23 @@
<artifactId>cocoon-core</artifactId>
<version>2.2.0-M3-SNAPSHOT</version>
</dependency>
+ <!-- excalibur -->
+ <dependency>
+ <groupId>org.apache.excalibur.components.sourceresolve</groupId>
+ <artifactId>excalibur-sourceresolve</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avalon.logkit</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
Propchange: cocoon/trunk/core/cocoon-common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 20 15:35:57 2006
@@ -0,0 +1,4 @@
+.project
+.settings
+target
+.classpath
Added: cocoon/trunk/core/cocoon-common/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-common/pom.xml?view=auto&rev=489224
==============================================================================
--- cocoon/trunk/core/cocoon-common/pom.xml (added)
+++ cocoon/trunk/core/cocoon-common/pom.xml Wed Dec 20 15:35:57 2006
@@ -0,0 +1,55 @@
+<?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">
+ <parent>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core-modules</artifactId>
+ <version>3-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cocoon-common</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Cocoon Common</name>
+ <dependencies>
+ <!-- excalibur -->
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.avalon.logkit</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- commons -->
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 20 15:35:57 2006
@@ -0,0 +1,4 @@
+.project
+.settings
+target
+.classpath
Added: cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml?view=auto&rev=489224
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml (added)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml Wed Dec 20 15:35:57 2006
@@ -0,0 +1,35 @@
+<?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">
+ <parent>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-configuration</artifactId>
+ <version>2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cocoon-configuration-api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Cocoon Configuration API</name>
+</project>
Propchange: cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 20 15:35:57 2006
@@ -0,0 +1,4 @@
+.project
+.settings
+target
+.classpath
Added: cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/pom.xml?view=auto&rev=489224
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/pom.xml (added)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/pom.xml Wed Dec 20 15:35:57 2006
@@ -0,0 +1,48 @@
+<?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">
+ <parent>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-configuration</artifactId>
+ <version>2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cocoon-configuration-impl</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Cocoon Configuration Implementation</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-configuration-api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <!-- commons -->
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ </dependency>
+ </dependencies>
+</project>
Added: cocoon/trunk/core/cocoon-configuration/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/pom.xml?view=auto&rev=489224
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/pom.xml (added)
+++ cocoon/trunk/core/cocoon-configuration/pom.xml Wed Dec 20 15:35:57 2006
@@ -0,0 +1,39 @@
+<?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">
+ <parent>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core-modules</artifactId>
+ <version>3-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cocoon-configuration</artifactId>
+ <version>2-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Cocoon Configuration [modules]</name>
+ <modules>
+ <module>cocoon-configuration-api</module>
+ <module>cocoon-configuration-impl</module>
+ </modules>
+</project>
Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/pom.xml?view=diff&rev=489224&r1=489223&r2=489224
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Wed Dec 20 15:35:57 2006
@@ -107,6 +107,16 @@
<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>
Propchange: cocoon/trunk/core/cocoon-environment/cocoon-environment-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 20 15:35:57 2006
@@ -0,0 +1,4 @@
+.project
+.settings
+target
+.classpath
Added: cocoon/trunk/core/cocoon-environment/cocoon-environment-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-environment/cocoon-environment-api/pom.xml?view=auto&rev=489224
==============================================================================
--- cocoon/trunk/core/cocoon-environment/cocoon-environment-api/pom.xml (added)
+++ cocoon/trunk/core/cocoon-environment/cocoon-environment-api/pom.xml Wed Dec 20 15:35:57 2006
@@ -0,0 +1,65 @@
+<?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">
+ <parent>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-environment</artifactId>
+ <version>2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cocoon-environment-api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Cocoon Environment API</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-common</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <!-- excalibur -->
+ <dependency>
+ <groupId>org.apache.excalibur.components.sourceresolve</groupId>
+ <artifactId>excalibur-sourceresolve</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avalon.logkit</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 20 15:35:57 2006
@@ -0,0 +1,4 @@
+.project
+.settings
+target
+.classpath
Added: cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/pom.xml?view=auto&rev=489224
==============================================================================
--- cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/pom.xml (added)
+++ cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/pom.xml Wed Dec 20 15:35:57 2006
@@ -0,0 +1,61 @@
+<?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">
+ <parent>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-environment</artifactId>
+ <version>2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cocoon-environment-impl</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Cocoon Environment Implementation</name>
+ <dependencies>
+ <!-- Cocoon -->
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-environment-api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-util</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <!-- commons -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: cocoon/trunk/core/cocoon-environment/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-environment/pom.xml?view=auto&rev=489224
==============================================================================
--- cocoon/trunk/core/cocoon-environment/pom.xml (added)
+++ cocoon/trunk/core/cocoon-environment/pom.xml Wed Dec 20 15:35:57 2006
@@ -0,0 +1,39 @@
+<?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">
+ <parent>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core-modules</artifactId>
+ <version>3-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cocoon-environment</artifactId>
+ <version>2-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Cocoon Environment [modules]</name>
+ <modules>
+ <module>cocoon-environment-api</module>
+ <module>cocoon-environment-impl</module>
+ </modules>
+</project>
Propchange: cocoon/trunk/core/cocoon-pipeline-api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Dec 20 15:35:57 2006
@@ -1 +1,5 @@
-target
+target
+.project
+.settings
+target
+.classpath
Modified: cocoon/trunk/core/cocoon-pipeline-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline-api/pom.xml?view=diff&rev=489224&r1=489223&r2=489224
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline-api/pom.xml Wed Dec 20 15:35:57 2006
@@ -33,6 +33,12 @@
<name>Pipeline API</name>
<dependencies>
+ <!-- Cocoon -->
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-environment-api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
<!-- excalibur -->
<dependency>
<groupId>org.apache.excalibur.components.xmlutil</groupId>
@@ -57,10 +63,6 @@
</exclusion>
<exclusion>
<groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
</exclusion>
<exclusion>
@@ -97,13 +99,11 @@
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.avalon.logkit</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ </exclusion>
</exclusions>
- </dependency>
- <!-- commons -->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
</dependency>
</dependencies>
</project>
Propchange: cocoon/trunk/core/cocoon-util/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 20 15:35:57 2006
@@ -0,0 +1,3 @@
+.project
+.settings
+.classpath
Added: cocoon/trunk/core/cocoon-util/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-util/pom.xml?view=auto&rev=489224
==============================================================================
--- cocoon/trunk/core/cocoon-util/pom.xml (added)
+++ cocoon/trunk/core/cocoon-util/pom.xml Wed Dec 20 15:35:57 2006
@@ -0,0 +1,42 @@
+<?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">
+ <parent>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core-modules</artifactId>
+ <version>3-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cocoon-util</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Cocoon Util</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-environment-api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/pom.xml?view=diff&rev=489224&r1=489223&r2=489224
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Wed Dec 20 15:35:57 2006
@@ -34,6 +34,10 @@
<modules>
<module>cocoon-blocks-fw</module>
<module>cocoon-core</module>
+ <module>cocoon-common</module>
+ <module>cocoon-util</module>
+ <module>cocoon-configuration</module>
+ <module>cocoon-environment</module>
<module>cocoon-pipeline-api</module>
<module>cocoon-webapp</module>
</modules>
Re: svn commit: r489224 - in /cocoon/trunk/core: ./ cocoon-blocks-fw/cocoon-blocks-fw-impl/
cocoon-common/ cocoon-common/src/ cocoon-common/src/main/ cocoon-common/src/main/java/
cocoon-common/src/main/java/org/ cocoon-common/src/main/java/org/apache/
coco...
Posted by Reinhard Poetz <re...@apache.org>.
Carsten Ziegeler wrote:
> Hi Daniel,
>
> thanks for the explanations. I'm fine with that approach and wait for
> further things to come :)
+1
--
Reinhard Pötz Independent Consultant, Trainer & (IT)-Coach
{Software Engineering, Open Source, Web Applications, Apache Cocoon}
web(log): http://www.poetz.cc
--------------------------------------------------------------------
___________________________________________________________
Telefonate ohne weitere Kosten vom PC zum PC: http://messenger.yahoo.de
Re: svn commit: r489224 - in /cocoon/trunk/core: ./ cocoon-blocks-fw/cocoon-blocks-fw-impl/
cocoon-common/ cocoon-common/src/ cocoon-common/src/main/ cocoon-common/src/main/java/
cocoon-common/src/main/java/org/ cocoon-common/src/main/java/org/apache/
coco...
Posted by Carsten Ziegeler <cz...@apache.org>.
Hi Daniel,
thanks for the explanations. I'm fine with that approach and wait for
further things to come :)
Carsten
Daniel Fagerstrom wrote:
> Carsten Ziegeler skrev:
>> danielf wrote:
>>
>>> Author: danielf
>>> Date: Wed Dec 20 15:35:57 2006
>>> New Revision: 489224
>>>
>>> URL: http://svn.apache.org/viewvc?view=rev&rev=489224
>>> Log:
>>> Further work on splitting the core so that it becomes layered. Created a number of new modules:
>>>
>>> * cocoon-common - classes needed everywhere: Constants, ProcessingException and their dependencies.
>>> * cocoon-configuration - The Settings interface and implementation.
>>> * cocoon-environment - The Cocoon environment API and the http implementation and some abstract base classes.
>>> * cocoon-util - Part of the o.a.c.util package that is needed in the modules listed above.
>>>
>>>
>> Hmm, I'm not sure but it seems to me that this is the far opposite to
>> our old monolithic structure.
> I agree that the current split is a little bit to fine grained. I
> started by just factoring out a pipeline implementation, but there are
> so many interdependencies so it didn't work that well.
>
> My current idea is to continue splitting up the core with the goal of
> making the core layered so that the pipeline can be used separately
> without needing to include all of the tree-processor code.
>
> This will lead to more modules than what we would like to have in the
> end. But it will make it clear how everything is connected. Then in a
> next step we can start refactoring things so that we get rid of
> unnecessary dependencies. And after that we probably can merge some of
> the modules. It will also be much easier for us to see and be able to
> discuss about what layers we want Cocoon to be split into.
>
> So see the current split as a temporary state, (and be prepared on that
> it will become even worse ;) )
>
>> What is the difference between "common"
>> and "util"?
>>
> Probably not that much. It might be that common, configuration and util
> should be merged.
>
>> We should rethink our environment abstraction as well. As we have
>> discussed in the past, it would make sense to forget about it and use
>> the servlet api instead.
> Agree.
>
>> So I think we should not make this available in
>> a separate module which will be obsolete soon again. What about adding
>> this to the pipeline api?
>>
> I made the environment a separate module as both pipeline and the
> container code depends on it. Otherwise it would be unclear if the
> pipeline should depend on the container or the opposite way around. If
> we can get rid of the dependency of the container on the environment, we
> could merge the environment ant the pipeline module.
>
> ==============
>
> So please bear with a too fine grained splitting of the core during a
> short period. It shouldn't affect use of Cocoon during that period as
> cocoon-core will depend on all that is needed. If we don't do enough
> progress into splitting Cocoon core in reasonable layers, it is very
> easy to merge everything together again.
>
> /Daniel
>
>
--
Carsten Ziegeler - Chief Architect
http://www.s-und-n.de
http://www.osoco.org/weblogs/rael/
Re: svn commit: r489224 - in /cocoon/trunk/core: ./ cocoon-blocks-fw/cocoon-blocks-fw-impl/
cocoon-common/ cocoon-common/src/ cocoon-common/src/main/ cocoon-common/src/main/java/
cocoon-common/src/main/java/org/ cocoon-common/src/main/java/org/apache/
coco...
Posted by Daniel Fagerstrom <da...@nada.kth.se>.
Carsten Ziegeler skrev:
> danielf wrote:
>
>> Author: danielf
>> Date: Wed Dec 20 15:35:57 2006
>> New Revision: 489224
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=489224
>> Log:
>> Further work on splitting the core so that it becomes layered. Created a number of new modules:
>>
>> * cocoon-common - classes needed everywhere: Constants, ProcessingException and their dependencies.
>> * cocoon-configuration - The Settings interface and implementation.
>> * cocoon-environment - The Cocoon environment API and the http implementation and some abstract base classes.
>> * cocoon-util - Part of the o.a.c.util package that is needed in the modules listed above.
>>
>>
> Hmm, I'm not sure but it seems to me that this is the far opposite to
> our old monolithic structure.
I agree that the current split is a little bit to fine grained. I
started by just factoring out a pipeline implementation, but there are
so many interdependencies so it didn't work that well.
My current idea is to continue splitting up the core with the goal of
making the core layered so that the pipeline can be used separately
without needing to include all of the tree-processor code.
This will lead to more modules than what we would like to have in the
end. But it will make it clear how everything is connected. Then in a
next step we can start refactoring things so that we get rid of
unnecessary dependencies. And after that we probably can merge some of
the modules. It will also be much easier for us to see and be able to
discuss about what layers we want Cocoon to be split into.
So see the current split as a temporary state, (and be prepared on that
it will become even worse ;) )
> What is the difference between "common"
> and "util"?
>
Probably not that much. It might be that common, configuration and util
should be merged.
> We should rethink our environment abstraction as well. As we have
> discussed in the past, it would make sense to forget about it and use
> the servlet api instead.
Agree.
> So I think we should not make this available in
> a separate module which will be obsolete soon again. What about adding
> this to the pipeline api?
>
I made the environment a separate module as both pipeline and the
container code depends on it. Otherwise it would be unclear if the
pipeline should depend on the container or the opposite way around. If
we can get rid of the dependency of the container on the environment, we
could merge the environment ant the pipeline module.
==============
So please bear with a too fine grained splitting of the core during a
short period. It shouldn't affect use of Cocoon during that period as
cocoon-core will depend on all that is needed. If we don't do enough
progress into splitting Cocoon core in reasonable layers, it is very
easy to merge everything together again.
/Daniel
Re: svn commit: r489224 - in /cocoon/trunk/core: ./ cocoon-blocks-fw/cocoon-blocks-fw-impl/
cocoon-common/ cocoon-common/src/ cocoon-common/src/main/ cocoon-common/src/main/java/
cocoon-common/src/main/java/org/ cocoon-common/src/main/java/org/apache/
coco...
Posted by Carsten Ziegeler <cz...@apache.org>.
danielf wrote:
> Author: danielf
> Date: Wed Dec 20 15:35:57 2006
> New Revision: 489224
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=489224
> Log:
> Further work on splitting the core so that it becomes layered. Created a number of new modules:
>
> * cocoon-common - classes needed everywhere: Constants, ProcessingException and their dependencies.
> * cocoon-configuration - The Settings interface and implementation.
> * cocoon-environment - The Cocoon environment API and the http implementation and some abstract base classes.
> * cocoon-util - Part of the o.a.c.util package that is needed in the modules listed above.
>
Hmm, I'm not sure but it seems to me that this is the far opposite to
our old monolithic structure. What is the difference between "common"
and "util"?
We should rethink our environment abstraction as well. As we have
discussed in the past, it would make sense to forget about it and use
the servlet api instead. So I think we should not make this available in
a separate module which will be obsolete soon again. What about adding
this to the pipeline api?
Carsten