portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raph...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/util URILookup.java
Date Wed, 02 May 2001 10:48:31 GMT
raphael     01/05/02 03:48:29

  Modified:    src/java/org/apache/jetspeed/daemon/impl FeedDaemon.java
               src/java/org/apache/jetspeed/daemon/impl/util/diskcachedaemon
                        PortletRefresher.java URLRefresher.java
               src/java/org/apache/jetspeed/daemon/impl/util/feeddaemon
                        EntryInstantiator.java Instantiator.java
               src/java/org/apache/jetspeed/modules/navigations
                        JetspeedTopNavigation.java
               src/java/org/apache/jetspeed/modules/screens Customize.java
                        Home.java
               src/java/org/apache/jetspeed/om/registry BaseRegistry.java
                        CapabilityMapRegistry.java EntryFactory.java
                        InvalidEntryException.java MediaTypeRegistry.java
                        PortletControlRegistry.java
                        PortletControllerRegistry.java PortletRegistry.java
                        Registry.java RegistryEntry.java
                        RegistryException.java
               src/java/org/apache/jetspeed/om/registry/peer
                        CapabilityMapEntry.java MediaTypeEntry.java
                        MetaInfo.java Parameter.java
                        PortletControlEntry.java
                        PortletControllerEntry.java PortletEntry.java
                        PortletEntryNormalizer.java ProfileEntry.java
                        Security.java
               src/java/org/apache/jetspeed/om/registry/peer/base
                        BasePortletEntry.java
               src/java/org/apache/jetspeed/portal PortletURIManager.java
               src/java/org/apache/jetspeed/portal/factory
                        MetaDataFactory.java ParametersFactory.java
                        PortletConfigFactory.java PortletFactory.java
                        PortletSetFactory.java
               src/java/org/apache/jetspeed/portal/portlets
                        ApplicationsPortlet.java PortletInfoPortlet.java
               src/java/org/apache/jetspeed/portal/portlets/customize
                        CustomizePortlet.java
               src/java/org/apache/jetspeed/services/jsp/tags
                        URILookupTag.java
               src/java/org/apache/jetspeed/services/portletcache
                        CacheHandleManager.java
               src/java/org/apache/jetspeed/services/profiler
                        JetspeedProfileManagerService.java
               src/java/org/apache/jetspeed/services/registrymanager
                        FileWatcher.java
               src/java/org/apache/jetspeed/util URILookup.java
  Added:       src/java/org/apache/jetspeed/om/newregistry
                        InvalidEntryException.java MediaTypeEntry.java
                        MetaInfo.java Parameter.java
                        PortletControlEntry.java
                        PortletControllerEntry.java PortletEntry.java
                        PortletInfoEntry.java Registry.java
                        RegistryEntry.java RegistryException.java
                        Security.java
               src/java/org/apache/jetspeed/om/newregistry/base
                        BaseMediaTypeEntry.java BaseMetaInfo.java
                        BaseParameter.java BasePortletControlEntry.java
                        BasePortletControllerEntry.java
                        BasePortletEntry.java BasePortletInfoEntry.java
                        BasePortletRegistry.java BaseRegistry.java
                        BaseRegistryEntry.java BaseSecurity.java
               src/java/org/apache/jetspeed/services Registry.java
               src/java/org/apache/jetspeed/services/registry
                        CastorRegistryService.java FileRegistry.java
                        RegistryFragment.java RegistryService.java
                        RegistryUtils.java RegistryWatcher.java
  Log:
  new registry implementation
  - new Registry service
  - new om.newregistry object model package
  - modified user classes dependent on the API
  
  Revision  Changes    Path
  1.31      +11 -27    jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/FeedDaemon.java
  
  Index: FeedDaemon.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/FeedDaemon.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- FeedDaemon.java	2001/03/07 06:43:08	1.30
  +++ FeedDaemon.java	2001/05/02 10:45:38	1.31
  @@ -64,14 +64,12 @@
   import org.apache.jetspeed.portal.factory.*;
   import org.apache.jetspeed.util.*;
   import org.apache.jetspeed.services.resources.JetspeedResources;
  -import org.apache.jetspeed.xml.api.registrymarkup.Registry;
  -import org.apache.jetspeed.xml.api.registrymarkup.Parameter;
  -import org.apache.jetspeed.xml.api.registrymarkup.Security;
  -import org.apache.jetspeed.xml.api.registrymarkup.Metainfo;
  +import org.apache.jetspeed.services.registry.FileRegistry;
  +import org.apache.jetspeed.services.registry.RegistryService;
   
  -
   //turbine stuff
   import org.apache.turbine.util.*;
  +import org.apache.turbine.services.TurbineServices;
   
   //java stuff
   import java.io.*;
  @@ -102,7 +100,7 @@
   </p>
   
   @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -@version $Id: FeedDaemon.java,v 1.30 2001/03/07 06:43:08 taylor Exp $
  +@version $Id: FeedDaemon.java,v 1.31 2001/05/02 10:45:38 raphael Exp $
   */
   public class FeedDaemon implements Daemon, Initable {
   
  @@ -189,6 +187,8 @@
   
                   String url = feeds[i].getURL();
   
  +                String name = "feed_"+feeds[i].getName();
  +                
                   String transformed = "";
   
                   try {
  @@ -200,33 +200,17 @@
                       
                       //the string transformed should now contain PML... tranform it into PortletMarkup
                       Log.note("Determining portlets...");
  -    
  -                    Registry reg = Registry.unmarshal( new StringReader( transformed ) );
  -    
  -                    Log.note("FeedDaemon: Got new portlets");
       
  -                    //FIX ME: we should have all the Portlets... now sort them
  -
  -                    FeedDaemon.count += reg.getPortlets().getEntry().length;
  -
  -                    Log.note( "Found a total of: " + count + " portlets..." );
  -                    
  -                    
  -                    //now go through the entries you found and add them to the PortletRegistry
  -                    org.apache.jetspeed.xml.api.registrymarkup.Entry[] entries = reg.getPortlets().getEntry();
  -                        
  -                    //now go through all the Portlet entries/entryRefs and instantiate them.
  -                    //this.instantiate();
  -                    
  -                    EntryInstantiator ei = new EntryInstantiator( entries );
  -                    ei.process();
  +                    FileRegistry registry = (FileRegistry)TurbineServices.getInstance()
  +                                                .getService( RegistryService.SERVICE_NAME );
   
  -                    
  +                    registry.createFragment( name, new StringReader( transformed ), true );
  +    
                       Log.note( "END FEED -> " + url + " -> SUCCESS");    
   
                       this.setResult( Daemon.RESULT_SUCCESS );    
   
  -                } catch ( CastorException e ) {
  +                } catch ( Exception e ) {
   
                       error( e, "FeedDaemon:  Couldn't process URL:  " + url );
   
  
  
  
  1.12      +4 -4      jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/diskcachedaemon/PortletRefresher.java
  
  Index: PortletRefresher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/diskcachedaemon/PortletRefresher.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- PortletRefresher.java	2001/03/07 06:43:19	1.11
  +++ PortletRefresher.java	2001/05/02 10:45:45	1.12
  @@ -56,8 +56,8 @@
   
   //jetspeed stuff
   import org.apache.jetspeed.portal.factory.PortletFactory;
  -import org.apache.jetspeed.om.registry.peer.PortletEntry;
  -import org.apache.jetspeed.services.registrymanager.RegistryManager;
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
  +import org.apache.jetspeed.services.Registry;
   import org.apache.jetspeed.services.urlmanager.URLManager;
   
   //turbine stuff
  @@ -71,7 +71,7 @@
   </p>
   
   @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -@version $Id: PortletRefresher.java,v 1.11 2001/03/07 06:43:19 taylor Exp $
  +@version $Id: PortletRefresher.java,v 1.12 2001/05/02 10:45:45 raphael Exp $
   */
   public class PortletRefresher implements Runnable {
      
  @@ -100,7 +100,7 @@
               Log.error( t );
   
               URLManager.register( this.entry.getURL(), URLManager.STATUS_BAD, t.toString() );
  -            RegistryManager.removeEntry( RegistryManager.PORTLET_REGISTRY, this.entry.getName() );
  +            Registry.removeEntry( Registry.PORTLET, this.entry.getName() );
              
           }
          
  
  
  
  1.9       +23 -25    jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/diskcachedaemon/URLRefresher.java
  
  Index: URLRefresher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/diskcachedaemon/URLRefresher.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- URLRefresher.java	2001/03/07 06:43:22	1.8
  +++ URLRefresher.java	2001/05/02 10:45:47	1.9
  @@ -59,10 +59,8 @@
   import org.apache.jetspeed.cache.disk.*;
   import org.apache.jetspeed.portal.*;
   import org.apache.jetspeed.portal.factory.*;
  -import org.apache.jetspeed.om.registry.PortletRegistry;
  -import org.apache.jetspeed.om.registry.peer.PortletEntry;
  -import org.apache.jetspeed.services.registrymanager.RegistryManager;
  -//SGP
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
  +import org.apache.jetspeed.services.Registry;
   import org.apache.jetspeed.services.urlmanager.URLFetcher;
   
   
  @@ -82,7 +80,7 @@
   </p>
   
   @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -@version $Id: URLRefresher.java,v 1.8 2001/03/07 06:43:22 taylor Exp $
  +@version $Id: URLRefresher.java,v 1.9 2001/05/02 10:45:47 raphael Exp $
   */
   public class URLRefresher implements Runnable {
   
  @@ -113,32 +111,32 @@
                   
                   //create a Runnable for updating this Portlet in the cache.
                       
  -                Enumeration enum = ((PortletRegistry)RegistryManager
  -                                        .get(RegistryManager.PORTLET_REGISTRY))
  -                                        .getEntries( url );
  +                Enumeration enum = Registry.get(Registry.PORTLET).getEntries();
                       
                   while( enum.hasMoreElements() ) {
  -                    try {
  -                        
  -                        PortletEntry entry = (PortletEntry)enum.nextElement();
  -                        
  -                        PortletRefresher pr = new PortletRefresher( entry );
  +                    PortletEntry entry = (PortletEntry)enum.nextElement();
  +                    
  +                    if ( (entry.getURL()!= null) && entry.getURL().equals(url) )
  +                    {
  +                        try
  +                        {
  +                            PortletRefresher pr = new PortletRefresher( entry );
                           
  -                        //now put this Instantiator in the ThreadPool so that 
  -                        //it can execute.
  -                        //SGP Trying to intersperse CPU intensive tasks with
  -                        // network intensive tasks
  -                        pr.run();
  -                        //ThreadPool.process( pr );
  -                    } catch (Throwable t) {
  -                        //FIXME: Put it in the bad URL list
  -                        Log.note( "DiskCacheDaemon: Error refreshing: " + url ); 
  +                            //now put this Instantiator in the ThreadPool so that 
  +                            //it can execute.
  +                            //SGP Trying to intersperse CPU intensive tasks with
  +                            // network intensive tasks
  +                            pr.run();
  +                            //ThreadPool.process( pr );
  +                        }
  +                        catch (Throwable t)
  +                        {
  +                            //FIXME: Put it in the bad URL list
  +                            Log.note( "DiskCacheDaemon: Error refreshing: " + url ); 
  +                        }
                       }
                   }
  -                
               }
  -
  -             
           } catch ( Throwable t ) {
               Log.error( t );
           }
  
  
  
  1.9       +7 -14     jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/feeddaemon/EntryInstantiator.java
  
  Index: EntryInstantiator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/feeddaemon/EntryInstantiator.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- EntryInstantiator.java	2001/03/07 06:43:27	1.8
  +++ EntryInstantiator.java	2001/05/02 10:45:56	1.9
  @@ -59,12 +59,8 @@
   import org.apache.jetspeed.portal.factory.*;
   import org.apache.jetspeed.portal.*;
   import org.apache.jetspeed.services.threadpool.ThreadPool;
  -import org.apache.jetspeed.services.registrymanager.RegistryManager;
  -import org.apache.jetspeed.om.registry.peer.PortletEntry;
  -import org.apache.jetspeed.om.registry.EntryFactory;
  -import org.apache.jetspeed.xml.api.registrymarkup.Parameter;
  -import org.apache.jetspeed.xml.api.registrymarkup.Security;
  -import org.apache.jetspeed.xml.api.registrymarkup.Metainfo;
  +import org.apache.jetspeed.services.Registry;
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
   
   //turbine stuff
   import org.apache.turbine.util.*;
  @@ -78,32 +74,29 @@
   everything is in memory.
   
   @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -@version $Id: EntryInstantiator.java,v 1.8 2001/03/07 06:43:27 taylor Exp $
  +@version $Id: EntryInstantiator.java,v 1.9 2001/05/02 10:45:56 raphael Exp $
   */
   public class EntryInstantiator {
   
  -    private org.apache.jetspeed.xml.api.registrymarkup.Entry[] entries = null;
  +    private PortletEntry[] entries = null;
       
       /**
       Create a EntryInstantiator for processing.
       */
  -    public EntryInstantiator( org.apache.jetspeed.xml.api.registrymarkup.Entry[] entries ) {
  +    public EntryInstantiator( PortletEntry[] entries ) {
           super();
           this.entries = entries;
       }
       
       public void process() {
   
  -        //FIX ME:  This will be an incorrect message until everything is stored in the PortletRegistry.
           Log.note( "BEGIN: EntryInstantiator:  Instantiating " + 
  -                  RegistryManager.get(RegistryManager.PORTLET_REGISTRY).getEntryCount() + 
  +                  Registry.get(Registry.PORTLET).getEntryCount() + 
                     " Portlet(s) found in the PortletRegistry" );
   
           for( int i = 0; i < entries.length; ++i ) {
  -            PortletEntry entry = (PortletEntry)EntryFactory.getEntry( entries[i] );
   
  -            Instantiator inst = new Instantiator( i, entry );
  -            
  +            Instantiator inst = new Instantiator( i, entries[i] );
               ThreadPool.process( inst );
   
           }
  
  
  
  1.17      +5 -12     jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/feeddaemon/Instantiator.java
  
  Index: Instantiator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/feeddaemon/Instantiator.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Instantiator.java	2001/03/07 06:43:29	1.16
  +++ Instantiator.java	2001/05/02 10:45:58	1.17
  @@ -59,20 +59,13 @@
   import org.apache.jetspeed.cache.disk.*;
   import org.apache.jetspeed.portal.*;
   import org.apache.jetspeed.portal.factory.*;
  -import org.apache.jetspeed.om.registry.PortletRegistry;
  -import org.apache.jetspeed.om.registry.peer.PortletEntry;
  -import org.apache.jetspeed.services.registrymanager.RegistryManager;
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
  +import org.apache.jetspeed.services.Registry;
   import org.apache.jetspeed.services.urlmanager.URLManager;
   import org.apache.jetspeed.services.urlmanager.URLManagerService;
   import org.apache.jetspeed.services.urlmanager.URLFetcher;
   import org.apache.jetspeed.services.resources.JetspeedResources;
   
  -//necessary classes from the registrymarkup castor API that works with the Peer.
  -import org.apache.jetspeed.xml.api.registrymarkup.Parameter;
  -import org.apache.jetspeed.xml.api.registrymarkup.Security;
  -import org.apache.jetspeed.xml.api.registrymarkup.Metainfo;
  -
  -
   //turbine stuff
   import org.apache.turbine.util.*;
   
  @@ -91,7 +84,7 @@
   </p>
   
   @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -@version $Id: Instantiator.java,v 1.16 2001/03/07 06:43:29 taylor Exp $
  +@version $Id: Instantiator.java,v 1.17 2001/05/02 10:45:58 raphael Exp $
   */
   public class Instantiator implements Runnable {
   
  @@ -204,8 +197,8 @@
               Log.error( "Instantiator: Throwable" + t);
           }
   
  -        PortletRegistry registry = 
  -            (PortletRegistry)RegistryManager.get(RegistryManager.PORTLET_REGISTRY);
  +        org.apache.jetspeed.om.newregistry.Registry registry = 
  +            Registry.get(Registry.PORTLET);
   
           try {
               if(!registry.hasEntry(this.entry.getName()))
  
  
  
  1.10      +4 -7      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/navigations/JetspeedTopNavigation.java
  
  Index: JetspeedTopNavigation.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/navigations/JetspeedTopNavigation.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JetspeedTopNavigation.java	2001/03/07 06:44:09	1.9
  +++ JetspeedTopNavigation.java	2001/05/02 10:46:05	1.10
  @@ -72,14 +72,12 @@
   import org.apache.jetspeed.util.JetspeedException;
   import org.apache.jetspeed.portal.*;
   import org.apache.jetspeed.services.resources.JetspeedResources;
  +import org.apache.jetspeed.services.Registry;
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
   
  -//necessary classes from the registrymarkup castor API that works with the Peer.
  -import org.apache.jetspeed.om.registry.peer.PortletEntry;
  -
  -
   /** 
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -@version $Id: JetspeedTopNavigation.java,v 1.9 2001/03/07 06:44:09 taylor Exp $
  +@version $Id: JetspeedTopNavigation.java,v 1.10 2001/05/02 10:46:05 raphael Exp $
   */
   public class JetspeedTopNavigation extends Navigation {
       
  @@ -263,8 +261,7 @@
       
       */
       private DynamicURI getApplicationsPortlet(RunData data) {
  -        PortletEntry entry = new PortletEntry();
  -        entry.setName( "Applications" );
  +        PortletEntry entry = (PortletEntry)Registry.getEntry( Registry.PORTLET, "Applications");
   
           return PortletURIManager.getPortletMaxURI( entry, data );
       }
  
  
  
  1.6       +1 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/screens/Customize.java
  
  Index: Customize.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/screens/Customize.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Customize.java	2001/03/07 06:44:24	1.5
  +++ Customize.java	2001/05/02 10:46:09	1.6
  @@ -69,8 +69,7 @@
   import org.apache.jetspeed.profiler.*;
   import org.apache.jetspeed.capability.*;
   import org.apache.jetspeed.services.resources.JetspeedResources;
  -import org.apache.jetspeed.om.registry.peer.*;
  -import org.apache.jetspeed.om.registry.*;
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
   
   //ECS support
   import org.apache.ecs.html.*;
  
  
  
  1.15      +2 -3      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/screens/Home.java
  
  Index: Home.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/screens/Home.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Home.java	2001/04/25 00:10:10	1.14
  +++ Home.java	2001/05/02 10:46:10	1.15
  @@ -75,8 +75,7 @@
   import org.apache.jetspeed.om.profile.*;
   
   import org.apache.jetspeed.capability.*;
  -import org.apache.jetspeed.om.registry.peer.PortletEntry;
  -import org.apache.jetspeed.services.registrymanager.RegistryManager;
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
   
   //ECS support
   import org.apache.ecs.html.*;
  @@ -97,7 +96,7 @@
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
   @author <a href="mailto:tom@PIsoftware.com">Tom Adams</a>
  -@version $Id: Home.java,v 1.14 2001/04/25 00:10:10 taylor Exp $
  +@version $Id: Home.java,v 1.15 2001/05/02 10:46:10 raphael Exp $
   */
   public class Home extends BaseJetspeedScreen {
       
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/InvalidEntryException.java
  
  Index: InvalidEntryException.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
   
  package org.apache.jetspeed.om.newregistry;
  
  /**
  Occurs when anything unexpected happens within Jetspeed and its Registry.  Any 
  
  @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  @version $Id: InvalidEntryException.java,v 1.1 2001/05/02 10:46:14 raphael Exp $
  */
  
  public class InvalidEntryException extends RegistryException {
  
      public static final String ENTRY_DOES_NOT_EXIST 
          = "The specified entry does not exist within the Registry";
      
      public static final String ENTRY_ALREADY_PRESENT 
          = "The entry specified already exists within the Registry";
  
      public static final String ENTRY_UNKNOWN 
          = "The entry type is unknown";
          
          
      public InvalidEntryException() {
          super();
      }
  
      public InvalidEntryException( String message ) {
          super( message );
      }
  
  
  }
  
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/MediaTypeEntry.java
  
  Index: MediaTypeEntry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry;
  
  /**
   * This entry describes all the properties that should be present in
   * a RegistryEntry describing a MediaType
   * 
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: MediaTypeEntry.java,v 1.1 2001/05/02 10:46:15 raphael Exp $
   */
  public interface MediaTypeEntry extends RegistryEntry
  {
  
      public String getMimeType();
      public void setMimeType( String mimeType );
  
  }
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/MetaInfo.java
  
  Index: MetaInfo.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry;
  
  
  public interface MetaInfo
  {
      public String getTitle();
      public void setTitle( String title );
      public String getDescription();
      public void setDescription( String description );
      public String getImage();
      public void setImage( String image );
  }
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/Parameter.java
  
  Index: Parameter.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
   
  package org.apache.jetspeed.om.newregistry;
  
  public interface Parameter
  {
  
      public String getName();
      public void setName(String name);    
      public String getValue();
      public void setValue(String value);
      public String getType();
      public void setType(String type);
  
  }
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/PortletControlEntry.java
  
  Index: PortletControlEntry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry;
  
  /**
   * This entry describes all the properties that should be present in
   * a RegistryEntry describing a PortletControl
   * 
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: PortletControlEntry.java,v 1.1 2001/05/02 10:46:15 raphael Exp $
   */
  public interface PortletControlEntry extends PortletInfoEntry
  {   
      // no specific methods
  }
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/PortletControllerEntry.java
  
  Index: PortletControllerEntry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry;
  
  import java.util.Vector;
  
  /**
   * This entry describes all the properties that should be present in
   * a RegistryEntry describing a PortletController
   * 
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: PortletControllerEntry.java,v 1.1 2001/05/02 10:46:15 raphael Exp $
   */
  public interface PortletControllerEntry extends PortletInfoEntry
  {   
      // no specific methods
  }
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/PortletEntry.java
  
  Index: PortletEntry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry;
  
  import java.util.Vector;
  
  /**
   * This entry describes all the properties that should be present in
   * a RegistryEntry describing a Portlet
   * 
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: PortletEntry.java,v 1.1 2001/05/02 10:46:15 raphael Exp $
   */
  public interface PortletEntry extends PortletInfoEntry
  {
  
      public static final String TYPE_REF        = "ref";
      public static final String TYPE_INSTANCE   = "instance";
      public static final String TYPE_ABSTRACT   = "abstract";
  
      public String getURL();
                                  
      public void setURL( String url );
              
      public String getParent();
                                  
      public void setParent( String parent );
          
      public boolean isAdmin();
  
      public boolean isApplication();
                                  
      public void setApplication( boolean application );
          
      public String getType();
      
      public void setType( String type );
      
  }
  
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/PortletInfoEntry.java
  
  Index: PortletInfoEntry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry;
  
  import java.util.Enumeration;
  
  /**
   * The BasePortletEntry defines all the common description properties 
   * for all the portlet related entries.
   * 
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: PortletInfoEntry.java,v 1.1 2001/05/02 10:46:15 raphael Exp $
   */
  public interface PortletInfoEntry extends RegistryEntry
  {
  
      public String getClassname();
                                  
      public void setClassname( String classname );
      
      public Enumeration getParameterNames();
  
      public Parameter getParameter( String name );
  
      public Parameter[] getParameter();
  
      public void setParameter( Parameter[] parameter );
      
      public void addParameter( Parameter parameter );
  
      public void removeParameter( int index );
  
      public MediaTypeEntry[] getMediaTypeEntry();
  
      public void setMediaTypeEntry( MediaTypeEntry[] mediaTypes );
      
      public void addMediaTypeEntry( MediaTypeEntry mediaTypes );
  
      public void removeMediaTypeEntry( int index );
  
  }
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/Registry.java
  
  Index: Registry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry;
  
  import java.util.Enumeration;
  
  /**
  Represents all items within Jetspeed that hold configuration information.
  
  @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  @version $Id: Registry.java,v 1.1 2001/05/02 10:46:16 raphael Exp $
  */
  public interface Registry
  {
  
      /**
      Get the number of entries within the Registry.
      */
      public int getEntryCount();
      
      /**
      Get the entry in the registry with the specified name
      
      @throws RegistryException if the given 'name' does not exist within the 
                                Registry
      */
      public RegistryEntry getEntry( String name ) throws RegistryException;
  
      /**
      Set the entry in the registry with the specified name and Entry
      
      @throws RegistryException if the given 'name' does not exist within the 
                                Registry
      */
      public void setEntry( RegistryEntry entry ) throws RegistryException;
  
      /**
         Add the given entry to the registry with the given name.
      
         @throws RegistryException if the given 'name' already exists within the 
                                Registry
      */
      public void addEntry( RegistryEntry entry ) throws RegistryException;
  
      /**
         Returns true if the given name exists within the Registry.
      */
      public boolean hasEntry( String name );
  
      /**
         Removes the given entry from the Registry
       */
      public void removeEntry( RegistryEntry entry );
  
      /**
         Removes the given entry from the Registry
       */
      public void removeEntry( String name );
  
      /**
         Get all entries within this Registry
       */
      public Enumeration getEntries();
  
      /**
         Get all entries within this Registry as an array
       */
      public RegistryEntry[] toArray();
      
  }
  
  
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/RegistryEntry.java
  
  Index: RegistryEntry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry;
  
  import java.util.Locale;
  
  /**
   * RegistryEntry is the base interface that objects must implement in order
   * to be used with the Registry service.
   * 
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: RegistryEntry.java,v 1.1 2001/05/02 10:46:16 raphael Exp $
   */
  public interface RegistryEntry
  {
      
      /**
       * @return the name of this entry. This value should be unique within the
       * registry its class.
       */
      public String getName();
      
      /**
       * Changes the name of this entry
       * @param name the new name for this entry
       */
      public void setName(String name);
      
      /**
       * @return the entry title in the default locale for this entry, if set
       */
      public String getTitle();
                                  
      /**
       * Sets the title of the portlet entry
       * @param title the new title for the entry
       */
      public void setTitle(String title);
                                  
      /**
       * @return the entry description in the default locale for this entry, if set
       */
      public String getDescription();
                                  
      /**
       * Sets the description for the portlet entry
       * @param description the new description for the entry
       */
      public void setDescription(String description);
  
      /** 
       * @return the security properties for this entry
       */
      public Security getSecurity();
      
      /** 
       * Set the security properties for this entry
       * @param security the new security properties
       */
      public void setSecurity(Security security);
  
      /**
       * Test if this entry should be visible in a list of the registry contents 
       * @return true if the entry should be hidden
       */
      public boolean isHidden();
  
      /** Modify the visibility status of this entry
       * @param hidden the new status. If true, the entry will not be displayed in
       * a registry list
       */
      public void setHidden(boolean hidden);
     
  }
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/RegistryException.java
  
  Index: RegistryException.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
   
  package org.apache.jetspeed.om.newregistry;
  
  import org.apache.jetspeed.util.JetspeedException;
  
  
  /**
  Occurs when anything unexpected happens within Jetspeed and its Registry.  Any 
  
  @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  @version $Id: RegistryException.java,v 1.1 2001/05/02 10:46:16 raphael Exp $
  */
  
  public class RegistryException extends JetspeedException {
  
      public static final String REGISTRY_NOT_FOUND
          = "The specified registry does not exist.";
  
      public RegistryException() {
          super();
      }
  
      public RegistryException( String message ) {
          super( message );
      }
  
  
  }
  
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/Security.java
  
  Index: Security.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry;
  
  /**
   * RegistryEntry is the base interface that objects must implement in order
   * to be used with the Registry service.
   * 
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: Security.java,v 1.1 2001/05/02 10:46:16 raphael Exp $
   */
  public interface Security
  {
      public String getRole();
  
      public void setRole( String role );
  
  }
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/base/BaseMediaTypeEntry.java
  
  Index: BaseMediaTypeEntry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry.base;
  
  import org.apache.jetspeed.om.newregistry.*;
  
  /**
   * This entry describes all the properties that should be present in
   * a RegistryEntry describing a MediaType
   * 
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: BaseMediaTypeEntry.java,v 1.1 2001/05/02 10:46:19 raphael Exp $
   */
  public class BaseMediaTypeEntry extends BaseRegistryEntry
      implements MediaTypeEntry
  {
  
      private String mimeType;
      
      public String getMimeType()
      {
          return this.mimeType;
      }
      
      public void setMimeType( String mimeType )
      {
          this.mimeType = mimeType;
      }
  }
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/base/BaseMetaInfo.java
  
  Index: BaseMetaInfo.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry.base;
  
  import org.apache.jetspeed.om.newregistry.*;
  
  public class BaseMetaInfo implements MetaInfo, java.io.Serializable
  {
       
      private String title;
       
      private String description;
           
      private String image;
           
      public String getTitle()
      {
          return this.title;
      }
                                  
      public void setTitle( String title )
      {
          this.title = title;
      }
      
      public String getDescription()
      {
          return this.description;
      }
                                  
      public void setDescription( String description )
      {
          this.description = description;
      }
      
      public String getImage()
      {
          return this.image;
      }
                                  
      public void setImage( String image )
      {
          this.image = image;
      }
      
  }
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/base/BaseParameter.java
  
  Index: BaseParameter.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
   
  package org.apache.jetspeed.om.newregistry.base;
  
  import org.apache.jetspeed.om.newregistry.*;
  
  import java.util.Vector;
  import java.util.List;
  
  public class BaseParameter implements Parameter, java.io.Serializable
  {
  
      private String name = null;
      private String value = null;
      private String type = null;
      
      public String getName()
      {
          return this.name;
      }
      
      public void setName(String name)
      {
          this.name = name;
      }
      
      public String getValue()
      {
          return this.value;
      }
      
      public void setValue(String value)
      {
          this.value = value;
      }
  
      public String getType()
      {
          return this.type;
      }
      
      public void setType(String type)
      {
          this.type = type;
      }
  }
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/base/BasePortletControlEntry.java
  
  Index: BasePortletControlEntry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry.base;
  
  import org.apache.jetspeed.om.newregistry.*;
  
  /**
   * This entry describes all the properties that should be present in
   * a RegistryEntry describing a PortletControl
   * 
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: BasePortletControlEntry.java,v 1.1 2001/05/02 10:46:20 raphael Exp $
   */
  public class BasePortletControlEntry extends BasePortletInfoEntry 
      implements PortletControlEntry
  {   
      // no special properties yet
  }
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/base/BasePortletControllerEntry.java
  
  Index: BasePortletControllerEntry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry.base;
  
  import org.apache.jetspeed.om.newregistry.*;
  
  /**
   * This entry describes all the properties that should be present in
   * a RegistryEntry describing a PortletController
   * 
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: BasePortletControllerEntry.java,v 1.1 2001/05/02 10:46:20 raphael Exp $
   */
  public class BasePortletControllerEntry extends BasePortletInfoEntry
         implements PortletControllerEntry
  {   
      // no special properties yet
  }
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/base/BasePortletEntry.java
  
  Index: BasePortletEntry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry.base;
  
  import org.apache.jetspeed.om.newregistry.*;
  import java.util.Vector;
  
  /**
   * This entry describes all the properties that should be present in
   * a RegistryEntry describing a Portlet
   * 
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: BasePortletEntry.java,v 1.1 2001/05/02 10:46:20 raphael Exp $
   */
  public class BasePortletEntry extends BasePortletInfoEntry
     implements PortletEntry
  {
  
      private String parent;
       
      private String url;
       
      private boolean application;
      
      private String type = PortletEntry.TYPE_ABSTRACT;
  
      public String getURL()
      {
          return this.url;
      }
                                  
      public void setURL( String url )
      {
          this.url = url;
      }
              
      public String getParent()
      {
          return this.parent;
      }
                                  
      public void setParent( String parent )
      {
          this.parent = parent;
      }
          
      public boolean isAdmin()
      {
          if (getSecurity()!=null)
          {
              return "admin".equals(getSecurity().getRole());
          }
          
          return false;
      }
                                  
      public boolean isApplication()
      {
          return this.application;
      }
                                  
      public boolean getApplication()
      {
          return this.application;
      }
  
      public void setApplication( boolean application )
      {
          this.application = application;
      }
          
      public String getType()
      {
          return this.type;
      }
      
      public void setType( String type )
      {
          this.type = type;
      }    
  }
  
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/base/BasePortletInfoEntry.java
  
  Index: BasePortletInfoEntry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry.base;
  
  import org.apache.jetspeed.om.newregistry.*;
  
  import java.util.Vector;
  import java.util.Hashtable;
  import java.util.Enumeration;
  
  /**
   * The BasePortletEntry defines all the common description properties 
   * for all the portlet related entries.
   * 
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: BasePortletInfoEntry.java,v 1.1 2001/05/02 10:46:20 raphael Exp $
   */
  public abstract class BasePortletInfoEntry extends BaseRegistryEntry
  {
  
      private String classname;
       
      private Vector parameter = new Vector();
       
      private Vector mediaTypes = new Vector();
      
      public String getClassname()
      {
          return this.classname;
      }
                                  
      public void setClassname( String classname )
      {
          this.classname = classname;
      }
      
      public Vector getParameters()
      {
          return parameter;
      }
  
      public void setParameters(Vector params)
      {
          this.parameter = params;
      }
  
      public Enumeration getParameterNames()
      {
          Hashtable hash = new Hashtable();
          Enumeration en = parameter.elements();
          while(en.hasMoreElements())
          {
              Parameter param = (Parameter)en.nextElement();
              hash.put(param.getName(),"1");
          }
          
          return hash.keys();
      }
  
      public Parameter[] getParameter()
      {
          Parameter[] params = new Parameter[this.parameter.size()];
          this.parameter.copyInto( params );
          return params;
      }
  
      public Parameter getParameter( String name )
      {
          if (name == null) return null;
          Enumeration en = parameter.elements();
          while(en.hasMoreElements())
          {
              Parameter param = (Parameter)en.nextElement();
              if (param.getName().equals(name))
              {
                  return param;
              }
          }
          
          return null;
      }
      
      public void setParameter( Parameter[] parameter )
      {
          this.parameter.removeAllElements();
      
          for( int i = 0; i < parameter.length; ++i )
          {
              this.parameter.addElement( parameter[i] );
          }
      }
      
      public void addParameter( Parameter parameter )
      {
          this.parameter.addElement( parameter );
      }
  
      public void removeParameter( int index )
      {
          this.parameter.removeElementAt( index );
      }
  
      public Vector getMediaTypes()
      {
          return mediaTypes;
      }
  
      public void setMediaTypes(Vector medias)
      {
          this.mediaTypes = mediaTypes;
      }
  
      public MediaTypeEntry[] getMediaTypeEntry()
      {
          MediaTypeEntry[] mediaTypes = new MediaTypeEntry[this.mediaTypes.size()];
          this.mediaTypes.copyInto( mediaTypes );
          return mediaTypes;
      }
  
      public void setMediaTypeEntry( MediaTypeEntry[] mediaTypes )
      {
          this.mediaTypes.removeAllElements();
          for( int i = 0; i < mediaTypes.length; ++i )
          {
              this.mediaTypes.addElement( mediaTypes[i] );
          }
      }
      
      public void addMediaTypeEntry( MediaTypeEntry mediaTypes )
      {
          this.mediaTypes.addElement( mediaTypes );
      }
  
      public void removeMediaTypeEntry( int index )
      {
          this.mediaTypes.removeElementAt( index );
      }
  }
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/base/BasePortletRegistry.java
  
  Index: BasePortletRegistry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry.base;
  
  import org.apache.jetspeed.om.newregistry.*;
  import org.apache.turbine.util.Log;
  import java.util.Hashtable;
  import java.util.Enumeration;
  
  /**
  Represents all items within Jetspeed that hold configuration information.
  
  @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  @version $Id: BasePortletRegistry.java,v 1.1 2001/05/02 10:46:20 raphael Exp $
  */
  public class BasePortletRegistry extends BaseRegistry {
  
      /**
      Handles mapping URLs to a EntryGroup which holds all Entries that depend
      on the URL
      */
      private Hashtable urlmap = new Hashtable();
  
      /**
         add and entry but also add it to the local entrygroup
         
         @see PortletEntry.addEntry
      */
      public final void addEntry( PortletEntry entry ) throws RegistryException { 
  
          synchronized( this ) {
  
              if ( entry.getURL() != null ) {
                  this.getEntryGroup( entry.getURL() ).addEntry( entry );
              }
  
              super.addEntry( entry );
              
          }
          
      }
  
      /**
         remove and entry but also remove it to the local entrygroup
         
         @see PortletEntry.removeEntry
      */
      public final void removeEntry( String name ) {
  
          try {
  
              this.removeEntry( (PortletEntry)getEntry( name ) );
              
          } catch ( RegistryException e ) {
              Log.error( e );
              return;
          }
  
      }
  
      /**
         remove and entry but also remove it to the local entrygroup
         
         @see PortletEntry.removeEntry
      */
      public final void removeEntry( PortletEntry entry ) {
  
          synchronized( this ) {
  
              if ( entry != null && entry.getURL() != null ) {
  
                  this.getEntryGroup( entry.getURL() ).removeEntry( entry.getName() );
  
              }
  
              super.removeEntry( entry );
          }
          
      }
      
      /**
      Get all entries from the PortletRegistry that are based on the following URL
      */
      public final Enumeration getEntries( String url ) {
          return this.getEntryGroup( url ).getEntries();
      }
      
      /**
      Look into the urlmap and get the EntryGroup that holds this URL or create 
      one if it doesn't exist.
      */
      private EntryGroup getEntryGroup( String url ) {
          
          EntryGroup eg = (EntryGroup)this.urlmap.get( url );
          
          if ( eg == null ) {
              
              eg = new EntryGroup();
              this.urlmap.put( url, eg );
              
          }
  
          return eg;
      }
      
  }
  
  /**
  Allows the developer to group multiple Entries together.
  */
  class EntryGroup {
      
      private Hashtable table = new Hashtable();
      
      /**
      Add an Entry to this EntryGroup
      */
      public void addEntry( PortletEntry entry ) {
          this.table.put( entry.getName(), entry );
      }
  
      /**
      Get an Entry from this EntryGroup or null if it does not exist
      */
      public PortletEntry getEntry( String name ) {
          return (PortletEntry)this.table.get( name );
      }
      
      /**
      Remove an Entry from this EntryGroup if it exists.
      */
      public void removeEntry( String name ) {
          this.table.remove( name );
      }
  
      /**
      Get the Entries that are stored in this EntryGroup
      */
      public Enumeration getEntries() {
          return this.table.elements();
      }
  }
  
  
  
  
  
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/base/BaseRegistry.java
  
  Index: BaseRegistry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry.base;
  
  import org.apache.jetspeed.om.newregistry.*;
  import java.util.Hashtable;
  import java.util.Enumeration;
  import java.util.Vector;
  
  /**
   * Provides base functionality within a Registry.
   *
   * @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: BaseRegistry.java,v 1.1 2001/05/02 10:46:21 raphael Exp $
   */
  public class BaseRegistry implements Registry
  {
          
      private Hashtable entries = new Hashtable();
  
      /** @see Registry.getEntryCount */
      public int getEntryCount()
      {
          return this.entries.size();
      }
          
      /** @see Registry.getEntry */
      public RegistryEntry getEntry( String name ) throws InvalidEntryException
      {
  
          RegistryEntry entry = (RegistryEntry)this.entries.get( name ) ;
  
          if ( entry == null ) {
              throw new InvalidEntryException( InvalidEntryException.ENTRY_DOES_NOT_EXIST+" "+name );
          }
          
          return entry;
      }
  
      /**
      @see Registry.setEntry
      */
      public void setEntry( RegistryEntry entry ) throws InvalidEntryException
      {
  
          if ( this.hasEntry( entry.getName() ) == false ) {
              throw new InvalidEntryException( InvalidEntryException.ENTRY_DOES_NOT_EXIST+" "+entry.getName());
          }
  
          this.entries.put( entry.getName(), entry );
      }
  
      /**
      @see Registry.addEntry
      */
      public void addEntry( RegistryEntry entry ) throws InvalidEntryException
      {
          
          if ( this.hasEntry( entry.getName() ) ) {
              throw new InvalidEntryException( InvalidEntryException.ENTRY_ALREADY_PRESENT );
          }
          
          this.entries.put( entry.getName(), entry );
          
      }
  
      /**
         @see Registry.hasEntry
      */
      public boolean hasEntry( String name )
      {
          return this.entries.containsKey( name );
      }
      
      /**
      @see Registry.removeEntry
      */
      public void removeEntry( String name )
      {
          this.entries.remove( name );
      }
  
      /**
      @see Registry.removeEntry
      */
  
      public void removeEntry( RegistryEntry entry )
      {
          this.entries.remove( entry.getName() );
      }
  
      /**
         @see Registry.getEntries
       */
      public Enumeration getEntries()
      {
          return this.entries.elements();
      }
  
      /**
         @see Registry.toArray
       */
      public RegistryEntry[] toArray()
      {
  
          Enumeration enum = getEntries();
          Vector v = new Vector();
  
          while( enum.hasMoreElements() ) {
              v.addElement( enum.nextElement() );
          }
  
          RegistryEntry[] entries = new RegistryEntry[ v.size() ];
          v.copyInto( entries );
          return entries;
  
      }
  }
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/base/BaseRegistryEntry.java
  
  Index: BaseRegistryEntry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry.base;
  
  import org.apache.jetspeed.om.newregistry.*;
  import java.util.Vector;
  import java.util.Locale;
  
  /**
   * Base simple bean-like implementation of the RegistryEntry interface
   * 
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: BaseRegistryEntry.java,v 1.1 2001/05/02 10:46:21 raphael Exp $
   */
  public class BaseRegistryEntry implements RegistryEntry, java.io.Serializable
  {
  
      private String name;
      
      private MetaInfo metaInfo;
       
      private Security security;
       
      private boolean hidden;    
      
      /** @see RegistryEntry.getName */
      public String getName()
      {
          return this.name;
      }
                                  
      /** @see RegistryEntry.setName */
      public void setName( String name )
      {
          this.name = name;
      }
  
      /** @return the MetaData structure for this object */
      public BaseMetaInfo getMetaInfo()
      {
          return (BaseMetaInfo)this.metaInfo;
      }
                                  
      /** Sets the MetaData structure for this object. This will affect 
       * the title and description in the public RegistryEntry API
       * @param metaInfo the MetaData structure for this entry
       */
      public void setMetaInfo( BaseMetaInfo metaInfo )
      {
          this.metaInfo = metaInfo;
      }
  
      /** @see RegistryEntry.getTitle */
      public String getTitle()
      {
          if (this.metaInfo != null)
          {
              return this.metaInfo.getTitle();
          }
          
          return null;
      }
                                  
      /** @see RegistryEntry.setTitle */
      public void setTitle(String title)
      {
          if (this.metaInfo == null)
          {
              this.metaInfo = new BaseMetaInfo();
          }
          
          this.metaInfo.setTitle(title);
      }
  
      /** @see RegistryEntry.getDescription */
      public String getDescription()
      {
          if (this.metaInfo != null)
          {
              return this.metaInfo.getDescription();
          }
          
          return null;
      }
                                  
      /** @see RegistryEntry.setDescription */
      public void setDescription(String description)
      {
          if (this.metaInfo == null)
          {
              this.metaInfo = new BaseMetaInfo();
          }
          
          this.metaInfo.setDescription(description);
      }
  
      /** @see RegistryEntry.getSecurity */
      public Security getSecurity()
      {
          return this.security;
      }
                                  
      /** @see RegistryEntry.setSecurity */
      public void setSecurity( Security security )
      {
          this.security = security;
      }
  
      /** @see RegistryEntry.getSecurity */
      public BaseSecurity getBaseSecurity()
      {
          return (BaseSecurity)this.security;
      }
                                  
      /** @see RegistryEntry.setSecurity */
      public void setBaseSecurity( BaseSecurity security )
      {
          this.security = security;
      }
  
      /** @see RegistryEntry.isHidden */
      public boolean isHidden()
      {
          return this.hidden;
      }                        
          
      public boolean getHidden()
      {
          return this.hidden;
      }                        
          
      /** @see RegistryEntry.setHidden */
      public void setHidden( boolean hidden )
      {
          this.hidden = hidden;
      }
      
  }
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/om/newregistry/base/BaseSecurity.java
  
  Index: BaseSecurity.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.om.newregistry.base;
  
  import org.apache.jetspeed.om.newregistry.*;
  
  /**
   * RegistryEntry is the base interface that objects must implement in order
   * to be used with the Registry service.
   * 
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: BaseSecurity.java,v 1.1 2001/05/02 10:46:21 raphael Exp $
   */
  public class BaseSecurity implements Security,java.io.Serializable
  {
  
      private String role;
      
      public String getRole()
      {
          return this.role;
      }
                                  
      public void setRole( String role )
      {
          this.role = role;
      }
  
  }
  
  
  
  1.5       +34 -37    jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/BaseRegistry.java
  
  Index: BaseRegistry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/BaseRegistry.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BaseRegistry.java	2001/03/07 06:44:46	1.4
  +++ BaseRegistry.java	2001/05/02 10:46:23	1.5
  @@ -1,8 +1,6 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  +/*
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  + * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -16,40 +14,39 @@
    *    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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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
  + * 3. Every modification must be notified to the Java Apache Project
  + *    and redistribution of the modified code without prior notification
  + *    is not permitted in any form.
  + *
  + * 4. All advertising materials mentioning features or use of this
  + *    software must display the following acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  + *    Project" must not be used to endorse or promote products
  + *    derived from this software without prior written permission.
  + *
  + * 6. Redistributions of any form whatsoever must retain the following
  + *    acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
    * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
  + *
  + * License version 1.0
  + *
    */
   
   package org.apache.jetspeed.om.registry;
  @@ -63,7 +60,7 @@
   Provides base functionality within a Registry.
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -@version $Id: BaseRegistry.java,v 1.4 2001/03/07 06:44:46 taylor Exp $
  +@version $Id: BaseRegistry.java,v 1.5 2001/05/02 10:46:23 raphael Exp $
   */
   public class BaseRegistry extends BaseInitable implements Registry {
           
  
  
  
  1.3       +34 -37    jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/CapabilityMapRegistry.java
  
  Index: CapabilityMapRegistry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/CapabilityMapRegistry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CapabilityMapRegistry.java	2001/03/07 06:44:48	1.2
  +++ CapabilityMapRegistry.java	2001/05/02 10:46:24	1.3
  @@ -1,8 +1,6 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  +/*
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  + * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -16,40 +14,39 @@
    *    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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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
  + * 3. Every modification must be notified to the Java Apache Project
  + *    and redistribution of the modified code without prior notification
  + *    is not permitted in any form.
  + *
  + * 4. All advertising materials mentioning features or use of this
  + *    software must display the following acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  + *    Project" must not be used to endorse or promote products
  + *    derived from this software without prior written permission.
  + *
  + * 6. Redistributions of any form whatsoever must retain the following
  + *    acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
    * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
  + *
  + * License version 1.0
  + *
    */
   
   package org.apache.jetspeed.om.registry;
  @@ -60,7 +57,7 @@
      Represents all items within Jetspeed that hold configuration information.
      
      @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -   @version $Id: CapabilityMapRegistry.java,v 1.2 2001/03/07 06:44:48 taylor Exp $
  +   @version $Id: CapabilityMapRegistry.java,v 1.3 2001/05/02 10:46:24 raphael Exp $
   */
   public class CapabilityMapRegistry extends BaseRegistry {
   
  
  
  
  1.5       +34 -37    jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/EntryFactory.java
  
  Index: EntryFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/EntryFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- EntryFactory.java	2001/03/07 06:44:50	1.4
  +++ EntryFactory.java	2001/05/02 10:46:25	1.5
  @@ -1,8 +1,6 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  +/*
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  + * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -16,40 +14,39 @@
    *    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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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
  + * 3. Every modification must be notified to the Java Apache Project
  + *    and redistribution of the modified code without prior notification
  + *    is not permitted in any form.
  + *
  + * 4. All advertising materials mentioning features or use of this
  + *    software must display the following acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  + *    Project" must not be used to endorse or promote products
  + *    derived from this software without prior written permission.
  + *
  + * 6. Redistributions of any form whatsoever must retain the following
  + *    acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
    * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
  + *
  + * License version 1.0
  + *
    */
   
   package org.apache.jetspeed.om.registry;
  @@ -68,7 +65,7 @@
   
      @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
      @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
  -   @version $Id: EntryFactory.java,v 1.4 2001/03/07 06:44:50 taylor Exp $
  +   @version $Id: EntryFactory.java,v 1.5 2001/05/02 10:46:25 raphael Exp $
   */
   public class EntryFactory {
       
  
  
  
  1.3       +35 -38    jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/InvalidEntryException.java
  
  Index: InvalidEntryException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/InvalidEntryException.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InvalidEntryException.java	2001/03/07 06:44:52	1.2
  +++ InvalidEntryException.java	2001/05/02 10:46:27	1.3
  @@ -1,55 +1,52 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  +/*
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  + * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, 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.
  + *    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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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
  + * 3. Every modification must be notified to the Java Apache Project
  + *    and redistribution of the modified code without prior notification
  + *    is not permitted in any form.
  + *
  + * 4. All advertising materials mentioning features or use of this
  + *    software must display the following acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed 
  + *    Project" must not be used to endorse or promote products 
  + *    derived from this software without prior written permission.
  + *
  + * 6. Redistributions of any form whatsoever must retain the following
  + *    acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
    * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
  + * 
  + * License version 1.0
  + *
    */
    
   package org.apache.jetspeed.om.registry;
  @@ -58,7 +55,7 @@
   Occurs when anything unexpected happens within Jetspeed and its Registry.  Any 
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -@version $Id: InvalidEntryException.java,v 1.2 2001/03/07 06:44:52 taylor Exp $
  +@version $Id: InvalidEntryException.java,v 1.3 2001/05/02 10:46:27 raphael Exp $
   */
   
   public class InvalidEntryException extends RegistryException {
  
  
  
  1.3       +34 -37    jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/MediaTypeRegistry.java
  
  Index: MediaTypeRegistry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/MediaTypeRegistry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MediaTypeRegistry.java	2001/03/07 06:44:52	1.2
  +++ MediaTypeRegistry.java	2001/05/02 10:46:29	1.3
  @@ -1,8 +1,6 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  +/*
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  + * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -16,40 +14,39 @@
    *    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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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
  + * 3. Every modification must be notified to the Java Apache Project
  + *    and redistribution of the modified code without prior notification
  + *    is not permitted in any form.
  + *
  + * 4. All advertising materials mentioning features or use of this
  + *    software must display the following acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  + *    Project" must not be used to endorse or promote products
  + *    derived from this software without prior written permission.
  + *
  + * 6. Redistributions of any form whatsoever must retain the following
  + *    acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
    * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
  + *
  + * License version 1.0
  + *
    */
   
   package org.apache.jetspeed.om.registry;
  @@ -60,7 +57,7 @@
   Represents all items within Jetspeed that hold configuration information.
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -@version $Id: MediaTypeRegistry.java,v 1.2 2001/03/07 06:44:52 taylor Exp $
  +@version $Id: MediaTypeRegistry.java,v 1.3 2001/05/02 10:46:29 raphael Exp $
   */
   public class MediaTypeRegistry extends BaseRegistry {
   
  
  
  
  1.3       +34 -37    jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/PortletControlRegistry.java
  
  Index: PortletControlRegistry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/PortletControlRegistry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PortletControlRegistry.java	2001/03/07 06:44:53	1.2
  +++ PortletControlRegistry.java	2001/05/02 10:46:30	1.3
  @@ -1,8 +1,6 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  +/*
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  + * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -16,40 +14,39 @@
    *    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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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
  + * 3. Every modification must be notified to the Java Apache Project
  + *    and redistribution of the modified code without prior notification
  + *    is not permitted in any form.
  + *
  + * 4. All advertising materials mentioning features or use of this
  + *    software must display the following acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  + *    Project" must not be used to endorse or promote products
  + *    derived from this software without prior written permission.
  + *
  + * 6. Redistributions of any form whatsoever must retain the following
  + *    acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
    * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
  + *
  + * License version 1.0
  + *
    */
   
   package org.apache.jetspeed.om.registry;
  @@ -61,7 +58,7 @@
   Represents all items within Jetspeed that hold configuration information.
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -@version $Id: PortletControlRegistry.java,v 1.2 2001/03/07 06:44:53 taylor Exp $
  +@version $Id: PortletControlRegistry.java,v 1.3 2001/05/02 10:46:30 raphael Exp $
   */
   public class PortletControlRegistry extends BaseRegistry {
   
  
  
  
  1.3       +34 -37    jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/PortletControllerRegistry.java
  
  Index: PortletControllerRegistry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/PortletControllerRegistry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PortletControllerRegistry.java	2001/03/07 06:44:54	1.2
  +++ PortletControllerRegistry.java	2001/05/02 10:46:31	1.3
  @@ -1,8 +1,6 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  +/*
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  + * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -16,40 +14,39 @@
    *    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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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
  + * 3. Every modification must be notified to the Java Apache Project
  + *    and redistribution of the modified code without prior notification
  + *    is not permitted in any form.
  + *
  + * 4. All advertising materials mentioning features or use of this
  + *    software must display the following acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  + *    Project" must not be used to endorse or promote products
  + *    derived from this software without prior written permission.
  + *
  + * 6. Redistributions of any form whatsoever must retain the following
  + *    acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
    * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
  + *
  + * License version 1.0
  + *
    */
   
   package org.apache.jetspeed.om.registry;
  @@ -61,7 +58,7 @@
   Represents all items within Jetspeed that hold configuration information.
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -@version $Id: PortletControllerRegistry.java,v 1.2 2001/03/07 06:44:54 taylor Exp $
  +@version $Id: PortletControllerRegistry.java,v 1.3 2001/05/02 10:46:31 raphael Exp $
   */
   public class PortletControllerRegistry extends BaseRegistry {
   
  
  
  
  1.4       +34 -37    jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/PortletRegistry.java
  
  Index: PortletRegistry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/PortletRegistry.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PortletRegistry.java	2001/03/07 06:44:55	1.3
  +++ PortletRegistry.java	2001/05/02 10:46:33	1.4
  @@ -1,8 +1,6 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  +/*
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  + * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -16,40 +14,39 @@
    *    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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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
  + * 3. Every modification must be notified to the Java Apache Project
  + *    and redistribution of the modified code without prior notification
  + *    is not permitted in any form.
  + *
  + * 4. All advertising materials mentioning features or use of this
  + *    software must display the following acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  + *    Project" must not be used to endorse or promote products
  + *    derived from this software without prior written permission.
  + *
  + * 6. Redistributions of any form whatsoever must retain the following
  + *    acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
    * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
  + *
  + * License version 1.0
  + *
    */
   
   package org.apache.jetspeed.om.registry;
  @@ -63,7 +60,7 @@
   Represents all items within Jetspeed that hold configuration information.
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -@version $Id: PortletRegistry.java,v 1.3 2001/03/07 06:44:55 taylor Exp $
  +@version $Id: PortletRegistry.java,v 1.4 2001/05/02 10:46:33 raphael Exp $
   */
   public class PortletRegistry extends BaseRegistry {
   
  
  
  
  1.3       +34 -37    jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/Registry.java
  
  Index: Registry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/Registry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Registry.java	2001/03/07 06:44:56	1.2
  +++ Registry.java	2001/05/02 10:46:35	1.3
  @@ -1,8 +1,6 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  +/*
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  + * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -16,40 +14,39 @@
    *    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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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
  + * 3. Every modification must be notified to the Java Apache Project
  + *    and redistribution of the modified code without prior notification
  + *    is not permitted in any form.
  + *
  + * 4. All advertising materials mentioning features or use of this
  + *    software must display the following acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  + *    Project" must not be used to endorse or promote products
  + *    derived from this software without prior written permission.
  + *
  + * 6. Redistributions of any form whatsoever must retain the following
  + *    acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
    * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
  + *
  + * License version 1.0
  + *
    */
   
   package org.apache.jetspeed.om.registry;
  @@ -61,7 +58,7 @@
   Represents all items within Jetspeed that hold configuration information.
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -@version $Id: Registry.java,v 1.2 2001/03/07 06:44:56 taylor Exp $
  +@version $Id: Registry.java,v 1.3 2001/05/02 10:46:35 raphael Exp $
   */
   public interface Registry extends Initable {
   
  
  
  
  1.3       +34 -37    jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/RegistryEntry.java
  
  Index: RegistryEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/RegistryEntry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RegistryEntry.java	2001/03/07 06:44:58	1.2
  +++ RegistryEntry.java	2001/05/02 10:46:37	1.3
  @@ -1,8 +1,6 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  +/*
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  + * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -16,40 +14,39 @@
    *    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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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
  + * 3. Every modification must be notified to the Java Apache Project
  + *    and redistribution of the modified code without prior notification
  + *    is not permitted in any form.
  + *
  + * 4. All advertising materials mentioning features or use of this
  + *    software must display the following acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  + *    Project" must not be used to endorse or promote products
  + *    derived from this software without prior written permission.
  + *
  + * 6. Redistributions of any form whatsoever must retain the following
  + *    acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
    * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
  + *
  + * License version 1.0
  + *
    */
   
   package org.apache.jetspeed.om.registry;
  @@ -59,7 +56,7 @@
   ProfileEntry, etc
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -@version $Id: RegistryEntry.java,v 1.2 2001/03/07 06:44:58 taylor Exp $
  +@version $Id: RegistryEntry.java,v 1.3 2001/05/02 10:46:37 raphael Exp $
   */
   public interface RegistryEntry {
       
  
  
  
  1.3       +35 -38    jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/RegistryException.java
  
  Index: RegistryException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/RegistryException.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RegistryException.java	2001/03/07 06:44:59	1.2
  +++ RegistryException.java	2001/05/02 10:46:38	1.3
  @@ -1,55 +1,52 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  +/*
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  + * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, 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.
  + *    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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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
  + * 3. Every modification must be notified to the Java Apache Project
  + *    and redistribution of the modified code without prior notification
  + *    is not permitted in any form.
  + *
  + * 4. All advertising materials mentioning features or use of this
  + *    software must display the following acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed 
  + *    Project" must not be used to endorse or promote products 
  + *    derived from this software without prior written permission.
  + *
  + * 6. Redistributions of any form whatsoever must retain the following
  + *    acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
    * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
  + * 
  + * License version 1.0
  + *
    */
    
   package org.apache.jetspeed.om.registry;
  @@ -61,7 +58,7 @@
   Occurs when anything unexpected happens within Jetspeed and its Registry.  Any 
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -@version $Id: RegistryException.java,v 1.2 2001/03/07 06:44:59 taylor Exp $
  +@version $Id: RegistryException.java,v 1.3 2001/05/02 10:46:38 raphael Exp $
   */
   
   public class RegistryException extends JetspeedException {
  
  
  
  1.3       +0 -53     jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/CapabilityMapEntry.java
  
  Index: CapabilityMapEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/CapabilityMapEntry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CapabilityMapEntry.java	2001/03/07 06:45:11	1.2
  +++ CapabilityMapEntry.java	2001/05/02 10:47:06	1.3
  @@ -1,56 +1,3 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, 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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
   
   package org.apache.jetspeed.om.registry.peer;
   
  @@ -63,7 +10,7 @@
   Autogenerated JavaBean from xjay (http://relativity.yi.org/xjay)
   
   @author XJay
  -@version $Id: CapabilityMapEntry.java,v 1.2 2001/03/07 06:45:11 taylor Exp $
  +@version $Id: CapabilityMapEntry.java,v 1.3 2001/05/02 10:47:06 raphael Exp $
   */
   
   
  
  
  
  1.3       +0 -53     jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/MediaTypeEntry.java
  
  Index: MediaTypeEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/MediaTypeEntry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MediaTypeEntry.java	2001/03/07 06:45:12	1.2
  +++ MediaTypeEntry.java	2001/05/02 10:47:08	1.3
  @@ -1,56 +1,3 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, 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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
   
   package org.apache.jetspeed.om.registry.peer;
   
  @@ -63,7 +10,7 @@
   Autogenerated JavaBean from xjay (http://relativity.yi.org/xjay)
   
   @author XJay
  -@version $Id: MediaTypeEntry.java,v 1.2 2001/03/07 06:45:12 taylor Exp $
  +@version $Id: MediaTypeEntry.java,v 1.3 2001/05/02 10:47:08 raphael Exp $
   */
   
   
  
  
  
  1.3       +0 -53     jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/MetaInfo.java
  
  Index: MetaInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/MetaInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MetaInfo.java	2001/03/07 06:45:13	1.2
  +++ MetaInfo.java	2001/05/02 10:47:10	1.3
  @@ -1,56 +1,3 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, 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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
   
   package org.apache.jetspeed.om.registry.peer;
   
  @@ -63,7 +10,7 @@
   Autogenerated JavaBean from xjay (http://relativity.yi.org/xjay)
   
   @author XJay
  -@version $Id: MetaInfo.java,v 1.2 2001/03/07 06:45:13 taylor Exp $
  +@version $Id: MetaInfo.java,v 1.3 2001/05/02 10:47:10 raphael Exp $
   */
   
   
  
  
  
  1.3       +0 -53     jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/Parameter.java
  
  Index: Parameter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/Parameter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Parameter.java	2001/03/07 06:45:14	1.2
  +++ Parameter.java	2001/05/02 10:47:11	1.3
  @@ -1,56 +1,3 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, 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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
   
   package org.apache.jetspeed.om.registry.peer;
   
  @@ -63,7 +10,7 @@
   Autogenerated JavaBean from xjay (http://relativity.yi.org/xjay)
   
   @author XJay
  -@version $Id: Parameter.java,v 1.2 2001/03/07 06:45:14 taylor Exp $
  +@version $Id: Parameter.java,v 1.3 2001/05/02 10:47:11 raphael Exp $
   */
   
   
  
  
  
  1.3       +0 -53     jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/PortletControlEntry.java
  
  Index: PortletControlEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/PortletControlEntry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PortletControlEntry.java	2001/03/07 06:45:15	1.2
  +++ PortletControlEntry.java	2001/05/02 10:47:13	1.3
  @@ -1,56 +1,3 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, 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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
   
   package org.apache.jetspeed.om.registry.peer;
   
  @@ -63,7 +10,7 @@
   Autogenerated JavaBean from xjay (http://relativity.yi.org/xjay)
   
   @author XJay
  -@version $Id: PortletControlEntry.java,v 1.2 2001/03/07 06:45:15 taylor Exp $
  +@version $Id: PortletControlEntry.java,v 1.3 2001/05/02 10:47:13 raphael Exp $
   */
   
   
  
  
  
  1.3       +0 -53     jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/PortletControllerEntry.java
  
  Index: PortletControllerEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/PortletControllerEntry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PortletControllerEntry.java	2001/03/07 06:45:17	1.2
  +++ PortletControllerEntry.java	2001/05/02 10:47:15	1.3
  @@ -1,56 +1,3 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, 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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
   
   package org.apache.jetspeed.om.registry.peer;
   
  @@ -63,7 +10,7 @@
   Autogenerated JavaBean from xjay (http://relativity.yi.org/xjay)
   
   @author XJay
  -@version $Id: PortletControllerEntry.java,v 1.2 2001/03/07 06:45:17 taylor Exp $
  +@version $Id: PortletControllerEntry.java,v 1.3 2001/05/02 10:47:15 raphael Exp $
   */
   
   
  
  
  
  1.3       +0 -53     jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/PortletEntry.java
  
  Index: PortletEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/PortletEntry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PortletEntry.java	2001/03/07 06:45:18	1.2
  +++ PortletEntry.java	2001/05/02 10:47:17	1.3
  @@ -1,56 +1,3 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, 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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
   
   package org.apache.jetspeed.om.registry.peer;
   
  @@ -62,7 +9,7 @@
   Autogenerated JavaBean from xjay (http://relativity.yi.org/xjay)
   
   @author XJay
  -@version $Id: PortletEntry.java,v 1.2 2001/03/07 06:45:18 taylor Exp $
  +@version $Id: PortletEntry.java,v 1.3 2001/05/02 10:47:17 raphael Exp $
   */
   
   
  
  
  
  1.3       +34 -37    jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/PortletEntryNormalizer.java
  
  Index: PortletEntryNormalizer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/PortletEntryNormalizer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PortletEntryNormalizer.java	2001/03/07 06:45:19	1.2
  +++ PortletEntryNormalizer.java	2001/05/02 10:47:19	1.3
  @@ -1,8 +1,6 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  +/*
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  + * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -16,40 +14,39 @@
    *    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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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
  + * 3. Every modification must be notified to the Java Apache Project
  + *    and redistribution of the modified code without prior notification
  + *    is not permitted in any form.
  + *
  + * 4. All advertising materials mentioning features or use of this
  + *    software must display the following acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  + *    Project" must not be used to endorse or promote products
  + *    derived from this software without prior written permission.
  + *
  + * 6. Redistributions of any form whatsoever must retain the following
  + *    acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
    * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
  + *
  + * License version 1.0
  + *
    */
   
   package org.apache.jetspeed.om.registry.peer;
  @@ -64,7 +61,7 @@
   inherited.
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -@version $Id: PortletEntryNormalizer.java,v 1.2 2001/03/07 06:45:19 taylor Exp $
  +@version $Id: PortletEntryNormalizer.java,v 1.3 2001/05/02 10:47:19 raphael Exp $
   */
   public class PortletEntryNormalizer {
   
  
  
  
  1.3       +0 -53     jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/ProfileEntry.java
  
  Index: ProfileEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/ProfileEntry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProfileEntry.java	2001/03/07 06:45:20	1.2
  +++ ProfileEntry.java	2001/05/02 10:47:21	1.3
  @@ -1,56 +1,3 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, 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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
   
   package org.apache.jetspeed.om.registry.peer;
   
  @@ -63,7 +10,7 @@
   Autogenerated JavaBean from xjay (http://relativity.yi.org/xjay)
   
   @author XJay
  -@version $Id: ProfileEntry.java,v 1.2 2001/03/07 06:45:20 taylor Exp $
  +@version $Id: ProfileEntry.java,v 1.3 2001/05/02 10:47:21 raphael Exp $
   */
   
   
  
  
  
  1.3       +0 -53     jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/Security.java
  
  Index: Security.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/Security.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Security.java	2001/03/07 06:45:20	1.2
  +++ Security.java	2001/05/02 10:47:23	1.3
  @@ -1,56 +1,3 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, 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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
   
   package org.apache.jetspeed.om.registry.peer;
   
  @@ -63,7 +10,7 @@
   Autogenerated JavaBean from xjay (http://relativity.yi.org/xjay)
   
   @author XJay
  -@version $Id: Security.java,v 1.2 2001/03/07 06:45:20 taylor Exp $
  +@version $Id: Security.java,v 1.3 2001/05/02 10:47:23 raphael Exp $
   */
   public class Security {
   
  
  
  
  1.3       +35 -38    jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/base/BasePortletEntry.java
  
  Index: BasePortletEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/peer/base/BasePortletEntry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BasePortletEntry.java	2001/03/07 06:45:28	1.2
  +++ BasePortletEntry.java	2001/05/02 10:47:38	1.3
  @@ -1,8 +1,6 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  +/*
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  - * reserved.
  + * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
  @@ -13,43 +11,42 @@
    *
    * 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
  + *    the documentation and/or other materials provided with thejk
    *    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" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  - *    derived from this software without prior written permission. For
  - *    written permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache" or
  - *    "Apache Jetspeed", 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
  + * 3. Every modification must be notified to the Java Apache Project
  + *    and redistribution of the modified code without prior notification
  + *    is not permitted in any form.
  + *
  + * 4. All advertising materials mentioning features or use of this
  + *    software must display the following acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
  + *    Project" must not be used to endorse or promote products
  + *    derived from this software without prior written permission.
  + *
  + * 6. Redistributions of any form whatsoever must retain the following
  + *    acknowledgment:
  + *    "This product includes software developed by the Java Apache Project
  + *    (http://java.apache.org/)."
  + *
  + * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
    * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
  + *
  + * License version 1.0
  + *
    */
   
   package org.apache.jetspeed.om.registry.peer.base;
  @@ -59,7 +56,7 @@
   
   /**
      @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -   @version $Id: BasePortletEntry.java,v 1.2 2001/03/07 06:45:28 taylor Exp $
  +   @version $Id: BasePortletEntry.java,v 1.3 2001/05/02 10:47:38 raphael Exp $
   */
   public abstract class BasePortletEntry implements RegistryEntry  {
   
  
  
  
  1.33      +6 -6      jakarta-jetspeed/src/java/org/apache/jetspeed/portal/PortletURIManager.java
  
  Index: PortletURIManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/PortletURIManager.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- PortletURIManager.java	2001/04/09 22:55:35	1.32
  +++ PortletURIManager.java	2001/05/02 10:47:41	1.33
  @@ -63,9 +63,9 @@
   //jetspeed support
   import org.apache.jetspeed.util.*;
   import org.apache.jetspeed.portal.factory.*;
  -import org.apache.jetspeed.om.registry.RegistryEntry;
  -import org.apache.jetspeed.om.registry.peer.PortletEntry;
  -import org.apache.jetspeed.services.registrymanager.RegistryManager;
  +import org.apache.jetspeed.om.newregistry.RegistryEntry;
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
  +import org.apache.jetspeed.services.Registry;
   
   //turbine
   import org.apache.turbine.util.*;
  @@ -101,7 +101,7 @@
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
   @author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
  -@version $Id: PortletURIManager.java,v 1.32 2001/04/09 22:55:35 sgala Exp $
  +@version $Id: PortletURIManager.java,v 1.33 2001/05/02 10:47:41 raphael Exp $
   */
   
   public class PortletURIManager {
  @@ -115,7 +115,7 @@
       */
       public static DynamicURI getPortletMaxURI( String name, RunData data ) {
           return getPortletMaxURI( 
  -            RegistryManager.getEntry(RegistryManager.PORTLET_REGISTRY, name ),
  +            Registry.getEntry(Registry.PORTLET, name ),
               data );
       }
           
  @@ -167,7 +167,7 @@
           try {
               String name = URIEncoder.decode( params.getString( "portlet" ) );
   
  -            return (PortletEntry)RegistryManager.getEntry(RegistryManager.PORTLET_REGISTRY,
  +            return (PortletEntry)Registry.getEntry(Registry.PORTLET,
                                                             name );
   
           } catch (Exception e) {
  
  
  
  1.10      +11 -23    jakarta-jetspeed/src/java/org/apache/jetspeed/portal/factory/MetaDataFactory.java
  
  Index: MetaDataFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/factory/MetaDataFactory.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MetaDataFactory.java	2001/03/07 06:46:30	1.9
  +++ MetaDataFactory.java	2001/05/02 10:47:45	1.10
  @@ -58,10 +58,9 @@
   import org.apache.jetspeed.util.MetaData;
   import org.apache.jetspeed.xml.api.portletmarkup.*;
   import org.apache.jetspeed.portal.*;
  -import org.apache.jetspeed.services.registrymanager.RegistryManager;
  -import org.apache.jetspeed.om.registry.peer.PortletEntry;
  +import org.apache.jetspeed.services.Registry;
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
   
  -
   //turbine stuff
   import org.apache.turbine.util.*;
   
  @@ -70,7 +69,7 @@
   PSML markup
   
   @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
  -@version $Id: MetaDataFactory.java,v 1.9 2001/03/07 06:46:30 taylor Exp $
  +@version $Id: MetaDataFactory.java,v 1.10 2001/05/02 10:47:45 raphael Exp $
   */
   public class MetaDataFactory {
                                       
  @@ -99,8 +98,8 @@
   
           if ( entry.getParent() != null ) {
   
  -            PortletEntry parent = (PortletEntry)RegistryManager
  -                .getEntry( RegistryManager.PORTLET_REGISTRY, entry.getParent() );
  +            PortletEntry parent = (PortletEntry)Registry
  +                .getEntry( Registry.PORTLET, entry.getParent() );
   
               if (parent != null) {
                   MetaData parentData = getMetaData( parent );
  @@ -152,23 +151,17 @@
       {
   
           MetaData data = new MetaData();
  -        org.apache.jetspeed.om.registry.peer.MetaInfo meta = entry.getMetaInfo();
   
  -        if ( meta != null ) {
  -            if ( meta.getTitle() != null )
  -                data.setTitle( meta.getTitle() );
  +        if ( entry.getTitle() != null )
  +            data.setTitle( entry.getTitle() );
   
  -            if ( meta.getDescription() != null )
  -                data.setDescription( meta.getDescription() );
  +        if ( entry.getDescription() != null )
  +            data.setDescription( entry.getDescription() );
   
  -            if ( meta.getImage() != null )
  -                data.setImage( meta.getImage() );
  -        }
  -
           if ( entry.getParent() != null ) {
   
  -            PortletEntry parent = (PortletEntry)RegistryManager
  -                .getEntry( RegistryManager.PORTLET_REGISTRY, entry.getParent() );
  +            PortletEntry parent = (PortletEntry)Registry
  +                .getEntry( Registry.PORTLET, entry.getParent() );
       
               if (parent!=null) {
                   MetaData parentData = getMetaData( parent );
  @@ -183,8 +176,3 @@
       }
   
   }
  -
  -
  -
  -
  -
  
  
  
  1.13      +7 -7      jakarta-jetspeed/src/java/org/apache/jetspeed/portal/factory/ParametersFactory.java
  
  Index: ParametersFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/factory/ParametersFactory.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ParametersFactory.java	2001/03/07 06:46:32	1.12
  +++ ParametersFactory.java	2001/05/02 10:47:46	1.13
  @@ -55,8 +55,8 @@
   package org.apache.jetspeed.portal.factory;
   
   //jetspeed stuff
  -import org.apache.jetspeed.services.registrymanager.RegistryManager;
  -import org.apache.jetspeed.om.registry.peer.PortletEntry;
  +import org.apache.jetspeed.services.Registry;
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
   import org.apache.jetspeed.util.JetspeedException;
   
   //castor API stuff
  @@ -78,7 +78,7 @@
   
   @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   @author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
  -@version $Id: ParametersFactory.java,v 1.12 2001/03/07 06:46:32 taylor Exp $
  +@version $Id: ParametersFactory.java,v 1.13 2001/05/02 10:47:46 raphael Exp $
   */
   public class ParametersFactory {
                                       
  @@ -186,7 +186,7 @@
   
           //No parent, so return our parameters
           if ( entry.getParent() == null ) {
  -            org.apache.jetspeed.om.registry.peer.Parameter[] props = entry.getParameter();
  +            org.apache.jetspeed.om.newregistry.Parameter[] props = entry.getParameter();
               for(int i = 0; i < props.length; ++i) {
                   hash.put(props[i].getName(), props[i].getValue() );
               }
  @@ -196,8 +196,8 @@
           //Difficult case. We should return our parent
           // params overriden with ours.
           PortletEntry parent = null;
  -        parent = (PortletEntry)RegistryManager
  -            .getEntry( RegistryManager.PORTLET_REGISTRY, entry.getParent() );
  +        parent = (PortletEntry)Registry
  +            .getEntry( Registry.PORTLET, entry.getParent() );
           //This adds parameters of entry on top of
           //parameters of parent (overriding them)
           return getParameters ( entry, getParameters( parent ) );
  @@ -219,7 +219,7 @@
                                 Map hash)
       {
           if (hash!=null) {
  -            org.apache.jetspeed.om.registry.peer.Parameter[] props = entry.getParameter();
  +            org.apache.jetspeed.om.newregistry.Parameter[] props = entry.getParameter();
               for(int i = 0; i < props.length; ++i) {
                   hash.put(props[i].getName(), props[i].getValue() );
               }
  
  
  
  1.12      +5 -29     jakarta-jetspeed/src/java/org/apache/jetspeed/portal/factory/PortletConfigFactory.java
  
  Index: PortletConfigFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/factory/PortletConfigFactory.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- PortletConfigFactory.java	2001/03/07 06:46:33	1.11
  +++ PortletConfigFactory.java	2001/05/02 10:47:47	1.12
  @@ -57,9 +57,8 @@
   //jetspeed stff
   import org.apache.jetspeed.portal.*;
   import org.apache.jetspeed.util.*;
  -import org.apache.jetspeed.om.registry.peer.PortletEntry;
  -import org.apache.jetspeed.om.registry.EntryFactory;
  -import org.apache.jetspeed.om.registry.InvalidEntryException;
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
  +import org.apache.jetspeed.om.newregistry.InvalidEntryException;
   
   //turbine stuff
   import org.apache.turbine.util.*;
  @@ -72,39 +71,16 @@
   data sets.
   
   @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
  -@version $Id: PortletConfigFactory.java,v 1.11 2001/03/07 06:46:33 taylor Exp $
  +@version $Id: PortletConfigFactory.java,v 1.12 2001/05/02 10:47:47 raphael Exp $
   */
   public class PortletConfigFactory {
   
       /**
  -    Given a PSML Entry, get the value of what its PortletConfig would be.
  -    
  -    @param entry the PSML Entry containing the config
  -    @returns the newly created PortletConfig object
  -    */
  -    public static PortletConfig getPortletConfig( org.apache.jetspeed.xml.api.portletmarkup.Entry entry ) 
  -    {
  -
  -        try {
  -
  -            PortletEntry real = (PortletEntry)EntryFactory.getEntry( entry );
  -            
  -            return getPortletConfig( real, null );
  -            
  -        } catch ( InvalidEntryException e ) {
  -            Log.error( e );
  -            return null;
  -        }
  -        
  -    }
  -
  -    /**
          Given a PSML Entry and a RunData object, get the value of what its PortletConfig would be.    
       */
  -    public static PortletConfig getPortletConfig( PortletEntry entry ) {
  -
  +    public static PortletConfig getPortletConfig( PortletEntry entry )
  +    {
           return getPortletConfig( entry, null );
  -
       }
   
       /**
  
  
  
  1.117     +41 -69    jakarta-jetspeed/src/java/org/apache/jetspeed/portal/factory/PortletFactory.java
  
  Index: PortletFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/factory/PortletFactory.java,v
  retrieving revision 1.116
  retrieving revision 1.117
  diff -u -r1.116 -r1.117
  --- PortletFactory.java	2001/03/29 06:10:31	1.116
  +++ PortletFactory.java	2001/05/02 10:47:47	1.117
  @@ -65,9 +65,9 @@
   import org.apache.jetspeed.capability.*;
   import org.apache.jetspeed.portal.portlets.*;
   import org.apache.jetspeed.portal.factory.util.*;
  -import org.apache.jetspeed.om.registry.PortletRegistry;
  -import org.apache.jetspeed.om.registry.RegistryException;
  -import org.apache.jetspeed.services.registrymanager.RegistryManager;
  +import org.apache.jetspeed.om.newregistry.RegistryException;
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
  +import org.apache.jetspeed.services.Registry;
   
   //Castor defined API
   import org.apache.jetspeed.xml.api.portletmarkup.*;
  @@ -87,14 +87,14 @@
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
   @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   @author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
  -@version $Id: PortletFactory.java,v 1.116 2001/03/29 06:10:31 sgala Exp $
  +@version $Id: PortletFactory.java,v 1.117 2001/05/02 10:47:47 raphael Exp $
   */
   public class PortletFactory {
   
       /**
       Given a PSML Entry return an instantiated Portlet.
   
  -    @see PortletFactory.getPortlet( org.apache.jetspeed.om.registry.peer.PortletEntry entry,
  +    @see PortletFactory.getPortlet( PortletEntry entry,
                                       RunData rundata )
       */
       public static final Portlet getPortlet( org.apache.jetspeed.xml.api.portletmarkup.Entry entry )
  @@ -102,10 +102,9 @@
       {
   
           // All entries must reference existing registry items
  -        org.apache.jetspeed.om.registry.peer.PortletEntry regEntry = null;
  +        PortletEntry regEntry = null;
   
  -        regEntry = (org.apache.jetspeed.om.registry.peer.PortletEntry)
  -        RegistryManager.getEntry( RegistryManager.PORTLET_REGISTRY, entry.getParent() );
  +        regEntry = (PortletEntry)Registry.getEntry( Registry.PORTLET, entry.getParent() );
           
           if (regEntry == null) 
               throw new PortletException( "Unknown registry entry "+entry.getParent() );
  @@ -140,7 +139,7 @@
                                       String name,
                                       PortletConfig pc )
       */
  -    public static final Portlet getPortlet( org.apache.jetspeed.om.registry.peer.PortletEntry entry )
  +    public static final Portlet getPortlet( PortletEntry entry )
           throws PortletException
       {
           return getPortlet( entry, false );
  @@ -150,7 +149,7 @@
       Given a registry Entry return an instantiated Portlet.
       This entry will not have Layout and Skin properties defined.
       */
  -    public static final Portlet getPortlet( org.apache.jetspeed.om.registry.peer.PortletEntry entry,
  +    public static final Portlet getPortlet( PortletEntry entry,
                                               boolean force ) 
           throws PortletException
       {
  @@ -273,11 +272,13 @@
   
           String classname = null;
           
  -        if ( name == null ) {
  +        if ( name == null )
  +        {
               throw new PortletException( "You must specify a name for the Portlet you wish to request" );
           }
   
  -        if ( pc == null ) {
  +        if ( pc == null )
  +        {
               pc = new PortletConfig();
               pc.setInitParameters(new Hashtable());
           }
  @@ -285,76 +286,48 @@
           //record the begining of the portlet creation
           long begin = System.currentTimeMillis();
   
  -        /*
  -        NOTE:  at this point you should branch Portlet discovery to become
  -        classname and name based.  if any required value  is null then assume
  -        that the user wants to resolve this from the PortletRegistry
  -        */
  -
  -
  -        org.apache.jetspeed.om.registry.peer.PortletEntry entry = null;
  -        PortletRegistry registry = (PortletRegistry)RegistryManager.get( RegistryManager.PORTLET_REGISTRY );
  +        // Retrieve the regsitry PortletEntry        
  +        PortletEntry entry = null;
           
  -        try {
  -            entry = (org.apache.jetspeed.om.registry.peer.PortletEntry)registry.getEntry( name );
  -        } catch ( RegistryException e ) {
  -            throw new PortletException( e.getMessage() );
  +        entry = (PortletEntry)Registry.getEntry( Registry.PORTLET, name );
  +        
  +        if ( entry == null )
  +        {
  +            throw new PortletException( "Portlet "+name+" not found in registry" );
           }
   
  -        if ( entry.getType().equals( org.apache.jetspeed.om.registry.peer.PortletEntry.TYPE_ABSTRACT ) ) {
  +        if ( entry.getType().equals( PortletEntry.TYPE_ABSTRACT ) )
  +        {
               throw new PortletException( "Abstract entries can not be instantiated -> " + entry.getName() );
           }
           
  +        // Traverse the registry entry hierarchy to build a complete 
  +        // parameters 
  +        PortletEntry parent = entry;
  +        
  +        while ( parent != null )
  +        {
  +            if (classname == null) classname = parent.getClassname();
   
  -        //here
  -        org.apache.jetspeed.om.registry.peer.PortletEntry parent = entry;
  -        while ( parent != null && 
  -                (classname == null ||
  -                 pc.getURL() == null ||
  -                 pc.getCapabilityMap() == null
  -                 ) )
  +            if ( pc.getURL() == null )
               {
  -                classname = parent.getClassname();
  -
  -                if ( pc.getURL() == null ) {
  -                    pc.setURL( parent.getURL() );
  -                }
  -
  -                if ( parent.getCapabilityMap() != null &&
  -                     pc.getCapabilityMap() == null ) {
  -                    //update the CapabilityMap within the PortletConfig
  -                    pc.setCapabilityMap( parent.getCapabilityMap() );
  -                }
  -
  -                //Keep on looking in the parent entry
  -                if( parent.getParent() == null ) {
  -                    // To stop the while loop
  -                    parent = null;
  -                } else {
  -                    parent =  (org.apache.jetspeed.om.registry.peer.PortletEntry)
  -                        RegistryManager.getEntry( RegistryManager.PORTLET_REGISTRY,
  -                                                  parent.getParent() );
  -                }
  +                pc.setURL( parent.getURL() );
  +            }
  +            
  +            // continue one level up
  +            if( parent.getParent() == null ) {
  +                parent = null;
  +            } else {
  +                parent = (PortletEntry)Registry.getEntry( Registry.PORTLET, parent.getParent() );
               }
  +        }
   
           // Merge parameters. It will overwrite parameters
           // already in portletConfig with parameters in entry, augmented
           // with other parameters up all the chain
           // or parent portlets.
           pc.addInitParameters( ParametersFactory.getParameters( entry,
  -                                                               pc.getInitParameters() ) );  
  -
  -        
  -        if ( pc.getCapabilityMap() == null )            
  -            {            
  -                pc.setCapabilityMap( new PortletCapabilityMap() );
  -            }
  -
  -
  -
  -        
  -        
  -        
  +                                                               pc.getInitParameters() ) );          
           //BEGIN ARGUMENT VALIDATION
   
           /*
  @@ -473,6 +446,5 @@
           return portlet;
       }
   
  -
  -}
   
  +}
  \ No newline at end of file
  
  
  
  1.19      +22 -25    jakarta-jetspeed/src/java/org/apache/jetspeed/portal/factory/PortletSetFactory.java
  
  Index: PortletSetFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/factory/PortletSetFactory.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- PortletSetFactory.java	2001/03/07 06:46:39	1.18
  +++ PortletSetFactory.java	2001/05/02 10:47:49	1.19
  @@ -61,9 +61,8 @@
   import org.apache.jetspeed.util.*;
   import org.apache.jetspeed.profiler.*;
   import org.apache.jetspeed.capability.*;
  -import org.apache.jetspeed.services.registrymanager.RegistryManager; 
  -import org.apache.jetspeed.om.registry.peer.PortletEntry;
  -import org.apache.jetspeed.om.registry.PortletRegistry;
  +import org.apache.jetspeed.services.Registry; 
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
   
   //Castor defined API
   import org.apache.jetspeed.xml.api.portletmarkup.*;
  @@ -86,7 +85,7 @@
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
   @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
  -@version $Id: PortletSetFactory.java,v 1.18 2001/03/07 06:46:39 taylor Exp $
  +@version $Id: PortletSetFactory.java,v 1.19 2001/05/02 10:47:49 raphael Exp $
   */
   public class PortletSetFactory extends BasePortletFactory {
   
  @@ -349,13 +348,6 @@
           }
   
           // Populate the PortletSet with Portlets
  -        PortletRegistry registry = 
  -            (PortletRegistry)RegistryManager.get(RegistryManager.PORTLET_REGISTRY);
  -
  -        if( registry == null ) {
  -            Log.error("PortletRegistry null in PortletSetFactory");
  -        }
  -
           Entry[] entries = portlets.getEntry();
   
           for( int i = 0; i < entries.length; ++i ) {
  @@ -367,23 +359,28 @@
           
               try {
   
  -                org.apache.jetspeed.om.registry.peer.PortletEntry entry = 
  -                    (org.apache.jetspeed.om.registry.peer.PortletEntry)registry.getEntry( entries[i].getParent() );
  +                PortletEntry entry = (PortletEntry)Registry.getEntry( Registry.PORTLET, entries[i].getParent() );
              
  -                if ( entry.isApplication() && application == false ) continue;
  -                if ( entry.isApplication() == false && applicationsOnly ) continue;
  -
  -
  -                Portlet p = PortletFactory.getPortlet( entries[i] );
  -                
  -                CapabilityMap map = CapabilityMapFactory.getCapabilityMap( rundata );
  +                if ( entry != null )
  +                {
  +                    if ( entry.isApplication() && application == false ) continue;
  +                    if ( entry.isApplication() == false && applicationsOnly ) continue;
  +
  +                    Portlet p = PortletFactory.getPortlet( entries[i] );
  +                    
  +                    CapabilityMap map = CapabilityMapFactory.getCapabilityMap( rundata );
                                   
  -                if ( p.supportsType( map.getPreferredType() ) ) {
  -                    set.addPortlet( p,
  -                                LayoutFactory.getLayout( entries[i].getLayout() ),
  -                                LayoutFactory.getPosition( entries[i].getLayout() ) );
  +                    if ( p.supportsType( map.getPreferredType() ) ) {
  +                        set.addPortlet( p,
  +                                    LayoutFactory.getLayout( entries[i].getLayout() ),
  +                                    LayoutFactory.getPosition( entries[i].getLayout() ) );
  +                    }
  +                }
  +                else 
  +                {
  +                    Log.error(" The portlet "+entries[i].getParent()+" does not exist in the Registry ");
  +                    continue;
                   }
  -                
               } catch ( JetspeedException e ) {
                   Log.error( e );
                   continue;
  
  
  
  1.30      +4 -5      jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/ApplicationsPortlet.java
  
  Index: ApplicationsPortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/ApplicationsPortlet.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- ApplicationsPortlet.java	2001/03/07 06:47:01	1.29
  +++ ApplicationsPortlet.java	2001/05/02 10:47:54	1.30
  @@ -66,9 +66,8 @@
   import org.apache.jetspeed.util.*;
   import org.apache.jetspeed.cache.disk.*;
   
  -//necessary classes from the registrymarkup castor API that works with the Peer.
  -import org.apache.jetspeed.om.registry.peer.PortletEntry;
  -import org.apache.jetspeed.services.registrymanager.RegistryManager;
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
  +import org.apache.jetspeed.services.Registry;
   
   //turbine
   import org.apache.turbine.util.*;
  @@ -86,7 +85,7 @@
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
   @author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
  -@version $Id: ApplicationsPortlet.java,v 1.29 2001/03/07 06:47:01 taylor Exp $
  +@version $Id: ApplicationsPortlet.java,v 1.30 2001/05/02 10:47:54 raphael Exp $
   */
   public class ApplicationsPortlet extends AbstractPortlet {
   
  @@ -105,7 +104,7 @@
           Log.note( "Jetspeed: initializing the ApplicationsPortlet: BEGIN " );
   
   
  -        Enumeration portlets = RegistryManager.get( RegistryManager.PORTLET_REGISTRY ).getEntries();
  +        Enumeration portlets = Registry.get( Registry.PORTLET ).getEntries();
   
           while ( portlets.hasMoreElements() ) {
   
  
  
  
  1.37      +6 -6      jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/PortletInfoPortlet.java
  
  Index: PortletInfoPortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/PortletInfoPortlet.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- PortletInfoPortlet.java	2001/03/07 06:47:11	1.36
  +++ PortletInfoPortlet.java	2001/05/02 10:47:55	1.37
  @@ -76,7 +76,7 @@
   
   //Turbine
   import org.apache.turbine.util.*;
  -import org.apache.jetspeed.om.registry.peer.PortletEntry;
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
   import org.apache.turbine.services.resources.TurbineResources;
   
   /**
  @@ -93,7 +93,7 @@
   </p>
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -@version $Id: PortletInfoPortlet.java,v 1.36 2001/03/07 06:47:11 taylor Exp $
  +@version $Id: PortletInfoPortlet.java,v 1.37 2001/05/02 10:47:55 raphael Exp $
   */
   public class PortletInfoPortlet extends AbstractPortlet {
   
  @@ -188,9 +188,9 @@
           //END 3RD PARTY REPL
   
               
  -        //BEGIN MIME TYPE SUPPORT
  -
  -        t.addElement( new TR().addElement( new TD()
  +        // BEGIN MIME TYPE SUPPORT
  +        /* RL: Temporarily disable mime support while changing registry
  +         t.addElement( new TR().addElement( new TD()
               .addElement( new B().addElement( "Mime Types:" ) ) ) );
   
           MimeType[] mts = portlet.getPortletConfig().getCapabilityMap().getMimeTypes();
  @@ -201,7 +201,7 @@
                   .addElement( new TD( mts[i].toString() ) ) );
                   
           }
  -                
  +         */      
   
           //END MIME TYPE SUPPORT
               
  
  
  
  1.8       +9 -12     jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/customize/CustomizePortlet.java
  
  Index: CustomizePortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/customize/CustomizePortlet.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CustomizePortlet.java	2001/03/07 06:47:48	1.7
  +++ CustomizePortlet.java	2001/05/02 10:47:58	1.8
  @@ -58,8 +58,7 @@
   import org.apache.jetspeed.xml.api.portletmarkup.*;
   
   import org.apache.jetspeed.portal.factory.*;
  -import org.apache.jetspeed.om.registry.peer.*;
  -import org.apache.jetspeed.om.registry.*;
  +import org.apache.jetspeed.om.newregistry.*;
   import org.apache.ecs.html.*;
   import org.apache.jetspeed.portal.portlets.*;
   import org.apache.jetspeed.portal.*;
  @@ -82,7 +81,7 @@
   import org.apache.jetspeed.util.servlet.*;
   
   import org.apache.jetspeed.portal.controls.*;
  -import org.apache.jetspeed.services.registrymanager.RegistryManager;
  +import org.apache.jetspeed.services.Registry;
   
   /** CustomizePortlet - Customization tool for Jetspeed
     * The CustomizePortlet is a rudimentary tool to customize the
  @@ -134,7 +133,7 @@
         catch (Exception e) {
             maxNumber = 50;
         }
  -      Enumeration entryEnumeration =  RegistryManager.get( RegistryManager.PORTLET_REGISTRY ) .getEntries( );
  +      Enumeration entryEnumeration =  Registry.get( Registry.PORTLET ) .getEntries( );
         int i = 0;
         while ( entryEnumeration.hasMoreElements( ) ) 
         {
  @@ -239,14 +238,12 @@
                   // get the portlet names and titles
                   PortletEntry portletEntry = ( PortletEntry )  availablePortlets.elementAt( i ) ;
                   portletDataBeans[i].setName( portletEntry.getName( ) );
  -                MetaInfo info = portletEntry.getMetaInfo( );
  -                if( info != null )
  -                {
  -                   String title = info.getTitle( );
  -                   if( title == null ) portletDataBeans[i].setTitle( portletEntry.getName( ) );
  -                   else portletDataBeans[i].setTitle( title );
  -                }
  -                else portletDataBeans[i].setTitle( portletEntry.getName( ) );
  +                   
  +                String title = portletEntry.getTitle( );
  +                if( title == null ) 
  +                    portletDataBeans[i].setTitle( portletEntry.getName( ) );
  +                else
  +                    portletDataBeans[i].setTitle( title );
           }
       
           for ( int i = 0; i < portletDataBeans.length; i++ ) 
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/services/Registry.java
  
  Index: Registry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.services;
  
  import org.apache.jetspeed.om.newregistry.*;
  import org.apache.jetspeed.services.registry.*;
  import org.apache.turbine.services.TurbineServices;
  import java.util.Enumeration;
  
  /**
   * <P>This is a commodity static accessor class around the 
   * <code>RegistryManagerService</code></P>
   * 
   * @see org.apache.jetspeed.services.registrymanager.RegistryManagerService
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: Registry.java,v 1.1 2001/05/02 10:48:02 raphael Exp $
   */
  public class Registry {
   
      /** Default Portlet Registry name */
      public static String PORTLET = "Portlet";
  
      /** Default PortletControl Registry name */
      public static String PORTLET_CONTROL = "PortletControl";
  
      /** Default PortletController Registry name */
      public static String PORTLET_CONTROLLER = "PortletController";
  
      /** Default MediaType Registry name */
      public static String MEDIA_TYPE = "MediaType";
  
      /** 
       * Commodity method for getting a reference to the service
       * singleton
       */
      private static RegistryService getService() {
          return (RegistryService)TurbineServices
                  .getInstance()
                  .getService(RegistryService.SERVICE_NAME);     
      }
      
      /**
       * @see RegistryManagerService#getNames
       */
      public static Enumeration getNames() {
          return getService().getNames();
      }
      
      /**
       * @see RegistryManagerService#get
       */
      public static org.apache.jetspeed.om.newregistry.Registry get( String regName ) {
          return getService().get( regName );
      }
      
      /**
       * @see RegistryManagerService#getEntry
       */
      public static RegistryEntry getEntry( String regName, String entryName ) {
          return getService().getEntry( regName, entryName );
      }
      
      /**
       * @see RegistryManagerService#addEntry
       */
      public static void addEntry( String regName, RegistryEntry value )
          throws RegistryException {
          getService().addEntry( regName, value );
      }
      
      /**
       * @see RegistryManagerService#removeEntry
       */
      public static void removeEntry( String regName, String entryName ) {
          getService().removeEntry( regName, entryName );
      }
          
  }
  
  
  
  1.8       +5 -3      jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/URILookupTag.java
  
  Index: URILookupTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/URILookupTag.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- URILookupTag.java	2001/03/07 06:48:41	1.7
  +++ URILookupTag.java	2001/05/02 10:48:03	1.8
  @@ -63,7 +63,9 @@
   
   // Jetsped Classes 
   import org.apache.jetspeed.util.URILookup;
  -import org.apache.jetspeed.om.registry.peer.PortletEntry;
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
  +import org.apache.jetspeed.om.newregistry.RegistryException;
  +import org.apache.jetspeed.services.Registry;
   import org.apache.jetspeed.portal.PortletURIManager;
   
   /**
  @@ -127,8 +129,8 @@
   
               /* APPLICATIONS */
               if (type.equalsIgnoreCase( "Applications" )) {
  -              PortletEntry entry = new PortletEntry();
  -              entry.setName( "Applications" );
  +              PortletEntry entry = null;
  +              entry = (PortletEntry)Registry.getEntry( Registry.PORTLET, "Applications" );
                 result = PortletURIManager.getPortletMaxURI( entry, data ).toString();
               }  
   
  
  
  
  1.6       +2 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletcache/CacheHandleManager.java
  
  Index: CacheHandleManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletcache/CacheHandleManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CacheHandleManager.java	2001/03/07 06:48:47	1.5
  +++ CacheHandleManager.java	2001/05/02 10:48:07	1.6
  @@ -57,7 +57,7 @@
   //jetspeed support
   import org.apache.jetspeed.portal.*;
   import org.apache.jetspeed.portal.factory.*;
  -import org.apache.jetspeed.om.registry.peer.PortletEntry;
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
   
   //java stuff
   import java.util.*;
  @@ -77,7 +77,7 @@
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
   @author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
  -@version $Id: CacheHandleManager.java,v 1.5 2001/03/07 06:48:47 taylor Exp $
  +@version $Id: CacheHandleManager.java,v 1.6 2001/05/02 10:48:07 raphael Exp $
   */
   public class CacheHandleManager {
       
  
  
  
  1.16      +11 -29    jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfileManagerService.java
  
  Index: JetspeedProfileManagerService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfileManagerService.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- JetspeedProfileManagerService.java	2001/04/25 00:03:06	1.15
  +++ JetspeedProfileManagerService.java	2001/05/02 10:48:11	1.16
  @@ -57,16 +57,13 @@
   //jetspeed stuff
   import org.apache.jetspeed.om.profile.*;
   import org.apache.jetspeed.om.profile.*;
  -import org.apache.jetspeed.services.registrymanager.*;
   import org.apache.jetspeed.capability.CapabilityMap;
   import org.apache.jetspeed.capability.CapabilityMapFactory;
   import org.apache.jetspeed.services.resources.JetspeedResources;
   import org.apache.jetspeed.util.MimeType;
  -import org.apache.jetspeed.om.registry.Registry;
  -import org.apache.jetspeed.om.registry.RegistryException;
  -import org.apache.jetspeed.om.registry.RegistryEntry;
  -import org.apache.jetspeed.om.registry.peer.CapabilityMapEntry;
  -import org.apache.jetspeed.om.registry.peer.MediaTypeEntry;
  +import org.apache.jetspeed.services.Registry;
  +import org.apache.jetspeed.om.newregistry.RegistryException;
  +import org.apache.jetspeed.om.newregistry.MediaTypeEntry;
   import org.apache.jetspeed.util.FileCopy;
   
   //turbine stuff
  @@ -109,7 +106,7 @@
    *
    * @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
    * @author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
  - * @version $Id: JetspeedProfileManagerService.java,v 1.15 2001/04/25 00:03:06 taylor Exp $
  + * @version $Id: JetspeedProfileManagerService.java,v 1.16 2001/05/02 10:48:11 raphael Exp $
    */
   
   public class JetspeedProfileManagerService  extends TurbineBaseService
  @@ -172,14 +169,8 @@
           // already initialized
           if (getInit()) return;
   
  -        initConfiguration();
  -
  -        //Ensure that the Registry manager is initialized
  -        TurbineServices
  -            .getInstance()
  -            .initService( RegistryManagerService.SERVICE_NAME, conf);
  -        
  -        initMediaTypeMap(); //dependent on RegistryManager being loaded
  +        initConfiguration();        
  +        initMediaTypeMap();
           initFallback();
   
           // initialization done
  @@ -691,22 +682,13 @@
       private void initMediaTypeMap()
       {
           mediaMap = new HashMap();
  -        Registry cmr = RegistryManager.get("CapabilityMapRegistry");
  -        Registry mtr = RegistryManager.get("MediaTypeRegistry");
  -        Enumeration entries = cmr.getEntries();
  +
  +        Enumeration entries = Registry.get(Registry.MEDIA_TYPE).getEntries();
           while (entries.hasMoreElements())
           {
  -            CapabilityMapEntry cme = (CapabilityMapEntry)entries.nextElement();
  -            try {
  -                MediaTypeEntry mte = (MediaTypeEntry)mtr.getEntry( cme.getName() );
  -                if (null != mte)
  -                    mediaMap.put( cme.getMimeType(), mte );
  -            }
  -            catch (RegistryException ex)
  -            {
  -                // not found in MediaType Registry
  -                // TODO: log the exception
  -            }
  +            MediaTypeEntry mte = (MediaTypeEntry)entries.nextElement();
  +            if (null != mte)
  +                mediaMap.put( mte.getMimeType(), mte );
           }
       }
   
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/CastorRegistryService.java
  
  Index: CastorRegistryService.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.services.registry;
  
  import org.apache.jetspeed.om.newregistry.*;
  import org.apache.jetspeed.om.newregistry.base.*;
  
  //turbine stuff
  import org.apache.turbine.util.Log;
  import org.apache.turbine.services.*;
  import org.apache.turbine.services.resources.ResourceService;
  
  // castor marshalling
  import org.exolab.castor.mapping.Mapping;
  import org.exolab.castor.mapping.MappingException;
  import org.exolab.castor.xml.Unmarshaller;
  import org.exolab.castor.xml.Marshaller;
  import org.xml.sax.InputSource;
  
  //java stuff
  import java.util.*;
  import java.io.*;
  import java.net.*;
  import javax.servlet.ServletConfig;
  
  /**
   * <p>This is an implementation of the <code>RegistryManagerService</code>
   * based on the Castor generated JetspeedConfig API</p>
   * <p>As such, it has a number of limitations :
   * <ul>
   *    <li>all the registries are persisted in the same file and thus are
   *         loaded or saved at the same time</li>
   *    <li>You can't store arbitrary objects within these registries unless
   *         you add support for them in the peer model</li>
   * </ul>
   * </p>
   * <p>This service expects 3 properties to be set for correct operation:
   * <dl>
   *    <dt>url</dt><dd>The url of the JetspeedConfig file</dd>
   *    <dt>registries</dt><dd>a comma separated list of registry names to load
   *     from this file</dd>
   *    <dt>refreshRate</dt><dd>Optional. The manager will check every 
   *     refreshRate seconds if the config has changed and if true will refresh
   *     all the registries. A value of 0 or negative will disable the
   *     automatic refresh operation. Default: 300 (5 minutes)</dd>
   * </dl>
   * </p>
   * <p>The state of the Manager is automatically presisted on disk during the
   * server shutdown. You can manually persist it at any time by calling
   * any save methods.</p>
   *
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: CastorRegistryService.java,v 1.1 2001/05/02 10:48:14 raphael Exp $
   */
  public class CastorRegistryService
      extends TurbineBaseService
      implements RegistryService, FileRegistry {
               
      public static final int DEFAULT_REFRESH = 300;
      public static final String DEFAULT_EXTENSION = ".xreg";
      public static final String DEFAULT_MAPPING = "${webapp.dir}/WEB-INF/conf/mapping.xml";
  
      /** Known registries */
      private Hashtable registries = new Hashtable();
      
      /** The Castor generated JetspeedConfig object */
      private Hashtable fragments = new Hashtable();
  
      /** the Watcher object which monitors the JetspeedConfig URL */
      private RegistryWatcher watcher = null;
          
      /** the mapping file name */
      private Mapping mapping = null;
          
      /** the base regsitry directory */
      private String directory = null;
      
      /** the extension for registry files */
      private String extension = null;
      
      /**
       * Returns a Registry object for further manipulation
       *
       * @param regName the name of the registry to fetch
       * @return a Registry object if found by the manager or null
       */
      public Registry get( String regName ) {
          return (Registry)registries.get( regName );       
      }
  
      /**
       *  List all the registry currently available to this service
       * 
       * @return an Enumeration of registry names.
       */
      public Enumeration getNames() {
          return registries.keys();
      }
      
      /**
       * Returns a RegistryEntry from the named Registry.
       * This is a convenience wrapper around {@link 
       * org.apache.jetspeed.om.newregistry.Registry#getEntry }
       *
       * @param regName the name of the registry
       * @param entryName the name of the entry to retrieve from the 
       *                  registry
       * @return a RegistryEntry object if the key is found or null
       */
      public RegistryEntry getEntry( String regName, String entryName ) {
          try {   
              return ((Registry)registries.get( regName )).getEntry( entryName );
          } catch ( RegistryException e ) {
              Log.error("Failed to retrieve "+entryName+" from "+regName);
              Log.error( e );
          } catch ( NullPointerException e ) {
              Log.error(regName + " registry is not known ");
              Log.error( e );
          }
              
          return null;
      }
      
      /**
       * Add a new RegistryEntry in the named Registry.
       * This is a convenience wrapper around {@link 
       * org.apache.jetspeed.om.newregistry.Registry#addEntry }
       *
       * @param regName the name of the registry
       * @param entry the Registry entry to add
       * @exception Sends a RegistryException if the manager can't add
       *            the provided entry
       */
      public void addEntry(String regName, RegistryEntry entry) throws RegistryException
      {
          try
          {
              Registry registry = (Registry)registries.get( regName );
              
              if (registry.getEntry(entry.getName())!=null)
              {
                  registry.setEntry(entry);
              }
              else
              {
                  registry.addEntry(entry);
              }
          }
          catch ( NullPointerException e )
          {
              Log.error(regName + "registry is not known ");
              Log.error( e );
          }
  
      }
      
      /**
       * Deletes a RegistryEntry from the named Registry
       * This is a convenience wrapper around {@link 
       * org.apache.jetspeed.om.newregistry.Registry#removeEntry }
       *
       * @param regName the name of the registry
       * @param entryName the name of the entry to remove
       */
      public void removeEntry( String regName, String entryName )
      {
          try
          {
              ((Registry)registries.get( regName )).removeEntry( entryName );
          }
          catch ( NullPointerException e )
          {
              Log.error(regName + "registry is not known ");
              Log.error( e );
          }
      }
          
      /**
       * This is the early initialization method called by the 
       * Turbine <code>Service</code> framework
       */
      public void init( ServletConfig conf ) throws InitializationException
      {
  
          ResourceService serviceConf = ((TurbineServices)TurbineServices.getInstance())
                                                       .getResources(RegistryService.SERVICE_NAME);
          String mapFile = null;
          Vector names = null;
          int refreshRate = 0;
          
          try
          {
              directory = serviceConf.getString("directory");
              mapFile = serviceConf.getString("mapping",DEFAULT_MAPPING);
              extension = serviceConf.getString("extension",DEFAULT_EXTENSION);
              refreshRate = serviceConf.getInt("refreshRate",DEFAULT_REFRESH);
              names = serviceConf.getVector("registries");
          }
          catch ( Throwable t )
          {
              throw new InitializationException( "Unable to initialize CastorRegistryService, missing config keys");
          }
              
          // test the mapping file and create the mapping object
          
          if (mapFile != null)
          {
              File map = new File(mapFile);
              Log.debug("Loading mapping file "+mapFile);
              if (map.exists() && map.isFile() && map.canRead())
              {
                  try
                  {
                      mapping = new Mapping();
                      mapping.loadMapping( new InputSource( new FileReader(map) ) );
                  }
                  catch (Exception e)
                  {
                      Log.error("Error in mapping creation",e);
                      throw new InitializationException("Error in mapping",e);
                  }
              }
              else
              {
                  throw new InitializationException("Mapping not found or not a file or unreadable: "+mapFile);
              }
          }
  
          // Set directory watcher if directory exists
          
          File base = new File(directory);
          File[] files = null;
  
          if (base.exists() && base.isDirectory() && base.canRead())
          {
              this.watcher = new RegistryWatcher();
              this.watcher.setSubscriber(this);
              this.watcher.setFilter(new ExtFileFilter(extension));
              this.watcher.setRefreshRate(refreshRate);
              // changing the base will trigger a synchronous loading of the fragments
              this.watcher.changeBase(base);
          }
                  
          // load the registries
          
          Enumeration en = names.elements();        
  
          while(en.hasMoreElements()) {
              String name = (String)en.nextElement();
              Enumeration en2 = fragments.elements();
              while(en2.hasMoreElements())
              {
                  RegistryFragment fragment = (RegistryFragment)en2.nextElement();
                  Registry registry = (Registry)registries.get(name);
                  Vector entries = fragment.getEntries(name);
                  if (entries != null)
                  {
                      if (registry==null)
                      {
                          registry = new BaseRegistry();
                          registries.put(name,registry);
                      }
                      
                      Enumeration en3 = entries.elements();
                      while(en3.hasMoreElements())
                      {
                          RegistryEntry entry = (RegistryEntry)en3.nextElement();
                          try 
                          {
                              registry.addEntry(entry);
                          }
                          catch (RegistryException e)
                          {
                              Log.error("Unable to able entry "+entry.getName(),e);
                          }
                      }
                  }
              }
          }
                      
          // Start the directory watcher thread
          if (this.watcher!=null) this.watcher.start();
  
          //Mark that we are done
          setInit(true);
  
          Log.note( "RegistryManager early init()....end!");
      }
  
  
      public void init( ) throws InitializationException {
          Log.note( "Late init for RegistryManager called" );
          while( !getInit() ) {
              //Not yet...
              try {
                  Thread.sleep( 500 );
                  Log.note( "Waiting for init of Registry Manager..." );
              } catch (InterruptedException ie ) {
                  Log.error( ie );
              }
          }
          Log.note( "We are done! (Registry Manager)" );
      }
  
      
      /**
       * This is the shutdown method called by the 
       * Turbine <code>Service</code> framework
       */
      public void shutdown() {
          this.watcher.setDone();
          Enumeration en = fragments.keys();
          while (en.hasMoreElements())
          {
              saveFragment((String)en.nextElement());
          }
      }
  
      /**
       * This is the shutdown method called by the 
       * Turbine <code>Service</code> framework
       */
      public void refresh() {
          Enumeration en = getNames();
          while(en.hasMoreElements())
          {
              refresh( (String)en.nextElement() );
          }
      }
  
      // Implementation specific methods
      
      /**
       * Refresh and merge the Registry entries with the JetspeedConfig contents
       * <strong>this method is very stringly tied to the Castor API and uses
       * the reflection API to invoke methods on Registry objects</strong>
       *
       * @param name the name of the Registry to refresh
       */
      protected void refresh( String regName ) {
  
          Log.note( "Updating the "+regName+" registry" ); 
  
          int count = 0;
          Registry registry = get(regName);
          
          if ( registry == null ) {
              Log.error( "Null " + name + " registry in refresh" );
              return;
          }
  
          Enumeration en = fragments.keys();
          while(en.hasMoreElements())
          {
              String location = (String)en.nextElement();
              RegistryFragment fragment = (RegistryFragment)fragments.get(location);
              Vector entries = fragment.getEntries(regName);
              if (entries != null)
              {
                  Enumeration en2 = entries.elements();
                  while(en2.hasMoreElements())
                  {
                      RegistryEntry entry = (RegistryEntry)en2.nextElement();
  
                      try 
                      {
                          if (registry.hasEntry(entry.getName()))
                          {
                              registry.setEntry(entry);
                          } 
                          else 
                          {
                              registry.addEntry(entry);
                          }
                          ++count;
                      }
                      catch (RegistryException e)
                      {
                          Log.error("RegistryException while adding "+entry.getName()+"from "+location, e);
                      }
                  }    
              }
          }
          
          Log.note( "Merged " + count + " entries into the " + name ); 
  
      }        
  
      /**
       * Load and unmarshal the JetspeedConfig object tree
       */
      public void loadFragment(String file)
      {
          FileReader reader = null;
          try
          {
              Unmarshaller unmarshaller = new Unmarshaller(this.mapping);
              reader = new FileReader(file);
              RegistryFragment fragment = (RegistryFragment)unmarshaller.unmarshal(reader);
              fragments.put(file,fragment);
          }
          catch ( Throwable t )
          {
              Log.error( "Could not unmarshal: " + file, t );
          }
          finally
          {
              try { reader.close(); } catch (Exception e) {};
          }
          
      }
      
      /**
       * Load and unmarshal the JetspeedConfig object tree
       */
      public void createFragment(String name, Reader reader, boolean persistent)
      {
          String file = new File( directory, name+extension ).getAbsolutePath();
          FileWriter writer = null;
          try
          {
              Unmarshaller unmarshaller = new Unmarshaller(this.mapping);
              RegistryFragment fragment = (RegistryFragment)unmarshaller.unmarshal(reader);
  
              fragments.put(file,fragment);
  
              if (persistent)
              {
                  writer = new FileWriter(file);
                  Marshaller marshaller = new Marshaller(writer);
                  marshaller.setMapping(this.mapping);
                  marshaller.marshal(fragment);
              }
          }
          catch ( Throwable t )
          {
              Log.error( "Could not create fragment: " + file, t );
          }
          finally
          {
              try { reader.close(); } catch (Exception e) {};
              try { writer.close(); } catch (Exception e) {};
          }
          
          refresh();
      }
      
      /**
       * Marshal and save to disk the JetspeedConfig object tree
       */
      public void saveFragment(String file) {
          FileWriter writer = null;
          RegistryFragment fragment = (RegistryFragment)fragments.get(file);
          
          if (fragment != null)
          {
              try
              {
                  writer = new FileWriter(file);
                  Marshaller marshaller = new Marshaller(writer);
                  marshaller.setMapping(this.mapping);
                  marshaller.marshal(fragment);
              }
              catch ( Throwable t )
              {
                  Log.error( "Could not marshal: " + file, t );
              }
              finally
              {
                  try { writer.close(); } catch (Exception e) {};
              }
          }
      }    
  
      /**
       * Remove a fragment from storage
       */
      public void removeFragment(String file) {
          RegistryFragment fragment = (RegistryFragment)fragments.get(file);
          
          if (fragment != null)
          {
              // make sure the keys & entries are freed for this fragment
              // only the entries not replaced by the next registry refresh will
              // stay in memory
              fragment.clear();
              // remove the actual fragment from memory
              fragments.remove(file);
          }
      }    
      
      class ExtFileFilter implements FileFilter
      {
          String extension = null;
          
          ExtFileFilter(String extension)
          {
              this.extension = extension;
          }
          
          public boolean accept(File f)
          {
              return f.toString().endsWith(extension);   
          }
      }
  
  }
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/FileRegistry.java
  
  Index: FileRegistry.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.services.registry;
  
  import java.io.File;
  import java.io.Reader;
  
  /**
   *
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: FileRegistry.java,v 1.1 2001/05/02 10:48:15 raphael Exp $
   */
  public interface FileRegistry {
               
      public static final int DEFAULT_REFRESH = 300;
  
      public void refresh();
      
      public void createFragment(String name, Reader reader, boolean persistent);
  
      public void loadFragment(String file);
  
      public void saveFragment(String file);
  
      public void removeFragment(String file);
  }
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/RegistryFragment.java
  
  Index: RegistryFragment.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.services.registry;
  
  import org.apache.jetspeed.services.Registry;
  import java.util.Vector;
  
  public class RegistryFragment implements java.io.Serializable {
  
      private Vector portlets = new Vector();
  
      private Vector controls = new Vector();
  
      private Vector controllers = new Vector();
  
      private Vector medias = new Vector();
  
      public Vector getEntries(String name)
      {
          if (Registry.PORTLET.equals(name))
          {
              return portlets;
          }
          else if (Registry.PORTLET_CONTROL.equals(name))
          {
              return controls;
          }
          else if (Registry.PORTLET_CONTROLLER.equals(name))
          {
              return controllers;
          }
          else if (Registry.MEDIA_TYPE.equals(name))
          {
              return medias;
          }
          
          return new Vector();
      }
             
      public Vector getPortlets()
      {
          return portlets;
      }
      
      public void setPortlets(Vector portlets)
      {
          this.portlets = portlets;
      }
      
      public Vector getControls()
      {
          return controls;
      }
      
      public void setControls(Vector controls)
      {
          this.controls = controls;
      }
      
      public Vector getControllers()
      {
          return controllers;
      }
      
      public void setControllers(Vector controllers)
      {
          this.controllers = controllers;
      }
      
      public Vector getMedias()
      {
          return medias;
      }
      
      public void setMedias(Vector medias)
      {
          this.medias = medias;
      }
      
      public void clear()
      {
          portlets.clear();
          controls.clear();
          controllers.clear();
          medias.clear();        
      }
             
  }
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/RegistryService.java
  
  Index: RegistryService.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.services.registry;
  
  import org.apache.jetspeed.om.newregistry.*;
  import org.apache.turbine.services.Service;
  import java.util.Enumeration;
  
  /**
   * <P>This service is a facade for all registry related operations</P>
   * 
   * @see org.apache.jetspeed.om.newregistry.Registry
   * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
   * @version $Id: RegistryService.java,v 1.1 2001/05/02 10:48:15 raphael Exp $
   */
  public interface RegistryService extends Service {
   
      /** The name of this service */
      public String SERVICE_NAME = "Registry";
      
      /**
       * Returns a Registry object for further manipulation
       *
       * @param regName the name of the registry to fetch
       * @return a Registry object if found by the manager or null
       */
      public Registry get( String regName );
      
      /**
       * Returns a RegistryEntry from the named Registry.
       * This is a convenience wrapper around {@link 
       * org.apache.jetspeed.om.newregistry.Registry#getEntry }
       *
       * @param regName the name of the registry
       * @param entryName the name of the entry to retrieve from the 
       *                  registry
       * @return a RegistryEntry object if the key is found or null
       */
      public RegistryEntry getEntry( String regName, String entryName );
      
      /**
       * Add a new RegistryEntry in the named Registry.
       * This is a convenience wrapper around {@link 
       * org.apache.jetspeed.om.newregistry.Registry#addEntry }
       *
       * @param regName the name of the registry
       * @param entry the Registry entry to add
       * @exception Sends a RegistryException if the manager can't add
       *            the provided entry
       */
      public void addEntry( String regName, RegistryEntry entry )
          throws RegistryException;
      
      /**
       * Deletes a RegistryEntry from the named Registry
       * This is a convenience wrapper around {@link 
       * org.apache.jetspeed.om.newregistry.Registry#removeEntry }
       *
       * @param regName the name of the registry
       * @param entryName the name of the entry to remove
       */
      public void removeEntry( String regName, String entryName );
          
      /**
       *  List all the registry currently available to this service
       * 
       * @return an Enumeration of registry names.
       */
      public Enumeration getNames();
  
  }
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/RegistryUtils.java
  
  Index: RegistryUtils.java
  ===================================================================
  /*
   *
   * Copyright (c) 1998 The Java Apache Project.  All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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. Every modification must be notified to the Java Apache Project
   *    and redistribution of the modified code without prior notification
   *    is not permitted in any form.
   *
   * 4. All advertising materials mentioning features or use of this
   *    software must display the following acknowledgment:
   *    "This product includes software developed by the Java Apache Project
   *    (http://java.apache.org/)."
   *
   * 5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
   *    Project" must not be used to endorse or promote products
   *    derived from this software without prior written permission.
   *
   * 6. Redistributions of any form whatsoever must retain the following
   *    acknowledgment:
   *    "This product includes software developed by the Java Apache Project
   *    (http://java.apache.org/)."
   *
   * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
   *
   * License version 1.0
   *
   */
  
  package org.apache.jetspeed.services.registry;
  
  import org.apache.jetspeed.capability.CapabilityMap;
  import org.apache.jetspeed.om.newregistry.*;
  import org.apache.jetspeed.services.Registry;
  import org.apache.jetspeed.om.newregistry.base.BasePortletEntry;
  import org.apache.turbine.util.Log;
  import java.util.Vector;
  
  /**
     Handles all operations that involve normalizing, instantiating the correct 
     Entry based on the castor generated info/peer clases
  
     @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
     @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
     @version $Id: RegistryUtils.java,v 1.1 2001/05/02 10:48:15 raphael Exp $
  */
  public class RegistryUtils {
          
      /**
      @see normalize( Parent parent )
      */
      public static void normalize( PortletEntry entry )
      {
          if ( entry.getType().equals( PortletEntry.TYPE_REF ) )
          {
              PortletEntry parent = (PortletEntry)Registry.getEntry(Registry.PORTLET, entry.getParent() );
                      
              if (parent!=null) 
                  normalize( entry, parent );
              else
                  Log.error("Entry "+entry.getParent()+" not found in registry");
          } 
      }
  
      
      /**
      Given an entry, if it is a reference, recursivly go through all it's parents
      and make sure that this object has all the properties that its parent(s) has.
      */    
      public static void normalize( PortletEntry entry, PortletEntry parent )
      {
  
          if ( entry.getType().equals( PortletEntry.TYPE_REF ) )
          {
  
              //classname
              
              if ( entry.getClassname() == null ) {
                  entry.setClassname( parent.getClassname() );
              }
              
              //URL
              if ( entry.getURL() == null ) {
                  entry.setURL( parent.getURL() );
              }
              
              //parameters
              Parameter[] params = parent.getParameter();
              
              for ( int i = 0; i < params.length; ++i ) {
  
                  //now find out if this parent's param exists in the current
                  
                  Parameter[] entryParams = entry.getParameter();
  
                  String name = null;
                  
                  for( int j = 0; j < entryParams.length; ++j ) {
                      if ( entryParams[j].getName().equals( params[i].getName() ) ) {
                          name = params[i].getName();
                          break;
                      }
                  }
                  
                  //if name still equals null at this point then the parent property 
                  //isn't in the entry so add it now.
                  
                  if ( name == null ) {
  
                      entry.addParameter( params[i] );
                  }
                  
              }
              
              //metainfo
              if ( entry.getTitle() == null )
              {
                  entry.setTitle( parent.getTitle() );
              }
                      
              if ( entry.getDescription() == null )
              {
                  entry.setDescription( parent.getDescription() );
              }
              
              //if at this point this parent still has a parent we need to 
              //go one level deeper.
              
              if ( parent.getType().equals( PortletEntry.TYPE_REF ) )
              {
  
                  PortletEntry next = (PortletEntry)Registry.getEntry( Registry.PORTLET, parent.getParent() );
                          
                  if (next != null ) {
                      normalize( next );
                  } else {
                      Log.error("Entry"+parent.getParent()+" not found in registry");
                  }
                      
              }
              
          }
          
      }
  
  }
  
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/RegistryWatcher.java
  
  Index: RegistryWatcher.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", 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 (INCLUDING, 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.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.services.registry;
  
  import org.apache.turbine.util.Log;
  import java.io.*;
  import java.net.*;
  import java.util.*;
  
  
  /**
  A generic class for watching a file and determining if it has changed.
  
  @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
  @version $Id: RegistryWatcher.java,v 1.1 2001/05/02 10:48:15 raphael Exp $
  */
  public class RegistryWatcher extends Thread
  {
  
      /** Minimum scan rate for evaluating file refresh */
      public static final int SCAN_RATE = 60 * 1000;
      
      /**
      The files monitored by this watcher
      */
      private Hashtable files = new Hashtable();
  
      /**
      the refresh rate to use for monitoring this file
      */
      private long refreshRate = 0;
  
      /**
      The object that relies on this FileWatcher
      */
      private FileRegistry subscriber = null;
  
      /**
      The object that relies on this FileWatcher
      */
      private FileFilter filter = null;
  
      /**
       * This object marks that we are done
      */
      private boolean done = false;
  
      /**
       * Create a FileWatcher with a default refresh rate.
       * @param url a string describing either a file URL or a file path
       * @param object the object to notify when the url is modified
       */
      public RegistryWatcher() {
          setDaemon(true);
          setPriority(Thread.MIN_PRIORITY);        
      }
  
      public void setSubscriber(FileRegistry registry)
      {
          synchronized (this)
          {
              if (subscriber!=null)
              {
                  Enumeration en = files.keys();
                  while(en.hasMoreElements())
                  {
                      try
                      {
                          subscriber.removeFragment(((File)en.nextElement()).getCanonicalPath());
                      }
                      catch (Exception e)
                      {
                          Log.error("Can't remove fragment", e);
                      }
                  }
              }
                  
              this.subscriber = registry;
          
              if (subscriber!=null)
              {
                  Enumeration en = files.keys();
                  while(en.hasMoreElements())
                  {
                      try
                      {
                          subscriber.loadFragment(((File)en.nextElement()).getCanonicalPath());
                      }
                      catch (Exception e)
                      {
                          Log.error("Can't load fragment", e);
                      }
                  }
              }
          }
      }
      
      public FileRegistry getSubscriber()
      {
          return this.subscriber;
      }
      
      public void setRefreshRate(long refresh)
      {
          this.refreshRate = ( refresh > SCAN_RATE ) ? refresh : SCAN_RATE;
      }
      
      public long getRefreshRate()
      {
          return refreshRate;
      }
          
      public void setFilter(FileFilter filter)
      {
          this.filter = filter;
      }
      
      public FileFilter getFilter()
      {
          return filter;
      }
          
      public void changeBase(File f)
      {
          synchronized (this)
          {
              if (this.subscriber!=null)
              {
                  Enumeration en = files.keys();
                  while (en.hasMoreElements())
                  {
                      try
                      {
                          subscriber.removeFragment(((File)en.nextElement()).getCanonicalPath());
                      }
                      catch (Exception e)
                      {
                          Log.error("Can't remove fragment", e);
                      }
                  }
              }
              files.clear();
              findFiles(f);
          }
      }
                                  
      /**
       * Create a new FileWatcher to watch the given URL.
       *
       * @param url a string describing either a file URL or a file path
       * @param object the object to notify when the url is modified
       * @param refresh the refresh rate for this monitor
       */
      public void findFiles(File f)
      {
          File[] contents = null;
  
          if (f.exists() && f.canRead())
          {
              this.files.put(f,new Long(f.lastModified()));
  
              if (f.isDirectory())
              {
                  
                  if (filter != null)
                      contents = f.listFiles(filter);
                  else
                      contents = f.listFiles();
      
                  if (contents!=null)
                  {
                      for (int i=0; i< contents.length; i++)
                      {
                          files.put(contents[i],new Long(contents[i].lastModified()));
  
                          if (subscriber!=null)
                          {
                              try
                              {
                                  subscriber.loadFragment(contents[i].getCanonicalPath());
                              }
                              catch (Exception e)
                              {
                                  Log.error("Can't load fragment", e);
                              }
                          }
                      }
                  }
              }
          } 
      }
      
      /**
       * <p>Main routine for the monitor which periodically checks whether 
       * the file has been modified.</p>
       * The algorithm used does not guarantee a constant refresh rate 
       * between invocations.
       */
      public void run()
      {
          try
          {
              while(!done)
              {
                  Enumeration en = files.keys();
                  boolean needRefresh = false;
                  while(en.hasMoreElements())
                  {
                      try
                      {
                          File f = (File)en.nextElement();
                          long modified = ((Long)files.get(f)).longValue();
  
                          if (!f.exists())
                          {
                              files.remove(f);
                          }
                          else
                          {
                              if (f.lastModified() > modified)
                              {
                                  if (f.isDirectory())
                                  {
                                      File[] contents = null;
                                      
                                      if (filter != null)
                                          contents = f.listFiles(filter);
                                      else
                                          contents = f.listFiles();
          
                                      if (contents!=null)
                                      {
                                          for (int i=0; i< contents.length; i++)
                                          {
                                              if (files.get(contents[i])==null)
                                              {
                                                  files.put(contents[i],new Long(contents[i].lastModified()));
      
                                                  if (subscriber!=null)
                                                  {
                                                      subscriber.loadFragment(contents[i].getCanonicalPath());
                                                  }
                                              }
                                          }
                                      }
                                  }
                                  else
                                  {
                                      files.put(f,new Long(f.lastModified()));
                                      subscriber.loadFragment(f.getCanonicalPath());
                                  }
                                  needRefresh = true;
                              }
                          }
                      }
                      catch (Exception e)
                      {
                          Log.error("RegistryWatcher: exception during update",e);
                      }
                  }
                  
                  
                  if (needRefresh == true)
                  {
                      subscriber.refresh();
                  }
  
                  sleep( refreshRate );
              }
          }
          catch  (InterruptedException e)
          {
              Log.error("RegistryWatcher stopping monitor: ");
              Log.error(e);
              return;
          }
      }
          
      /**
       * Mark that File Watching is no longer needed
       */
      public void setDone() {
          done = true;
      }
      
  }
  
  
  
  1.5       +2 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/services/registrymanager/FileWatcher.java
  
  Index: FileWatcher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/registrymanager/FileWatcher.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FileWatcher.java	2001/03/07 06:49:04	1.4
  +++ FileWatcher.java	2001/05/02 10:48:19	1.5
  @@ -65,7 +65,7 @@
   A generic class for watching a file and determining if it has changed.
   
   @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
  -@version $Id: FileWatcher.java,v 1.4 2001/03/07 06:49:04 taylor Exp $
  +@version $Id: FileWatcher.java,v 1.5 2001/05/02 10:48:19 raphael Exp $
   */
   public class FileWatcher extends Thread {
   
  @@ -172,7 +172,7 @@
         */
       private boolean isModified() throws IOException {
           
  -        long modified = this.file.lastModified();
  +        long modified = (this.file != null)?this.file.lastModified():0;
   
           if ( lastModified == 0 ) {
               lastModified = modified;
  
  
  
  1.13      +5 -5      jakarta-jetspeed/src/java/org/apache/jetspeed/util/URILookup.java
  
  Index: URILookup.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/URILookup.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- URILookup.java	2001/04/09 22:55:35	1.12
  +++ URILookup.java	2001/05/02 10:48:25	1.13
  @@ -57,8 +57,8 @@
   //jetspeed support
   import org.apache.jetspeed.portal.Portlet;
   import org.apache.jetspeed.portal.PortletControl;
  -import org.apache.jetspeed.om.registry.peer.PortletEntry;
  -import org.apache.jetspeed.services.registrymanager.RegistryManager;
  +import org.apache.jetspeed.om.newregistry.PortletEntry;
  +import org.apache.jetspeed.services.Registry;
   
   //turbine
   import org.apache.jetspeed.services.resources.JetspeedResources;
  @@ -119,7 +119,7 @@
    * 
    * @author <A HREF="shesmer@raleigh.ibm.com">Stephan Hesmer</A>
    * @author <A HREF="sgala@apache.org">Santiago Gala</A>
  - * @version $Id: URILookup.java,v 1.12 2001/04/09 22:55:35 sgala Exp $
  + * @version $Id: URILookup.java,v 1.13 2001/05/02 10:48:25 raphael Exp $
    */
   
   public class URILookup {
  @@ -744,9 +744,9 @@
       */
       public static final PortletEntry getEntry( ParameterParser params ) throws Exception {
   
  -            String name = URIEncoder.decode( params.getString( "portlet" ) );
  +        String name = URIEncoder.decode( params.getString( "portlet" ) );
   
  -        return (PortletEntry)RegistryManager.getEntry(RegistryManager.PORTLET_REGISTRY, name );
  +        return (PortletEntry)Registry.getEntry(Registry.PORTLET, name );
   
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message