portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/test/testdata/pages default-page.psml test001.psml
Date Mon, 15 Mar 2004 19:38:01 GMT
taylor      2004/03/15 11:38:01

  Modified:    portal   maven.xml
               portal/src/java/org/apache/jetspeed/aggregator
                        PortletWindowFactory.java
               portal/src/java/org/apache/jetspeed/aggregator/impl
                        PortletRendererImpl.java
               portal/src/java/org/apache/jetspeed/engine/core
                        PortalControlParameter.java
               portal/src/java/org/apache/jetspeed/om/page Fragment.java
               portal/src/java/org/apache/jetspeed/om/page/psml
                        FragmentImpl.java
               portal/src/java/org/apache/jetspeed/page/impl
                        page-mapping.xml
               portal/src/test/org/apache/jetspeed/page
                        TestCastorXmlPageManager.java
               portal/src/webapp/WEB-INF/assembly jetspeed.groovy
               portal/src/webapp/WEB-INF/conf Log4j.properties
               portal/src/webapp/WEB-INF/pages default-page.psml p001.psml
                        p002.psml testsuite.psml
               portal/test/testdata/pages default-page.psml test001.psml
  Added:       portal/src/java/org/apache/jetspeed/container/window
                        PortletWindowAccessor.java
               portal/src/java/org/apache/jetspeed/container/window/impl
                        PortletWindowAccessorImpl.java
  Log:
  Added PortletWindowAccessor component (will soon deprecate PortletWindow factory)
  Completes first phase of Entity refactoring.
  Second phase will introduce NavigationalState component to work with PortletWindowAccessor
component
  
  Revision  Changes    Path
  1.56      +1 -1      jakarta-jetspeed-2/portal/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- maven.xml	10 Mar 2004 07:55:27 -0000	1.55
  +++ maven.xml	15 Mar 2004 19:38:00 -0000	1.56
  @@ -5,7 +5,7 @@
            xmlns:maven="jelly:maven">
   
     <!-- Target of maven test:single test -->
  -<property name='testcase' value='org.apache.jetspeed.page.TestCastorXmlPageManager'/>

  +<property name='testcase' value='org.apache.jetspeed.pipeline.TestPipeline'/> 
                                                     
    <preGoal name="java:prepare-filesystem">
    	<echo message="====================================" />
  
  
  
  1.15      +4 -3      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/PortletWindowFactory.java
  
  Index: PortletWindowFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/PortletWindowFactory.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- PortletWindowFactory.java	9 Mar 2004 19:35:46 -0000	1.14
  +++ PortletWindowFactory.java	15 Mar 2004 19:38:00 -0000	1.15
  @@ -18,6 +18,7 @@
   import org.apache.jetspeed.Jetspeed;
   import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
   import org.apache.jetspeed.om.window.impl.PortletWindowImpl;
  +import org.apache.jetspeed.util.JetspeedObjectID;
   import org.apache.pluto.om.common.ObjectID;
   import org.apache.pluto.om.entity.PortletEntity;
   import org.apache.pluto.om.portlet.PortletDefinition;
  @@ -42,8 +43,8 @@
           }
           
           PortletEntityAccessComponent entityAccess = (PortletEntityAccessComponent) Jetspeed.getComponentManager().getComponent(PortletEntityAccessComponent.class);
  -        PortletEntity portletEntity = entityAccess.getPortletEntity(portletDefinition,
portletName);
  -
  +        // PortletEntity portletEntity = entityAccess.getPortletEntity(portletDefinition,
