portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/window PortletWindowAccessor.java
Date Fri, 28 May 2004 18:54:08 GMT
weaver      2004/05/28 11:54:08

  Modified:    portal/src/java/org/apache/jetspeed/container/url/impl
                        AbstractPortalURL.java
               portal/src/java/org/apache/jetspeed/container/session/impl
                        SessionNavigationalState.java
                        PathNavigationalState.java
               portal/src/java repository.xml
               portal   project.xml
  Added:       portal/src/java/org/apache/jetspeed/container/url/impl
                        PortalControlParameterImpl.java
  Removed:     portal/src/java/org/apache/jetspeed/pipeline/descriptor
                        ValveDescriptor.java BaseDescriptor.java
                        XmlReader.java PipelineDescriptor.java
               portal/src/java/org/apache/jetspeed/capabilities Client.java
                        MediaType.java Capabilities.java Capability.java
                        MimeType.java CapabilityMap.java
               portal/src/java/org/apache/jetspeed/profiler
                        ProfilerException.java ProfileLocatorProperty.java
                        Profiler.java ProfileLocator.java
               portal/src/java/org/apache/jetspeed/om/folder Folder.java
               portal/src/java/org/apache/jetspeed/profiler/rules
                        RuleCriterion.java ProfilingRule.java
                        RuleCriterionResolver.java PrincipalRule.java
               portal/src/java/org/apache/jetspeed/container/url/impl
                        PortalControlParameter.java
               portal/src/java/org/apache/jetspeed/capabilities/impl
                        CapabilityMapImpl.java JetspeedCapabilities.java
                        CapabilityImpl.java ClientImpl.java
                        MediaTypeImpl.java MimeTypeImpl.java
               portal/src/java/org/apache/jetspeed/aggregator
                        PortletRenderer.java ContentDispatcherCtrl.java
                        PageAggregator.java
                        UnknownPortletDefinitionException.java
                        ContentDispatcher.java PortletAggregator.java
                        Aggregator.java
               portal/src/java/org/apache/jetspeed/container/session
                        NavigationalStateComponent.java PageState.java
                        NavigationalState.java
               portal/src/java/org/apache/jetspeed/request
                        RequestContextComponent.java RequestContext.java
               portal/src/java/org/apache/jetspeed/om/page Reference.java
                        package.html Page.java Fragment.java Property.java
                        BaseElement.java
               portal/src/java/org/apache/jetspeed/om
                        SecurityReference.java ControllerFactoryImpl.java
                        BaseSecurityReference.java
               portal/src/java/org/apache/jetspeed/pipeline/valve
                        LayoutValve.java ValveContext.java ActionValve.java
                        Valve.java UserProfilerValve.java
                        ContainerValve.java SecurityValve.java
                        CleanupValve.java AggregateValve.java
                        LocalizationValve.java AbstractValve.java
                        PageProfilerValve.java CapabilityValve.java
                        ContentValve.java
               portal/src/java repository_jetspeed.xml
               portal/src/java/org/apache/jetspeed/page
                        PageNotRemovedException.java PageManager.java
                        PageNotUpdatedException.java
               portal/src/java/org/apache/jetspeed/pipeline
                        PipelineException.java Pipeline.java
               portal/src/java/org/apache/jetspeed/container/url
                        PortalURL.java
               portal/src/java/org/apache/jetspeed/om/desktop Desktop.java
               portal/src/java/org/apache/jetspeed/container/window
                        PortletWindowAccessor.java
  Log:
  see: JS2-30 <http://issues.apache.org/jira/browse/JS2-30>
  
  Revision  Changes    Path
  1.5       +8 -7      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/AbstractPortalURL.java
  
  Index: AbstractPortalURL.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/AbstractPortalURL.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractPortalURL.java	7 Apr 2004 23:11:24 -0000	1.4
  +++ AbstractPortalURL.java	28 May 2004 18:54:08 -0000	1.5
  @@ -15,10 +15,10 @@
    */
   package org.apache.jetspeed.container.url.impl;
   
  -import java.util.List;
   import java.util.ArrayList;
   import java.util.HashMap;
   import java.util.Iterator;
  +import java.util.List;
   import java.util.Map;
   import java.util.StringTokenizer;
   
  @@ -26,6 +26,7 @@
   import javax.portlet.WindowState;
   
   import org.apache.jetspeed.container.session.NavigationalStateComponent;
  +import org.apache.jetspeed.container.url.PortalControlParameter;
   import org.apache.jetspeed.container.url.PortalURL;
   import org.apache.jetspeed.request.RequestContext;
   import org.apache.pluto.om.window.PortletWindow;
  @@ -55,7 +56,7 @@
       protected List startLocalNavigation = new ArrayList();
       protected HashMap startControlParameter = new HashMap();
       protected HashMap startStateLessControlParameter = new HashMap();
  -    protected PortalControlParameter pcp;
  +    protected PortalControlParameterImpl pcp;
       
       
       public AbstractPortalURL(RequestContext context, NavigationalStateComponent nsc)
  @@ -63,7 +64,7 @@
           this.context = context;
           this.nsc = nsc;        
           init(context);
  -        pcp = new PortalControlParameter(this, nsc);
  +        pcp = new PortalControlParameterImpl(this, nsc);
           pcp.init();
       }
       
  @@ -356,7 +357,7 @@
           return result.toString();
       }
   
  -    public String getControlParameterAsString(PortalControlParameter controlParam)
  +    public String getControlParameterAsString(PortalControlParameterImpl controlParam)
       {
           Map stateFullParams = startControlParameter;
           Map stateLessParams = null;
  @@ -393,7 +394,7 @@
           return toString(pcp, new Boolean(secure));
       }
       
  -    public String toString(PortalControlParameter controlParam, Boolean p_secure)
  +    public String toString(PortalControlParameterImpl controlParam, Boolean p_secure)
       {
           StringBuffer buffer = getBaseURLBuffer();
           buffer.append(this.basePath);
  @@ -440,7 +441,7 @@
           return (Map) startStateLessControlParameter.clone();
       }
   
  -    public void analyzeControlInformation(PortalControlParameter control)
  +    public void analyzeControlInformation(PortalControlParameterImpl control)
       {
           startControlParameter = (HashMap) control.getStateFullControlParameter();
           startStateLessControlParameter = (HashMap) control.getStateLessControlParameter();
  
  
  
  1.2       +329 -0    jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/PortalControlParameterImpl.java
  
  
  
  
  1.14      +2 -2      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/SessionNavigationalState.java
  
  Index: SessionNavigationalState.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/SessionNavigationalState.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SessionNavigationalState.java	12 May 2004 18:48:03 -0000	1.13
  +++ SessionNavigationalState.java	28 May 2004 18:54:08 -0000	1.14
  @@ -26,8 +26,8 @@
   import org.apache.jetspeed.Jetspeed;
   import org.apache.jetspeed.container.session.NavigationalState;
   import org.apache.jetspeed.container.session.NavigationalStateComponent;
  +import org.apache.jetspeed.container.url.PortalControlParameter;
   import org.apache.jetspeed.container.url.PortalURL;
  -import org.apache.jetspeed.container.url.impl.PortalControlParameter;
   import org.apache.jetspeed.container.window.PortletWindowAccessor;
   import org.apache.jetspeed.om.page.Page;
   import org.apache.jetspeed.request.RequestContext;
  
  
  
  1.11      +3 -2      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/PathNavigationalState.java
  
  Index: PathNavigationalState.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/PathNavigationalState.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- PathNavigationalState.java	8 May 2004 01:15:46 -0000	1.10
  +++ PathNavigationalState.java	28 May 2004 18:54:08 -0000	1.11
  @@ -24,8 +24,9 @@
   import org.apache.jetspeed.Jetspeed;
   import org.apache.jetspeed.container.session.NavigationalState;
   import org.apache.jetspeed.container.session.NavigationalStateComponent;
  +import org.apache.jetspeed.container.url.PortalControlParameter;
   import org.apache.jetspeed.container.url.PortalURL;
  -import org.apache.jetspeed.container.url.impl.PortalControlParameter;
  +import org.apache.jetspeed.container.url.impl.PortalControlParameterImpl;
   import org.apache.jetspeed.container.window.PortletWindowAccessor;
   import org.apache.jetspeed.om.page.Page;
   import org.apache.jetspeed.request.RequestContext;
  
  
  
  1.8       +0 -4      jakarta-jetspeed-2/portal/src/java/repository.xml
  
  Index: repository.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/repository.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- repository.xml	21 May 2004 22:15:50 -0000	1.7
  +++ repository.xml	28 May 2004 18:54:08 -0000	1.8
  @@ -20,7 +20,6 @@
   <!DOCTYPE descriptor-repository SYSTEM "repository.dtd" [
   	<!ENTITY database SYSTEM "repository_database.xml">
   	<!ENTITY internal SYSTEM "repository_internal.xml">
  -	<!ENTITY jetspeed SYSTEM "repository_jetspeed.xml">
   	<!ENTITY page SYSTEM "repository_page.xml">
   ]>
   <descriptor-repository version="1.0" isolation-level="read-uncommitted">
  @@ -29,9 +28,6 @@
   
       <!-- include ojb internal mappings here -->
       &internal;
  -
  -    <!-- include jetspeed defined mappings here -->
  -    &jetspeed;
   
       <!-- include jetspeed page and profiler mappings here -->
       &page;
  
  
  
  1.74      +7 -1      jakarta-jetspeed-2/portal/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/project.xml,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- project.xml	25 May 2004 22:36:03 -0000	1.73
  +++ project.xml	28 May 2004 18:54:08 -0000	1.74
  @@ -130,7 +130,13 @@
           <war.bundle.jar>true</war.bundle.jar>
         </properties>
       </dependency>
  -
  +    <dependency>
  +      <id>jetspeed2:jetspeed-capability</id>
  +      <version>2.0-a1-dev</version>
  +      <properties>
  +        <war.bundle.jar>true</war.bundle.jar>
  +      </properties>
  +    </dependency>
       <dependency>
         <id>picocontainer</id>
         <version>1.0-beta-5</version>
  
  
  

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