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/01/13 21:24:08 UTC
svn commit: r495962 - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-auth-impl/src/main/java/org/apache/cocoon/auth/portal/
cocoon-portal-sample/src/main/resources/COB-INF/
cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/
Author: cziegeler
Date: Sat Jan 13 12:24:07 2007
New Revision: 495962
URL: http://svn.apache.org/viewvc?view=rev&rev=495962
Log:
Remove unused interface
Make portal sample work again by disabling ajax features and uncommenting cforms transformation.
Removed:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-auth-impl/src/main/java/org/apache/cocoon/auth/portal/PortalApplication.java
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-auth-impl/src/main/java/org/apache/cocoon/auth/portal/StandardPortalApplication.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-auth-impl/src/main/java/org/apache/cocoon/auth/portal/StandardPortalApplication.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-auth-impl/src/main/java/org/apache/cocoon/auth/portal/StandardPortalApplication.java?view=diff&rev=495962&r1=495961&r2=495962
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-auth-impl/src/main/java/org/apache/cocoon/auth/portal/StandardPortalApplication.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-auth-impl/src/main/java/org/apache/cocoon/auth/portal/StandardPortalApplication.java Sat Jan 13 12:24:07 2007
@@ -38,31 +38,16 @@
* @version $Id$
*/
public class StandardPortalApplication
- extends StandardApplication
- implements PortalApplication {
+ extends StandardApplication {
/** Attribute storing the portal user. */
public static final String PORTAL_USER = PortalUser.class.getName();
- /** The configuration. */
- protected Map portalConfig = Collections.EMPTY_MAP;
-
/** The portal service. */
protected PortalService portalService;
public void setPortalService(PortalService s) {
this.portalService = s;
- }
-
- public void setPortalConfig(Map config) {
- this.portalConfig = config;
- }
-
- /**
- * @see org.apache.cocoon.auth.portal.PortalApplication#getPortalConfiguration()
- */
- public Map getPortalConfiguration() {
- return this.portalConfig;
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf?view=diff&rev=495962&r1=495961&r2=495962
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf Sat Jan 13 12:24:07 2007
@@ -53,7 +53,7 @@
<!-- The directory where all possible skins are stored. -->
<skins-path>skins</skins-path>
<!-- Whether the portal should use ajax or not -->
- <use-ajax>true</use-ajax>
+ <use-ajax>false</use-ajax>
</configuration>
</portal>
</portal-service>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=495962&r1=495961&r2=495962
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap Sat Jan 13 12:24:07 2007
@@ -219,9 +219,11 @@
<map:parameter name="title" value="{global:mainTitle}"/>
<map:parameter name="skin" value="{portal-skin:skin}"/>
</map:transform>
+ <!--
<map:transform src="{portal-skin:skin.basepath}/styles/forms-styling.xsl">
<map:parameter name="resources-uri" value="{request:contextPath}/_cocoon/resources"/>
</map:transform>
+ -->
<map:transform type="cinclude"/>
<map:transform type="portal-coplet"/>
<map:transform type="portal-new-eventlink"/>