portletName);
  +        PortletEntity portletEntity = entityAccess.getPortletEntity(JetspeedObjectID.createFromString(portletName));
   
           // TODO: This needs to be changed to support multiple windows per entity
           PortletWindow portletWindow = portletEntity.getPortletWindowList().get(portletEntity.getId());
  
  
  
  1.13      +12 -36    jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
  
  Index: PortletRendererImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- PortletRendererImpl.java	9 Mar 2004 19:35:46 -0000	1.12
  +++ PortletRendererImpl.java	15 Mar 2004 19:38:00 -0000	1.13
  @@ -25,11 +25,10 @@
   import org.apache.jetspeed.aggregator.ContentDispatcher;
   import org.apache.jetspeed.aggregator.ContentDispatcherCtrl;
   import org.apache.jetspeed.aggregator.PortletRenderer;
  -import org.apache.jetspeed.aggregator.PortletWindowFactory;
   import org.apache.jetspeed.aggregator.UnknownPortletDefinitionException;
   import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
  -import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
   import org.apache.jetspeed.container.PortletContainerFactory;
  +import org.apache.jetspeed.container.window.PortletWindowAccessor;
   import org.apache.jetspeed.cps.BaseCommonService;
   import org.apache.jetspeed.om.page.Fragment;
   import org.apache.jetspeed.request.RequestContext;
  @@ -38,7 +37,6 @@
   import org.apache.pluto.PortletContainerException;
   import org.apache.pluto.om.common.ObjectID;
   import org.apache.pluto.om.entity.PortletEntity;
  -import org.apache.pluto.om.portlet.PortletDefinition;
   import org.apache.pluto.om.window.PortletWindow;
   
   /**
  @@ -191,41 +189,19 @@
       protected PortletWindow getPortletWindow(Fragment fragment) throws UnknownPortletDefinitionException
       {
           ObjectID oid = JetspeedObjectID.createFromString(fragment.getId());
  +        
  +        // TODO: make renderer a component, assemble entity accessor in constructor   
    
           PortletEntityAccessComponent entityAccess = (PortletEntityAccessComponent) Jetspeed.getComponentManager().getComponent(PortletEntityAccessComponent.class);
  -        // DST: PortletEntity portletEntity = entityAccess.getPortletEntity(oid);
  -        PortletEntity portletEntity = null;
  -        PortletWindow portletWindow = null;
  -
  -        if (portletEntity==null)
  -        {
  -			PortletRegistryComponent registry = (PortletRegistryComponent) Jetspeed.getComponentManager().getComponent(PortletRegistryComponent.class);
  -            PortletDefinition portletDefinition = registry.getPortletDefinitionByUniqueName(fragment.getName());
  -            if (portletDefinition == null)
  -            {
  -                log.error("Failed to load: " + fragment.getName() + " from registry");
  -                throw new UnknownPortletDefinitionException("Could not locate portlet definition
\""+fragment.getName()+"\".");
  -            }
  -            portletWindow = PortletWindowFactory.getWindow(portletDefinition, fragment.getName());
  -
  - //TODO: DST: Why the hell are we storing an entity on a getter?
  - 
  -            // fix issues, persist entity and update fragment ID
  -            try
  -            {
  -                entityAccess.storePortletEntity(portletWindow.getPortletEntity());
  -            }
  -            catch (Exception e)
  -            {
  -                log.error("Error persisting new portletEntity", e);
  -            }
  -
  -            fragment.setId(portletWindow.getId().toString());
  -            oid = portletWindow.getId();
  -        }
  -        else
  +        
  +        // TODO: make renderer a component, assemble window accessor in constructor
  +        PortletWindowAccessor windowAccess = (PortletWindowAccessor)Jetspeed.getComponentManager().getComponent(PortletWindowAccessor.class);
  +        
  +        PortletWindow portletWindow = windowAccess.getPortletWindow(fragment);
  +        if (portletWindow == null)
           {
  -            portletWindow = PortletWindowFactory.getWindow(portletEntity, oid);
  +            throw new UnknownPortletDefinitionException("Portlet Window creation failed
for fragment: " + fragment.getId() + ", " + fragment.getName());
           }
  +        PortletEntity portletEntity = portletWindow.getPortletEntity();
   
           return portletWindow;
       }
  
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/window/PortletWindowAccessor.java
  
  Index: PortletWindowAccessor.java
  ===================================================================
  /*
   * Copyright 2000-2001,2004 The Apache Software Foundation.
   * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   * 
   *      http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  package org.apache.jetspeed.container.window;
  
  import org.apache.jetspeed.om.page.Fragment;
  import org.apache.pluto.om.window.PortletWindow;
  
  /**
   * Portlet Window Accessor
   *
   * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
   * @version $Id: PortletWindowAccessor.java,v 1.1 2004/03/15 19:38:00 taylor Exp $
   */
  public interface PortletWindowAccessor 
  {
      /**
       * Get a portlet window for the given fragment
       * 
       * @param fragment
       * @return
       */
      PortletWindow getPortletWindow(Fragment fragment);
      
      PortletWindow getPortletWindow(Fragment fragment, String principal);
  
      PortletWindow getPortletWindow(String windowId);
      
  }
  
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
  
  Index: PortletWindowAccessorImpl.java
  ===================================================================
  /*
   * Copyright 2000-2001,2004 The Apache Software Foundation.
   * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   * 
   *      http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  package org.apache.jetspeed.container.window.impl;
  
  import java.util.HashMap;
  import java.util.Map;
  
  import groovy.swing.impl.Startable;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
  import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
  import org.apache.jetspeed.container.window.PortletWindowAccessor;
  import org.apache.jetspeed.om.page.Fragment;
  import org.apache.jetspeed.om.window.impl.PortletWindowImpl;
  import org.apache.jetspeed.util.JetspeedObjectID;
  import org.apache.pluto.om.common.ObjectID;
  import org.apache.pluto.om.entity.PortletEntity;
  import org.apache.pluto.om.portlet.PortletDefinition;
  import org.apache.pluto.om.window.PortletWindow;
  import org.apache.pluto.om.window.PortletWindowCtrl;
  import org.apache.pluto.om.window.PortletWindowList;
  import org.apache.pluto.om.window.PortletWindowListCtrl;
  
  /**
   * Portlet Window Accessor Implementation
   *
   * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
   * @version $Id: PortletWindowAccessorImpl.java,v 1.1 2004/03/15 19:38:00 taylor Exp $
   */
  public class PortletWindowAccessorImpl implements PortletWindowAccessor, Startable 
  {
      protected final static Log log = LogFactory.getLog(PortletWindowAccessorImpl.class);
     
      private Map windows = new HashMap();
      private PortletEntityAccessComponent entityAccessor;
      private PortletRegistryComponent registry;
      
   
      public PortletWindowAccessorImpl(PortletEntityAccessComponent entityAccessor,
                                       PortletRegistryComponent registry)
      {
          this.entityAccessor = entityAccessor;
          this.registry = registry;
      }
      
      public void start() 
      {
      }
  
      public PortletWindow getPortletWindow(String windowId)
      {
          return getWindowFromCache(windowId);
      }
      
      public PortletWindow getPortletWindow(Fragment fragment)
      {
          PortletWindow portletWindow = getWindowFromCache(fragment);
          if (portletWindow == null)
          {
              return createPortletWindow(fragment);
          }
          return portletWindow;
      }
      
      public PortletWindow getPortletWindow(Fragment fragment, String principal)
      {
          PortletWindow portletWindow = getWindowFromCache(fragment);
          if (portletWindow == null)
          {
              return createPortletWindow(fragment, principal);
          }        
          return portletWindow;
      }
  
      private PortletWindow createPortletWindow(Fragment fragment)
      {
          return createPortletWindow(fragment, null);
      }
      
      private PortletWindow createPortletWindow(Fragment fragment, String principal)
      {
          PortletWindow portletWindow = new PortletWindowImpl(fragment.getId());
          
          PortletEntity portletEntity = entityAccessor.getPortletEntity(makeEntityKey(fragment,
principal));
          if (portletEntity == null)
          {
              PortletDefinition pd = registry.getPortletDefinitionByUniqueName(fragment.getName());
              if (pd == null)
              {
                  log.error("Failed to retrieve Portlet Definition for " + fragment.getName());
                  return null;
              }
              portletEntity = entityAccessor.newPortletEntityInstance(pd);
              if (portletEntity == null)
              {
                  log.error("Failed to create Portlet Entity for " + fragment.getName());
                  return null;
              }            
          }
          ((PortletWindowCtrl) portletWindow).setPortletEntity(portletEntity);
          PortletWindowList windowList = portletEntity.getPortletWindowList();
          ((PortletWindowListCtrl) windowList).add(portletWindow);
          
          windows.put(fragment.getId(), portletWindow);
          
          try
          {
              entityAccessor.storePortletEntity(portletEntity);
          }
          catch (Exception e)
          {
              log.error("Error persisting new portletEntity", e);
          }
          
          return portletWindow;
      }
      
      private ObjectID makeEntityKey(Fragment fragment, String principal)
      {
          StringBuffer key = new StringBuffer();
          if (principal != null && principal.length() > 0)
          {
              key.append(principal);
              key.append("/");
          }
          key.append(fragment.getId());
          return JetspeedObjectID.createFromString(key.toString());
      }
      
      private PortletWindow getWindowFromCache(Fragment fragment)
      {
          return (PortletWindow)windows.get(fragment.getId());
      }
      
      private PortletWindow getWindowFromCache(String id)
      {
          return (PortletWindow)windows.get(id);
      }
      
  }
  
  
  
  1.12      +20 -4     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/core/PortalControlParameter.java
  
  Index: PortalControlParameter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/core/PortalControlParameter.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- PortalControlParameter.java	9 Mar 2004 19:35:46 -0000	1.11
  +++ PortalControlParameter.java	15 Mar 2004 19:38:00 -0000	1.12
  @@ -25,9 +25,12 @@
   import javax.portlet.WindowState;
   
   import org.apache.jetspeed.Jetspeed;
  -import org.apache.jetspeed.aggregator.PortletWindowFactory;
  +import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
   import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
  +import org.apache.jetspeed.container.window.PortletWindowAccessor;
   import org.apache.jetspeed.exception.JetspeedException;
  +import org.apache.jetspeed.util.JetspeedObjectID;
  +import org.apache.pluto.om.common.ObjectID;
   import org.apache.pluto.om.portlet.PortletDefinition;
   import org.apache.pluto.om.window.PortletWindow;
   import org.apache.pluto.util.StringUtils;
  @@ -229,7 +232,6 @@
                   if(fragment instanceof PortletFragment) {
                       return ((PortletFragment)fragment).getPortletWindow();
                   }
  -                */
   
                   StringTokenizer idTokenizer = new StringTokenizer(id, KEY_DELIMITER);
                   String portletName = idTokenizer.nextToken();
  @@ -243,9 +245,23 @@
                   {
                       throw new JetspeedException("Failed to load: " + portletName + " from
registry");
                   }
  +                    */
   
  -                portletWindow = PortletWindowFactory.getWindow(portletDefinition, entityName);
  +                // TODO: deprecate this class and reimplment as a NavigationalState component
   
  +                PortletWindowAccessor windowAccessor = 
  +                    (PortletWindowAccessor) Jetspeed.getComponentManager().getComponent(PortletWindowAccessor.class);
  +                portletWindow = windowAccessor.getPortletWindow(id);
  +                /*
  +                PortletEntityAccessComponent entityAccess = 
  +                    (PortletEntityAccessComponent) Jetspeed.getComponentManager().getComponent(PortletEntityAccessComponent.class);
  +                ObjectID entityId = JetspeedObjectID.createFromString(id);
  +                
  +                PortletEntity entity = entityAccess.getPortletEntity(entityId);
  +                portletWindow = entityAccess.getPortletWindow(entity);
  +                
  +                portletWindow = PortletWindowFactory.getWindow(portletDefinition, entityName);
  +                    */
               }
           }
   
  
  
  
  1.6       +2 -6      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/page/Fragment.java
  
  Index: Fragment.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/page/Fragment.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Fragment.java	10 Mar 2004 07:55:27 -0000	1.5
  +++ Fragment.java	15 Mar 2004 19:38:00 -0000	1.6
  @@ -187,10 +187,6 @@
        */
       public Object clone()
           throws java.lang.CloneNotSupportedException;
  -    
  -    public void setEntityId(String id);
  -    
  -    public String getEntityId();
  - 
  +     
       
   }
  
  
  
  1.6       +1 -13     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
  
  Index: FragmentImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FragmentImpl.java	10 Mar 2004 07:55:28 -0000	1.5
  +++ FragmentImpl.java	15 Mar 2004 19:38:01 -0000	1.6
  @@ -42,20 +42,8 @@
   
       private List properties = new Vector();
   
  -    private String entityId;
  -
       public FragmentImpl()
       {}
  -
  -    public String getEntityId()
  -    {
  -        return entityId;
  -    }
  -
  -    public void setEntityId(String id)
  -    {
  -        this.entityId = id;
  -    }
   
       public String getType()
       {
  
  
  
  1.3       +0 -4      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/page/impl/page-mapping.xml
  
  Index: page-mapping.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/page/impl/page-mapping.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- page-mapping.xml	10 Mar 2004 07:55:28 -0000	1.2
  +++ page-mapping.xml	15 Mar 2004 19:38:01 -0000	1.3
  @@ -37,10 +37,6 @@
         <bind-xml name="acl" node="attribute"/>
       </field>
   
  -    <field name="entityId" type="java.lang.String">
  -      <bind-xml name="entity" node="attribute"/>
  -    </field>
  -
       <field name="type" type="java.lang.String">
         <bind-xml name="type" node="attribute"/>
       </field>
  
  
  
  1.6       +1 -5      jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java
  
  Index: TestCastorXmlPageManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TestCastorXmlPageManager.java	10 Mar 2004 07:55:28 -0000	1.5
  +++ TestCastorXmlPageManager.java	15 Mar 2004 19:38:01 -0000	1.6
  @@ -22,8 +22,6 @@
   import junit.framework.TestSuite;
   
   import org.apache.jetspeed.PortalComponentAssemblyTestCase;
  -import org.apache.jetspeed.components.ComponentAwareTestSuite;
  -import org.apache.jetspeed.components.ComponentManager;
   import org.apache.jetspeed.om.page.Fragment;
   import org.apache.jetspeed.om.page.Page;
   import org.apache.jetspeed.om.page.Property;
  @@ -126,7 +124,6 @@
           Fragment f = (Fragment) children.get(0);
           assertTrue(f.getId().equals("pe001"));
           assertTrue(f.getName().equals("HelloPortlet"));
  -        assertTrue(f.getEntityId().equals("3"));
           assertTrue(f.getType().equals(Fragment.PORTLET));
   
           List properties = f.getProperties(root.getName());
  @@ -141,7 +138,6 @@
           assertTrue(f.getId().equals("pe002"));
           assertTrue(f.getName().equals("JMXPortlet"));
           assertTrue(f.getType().equals(Fragment.PORTLET));
  -        assertTrue(f.getEntityId().equals("4"));
   
           properties = f.getProperties(root.getName());
           assertNotNull(properties);
  
  
  
  1.21      +10 -1     jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy
  
  Index: jetspeed.groovy
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- jetspeed.groovy	13 Mar 2004 23:56:17 -0000	1.20
  +++ jetspeed.groovy	15 Mar 2004 19:38:01 -0000	1.21
  @@ -13,7 +13,10 @@
   import org.apache.jetspeed.Jetspeed
   import org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer
   import org.apache.jetspeed.components.util.system.FSSystemResourceUtilImpl
  -
  +import org.apache.jetspeed.container.window.PortletWindowAccessor
  +import org.apache.jetspeed.container.window.impl.PortletWindowAccessorImpl
  +import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent
  +import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent
   
   import org.apache.jetspeed.cache.file.FileCache
   import org.apache.jetspeed.profiler.Profiler
  @@ -90,5 +93,11 @@
   //
   //container.registerComponentInstance(Capabilities, new JetspeedCapabilities(pContainer))
   container.registerComponentImplementation(Capabilities, JetspeedCapabilities, new Parameter[]
{new ComponentParameter(PersistenceStoreContainer)} )
  +
  +//
  +// Portlet Window component
  +//
  +container.registerComponentImplementation(PortletWindowAccessor, PortletWindowAccessorImpl,

  +    new Parameter[] {new ComponentParameter(PortletEntityAccessComponent), new ComponentParameter(PortletRegistryComponent)}
)
   
   return container
  
  
  
  1.4       +2 -2      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/Log4j.properties
  
  Index: Log4j.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/Log4j.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Log4j.properties	15 Jan 2004 16:27:17 -0000	1.3
  +++ Log4j.properties	15 Mar 2004 19:38:01 -0000	1.4
  @@ -39,7 +39,7 @@
   #
   # Pluto Category
   #
  -log4j.category.org.apache.pluto = DEBUG, PLUTO, console
  +log4j.category.org.apache.pluto = INFO, PLUTO, console
   log4j.additivity.org.apache.pluto = false
   
   #
  
  
  
  1.12      +5 -6      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/default-page.psml
  
  Index: default-page.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/default-page.psml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- default-page.psml	14 Mar 2004 05:10:00 -0000	1.11
  +++ default-page.psml	15 Mar 2004 19:38:01 -0000	1.12
  @@ -5,24 +5,23 @@
        portlet-decorator="jetspeed"
     />
     <title>My First PSML Page</title>
  -  <fragment id="f001" entity="2" type="layout" name="jetspeed::VelocityTwoColumns">
  -    <fragment id="pe001" entity="3" type="portlet" name="HW_App::HelloPortlet">
  +  <fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
  +    <fragment id="3" type="portlet" name="HW_App::HelloPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>                                
  -    <fragment id="pe002" 
  -     entity="5" 
  +    <fragment id="5" 
        type="portlet" 
        name="HW_App::PreferencePortlet"
        decorator="metal">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="1" />
       </fragment>
  -    <fragment id="pe003" entity="9" type="portlet" name="HW_App::CustomerList">
  +    <fragment id="9" type="portlet" name="HW_App::CustomerList">
         <property layout="TwoColumns" name="row" value="1" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>
  -    <fragment id="pe004" entity="13" type="portlet" name="PAM::PortletApplicationBrowser">
  +    <fragment id="13" type="portlet" name="PAM::PortletApplicationBrowser">
         <property layout="TwoColumns" name="row" value="1" />
         <property layout="TwoColumns" name="column" value="1" />
       </fragment>
  
  
  
  1.6       +5 -5      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p001.psml
  
  Index: p001.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p001.psml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- p001.psml	11 Mar 2004 21:45:55 -0000	1.5
  +++ p001.psml	15 Mar 2004 19:38:01 -0000	1.6
  @@ -6,20 +6,20 @@
        portlet-decorator="portletstd"
     />
     <title>My First PSML Page</title>
  -  <fragment id="f001" entity="1" type="layout" name="jetspeed::TwoColumns">
  -    <fragment id="pe001" entity="3" type="portlet" name="HW_App::HelloPortlet">
  +  <fragment id="1" type="layout" name="jetspeed::TwoColumns">
  +    <fragment id="3" type="portlet" name="HW_App::HelloPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>
  -    <fragment id="pe002" entity="4" type="portlet" name="PAM::PortletApplicationBrowser">
  +    <fragment id="4" type="portlet" name="PAM::PortletApplicationBrowser">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="1" />
       </fragment>
  -    <fragment id="pe003" entity="5" type="portlet" name="HW_App::PreferencePortlet">
  +    <fragment id="5" type="portlet" name="HW_App::PreferencePortlet">
         <property layout="TwoColumns" name="row" value="1" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>
  -    <fragment id="pe004" entity="9" type="portlet" name="HW_App::CustomerList">
  +    <fragment id="9" type="portlet" name="HW_App::CustomerList">
         <property layout="TwoColumns" name="row" value="1" />
         <property layout="TwoColumns" name="column" value="1" />
       </fragment>
  
  
  
  1.6       +9 -9      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p002.psml
  
  Index: p002.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p002.psml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- p002.psml	11 Mar 2004 21:45:55 -0000	1.5
  +++ p002.psml	15 Mar 2004 19:38:01 -0000	1.6
  @@ -6,14 +6,14 @@
        portlet-decorator="box-titled"
     />
     <title>Welcome to Jetspeed-2</title>
  -  <fragment id="f001" entity="1" type="layout" name="jetspeed::OneColumn">
  -    <fragment id="p002-01" entity="12" type="portlet" name="HW_App::LoginPortlet"/>
  -    <fragment id="p002-02" entity="3" type="portlet" name="HW_App::HelloPortlet"/>
  -    <fragment id="p002-03" entity="6" type="portlet" name="HW_App::DisplayRequestPortlet"/>
  -    <fragment id="p002-04" entity="9" type="portlet" name="HW_App::CustomerList"/>
  -    <fragment id="p002-05" entity="10" type="portlet" name="HW_App::CustomerInfo"/>
  -    <fragment id="p002-06" entity="11" type="portlet" name="HW_App::CustomerDetail"/>
  -    <fragment id="p002-07" entity="4" type="portlet" name="PAM::PortletApplicationBrowser"/>
  -    <fragment id="p002-08" entity="5" type="portlet" name="HW_App::PreferencePortlet"/>
  +  <fragment id="1" type="layout" name="jetspeed::OneColumn">
  +    <fragment id="12" type="portlet" name="HW_App::LoginPortlet"/>
  +    <fragment id="3" type="portlet" name="HW_App::HelloPortlet"/>
  +    <fragment id="6"  type="portlet" name="HW_App::DisplayRequestPortlet"/>
  +    <fragment id="9"  type="portlet" name="HW_App::CustomerList"/>
  +    <fragment id="10" type="portlet" name="HW_App::CustomerInfo"/>
  +    <fragment id="11" type="portlet" name="HW_App::CustomerDetail"/>
  +    <fragment id="4"  type="portlet" name="PAM::PortletApplicationBrowser"/>
  +    <fragment id="5" type="portlet" name="HW_App::PreferencePortlet"/>
     </fragment>
   </page>
  
  
  
  1.4       +2 -2      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/testsuite.psml
  
  Index: testsuite.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/testsuite.psml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- testsuite.psml	10 Mar 2004 07:55:28 -0000	1.3
  +++ testsuite.psml	15 Mar 2004 19:38:01 -0000	1.4
  @@ -5,8 +5,8 @@
        portlet-decorator="portletstd"
     />
     <title>Test Suite Page</title>
  -  <fragment id="f002" entity="2" type="layout" name="jetspeed::VelocityTwoColumns">
  -    <fragment id="pe066" entity='18' type="portlet" name="TestPortlet1">
  +  <fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
  +    <fragment id="18" type="portlet" name="TestPortlet1">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>    
  
  
  
  1.3       +5 -5      jakarta-jetspeed-2/portal/test/testdata/pages/default-page.psml
  
  Index: default-page.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/test/testdata/pages/default-page.psml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- default-page.psml	10 Mar 2004 07:55:28 -0000	1.2
  +++ default-page.psml	15 Mar 2004 19:38:01 -0000	1.3
  @@ -6,20 +6,20 @@
        portlet-decorator="box-titled"
     />
     <title>My First PSML Page</title>
  -  <fragment id="f001" entity='1' type="layout" name="TwoColumns">
  -    <fragment id="pe001" entity='3' type="portlet" name="HelloPortlet">
  +  <fragment id="f001" type="layout" name="TwoColumns">
  +    <fragment id="pe001" type="portlet" name="HelloPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />      
       </fragment>
  -    <fragment id="pe002" entity='4' type="portlet" name="JMXPortlet">
  +    <fragment id="pe002" type="portlet" name="JMXPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="1" />      
       </fragment>
  -    <fragment id="pe003" entity='9' type="portlet" name="CustomerList">
  +    <fragment id="pe003" type="portlet" name="CustomerList">
         <property layout="TwoColumns" name="row" value="1" />
         <property layout="TwoColumns" name="column" value="0" />      
       </fragment>
  -    <fragment id="pe004" entity='10' type="portlet" name="CustomerInfo">
  +    <fragment id="pe004" type="portlet" name="CustomerInfo">
         <property layout="TwoColumns" name="row" value="1" />
         <property layout="TwoColumns" name="column" value="1" />      
       </fragment>
  
  
  
  1.3       +6 -6      jakarta-jetspeed-2/portal/test/testdata/pages/test001.psml
  
  Index: test001.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/test/testdata/pages/test001.psml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- test001.psml	10 Mar 2004 07:55:28 -0000	1.2
  +++ test001.psml	15 Mar 2004 19:38:01 -0000	1.3
  @@ -6,20 +6,20 @@
        layout-decorator="test-layout"
        portlet-decorator="test-portlet"
     />
  -  <fragment id="f001" entity='1' type="layout" name="TwoColumns">
  -    <fragment id="pe001" entity='3' type="portlet" name="HelloPortlet">
  +  <fragment id="f001" type="layout" name="TwoColumns">
  +    <fragment id="pe001" type="portlet" name="HelloPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />      
       </fragment>
  -    <fragment id="pe002" entity='4' type="portlet" name="JMXPortlet">
  +    <fragment id="pe002" type="portlet" name="JMXPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="1" />      
       </fragment>
  -    <fragment id="f002" entity='99' type="layout" name="Card" decorator="Tab">
  +    <fragment id="f002" type="layout" name="Card" decorator="Tab">
         <property layout="TwoColumns" name="row" value="1" />
         <property layout="TwoColumns" name="column" value="0" />      
  -      <fragment id="pe003" entity='9' type="portlet" name="CustomerList"/>
  -      <fragment id="pe004" entity='10' type="portlet" name="CustomerInfo"/>
  +      <fragment id="pe003" type="portlet" name="CustomerList"/>
  +      <fragment id="pe004" type="portlet" name="CustomerInfo"/>
       </fragment>
     </fragment>
   </page>
  
  
  

---------------------------------------------------------------------
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