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 2005/09/27 20:06:33 UTC
svn commit: r292009 - in /cocoon: blocks/portal-sample/trunk/WEB-INF/xconf/
blocks/portal/trunk/WEB-INF/xconf/
blocks/portal/trunk/java/org/apache/cocoon/components/persistence/
blocks/portal/trunk/java/org/apache/cocoon/portal/ blocks/portal/trunk/jav...
Author: cziegeler
Date: Tue Sep 27 11:05:39 2005
New Revision: 292009
URL: http://svn.apache.org/viewcvs?rev=292009&view=rev
Log:
Move all pluto related stuff into the pluto package
Clean up portal configuration
Remove tabs in ProjectPathModule
Added:
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
- copied, changed from r291846, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java
- copied, changed from r291846, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/PortletWindowAspect.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal.roles
Removed:
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/PortletWindowAspect.java
Modified:
cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf
cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf
cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles
cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java
Modified: cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf?rev=292009&r1=292008&r2=292009&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf (original)
+++ cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-sample.xconf Tue Sep 27 11:05:39 2005
@@ -19,15 +19,34 @@
| SVN $Id: cocoon-portal-samples.xconf 125443 2005-01-17 20:39:52Z cziegeler $
+-->
<components>
+ <!--+
+ | THIS IS A SAMPLE PORTAL
+ |
+ | It demonstrates several features of the portal engine,
+ | so it's not neither configured for *your* environment nor
+ | optimized for production. If you use the portal for your
+ | own projects make sure that you remove all unused stuff
+ | from the configuration and that you configure the remaining
+ | components properly.
+ +-->
+
<!-- Include dependencies -->
<include src="context://WEB-INF/xconf/cocoon-portal.xconf"/>
- <!-- THIS IS A SAMPLE PORTAL
- It demonstrates several features of the portal engine,
- so it's not optimized for production. Make sure that
- if you use the portal for your own projects that you
- remove all unused stuff from the configuration!
- -->
+ <!-- Include portal roles -->
+ <include src="resource://org/apache/cocoon/portal/portal.roles"/>
+ <!-- If you don't need JSR 168 support, you can remove the following include: -->
+ <include src="resource://org/apache/cocoon/portal/pluto/portal.roles"/>
+ <!-- If you don't need WSRP support, you can remove the following include: -->
+ <include src="resource://org/apache/cocoon/portal/wsrp/portal.roles"/>
+
+ <input-modules>
+ <component-instance name="portalpath"
+ class="org.apache.cocoon.components.modules.input.ProjectPathModule">
+ <uri-prefix>samples/blocks/portal-sample/</uri-prefix>
+ </component-instance>
+ </input-modules>
+
<component role="org.osoco.cowarp.ApplicationManager"
class="org.osoco.cowarp.impl.StandardApplicationManager"/>
<!-- This security handler uses OJB and the hsqldb for the authentication: -->
@@ -58,39 +77,111 @@
</profiles>
</component>
<component class="org.apache.cocoon.portal.profile.impl.GroupBasedProfileManager"
- logger="portal"
role="org.apache.cocoon.portal.profile.ProfileManager/Cowarp">
<parameter name="userinfo-provider" value="org.osoco.cowarp.portal.UserInfoProviderImpl"/>
</component>
- <component class="org.apache.cocoon.portal.impl.PortalServiceImpl"
- logger="portal"
- role="org.apache.cocoon.portal.PortalService">
- <portals>
- <portal name="portal">
- <!-- This is the sample portal:
+ <portal-service>
+ <portals>
+ <portal name="portal">
+ <!-- This is the sample portal:
- we use the cowarp profile manager
- -->
- <profile-manager>org.apache.cocoon.portal.profile.ProfileManager/Cowarp</profile-manager>
- <!-- If you want to use the authentication framework, comment out the above line
- and uncomment the following line:
+ -->
+ <profile-manager>org.apache.cocoon.portal.profile.ProfileManager/Cowarp</profile-manager>
+ <!-- If you want to use the authentication framework, comment out the above line
+ and uncomment the following line:
<profile-manager>org.apache.cocoon.portal.profile.ProfileManager/Auth</profile-manager>
- -->
- <!-- These are the skins the user can choose from: -->
- <skins>
- <skin name="basic" base-path="context://samples/blocks/portal-sample/skins/basic">
- <thumbnail-path>images/thumb.jpg</thumbnail-path>
- </skin>
- <skin name="common" base-path="context://samples/blocks/portal-sample/skins/common">
- <thumbnail-path>images/thumb.jpg</thumbnail-path>
- </skin>
- </skins>
- </portal>
- </portals>
- </component>
+ -->
+ <!-- These are the skins the user can choose from: -->
+ <skins>
+ <skin name="basic" base-path="context://samples/blocks/portal-sample/skins/basic">
+ <thumbnail-path>images/thumb.jpg</thumbnail-path>
+ </skin>
+ <skin name="common" base-path="context://samples/blocks/portal-sample/skins/common">
+ <thumbnail-path>images/thumb.jpg</thumbnail-path>
+ </skin>
+ </skins>
+ </portal>
+ </portals>
+ </portal-service>
+
+ <!-- This is the portal manager.
+ The portal manager can be extended with different aspects.
+ Currently the JSR-168 aspect is configured/activated.
+ If you don't need the JSR-168 support uncomment the aspect.
+ In a similar manner the wsrp support works.
+ -->
+ <portal-manager>
+ <aspects>
+ <!-- JSR-168 support: -->
+ <aspect adapter="portlet"/>
+ <!-- wsrp support: -->
+ <aspect adapter="wsrp"/>
+ </aspects>
+ </portal-manager>
+
+ <portal-event-manager>
+ <event-aspects>
+ <!-- The client should not cache the page. -->
+ <aspect type="no-client-caching"/>
+ <!-- Uncomment this aspect when marshalling JSR168 portlet events
+ <aspect type="convertable"/>
+ -->
+ <!-- Use the action counter with great care. We recommend turning it off. -->
+ <!-- Remove action-counter when using PageLabels -->
+ <!-- aspect type="action-counter"/ -->
+ <aspect type="frame"/>
+ <aspect type="link"/>
+ <aspect type="full-screen-coplet"/>
+ <!-- Uncomment the following when using PageLabels
+ <aspect type="page-label"/>
+ -->
+ <!-- Comment the following out if you don't need WSRP: -->
+ <aspect type="wsrp"/>
+ <aspect type="request-parameter">
+ <!-- Uncomment the following when marshalling JSR168 portlet events
+ <parameter name="parameter-name" value="cocoon-portal-event,url"/>
+ -->
+ </aspect>
+ </event-aspects>
+ <!-- add a new instance of each class as a receiver: -->
+ <receiver-classes>
+ <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaulCopletDataEventSubscriber"/>
+ <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaultChangeAspectDataEventSubscriber"/>
+ <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaultJXPathEventSubscriber"/>
+ </receiver-classes>
+ <!-- add each component as a receiver (the component should be thread safe): -->
+ <receiver-roles>
+ <!-- <role name="AVALON-ROLE"/> -->
+ </receiver-roles>
+ </portal-event-manager>
+
+ <!--+
+ | Page Labels.
+ | To enable PageLabels uncomment the following definition:
+ <portal-event-converter class="org.apache.cocoon.portal.event.impl.PageLabelEventConverter"/>
+ +-->
+
+ <page-label-manager>
+ <!-- Uncomment to marshall JSR-168 portlet events
+ <marshallEvents>true</marshallEvents>
+ -->
+ <!-- Uncomment to enable non sticky tabs
+ <nonStickyTabs>true</nonStickyTabs>
+ -->
+ </page-label-manager>
+
+ <!--+
+ | Page Labels.
+ | To enable PageLabels add a "class" attribute to the following
+ | definition with the value "org.apache.cocoon.portal.impl.PageLabelLinkService"
+ +-->
+ <portal-link-service>
+ <parameter name="defaultPort" value="8888"/>
+ <parameter name="defaultSecurePort" value="443"/>
+ </portal-link-service>
<component class="org.apache.cocoon.portal.profile.impl.AuthenticationProfileManager"
- logger="portal"
role="org.apache.cocoon.portal.profile.ProfileManager/Auth"/>
@@ -98,8 +189,7 @@
<component class="org.apache.cocoon.core.container.DefaultServiceSelector"
role="org.apache.cocoon.portal.layout.renderer.RendererSelector">
<renderer name="column"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
- logger="portal" >
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
<aspects>
<aspect type="xslt">
<parameter name="style" value="{portal-skin:skin.basepath}/styles/column.xsl"/>
@@ -113,8 +203,7 @@
</aspects>
</renderer>
<renderer name="row"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
- logger="portal" >
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
<aspects>
<aspect type="xslt">
<parameter name="style" value="{portal-skin:skin.basepath}/styles/row.xsl"/>
@@ -128,8 +217,7 @@
</aspects>
</renderer>
<renderer name="tab"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
- logger="portal" >
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
<aspects>
<aspect type="xslt">
<parameter name="style" value="{portal-skin:skin.basepath}/styles/tab.xsl"/>
@@ -145,8 +233,7 @@
</aspects>
</renderer>
<renderer name="rawtab"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
- logger="portal" >
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
<aspects>
<aspect type="parameter">
<parameter name="tag-name" value="tab-layout"/>
@@ -159,8 +246,7 @@
</aspects>
</renderer>
<renderer name="linktab"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
- logger="portal">
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
<aspects>
<aspect type="xslt">
<parameter name="style" value="{portal-skin:skin.basepath}/styles/linktab.xsl"/>
@@ -176,8 +262,7 @@
</aspects>
</renderer>
<renderer name="window"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
- logger="portal" >
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
<aspects>
<aspect type="xslt">
<parameter name="style" value="{portal-skin:skin.basepath}/styles/window.xsl"/>
@@ -197,8 +282,7 @@
</aspects>
</renderer>
<renderer name="borderless-window"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
- logger="portal" >
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
<aspects>
<aspect type="xslt">
<parameter name="style" value="{portal-skin:skin.basepath}/styles/borderless-window.xsl"/>
@@ -218,8 +302,7 @@
</aspects>
</renderer>
<renderer name="frame"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
- logger="portal" >
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
<aspects>
<aspect type="frame">
<parameter name="store" value="request"/>
@@ -227,8 +310,7 @@
</aspects>
</renderer>
<renderer name="nowindow"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
- logger="portal">
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
<aspects>
<aspect type="history"/>
<aspect type="coplet-cinclude">
@@ -237,8 +319,7 @@
</aspects>
</renderer>
<renderer name="portlet-window"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
- logger="portal">
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
<aspects>
<aspect type="xslt">
<parameter name="style" value="{portal-skin:skin.basepath}/styles/window.xsl"/>
@@ -256,8 +337,7 @@
</aspects>
</renderer>
<renderer name="wsrp-window"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
- logger="portal">
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
<aspects>
<aspect type="xslt">
<parameter name="style" value="{portal-skin:skin.basepath}/styles/window.xsl"/>
@@ -275,11 +355,9 @@
</aspects>
</renderer>
<renderer name="link"
- class="org.apache.cocoon.portal.layout.renderer.impl.DefaultLinkRenderer"
- logger="portal"/>
+ class="org.apache.cocoon.portal.layout.renderer.impl.DefaultLinkRenderer"/>
<renderer name="decorated-frame"
- class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer"
- logger="portal">
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
<aspects>
<aspect type="xslt">
<parameter name="style" value="{portal-skin:skin.basepath}/styles/frame.xsl"/>
@@ -401,8 +479,7 @@
<!-- This is the basket manager -->
<component class="org.apache.cocoon.portal.coplets.basket.BasketManagerImpl"
- role="org.apache.cocoon.portal.coplets.basket.BasketManager"
- logger="portal">
+ role="org.apache.cocoon.portal.coplets.basket.BasketManager">
<!-- This is only a sample configuration, it doesn't really work -->
<parameter name="basket:action:print" value="cocoon://print-basket"/>
<parameter name="basket:action:email" value="cocoon://email-basket"/>
@@ -413,8 +490,7 @@
<!-- This is the special basket renderer -->
<component role="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/basket"
- class="org.apache.cocoon.portal.coplets.basket.AddToBasketAspect"
- logger="portal"/>
+ class="org.apache.cocoon.portal.coplets.basket.AddToBasketAspect"/>
<wsrp-adapter>
<!-- This is the WSRP configuration containing the producers etc. -->
Modified: cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf?rev=292009&r1=292008&r2=292009&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf (original)
+++ cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf Tue Sep 27 11:05:39 2005
@@ -19,98 +19,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include roles -->
- <include src="resource://org/apache/cocoon/portal/portal.roles"/>
- <include src="resource://org/apache/cocoon/portal/wsrp/portal.roles"/>
-
- <!-- Portal service definition template
- <component class="org.apache.cocoon.portal.impl.PortalServiceImpl" logger="portal" role="org.apache.cocoon.portal.PortalService">
- <portals>
- *** Here comes the portal configuration ***
- </portals>
- </component>
- -->
- <input-modules>
- <!-- FIXME: THIS HAS TO BE PORTAL DEPENDENT AND NOT GLOBAL -->
- <component-instance name="portalpath" class="org.apache.cocoon.components.modules.input.ProjectPathModule" logger="portal">
- <uri-prefix>samples/blocks/portal-sample/</uri-prefix>
- </component-instance>
- </input-modules>
-
- <component class="org.apache.cocoon.portal.event.impl.DefaultEventManager"
- logger="portal"
- role="org.apache.cocoon.portal.event.EventManager">
- <event-aspects>
- <!-- The client should not cache the page. -->
- <aspect type="no-client-caching"/>
- <!-- Uncomment this aspect when marshalling JSR168 portlet events
- <aspect type="convertable"/>
- -->
- <!-- Use the action counter with great care. We recommend turning it off. -->
- <!-- Remove action-counter when using PageLabels -->
- <!-- aspect type="action-counter"/ -->
- <aspect type="frame"/>
- <aspect type="link"/>
- <aspect type="full-screen-coplet"/>
- <!-- Uncomment the following when using PageLabels
- <aspect type="page-label"/>
- -->
- <!-- Comment the following out if you don't need WSRP: -->
- <aspect type="wsrp"/>
- <aspect type="request-parameter">
- <!-- Uncomment the following when marshalling JSR168 portlet events
- <parameter name="parameter-name" value="cocoon-portal-event,url"/>
- -->
- </aspect>
- </event-aspects>
- <!-- add a new instance of each class as a receiver: -->
- <receiver-classes>
- <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaulCopletDataEventSubscriber"/>
- <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaultChangeAspectDataEventSubscriber"/>
- <class name="org.apache.cocoon.portal.event.subscriber.impl.DefaultJXPathEventSubscriber"/>
- </receiver-classes>
- <!-- add each component as a receiver (the component should be thread safe): -->
- <receiver-roles>
- <!-- <role name="AVALON-ROLE"/> -->
- </receiver-roles>
- </component>
-
- <!-- This is the portal manager.
- The portal manager can be extended with different aspects.
- Currently the JSR-168 aspect is configured/activated.
- If you don't need the JSR-168 support uncomment the aspect.
- In a similar manner the wsrp support works.
- -->
- <component class="org.apache.cocoon.portal.impl.PortalManagerImpl"
- logger="portal" role="org.apache.cocoon.portal.PortalManager">
- <aspects>
- <!-- JSR-168 support: -->
- <aspect adapter="portlet"/>
- <!-- wsrp support: -->
- <aspect adapter="wsrp"/>
- </aspects>
- </component>
-
- <!-- To enable PageLabels change DefaultLinkService to PageLabelLinkService -->
- <component class="org.apache.cocoon.portal.impl.DefaultLinkService"
- logger="portal"
- role="org.apache.cocoon.portal.LinkService">
- <parameter name="defaultPort" value="8888"/>
- <parameter name="defaultSecurePort" value="443"/>
- </component>
-
- <!-- To enable PageLabels change DefaultEventConverter to PageLabelEventConverter -->
- <component class="org.apache.cocoon.portal.event.impl.DefaultEventConverter" logger="portal" role="org.apache.cocoon.portal.event.EventConverter">
- </component>
-
- <!-- Page Label Manager -->
- <component class="org.apache.cocoon.portal.impl.PageLabelManager" logger="portal" role="org.apache.cocoon.portal.impl.PageLabelManager">
- <!-- Uncomment to marshall JSR-168 portlet events
- <marshallEvents>true</marshallEvents>
- -->
- <!-- Uncomment to enable non sticky tabs
- <nonStickyTabs>true</nonStickyTabs>
- -->
- </component>
+ <!-- Dummy configuration for dependencies. -->
</components>
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java?rev=292009&r1=292008&r2=292009&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java Tue Sep 27 11:05:39 2005
@@ -105,35 +105,34 @@
}
}
- /* (non-Javadoc)
+ /**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
*/
public void configure(Configuration config) throws ConfigurationException {
- Configuration[] children = config.getChildren("mapping-source");
- if ( children.length == 0 ) {
- // default configuration
- final String prefix = "resource://org/apache/cocoon/portal/";
- this.mappingSources.put("layout", prefix + "layout/layout.xml");
- this.mappingSources.put("copletbasedata", prefix + "coplet/copletbasedata.xml");
- this.mappingSources.put("copletdata", prefix + "coplet/copletdata.xml");
- this.mappingSources.put("copletinstancedata", prefix + "coplet/copletinstancedata.xml");
- } else {
- for (int i=0; i<children.length; i++) {
- Configuration mappingSource = children[i];
- this.mappingSources.put(mappingSource.getAttribute("source"), mappingSource.getValue());
- }
- }
+ // default configuration
+ final String prefix = "resource://org/apache/cocoon/portal/";
+ this.mappingSources.put("layout", prefix + "layout/layout.xml");
+ this.mappingSources.put("copletbasedata", prefix + "coplet/copletbasedata.xml");
+ this.mappingSources.put("copletdata", prefix + "coplet/copletdata.xml");
+ this.mappingSources.put("copletinstancedata", prefix + "coplet/copletinstancedata.xml");
+
+ // the custom configuration might overwrite the default config
+ Configuration[] children = config.getChildren("mapping-source");
+ for (int i=0; i<children.length; i++) {
+ Configuration mappingSource = children[i];
+ this.mappingSources.put(mappingSource.getAttribute("source"), mappingSource.getValue());
+ }
this.defaultSuppressXSIType = config.getChild("suppressXSIType").getValueAsBoolean(false);
}
- /* (non-Javadoc)
+ /**
* @see org.apache.avalon.framework.activity.Initializable#initialize()
*/
public void initialize() throws Exception {
Copied: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java (from r291846, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java?p2=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java&p1=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java&r1=291846&r2=292009&rev=292009&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java Tue Sep 27 11:05:39 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.portal.coplet.adapter.impl;
+package org.apache.cocoon.portal.pluto.adapter;
import java.util.Map;
import java.util.Properties;
@@ -41,6 +41,7 @@
import org.apache.cocoon.portal.PortalManagerAspectRenderContext;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter;
import org.apache.cocoon.portal.event.EventManager;
import org.apache.cocoon.portal.event.Receiver;
import org.apache.cocoon.portal.pluto.PortletContainerEnvironmentImpl;
Copied: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java (from r291846, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/PortletWindowAspect.java)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java?p2=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java&p1=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/PortletWindowAspect.java&r1=291846&r2=292009&rev=292009&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/PortletWindowAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java Tue Sep 27 11:05:39 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.portal.layout.renderer.aspect.impl;
+package org.apache.cocoon.portal.pluto.adapter;
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
@@ -27,10 +27,10 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.coplet.CopletInstanceData;
-import org.apache.cocoon.portal.coplet.adapter.impl.PortletAdapter;
import org.apache.cocoon.portal.layout.Layout;
import org.apache.cocoon.portal.layout.impl.CopletLayout;
import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext;
+import org.apache.cocoon.portal.layout.renderer.aspect.impl.AbstractAspect;
import org.apache.cocoon.portal.pluto.PortletURLProviderImpl;
import org.apache.cocoon.portal.pluto.om.PortletWindowImpl;
import org.apache.cocoon.servlet.CocoonServlet;
Added: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal.roles
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal.roles?rev=292009&view=auto
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal.roles (added)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal.roles Tue Sep 27 11:05:39 2005
@@ -0,0 +1,36 @@
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed 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.
+-->
+<!-- $Id$ -->
+<role-list>
+
+ <!--+
+ | Renderer Aspects
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/portlet-window"
+ default-class="org.apache.cocoon.portal.pluto.adapter.PortletWindowAspect"/>
+
+ <!--+
+ | Coplet Adapters
+ |
+ +-->
+ <!--+
+ | This is the JSR-168 adapter.
+ +-->
+ <role name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/portlet"
+ default-class="org.apache.cocoon.portal.pluto.adapter.PortletAdapter"/>
+
+</role-list>
\ No newline at end of file
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles?rev=292009&r1=292008&r2=292009&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles Tue Sep 27 11:05:39 2005
@@ -79,9 +79,6 @@
<role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/window"
default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.WindowAspect"/>
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/portlet-window"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.PortletWindowAspect"/>
-
<!--+
| This aspect can be used to render the minimize/maximize buttons.
+-->
@@ -200,12 +197,6 @@
default-class="org.apache.cocoon.portal.coplet.adapter.impl.URICopletAdapter"/>
<!--+
- | This is the JSR-168 adapter.
- +-->
- <role name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/portlet"
- default-class="org.apache.cocoon.portal.coplet.adapter.impl.PortletAdapter"/>
-
- <!--+
| This is an extension of the uri adapter supporting caching the content.
+-->
<role name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/caching-uri"
@@ -219,7 +210,7 @@
<!--+
- | Coplet Adapters.
+ | Coplet Source.
|
+-->
<role name="org.apache.excalibur.source.SourceFactory/coplet"
@@ -236,5 +227,53 @@
default-class="org.apache.cocoon.portal.components.modules.input.LayoutModule"/>
<role name="org.apache.cocoon.components.modules.input.InputModule/portal-skin"
default-class="org.apache.cocoon.portal.components.modules.input.SkinModule"/>
+
+ <!--+
+ | Portal Service.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.PortalService"
+ default-class="org.apache.cocoon.portal.impl.PortalServiceImpl"
+ shorthand="portal-service"/>
+
+ <!--+
+ | Portal Manager.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.PortalManager"
+ default-class="org.apache.cocoon.portal.impl.PortalManagerImpl"
+ shorthand="portal-manager"/>
+
+ <!--+
+ | Event Manager.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.event.EventManager"
+ default-class="org.apache.cocoon.portal.event.impl.DefaultEventManager"
+ shorthand="portal-event-manager"/>
+
+ <!--+
+ | Event Converter.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.event.EventConverter"
+ default-class="org.apache.cocoon.portal.event.impl.DefaultEventConverter"
+ shorthand="portal-event-converter"/>
+
+ <!--+
+ | Page Label Manager.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.impl.PageLabelManager"
+ default-class="org.apache.cocoon.portal.impl.PageLabelManager"
+ shorthand="page-label-manager"/>
+
+ <!--+
+ | Portal Link Service.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.LinkService"
+ default-class="org.apache.cocoon.portal.impl.DefaultLinkService"
+ shorthand="portal-link-service"/>
</role-list>
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java?rev=292009&r1=292008&r2=292009&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java Tue Sep 27 11:05:39 2005
@@ -1,12 +1,12 @@
/*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed 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.
@@ -65,77 +65,101 @@
* </p>
*
*/
-public class ProjectPathModule extends AbstractInputModule implements Configurable, ThreadSafe {
-
- protected static String PROJECT_PARAM_NAME = "uri-prefix";
- protected static String PROJECT_PARAM_DEFAULT = "/";
-
- protected String projectBase;
-
- final static Vector returnNames;
+public class ProjectPathModule
+ extends AbstractInputModule
+ implements Configurable, ThreadSafe {
+
+ protected static String PROJECT_PARAM_NAME = "uri-prefix";
+ protected static String PROJECT_PARAM_DEFAULT = "/";
+
+ protected String projectBase;
+
+ final static Vector returnNames;
static {
- Vector tmp = new Vector();
- tmp.add("relative");
- tmp.add("path");
- tmp.add("folder");
- returnNames = tmp;
+ Vector tmp = new Vector();
+ tmp.add("relative");
+ tmp.add("path");
+ tmp.add("folder");
+ returnNames = tmp;
}
+ /**
+ * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
+ */
public void configure(Configuration conf) throws ConfigurationException {
- this.projectBase = conf.getChild(PROJECT_PARAM_NAME).getValue();
- if (getLogger().isDebugEnabled()) getLogger().debug("Configuration supplied: " + this.projectBase);
- if (this.projectBase == null) {
- this.projectBase = PROJECT_PARAM_DEFAULT;
- if (getLogger().isWarnEnabled()) getLogger().warn("No configuration supplied, using default: " + PROJECT_PARAM_DEFAULT);
- }
- if (this.projectBase.equals("")) {
- this.projectBase = PROJECT_PARAM_DEFAULT;
- if (getLogger().isWarnEnabled()) getLogger().warn("Empty configuration supplied, using default: " + PROJECT_PARAM_DEFAULT);
- }
+ this.projectBase = conf.getChild(PROJECT_PARAM_NAME).getValue();
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Configuration supplied: " + this.projectBase);
+ }
+ if (this.projectBase == null) {
+ this.projectBase = PROJECT_PARAM_DEFAULT;
+ if (getLogger().isWarnEnabled()) {
+ getLogger().warn("No configuration supplied, using default: " + PROJECT_PARAM_DEFAULT);
+ }
+ }
+ if (this.projectBase.equals("")) {
+ this.projectBase = PROJECT_PARAM_DEFAULT;
+ if (getLogger().isWarnEnabled()) {
+ getLogger().warn("Empty configuration supplied, using default: " + PROJECT_PARAM_DEFAULT);
+ }
+ }
}
- public Object getAttribute(String name, Configuration modeConf, Map objectModel) throws ConfigurationException {
- String uri = ObjectModelHelper.getRequest(objectModel).getServletPath();
- StringBuffer result = new StringBuffer(uri.length());
- int baseIndex = uri.indexOf(this.projectBase);
- if (baseIndex != -1) {
- uri = uri.substring(baseIndex + this.projectBase.length());
- } else {
- throw new ConfigurationException( "No project-base path found in URI");
- }
- try {
- // provide a relative path back to the project
- if (name.startsWith("relative")) {
- int nextIndex = 0;
- while ((nextIndex = uri.indexOf('/', nextIndex) + 1) > 0) {
- result.append("../");
- }
- } else if (name.startsWith("path")) { // provide the full path from the project
- result.append("/");
- result.append(uri);
- } else if (name.startsWith("folder")) { // provide the folder path from the project
- result.append("/");
- result.append(uri.substring(0,uri.lastIndexOf("/") + 1));
- } else {
- if (getLogger().isWarnEnabled()) getLogger().warn("Invalid verb: " + name);
- }
- return result;
- } catch( final Exception mue ) {
- throw new ConfigurationException( "Problems resolving project path.", mue);
- }
+ /**
+ * @see org.apache.cocoon.components.modules.input.InputModule#getAttribute(java.lang.String, org.apache.avalon.framework.configuration.Configuration, java.util.Map)
+ */
+ public Object getAttribute(String name, Configuration modeConf, Map objectModel)
+ throws ConfigurationException {
+ String uri = ObjectModelHelper.getRequest(objectModel).getServletPath();
+ StringBuffer result = new StringBuffer(uri.length());
+ int baseIndex = uri.indexOf(this.projectBase);
+ if (baseIndex != -1) {
+ uri = uri.substring(baseIndex + this.projectBase.length());
+ } else {
+ throw new ConfigurationException( "No project-base path found in URI");
+ }
+ try {
+ // provide a relative path back to the project
+ if (name.startsWith("relative")) {
+ int nextIndex = 0;
+ while ((nextIndex = uri.indexOf('/', nextIndex) + 1) > 0) {
+ result.append("../");
+ }
+ } else if (name.startsWith("path")) {
+ // provide the full path from the project
+ result.append("/");
+ result.append(uri);
+ } else if (name.startsWith("folder")) {
+ // provide the folder path from the project
+ result.append("/");
+ result.append(uri.substring(0,uri.lastIndexOf("/") + 1));
+ } else {
+ if (getLogger().isWarnEnabled()) {
+ getLogger().warn("Invalid verb: " + name);
+ }
+ }
+ return result;
+ } catch( final Exception mue ) {
+ throw new ConfigurationException( "Problems resolving project path.", mue);
+ }
}
- public Iterator getAttributeNames( Configuration modeConf, Map objectModel ) throws ConfigurationException {
- return ProjectPathModule.returnNames.iterator();
+ /**
+ * @see org.apache.cocoon.components.modules.input.InputModule#getAttributeNames(org.apache.avalon.framework.configuration.Configuration, java.util.Map)
+ */
+ public Iterator getAttributeNames( Configuration modeConf, Map objectModel )
+ throws ConfigurationException {
+ return ProjectPathModule.returnNames.iterator();
}
-
+ /**
+ * @see org.apache.cocoon.components.modules.input.InputModule#getAttributeValues(java.lang.String, org.apache.avalon.framework.configuration.Configuration, java.util.Map)
+ */
public Object[] getAttributeValues( String name, Configuration modeConf, Map objectModel )
- throws ConfigurationException {
-
- List values = new LinkedList();
- values.add( this.getAttribute(name, modeConf, objectModel) );
+ throws ConfigurationException {
+ List values = new LinkedList();
+ values.add( this.getAttribute(name, modeConf, objectModel) );
- return values.toArray();
+ return values.toArray();
}
}