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 2007/03/12 09:11:39 UTC
svn commit: r517125 - in /cocoon/trunk:
blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/
blocks/cocoon-xsp/cocoon-xsp-impl/
core/cocoon-configuration/cocoon-spring-configurator/
core/cocoon-pipeline/cocoon-...
Author: cziegeler
Date: Mon Mar 12 01:11:38 2007
New Revision: 517125
URL: http://svn.apache.org/viewvc?view=rev&rev=517125
Log:
Add missing configuration file
Update to spring 2.0.3
Added:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml (with props)
Modified:
cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/pom.xml
Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml?view=auto&rev=517125
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml Mon Mar 12 01:11:38 2007
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<!--+
+ | This is the default configuration for the portal beans.
+ |
+ | @version $Id$
+ +-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:portal="http://cocoon.apache.org/schema/portal"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://cocoon.apache.org/schema/portal http://cocoon.apache.org/schema/portal/cocoon-portal-1.0.xsd">
+
+ <!--+
+ | Default User Context Provider for WSRP.
+ +-->
+ <bean name="org.apache.cocoon.portal.wsrp.consumer.UserContextProvider"
+ class="org.apache.cocoon.portal.wsrp.consumer.UserContextProviderImpl" scope="singleton"/>
+
+ <!--+
+ | Coplet Adapters
+ |
+ +-->
+ <!--+
+ | This is the WSRP coplet adapter.
+ +-->
+ <bean name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/wsrp"
+ class="org.apache.cocoon.portal.wsrp.adapter.WSRPAdapter"
+ parent="org.apache.cocoon.portal.coplet.adapter.AbstractCopletAdapter" scope="singleton">
+ <property name="userContextProvider" ref="org.apache.cocoon.portal.wsrp.consumer.UserContextProvider"/>
+ <property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
+ <property name="serviceManager" ref="org.apache.avalon.framework.service.ServiceManager"/>
+ </bean>
+</beans>
\ No newline at end of file
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml?view=diff&rev=517125&r1=517124&r2=517125
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml Mon Mar 12 01:11:38 2007
@@ -54,7 +54,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>2.0.2</version>
+ <version>3.0.1</version>
</dependency>
<dependency>
<groupId>excalibur-datasource</groupId>
Modified: cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml?view=diff&rev=517125&r1=517124&r2=517125
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml (original)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml Mon Mar 12 01:11:38 2007
@@ -113,27 +113,27 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
</dependency>
</dependencies>
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml?view=diff&rev=517125&r1=517124&r2=517125
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml Mon Mar 12 01:11:38 2007
@@ -118,12 +118,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml?view=diff&rev=517125&r1=517124&r2=517125
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml Mon Mar 12 01:11:38 2007
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
<exclusions>
<exclusion>
<groupId>avalon-framework</groupId>
@@ -87,17 +87,17 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml?view=diff&rev=517125&r1=517124&r2=517125
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml Mon Mar 12 01:11:38 2007
@@ -153,17 +153,17 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
<exclusions>
<exclusion>
<groupId>avalon-framework</groupId>
@@ -174,12 +174,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml?view=diff&rev=517125&r1=517124&r2=517125
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml Mon Mar 12 01:11:38 2007
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
<exclusions>
<exclusion>
<groupId>avalon-framework</groupId>
Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/pom.xml?view=diff&rev=517125&r1=517124&r2=517125
==============================================================================
--- cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/pom.xml Mon Mar 12 01:11:38 2007
@@ -70,31 +70,31 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3</version>
<scope>provided</scope>
</dependency>
<!-- test dependencies -->