cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r321405 [2/2] - in /cocoon: blocks/portal/trunk/java/org/apache/cocoon/components/persistence/ blocks/portal/trunk/java/org/apache/cocoon/portal/ blocks/portal/trunk/java/org/apache/cocoon/portal/acting/ blocks/portal/trunk/java/org/apache/...
Date Sat, 15 Oct 2005 18:20:41 GMT
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/GroupBasedProfileManager.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/GroupBasedProfileManager.java?rev=321405&r1=321404&r2=321405&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/GroupBasedProfileManager.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/GroupBasedProfileManager.java
Sat Oct 15 11:15:44 2005
@@ -41,6 +41,8 @@
 import org.apache.cocoon.portal.profile.PortalUser;
 import org.apache.cocoon.portal.profile.ProfileLS;
 import org.apache.cocoon.portal.profile.ProfileException;
+import org.apache.cocoon.portal.scratchpad.Profile;
+import org.apache.cocoon.portal.scratchpad.ProfileImpl;
 import org.apache.cocoon.portal.PortalException;
 import org.apache.commons.collections.map.LinkedMap;
 import org.apache.commons.lang.exception.ExceptionUtils;
@@ -113,12 +115,12 @@
         this.parameters = params;
     }
 
-    protected UserProfile getUserProfile(String layoutKey) {
+    protected ProfileImpl getUserProfile(String layoutKey) {
         if ( layoutKey == null ) {
             layoutKey = this.portalService.getDefaultLayoutKey();
         }
 
-        return (UserProfile)this.portalService.getAttribute(KEY_PREFIX + layoutKey);
+        return (ProfileImpl)this.portalService.getAttribute(KEY_PREFIX + layoutKey);
     }
 
     protected void removeUserProfiles() {
@@ -128,7 +130,7 @@
         this.portalService.removeAttribute(KEY_PREFIX + layoutKey);
     }
 
-    protected void storeUserProfile(String layoutKey, UserProfile profile) {
+    protected void storeUserProfile(String layoutKey, Profile profile) {
         if ( layoutKey == null ) {
             layoutKey = this.portalService.getDefaultLayoutKey();
         }
@@ -195,13 +197,13 @@
      * @see org.apache.cocoon.portal.profile.impl.AbstractProfileManager#logout(org.apache.cocoon.portal.profile.PortalUser)
      */
     protected void logout(PortalUser user) {
-        final UserProfile profile = this.getUserProfile(null);
+        final Profile profile = this.getUserProfile(null);
         if ( profile != null ) {
             ServiceSelector adapterSelector = null;
             try {
                 adapterSelector = (ServiceSelector)this.manager.lookup(CopletAdapter.ROLE+"Selector");
 
-                Iterator iter = profile.getCopletInstanceDatas().values().iterator();
+                Iterator iter = profile.getCopletInstanceDataObjects().iterator();
                 while ( iter.hasNext() ) {
                     CopletInstanceData cid = (CopletInstanceData) iter.next();
                     CopletAdapter adapter = null;
@@ -227,9 +229,9 @@
      * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletInstanceData(java.lang.String)
      */
     public CopletInstanceData getCopletInstanceData(String copletID) {
-        final UserProfile profile = this.getUserProfile(null);
+        final Profile profile = this.getUserProfile(null);
         if ( profile != null ) {
-            return (CopletInstanceData)profile.getCopletInstanceDatas().get(copletID);
+            return profile.searchCopletInstanceData(copletID);
         }
         return null;
     }
@@ -238,9 +240,9 @@
      * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletData(java.lang.String)
      */
     public CopletData getCopletData(String copletDataId) {
-        final UserProfile profile = this.getUserProfile(null);
+        final Profile profile = this.getUserProfile(null);
         if ( profile != null ) {
-            return (CopletData)profile.getCopletDatas().get(copletDataId);
+            return profile.searchCopletData(copletDataId);
         }
         return null;
     }
@@ -249,54 +251,51 @@
      * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletInstanceData(org.apache.cocoon.portal.coplet.CopletData)
      */
     public List getCopletInstanceData(CopletData data) {
-        final UserProfile profile = this.getUserProfile(null);
-        final List coplets = new ArrayList();
+        final Profile profile = this.getUserProfile(null);
         if ( profile != null ) {
-            final Iterator iter = profile.getCopletInstanceDatas().values().iterator();
+            final List coplets = new ArrayList();
+            final Iterator iter = profile.getCopletInstanceDataObjects().iterator();
             while ( iter.hasNext() ) {
                 final CopletInstanceData current = (CopletInstanceData)iter.next();
                 if ( current.getCopletData().equals(data) ) {
                     coplets.add( current );
                 }
             }
+            return coplets;
         }
-        return coplets;
+        return Collections.EMPTY_LIST;
     }
 
     /**
      * @see org.apache.cocoon.portal.profile.ProfileManager#register(org.apache.cocoon.portal.coplet.CopletInstanceData)
      */
     public void register(CopletInstanceData coplet) {
-        final UserProfile profile = this.getUserProfile(null);
-        profile.getCopletInstanceDatas().put(coplet.getId(), coplet);
+        final ProfileImpl profile = this.getUserProfile(null);
+        profile.add(coplet);
     }
 
     /**
      * @see org.apache.cocoon.portal.profile.ProfileManager#unregister(org.apache.cocoon.portal.coplet.CopletInstanceData)
      */
     public void unregister(CopletInstanceData coplet) {
-        final UserProfile profile = this.getUserProfile(null);
-        profile.getCopletInstanceDatas().remove(coplet.getId());
+        final ProfileImpl profile = this.getUserProfile(null);
+        profile.remove(coplet);
     }
 
     /**
      * @see org.apache.cocoon.portal.profile.ProfileManager#register(org.apache.cocoon.portal.layout.Layout)
      */
     public void register(Layout layout) {
-        if ( layout != null && layout.getId() != null ) {
-            final UserProfile profile = this.getUserProfile(null);    
-            profile.getLayouts().put(layout.getId(), layout);
-        }
+        final ProfileImpl profile = this.getUserProfile(null);
+        profile.add(layout);
     }
 
     /**
      * @see org.apache.cocoon.portal.profile.ProfileManager#unregister(org.apache.cocoon.portal.layout.Layout)
      */
     public void unregister(Layout layout) {
-        if ( layout != null && layout.getId() != null ) {
-            final UserProfile profile = this.getUserProfile(null);
-            profile.getLayouts().remove(layout.getId());
-        }
+        final ProfileImpl profile = this.getUserProfile(null);
+        profile.remove(layout);
     }
 
     /**
@@ -307,7 +306,7 @@
             layoutKey = this.portalService.getDefaultLayoutKey();
         }
 
-        UserProfile profile = this.getUserProfile(layoutKey);
+        Profile profile = this.getUserProfile(layoutKey);
         if ( profile == null ) {
             try {
                 profile = this.loadProfile(layoutKey);
@@ -319,7 +318,7 @@
             throw new ProfileException("Unable to load profile: " + layoutKey);
         }
         if ( layoutId != null ) {
-            return (Layout)profile.getLayouts().get(layoutId);
+            return profile.searchLayout(layoutId);
         }
         return profile.getRootLayout();
     }
@@ -328,9 +327,9 @@
      * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletDatas()
      */
     public Collection getCopletDatas() {
-        final UserProfile profile = this.getUserProfile(null);
+        final Profile profile = this.getUserProfile(null);
         if ( profile != null ) {
-            return profile.getCopletDatas().values();
+            return profile.getCopletDataObjects();
         }
         return null;
     }
@@ -339,9 +338,9 @@
      * @see org.apache.cocoon.portal.profile.ProfileManager#getCopletInstanceDatas()
      */
     public Collection getCopletInstanceDatas() {
-        final UserProfile profile = this.getUserProfile(null);
+        final Profile profile = this.getUserProfile(null);
         if ( profile != null ) {
-            return profile.getCopletInstanceDatas().values();
+            return profile.getCopletInstanceDataObjects();
         }
         return null;
     }
@@ -349,13 +348,13 @@
     /**
      * Load the profile
      */
-    protected UserProfile loadProfile(final String layoutKey) 
+    protected Profile loadProfile(final String layoutKey) 
     throws Exception {
         final PortalUser info = (PortalUser)this.portalService.getTemporaryAttribute(USER_ATTRIBUTE);
         ProfileLS loader = null;
         try {
             loader = (ProfileLS)this.manager.lookup( ProfileLS.ROLE );
-            final UserProfile profile = new UserProfile();
+            final ProfileImpl profile = new ProfileImpl(layoutKey);
             this.storeUserProfile(layoutKey, profile);
 
             // first "load" the global data
@@ -435,7 +434,7 @@
 
     protected Map getGlobalDatas(final ProfileLS   loader,
                                  final PortalUser  info,
-                                 final UserProfile profile,
+                                 final ProfileImpl profile,
                                  final String      layoutKey) 
     throws Exception {
         // if we already have loaded the profile and don't check
@@ -453,7 +452,7 @@
         parameters.put(ProfileLS.PARAMETER_PROFILETYPE, 
                        ProfileLS.PROFILETYPE_COPLETDATA);
         parameters.put(ProfileLS.PARAMETER_OBJECTMAP,
-                       profile.getCopletBaseDatas());
+                       profile.getCopletBaseDatasMap());
 
         SourceValidity newValidity = null;
         // if we have a profile, check for reloading
@@ -493,7 +492,7 @@
     }
 
     protected boolean getCopletInstanceDatas(final ProfileLS   loader,
-                                             final UserProfile profile,
+                                             final ProfileImpl profile,
                                              final PortalUser  info,
                                              final String      category,
                                              final String      layoutKey) 
@@ -507,12 +506,12 @@
         parameters.put(ProfileLS.PARAMETER_PROFILETYPE, 
                        ProfileLS.PROFILETYPE_COPLETINSTANCEDATA);        
         parameters.put(ProfileLS.PARAMETER_OBJECTMAP,
-                       profile.getCopletDatas());
+                       profile.getCopletDatasMap());
 
         try {
             CopletInstanceDataManager cidm = (CopletInstanceDataManager)loader.loadProfile(key,
parameters);
             profile.setCopletInstanceDatas(cidm.getCopletInstanceData());
-            this.prepareObject(profile.getCopletInstanceDatas());
+            this.prepareObject(profile.getCopletInstanceDatasMap());
 
             return true;
         } catch (Exception e) {
@@ -524,7 +523,7 @@
     }
 
     protected boolean getLayout(final ProfileLS   loader,
-                                final UserProfile profile,
+                                final ProfileImpl profile,
                                 final PortalUser  info,
                                 final String      category,
                                 final String      layoutKey) 
@@ -538,7 +537,7 @@
         parameters.put(ProfileLS.PARAMETER_PROFILETYPE, 
                        ProfileLS.PROFILETYPE_LAYOUT);        
         parameters.put(ProfileLS.PARAMETER_OBJECTMAP, 
-                       profile.getCopletInstanceDatas());
+                       profile.getCopletInstanceDatasMap());
         try {
             Layout l = (Layout)loader.loadProfile(key, parameters);
             this.prepareObject(l);
@@ -603,7 +602,7 @@
             if (layoutKey == null) {
                 layoutKey = this.portalService.getDefaultLayoutKey();
             }
-            final UserProfile profile = this.getUserProfile(layoutKey);
+            final ProfileImpl profile = this.getUserProfile(layoutKey);
 
             final Map parameters = new HashMap();
             parameters.put(ProfileLS.PARAMETER_PROFILETYPE, 
@@ -615,7 +614,7 @@
                                           false,
                                           layoutKey);
             // FIXME - we should be able to save without creating a CopletInstanceDataManager
-            CopletInstanceDataManager cidm = new CopletInstanceDataManager(profile.getCopletInstanceDatas());
+            CopletInstanceDataManager cidm = new CopletInstanceDataManager(profile.getCopletInstanceDatasMap());
             adapter.saveProfile(key, parameters, cidm);
         } catch (Exception e) {
             // TODO
@@ -635,7 +634,7 @@
             if (layoutKey == null) {
                 layoutKey = this.portalService.getDefaultLayoutKey();
             }
-            final UserProfile profile = this.getUserProfile(layoutKey);
+            final Profile profile = this.getUserProfile(layoutKey);
 
             final Map parameters = new HashMap();
             parameters.put(ProfileLS.PARAMETER_PROFILETYPE, 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/scratchpad/Profile.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/scratchpad/Profile.java?rev=321405&r1=321404&r2=321405&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/scratchpad/Profile.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/scratchpad/Profile.java Sat Oct
15 11:15:44 2005
@@ -15,7 +15,7 @@
  */
 package org.apache.cocoon.portal.scratchpad;
 
-import java.util.Iterator;
+import java.util.Collection;
 
 import org.apache.cocoon.portal.coplet.CopletBaseData;
 import org.apache.cocoon.portal.coplet.CopletData;
@@ -35,20 +35,21 @@
 
     String getProfileName();
 
-    Iterator getCopletBaseDataObjects();
-    Iterator getCopletDataObjects();
-    Iterator getCopletInstanceDataObjects();
-    Iterator getLayoutObjects();
+    Collection getCopletBaseDataObjects();
+    Collection getCopletDataObjects();
+    Collection getCopletInstanceDataObjects();
+    Collection getLayoutObjects();
 
     Layout searchLayout(String layoutId);
-    
+    Layout getRootLayout();
+
     CopletBaseData searchCopletBaseData(String copletBaseDataId);
 
     CopletData searchCopletData(String copletDataId);
-    Iterator searchCopletDataObjects(String copletBaseDataId);
-    Iterator searchCopletDataObjects(CopletBaseData copletBaseData);
+    Collection searchCopletDataObjects(String copletBaseDataId);
+    Collection searchCopletDataObjects(CopletBaseData copletBaseData);
 
     CopletInstanceData searchCopletInstanceData(String copletId);
-    Iterator searchCopletInstanceDataObjects(String copletDataId);
-    Iterator searchCopletInstanceDataObjects(CopletData copletData);
+    Collection searchCopletInstanceDataObjects(String copletDataId);
+    Collection searchCopletInstanceDataObjects(CopletData copletData);
 }

Added: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/scratchpad/ProfileImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/scratchpad/ProfileImpl.java?rev=321405&view=auto
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/scratchpad/ProfileImpl.java (added)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/scratchpad/ProfileImpl.java Sat
Oct 15 11:15:44 2005
@@ -0,0 +1,274 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.portal.scratchpad;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cocoon.portal.coplet.CopletBaseData;
+import org.apache.cocoon.portal.coplet.CopletData;
+import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.layout.CompositeLayout;
+import org.apache.cocoon.portal.layout.Item;
+import org.apache.cocoon.portal.layout.Layout;
+
+/**
+ * The profile for a single user.
+ * WORK IN PROGRESS
+ *
+ * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
+ *
+ * @version $Id$
+ * @since 2.2
+ */
+public class ProfileImpl implements Profile {
+
+    /** The name (unique key) of this profile. */
+    protected final String profileName;
+
+    /** A map of all coplet base datas. */
+    protected Map copletBaseDatas;
+
+    /** A map of all coplet datas. */
+    protected Map copletDatas;
+
+    /** A map of all coplet instance datas. */
+    protected Map copletInstanceDatas;
+
+    /** A list of all layouts. */
+    protected List layouts;
+
+    /** A map of all layouts having an id. */
+    protected Map keyedLayouts;
+
+    /** The root element of the layout. */
+    protected Layout rootLayout;
+
+    public ProfileImpl(String profileName) {
+        this.profileName = profileName;
+    }
+
+    /**
+     * Set the root layout for this profile.
+     */
+    public void setRootLayout(Layout rootLayout) {
+        this.rootLayout = rootLayout;
+        this.createLayoutCollections();
+    }
+
+    public void setCopletBaseDatas(Map copletBaseDatas) {
+        this.copletBaseDatas = copletBaseDatas;
+    }
+
+    public void setCopletDatas(Map copletDatas) {
+        this.copletDatas = copletDatas;
+    }
+
+    public void setCopletInstanceDatas(Map copletInstanceDatas) {
+        this.copletInstanceDatas = copletInstanceDatas;
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.scratchpad.Profile#getRootLayout()
+     */
+    public Layout getRootLayout() {
+        return this.rootLayout;
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.scratchpad.Profile#getCopletBaseDataObjects()
+     */
+    public Collection getCopletBaseDataObjects() {
+        return this.copletBaseDatas.values();
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.scratchpad.Profile#getCopletDataObjects()
+     */
+    public Collection getCopletDataObjects() {
+        return this.copletDatas.values();
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.scratchpad.Profile#getCopletInstanceDataObjects()
+     */
+    public Collection getCopletInstanceDataObjects() {
+        return this.copletInstanceDatas.values();
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.scratchpad.Profile#getLayoutObjects()
+     */
+    public Collection getLayoutObjects() {
+        return this.layouts;
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.scratchpad.Profile#getProfileName()
+     */
+    public String getProfileName() {
+        return this.profileName;
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.scratchpad.Profile#searchCopletBaseData(java.lang.String)
+     */
+    public CopletBaseData searchCopletBaseData(String copletBaseDataId) {
+        return (CopletBaseData) this.copletBaseDatas.get(copletBaseDataId);
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.scratchpad.Profile#searchCopletData(java.lang.String)
+     */
+    public CopletData searchCopletData(String copletDataId) {
+        return (CopletData) this.copletDatas.get(copletDataId);
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.scratchpad.Profile#searchCopletDataObjects(org.apache.cocoon.portal.coplet.CopletBaseData)
+     */
+    public Collection searchCopletDataObjects(CopletBaseData copletBaseData) {
+        final List list = new ArrayList();
+        final Iterator i = this.getCopletDataObjects().iterator();
+        while ( i.hasNext() ) {
+            final CopletData current = (CopletData)i.next();
+            if ( current.getCopletBaseData().equals(copletBaseData) ) {
+                list.add(current);
+            }
+        }
+        return list;
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.scratchpad.Profile#searchCopletDataObjects(java.lang.String)
+     */
+    public Collection searchCopletDataObjects(String copletBaseDataId) {
+        final CopletBaseData cbd = this.searchCopletBaseData(copletBaseDataId);
+        if ( cbd != null ) {
+            return this.searchCopletDataObjects(cbd);
+        }
+        return null;
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.scratchpad.Profile#searchCopletInstanceData(java.lang.String)
+     */
+    public CopletInstanceData searchCopletInstanceData(String copletId) {
+        return (CopletInstanceData) this.copletInstanceDatas.get(copletId);
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.scratchpad.Profile#searchCopletInstanceDataObjects(org.apache.cocoon.portal.coplet.CopletData)
+     */
+    public Collection searchCopletInstanceDataObjects(CopletData copletData) {
+        final List list = new ArrayList();
+        final Iterator i = this.getCopletInstanceDataObjects().iterator();
+        while ( i.hasNext() ) {
+            final CopletInstanceData current = (CopletInstanceData)i.next();
+            if ( current.getCopletData().equals(copletData) ) {
+                list.add(current);
+            }
+        }
+        return list;
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.scratchpad.Profile#searchCopletInstanceDataObjects(java.lang.String)
+     */
+    public Collection searchCopletInstanceDataObjects(String copletDataId) {
+        final CopletData copletData = this.searchCopletData(copletDataId);
+        if ( copletData != null ) {
+            return this.searchCopletInstanceDataObjects(copletData);
+        }
+        return null;
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.scratchpad.Profile#searchLayout(java.lang.String)
+     */
+    public Layout searchLayout(String layoutId) {
+        return (Layout)this.keyedLayouts.get(layoutId);
+    }
+
+    protected void createLayoutCollections() {
+        this.layouts = new ArrayList();
+        this.keyedLayouts = new HashMap();
+        this.traverseLayouts(this.rootLayout);
+    }
+
+    protected void traverseLayouts(Layout layout) {
+        if ( layout != null ) {
+            this.layouts.add(layout);
+            if ( layout.getId() != null ) {
+                this.keyedLayouts.put( layout.getId(), layout );
+            }
+            if ( layout instanceof CompositeLayout ) {
+                final CompositeLayout cl = (CompositeLayout)layout;
+                final Iterator i = cl.getItems().iterator();
+                while ( i.hasNext() ) {
+                    final Item current = (Item)i.next();
+                    this.traverseLayouts( current.getLayout() );
+                }
+            }
+        }        
+    }
+
+    public void add(CopletInstanceData cid) {
+        if ( cid != null ) {
+            this.copletInstanceDatas.put(cid.getId(), cid);
+        }
+    }
+
+    public void remove(CopletInstanceData cid) {
+        if ( cid != null ) {
+            this.copletInstanceDatas.remove(cid.getId());
+        }
+    }
+
+    public void add(Layout layout) {
+        if ( layout != null ) {
+            this.layouts.add(layout);
+            if ( layout.getId() != null ) {
+                this.keyedLayouts.put(layout.getId(), layout);
+            }
+        }
+    }
+
+    public void remove(Layout layout) {
+        if ( layout != null ) {
+            if ( layout.getId() != null ) {
+                this.keyedLayouts.remove(layout.getId());
+            }
+            this.layouts.remove(layout);
+        }
+    }
+
+    public Map getCopletInstanceDatasMap() {
+        return this.copletInstanceDatas;
+    }
+
+    public Map getCopletDatasMap() {
+        return this.copletDatas;
+    }
+    
+    public Map getCopletBaseDatasMap() {
+        return this.copletBaseDatas;
+    }
+}

Propchange: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/scratchpad/ProfileImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/scratchpad/ProfileImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/CREDITS.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/CREDITS.txt?rev=321405&r1=321404&r2=321405&view=diff
==============================================================================
--- cocoon/trunk/CREDITS.txt (original)
+++ cocoon/trunk/CREDITS.txt Sat Oct 15 11:15:44 2005
@@ -31,7 +31,10 @@
 
 The initial code of the new portal framework is a donation by a joined development
 effort of BASF IT-Services (http://www.basf-it-services.com) 
-and s&n AG (http://www.s-und-n.de).
+and s&n AG (http://www.s-und-n.de). This initial version has been developed by
+Volker Schmitt (volker.schmitt@basf-it-services.com), 
+Juergen Seitz (juergen.seitz@basf-it-services.com),
+Bjoern Luetkemeier (bluetkemeier@s-und-n.de) and Carsten Ziegeler (cziegeler@s-und-n.de).
 
 The initial code of the new ojb block and other contributions from Antonio Gallardo
 and Carlos Chávez are made posible by the time donated by AG Software, S. A.



Mime
View raw message