cziegeler    2003/08/20 23:41:19

  Modified:    src/blocks/portal/java/org/apache/cocoon/portal/impl
                        PortalServiceImpl.java
               src/blocks/portal/java/org/apache/cocoon/portal/profile/impl
                        MapProfileLS.java
               src/blocks/portal/conf portal.xconf
  Added:       src/blocks/portal/java/org/apache/cocoon/components/persistence
                        CastorSourceConverter.java
                        RequestDataStoreImpl.java ConverterException.java
                        RequestDataStore.java
  Removed:     src/blocks/portal/java/org/apache/cocoon/components/persistance
                        ConverterException.java CastorSourceConverter.java
                        RequestDataStoreImpl.java RequestDataStore.java
  Log:
  Rename :)
  
  Revision  Changes    Path
  1.1                  
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java
  
  Index: CastorSourceConverter.java
  ===================================================================
  /*
  
   ============================================================================
                     The Apache Software License, Version 1.1
   ============================================================================
  
   Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
      include  the following  acknowledgment:  "This product includes  software
      developed  by the  Apache Software Foundation  (http://www.apache.org/)."
      Alternately, this  acknowledgment may  appear in the software itself,  if
      and wherever such third-party acknowledgments normally appear.
  
   4. The names "Apache Cocoon" and  "Apache Software Foundation" must  not  be
      used to  endorse or promote  products derived from  this software without
      prior written permission. For written permission, please contact
      [EMAIL PROTECTED]
  
   5. Products  derived from this software may not  be called "Apache", nor may
      "Apache" appear  in their name,  without prior written permission  of the
      Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation and was  originally created by
   Stefano Mazzocchi  <[EMAIL PROTECTED]>. For more  information on the Apache
   Software Foundation, please see <http://www.apache.org/>.
  
  */
  package org.apache.cocoon.components.persistence;
  
  import java.io.InputStream;
  import java.io.OutputStream;
  import java.io.OutputStreamWriter;
  import java.io.Writer;
  import java.util.HashMap;
  import java.util.Iterator;
  import java.util.Map;
  import java.util.Map.Entry;
  
  import org.apache.avalon.framework.activity.Initializable;
  import org.apache.avalon.framework.component.Component;
  import org.apache.avalon.framework.component.ComponentException;
  import org.apache.avalon.framework.component.ComponentManager;
  import org.apache.avalon.framework.component.Composable;
  import org.apache.avalon.framework.configuration.Configurable;
  import org.apache.avalon.framework.configuration.Configuration;
  import org.apache.avalon.framework.configuration.ConfigurationException;
  import org.apache.avalon.framework.logger.AbstractLogEnabled;
  import org.apache.avalon.framework.thread.ThreadSafe;
  import org.apache.cocoon.components.source.SourceUtil;
  import org.apache.cocoon.portal.util.ReferenceFieldHandler;
  import org.apache.excalibur.source.Source;
  import org.apache.excalibur.source.SourceResolver;
  import org.exolab.castor.mapping.Mapping;
  import org.exolab.castor.mapping.MappingException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
  import org.xml.sax.InputSource;
  
  /**
   * This is a component that converts the profiles (= object tree) to XML and 
vice-versa
   * using Castor.
   * 
   * In order to work properly the methods provided by this interface require 
some 
   * parameters:
   * objectmap : containing a map of objects for resolving references during 
load
   * profiletype: specifying the mapping (this is one of layout, 
copletinstancedata, copletdata or copletbasedate
   * 
   * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
   * @author <a href="mailto:[EMAIL PROTECTED]">Volker Schmitt</a>
   * @author <a href="mailto:[EMAIL PROTECTED]">Bj&ouml;rn L&uuml;tkemeier</a>
   * 
   * @version CVS $Id: CastorSourceConverter.java,v 1.1 2003/08/21 06:41:19 
cziegeler Exp $
   */
  public class CastorSourceConverter
      extends AbstractLogEnabled
      implements Component, Composable, Configurable, Initializable, ThreadSafe 
{
          
      public static final String ROLE = CastorSourceConverter.class.getName();
  
      private Map mappingSources = new HashMap();
      private ComponentManager manager;
      private Map mappings = new HashMap();
  
      public Object getObject(InputStream stream, Map parameters) throws 
ConverterException {
          try {
              
ReferenceFieldHandler.setObjectMap((Map)parameters.get("objectmap"));
              Unmarshaller unmarshaller = new 
Unmarshaller((Mapping)this.mappings.get(parameters.get("profiletype")));
              Object result = unmarshaller.unmarshal(new InputSource(stream));
              stream.close();
              return result;
          } catch (MappingException e) {
              throw new ConverterException("can't create Unmarshaller", e);
          } catch (Exception e) {
              throw new ConverterException(e.getMessage(), e);
          }
      }
  
        public void storeObject(OutputStream stream, Map parameters, Object 
object) throws ConverterException {
          Writer writer = new OutputStreamWriter(stream);
                try {
                        Marshaller marshaller = new Marshaller( writer );
                        
marshaller.setMapping((Mapping)this.mappings.get(parameters.get(parameters.get("profiletype"))));
                        marshaller.marshal(object);
                        writer.close();
                } catch (MappingException e) {
                        throw new ConverterException("can't create 
Unmarshaller", e);
                } catch (Exception e) {
                        throw new ConverterException(e.getMessage(), e);
                }
        }
  
      /* (non-Javadoc)
       * @see 
org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
       */
      public void compose(ComponentManager manager) throws ComponentException {
          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");
        for (int i=0; i<children.length; i++) {
                Configuration mappingSource = children[i];
                this.mappingSources.put(mappingSource.getAttribute("source"), 
mappingSource.getValue());
        }
      }
  
      /* (non-Javadoc)
       * @see org.apache.avalon.framework.activity.Initializable#initialize()
       */
      public void initialize() throws Exception {
          SourceResolver resolver = (SourceResolver) 
manager.lookup(SourceResolver.ROLE);
          Source source = null;
          try {
                        Entry entry;
                        String name;
                        String mappingSource;
                        Mapping mapping;
                        Iterator iterator = 
this.mappingSources.entrySet().iterator();
                while (iterator.hasNext()) {
                        entry = (Map.Entry)iterator.next(); 
                        name = (String)entry.getKey();
                        mappingSource = (String)entry.getValue();
                        
                                source = resolver.resolveURI(mappingSource);
                                mapping = new Mapping();
                                
mapping.loadMapping(SourceUtil.getInputSource(source));
                                this.mappings.put(name, mapping);
                }
          } finally {
              if (source != null) {
                  resolver.release(source);
              }
              manager.release(resolver);
          }
      }
  }
  
  
  
  1.1                  
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/components/persistence/RequestDataStoreImpl.java
  
  Index: RequestDataStoreImpl.java
  ===================================================================
  /*
  
   ============================================================================
                     The Apache Software License, Version 1.1
   ============================================================================
  
   Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
      include  the following  acknowledgment:  "This product includes  software
      developed  by the  Apache Software Foundation  (http://www.apache.org/)."
      Alternately, this  acknowledgment may  appear in the software itself,  if
      and wherever such third-party acknowledgments normally appear.
  
   4. The names "Apache Cocoon" and  "Apache Software Foundation" must  not  be
      used to  endorse or promote  products derived from  this software without
      prior written permission. For written permission, please contact
      [EMAIL PROTECTED]
  
   5. Products  derived from this software may not  be called "Apache", nor may
      "Apache" appear  in their name,  without prior written permission  of the
      Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation and was  originally created by
   Stefano Mazzocchi  <[EMAIL PROTECTED]>. For more  information on the Apache
   Software Foundation, please see <http://www.apache.org/>.
  
  */
  package org.apache.cocoon.components.persistence;
  
  import java.util.HashMap;
  import java.util.Map;
  
  import org.apache.avalon.framework.component.Component;
  import org.apache.avalon.framework.context.Context;
  import org.apache.avalon.framework.context.ContextException;
  import org.apache.avalon.framework.context.Contextualizable;
  import org.apache.avalon.framework.logger.AbstractLogEnabled;
  import org.apache.avalon.framework.thread.ThreadSafe;
  import org.apache.cocoon.components.ContextHelper;
  import org.apache.cocoon.environment.ObjectModelHelper;
  
  /**
   * 
   * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
   * 
   * @version CVS $Id: RequestDataStoreImpl.java,v 1.1 2003/08/21 06:41:19 
cziegeler Exp $
   */
  public class RequestDataStoreImpl
      extends AbstractLogEnabled
      implements Component, ThreadSafe, RequestDataStore, Contextualizable {
          
      protected Context context;
  
      protected String requestDataKey;
      
      protected String globalRequestDataKey;
  
      /* (non-Javadoc)
       * @see 
org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
       */
      public void contextualize(Context context) throws ContextException {
          this.context = context;
          this.requestDataKey = this.getClass().getName() + "/RD";
          this.globalRequestDataKey = this.getClass().getName() + "/GRD";
      }
  
      /* (non-Javadoc)
       * @see 
org.apache.cocoon.components.persistance.RequestDataStore#getGlobalRequestData(java.lang.String)
       */
      public Object getGlobalRequestData(String key) {
          Object value = null;
          final Map objectModel = 
(Map)ContextHelper.getObjectModel(this.context);
          Map m = (Map)objectModel.get(this.globalRequestDataKey);
          if ( m != null ) {
              value = m.get( key );
          }
          return value;
      }
  
      /* (non-Javadoc)
       * @see 
org.apache.cocoon.components.persistance.RequestDataStore#getRequestData(java.lang.String)
       */
      public Object getRequestData(String key) {
          Object value = null;
          final Map objectModel = 
(Map)ContextHelper.getObjectModel(this.context);
          Map m = (Map)objectModel.get(this.requestDataKey + 
ObjectModelHelper.getRequest(objectModel).hashCode());
          if ( m != null ) {
              value = m.get( key );
          }
          return value;
      }
  
      /* (non-Javadoc)
       * @see 
org.apache.cocoon.components.persistance.RequestDataStore#removeGlobalRequestData(java.lang.String)
       */
      public void removeGlobalRequestData(String key) {
          final Map objectModel = 
(Map)ContextHelper.getObjectModel(this.context);
          Map m = (Map)objectModel.get(this.globalRequestDataKey);
          if ( m != null ) {
              objectModel.remove( key );
          }
      }
  
      /* (non-Javadoc)
       * @see 
org.apache.cocoon.components.persistance.RequestDataStore#removeRequestData(java.lang.String)
       */
      public void removeRequestData(String key) {
          final Map objectModel = 
(Map)ContextHelper.getObjectModel(this.context);
          Map m = (Map)objectModel.get(this.requestDataKey + 
ObjectModelHelper.getRequest(objectModel).hashCode());
          if ( m != null ) {
              objectModel.remove( key );
          }
      }
  
      /* (non-Javadoc)
       * @see 
org.apache.cocoon.components.persistance.RequestDataStore#setGlobalRequestData(java.lang.String,
 java.lang.Object)
       */
      public void setGlobalRequestData(String key, Object value) {
          final Map objectModel = 
(Map)ContextHelper.getObjectModel(this.context);
          Map m = (Map)objectModel.get(this.globalRequestDataKey);
          if ( m == null ) {
              m = new HashMap();
              objectModel.put(this.globalRequestDataKey, m);
          }
          m.put(key, value);
      }
  
      /* (non-Javadoc)
       * @see 
org.apache.cocoon.components.persistance.RequestDataStore#setRequestData(java.lang.String,
 java.lang.Object)
       */
      public void setRequestData(String key, Object value) {
          final Map objectModel = 
(Map)ContextHelper.getObjectModel(this.context);
          Map m = (Map)objectModel.get(this.requestDataKey + 
ObjectModelHelper.getRequest(objectModel).hashCode());
          if ( m == null ) {
              m = new HashMap();
              objectModel.put(this.requestDataKey + 
ObjectModelHelper.getRequest(objectModel).hashCode(), m);
          }
          m.put(key, value);
      }
  
  }
  
  
  
  1.1                  
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/components/persistence/ConverterException.java
  
  Index: ConverterException.java
  ===================================================================
  /*
  
   ============================================================================
                     The Apache Software License, Version 1.1
   ============================================================================
  
   Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
      include  the following  acknowledgment:  "This product includes  software
      developed  by the  Apache Software Foundation  (http://www.apache.org/)."
      Alternately, this  acknowledgment may  appear in the software itself,  if
      and wherever such third-party acknowledgments normally appear.
  
   4. The names "Apache Cocoon" and  "Apache Software Foundation" must  not  be
      used to  endorse or promote  products derived from  this software without
      prior written permission. For written permission, please contact
      [EMAIL PROTECTED]
  
   5. Products  derived from this software may not  be called "Apache", nor may
      "Apache" appear  in their name,  without prior written permission  of the
      Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation and was  originally created by
   Stefano Mazzocchi  <[EMAIL PROTECTED]>. For more  information on the Apache
   Software Foundation, please see <http://www.apache.org/>.
  
  */
  package org.apache.cocoon.components.persistence;
  
  import org.apache.avalon.framework.CascadingException;
  
  /**
   *
   * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
   * @author <a href="mailto:[EMAIL PROTECTED]">Volker Schmitt</a>
   * 
   * @version CVS $Id: ConverterException.java,v 1.1 2003/08/21 06:41:19 
cziegeler Exp $
   */
  public class ConverterException extends CascadingException {
  
      public ConverterException(String message) {
          super(message);
      }
  
      public ConverterException(String message, Throwable throwable) {
          super(message, throwable);
      }
  }
  
  
  
  1.1                  
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/components/persistence/RequestDataStore.java
  
  Index: RequestDataStore.java
  ===================================================================
  /*
  
   ============================================================================
                     The Apache Software License, Version 1.1
   ============================================================================
  
   Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
      include  the following  acknowledgment:  "This product includes  software
      developed  by the  Apache Software Foundation  (http://www.apache.org/)."
      Alternately, this  acknowledgment may  appear in the software itself,  if
      and wherever such third-party acknowledgments normally appear.
  
   4. The names "Apache Cocoon" and  "Apache Software Foundation" must  not  be
      used to  endorse or promote  products derived from  this software without
      prior written permission. For written permission, please contact
      [EMAIL PROTECTED]
  
   5. Products  derived from this software may not  be called "Apache", nor may
      "Apache" appear  in their name,  without prior written permission  of the
      Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation and was  originally created by
   Stefano Mazzocchi  <[EMAIL PROTECTED]>. For more  information on the Apache
   Software Foundation, please see <http://www.apache.org/>.
  
  */
  package org.apache.cocoon.components.persistence;
  
  
  /**
   * 
   * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
   * 
   * @version CVS $Id: RequestDataStore.java,v 1.1 2003/08/21 06:41:19 
cziegeler Exp $
   */
  public interface RequestDataStore {
          
      String ROLE = RequestDataStore.class.getName();
      
      Object getRequestData(String key);
  
      void removeRequestData(String key);
  
      void setRequestData(String key, Object value);
  
      Object getGlobalRequestData(String key);
  
      void removeGlobalRequestData(String key);
  
      void setGlobalRequestData(String key, Object value);
  }
  
  
  
  1.8       +2 -2      
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
  
  Index: PortalServiceImpl.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- PortalServiceImpl.java    20 Aug 2003 07:34:36 -0000      1.7
  +++ PortalServiceImpl.java    21 Aug 2003 06:41:19 -0000      1.8
  @@ -69,7 +69,7 @@
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.thread.ThreadSafe;
   import org.apache.cocoon.components.ContextHelper;
  -import org.apache.cocoon.components.persistance.RequestDataStore;
  +import org.apache.cocoon.components.persistence.RequestDataStore;
   import org.apache.cocoon.portal.PortalComponentManager;
   import org.apache.cocoon.portal.PortalService;
   
  
  
  
  1.3       +2 -2      
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java
  
  Index: MapProfileLS.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MapProfileLS.java 29 Jul 2003 06:30:07 -0000      1.2
  +++ MapProfileLS.java 21 Aug 2003 06:41:19 -0000      1.3
  @@ -63,7 +63,7 @@
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.components.persistance.CastorSourceConverter;
  +import org.apache.cocoon.components.persistence.CastorSourceConverter;
   import org.apache.cocoon.portal.profile.ProfileLS;
   import org.apache.cocoon.xml.dom.DOMUtil;
   import org.apache.excalibur.source.ModifiableSource;
  
  
  
  1.24      +2 -2      cocoon-2.1/src/blocks/portal/conf/portal.xconf
  
  Index: portal.xconf
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/conf/portal.xconf,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- portal.xconf      20 Aug 2003 07:34:36 -0000      1.23
  +++ portal.xconf      21 Aug 2003 06:41:19 -0000      1.24
  @@ -73,7 +73,7 @@
       <store name="persistent" 
class="org.apache.cocoon.portal.aspect.impl.PersistentAspectDataStore"/>
    </component>
   
  -<component 
class="org.apache.cocoon.components.persistance.CastorSourceConverter" 
role="org.apache.cocoon.components.persistance.CastorSourceConverter">
  +<component 
class="org.apache.cocoon.components.persistence.CastorSourceConverter" 
role="org.apache.cocoon.components.persistence.CastorSourceConverter">
        <mapping-source 
source="layout">resource://org/apache/cocoon/portal/layout/layout.xml</mapping-source>
        <mapping-source 
source="copletbasedata">resource://org/apache/cocoon/portal/coplet/copletbasedata.xml</mapping-source>
        <mapping-source 
source="copletdata">resource://org/apache/cocoon/portal/coplet/copletdata.xml</mapping-source>
  @@ -82,5 +82,5 @@
    <component class="org.apache.cocoon.portal.profile.impl.MapProfileLS" 
role="org.apache.cocoon.portal.profile.ProfileLS" />
   
    <component 
class="org.apache.cocoon.components.variables.DefaultVariableResolverFactory" 
role="org.apache.cocoon.components.variables.VariableResolverFactory" />
  - <component 
class="org.apache.cocoon.components.persistance.RequestDataStoreImpl" 
role="org.apache.cocoon.components.persistance.RequestDataStore" />
  + <component 
class="org.apache.cocoon.components.persistence.RequestDataStoreImpl" 
role="org.apache.cocoon.components.persistence.RequestDataStore" />
   </xconf>
  
  
  

Reply via email to