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/11/27 23:14:17 UTC
svn commit: r598784 - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/
cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/
cocoon-portal-sample/src/main/resources/COB-INF/...
Author: cziegeler
Date: Tue Nov 27 14:14:16 2007
New Revision: 598784
URL: http://svn.apache.org/viewvc?rev=598784&view=rev
Log:
Start fixing portal configuration: uri coplet adapter is just for uri's; new cocoon coplet adapter is able to use cocoon pipelines.
Added:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/resources/META-INF/cocoon/spring/
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-portal-sitemap-components.xml (with props)
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/coplettype/portal.xml
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java?rev=598784&r1=598783&r2=598784&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java Tue Nov 27 14:14:16 2007
@@ -38,7 +38,7 @@
protected SAXParser parser;
- public void setSAXParser(final SAXParser p) {
+ public void setParser(final SAXParser p) {
this.parser = p;
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml?rev=598784&r1=598783&r2=598784&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml Tue Nov 27 14:14:16 2007
@@ -52,23 +52,12 @@
</bean>
<!--+
- | This is the pipeline/uri based adapter.
+ | This is the uri based adapter.
+-->
<bean name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/uri"
class="org.apache.cocoon.portal.coplet.adapter.impl.URICopletAdapter"
parent="org.apache.cocoon.portal.coplet.adapter.AbstractCopletAdapter" scope="singleton">
- <property name="notifyingBuilder" ref="org.apache.cocoon.components.notification.NotifyingBuilder"/>
- <property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
- </bean>
-
- <!--+
- | This is the application adapter.
- +-->
- <bean name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/application"
- class="org.apache.cocoon.portal.coplet.adapter.impl.ApplicationCopletAdapter"
- parent="org.apache.cocoon.portal.coplet.adapter.AbstractCopletAdapter" scope="singleton">
- <property name="notifyingBuilder" ref="org.apache.cocoon.components.notification.NotifyingBuilder"/>
- <property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
+ <property name="parser" ref="org.apache.cocoon.core.xml.SAXParser"/>
</bean>
<!--+
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/coplettype/portal.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/coplettype/portal.xml?rev=598784&r1=598783&r2=598784&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/coplettype/portal.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/coplettype/portal.xml Tue Nov 27 14:14:16 2007
@@ -19,9 +19,9 @@
<coplets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<coplet-type id="URICoplet">
- <coplet-adapter>uri</coplet-adapter>
+ <coplet-adapter>cocoon</coplet-adapter>
</coplet-type>
-
+<!--
<coplet-type id="Portlet">
<coplet-adapter>portlet</coplet-adapter>
<configuration>
@@ -45,5 +45,6 @@
<value xsi:type="java:java.lang.Boolean">true</value>
</configuration>
</coplet-type>
+ -->
</coplets>
Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-portal-sitemap-components.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-portal-sitemap-components.xml?rev=598784&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-portal-sitemap-components.xml (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-portal-sitemap-components.xml Tue Nov 27 14:14:16 2007
@@ -0,0 +1,58 @@
+<?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"
+ xmlns:configurator="http://cocoon.apache.org/schema/configurator"
+ 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
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
+
+ <!--+
+ | Coplet Adapters
+ |
+ +-->
+ <!--+
+ | This is the pipeline based adapter.
+ +-->
+ <bean name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/cocoon"
+ class="org.apache.cocoon.portal.coplet.adapter.impl.CocoonCopletAdapter"
+ parent="org.apache.cocoon.portal.coplet.adapter.AbstractCopletAdapter" scope="singleton">
+ <property name="notifyingBuilder" ref="org.apache.cocoon.components.notification.NotifyingBuilder"/>
+ <property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
+ <property name="processInfoProvider" ref="org.apache.cocoon.processing.ProcessInfoProvider"/>
+ </bean>
+
+ <!--+
+ | This is the application adapter.
+ +-->
+ <bean name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/application"
+ class="org.apache.cocoon.portal.coplet.adapter.impl.ApplicationCopletAdapter"
+ parent="org.apache.cocoon.portal.coplet.adapter.AbstractCopletAdapter" scope="singleton">
+ <property name="notifyingBuilder" ref="org.apache.cocoon.components.notification.NotifyingBuilder"/>
+ <property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
+ <property name="processInfoProvider" ref="org.apache.cocoon.processing.ProcessInfoProvider"/>
+ </bean>
+</beans>
\ No newline at end of file
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-portal-sitemap-components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-portal-sitemap-components.xml
------------------------------------------------------------------------------
svn:keywords = Id