pages p002.psml p001.psml

raphael Wed, 31 Dec 2003 02:48:39 -0800

raphael     2003/12/31 01:46:36

  Modified:    applications/demo project.xml
               applications/demo/src/webapp/WEB-INF portlet.xml web.xml
               commons/src/java/org/apache/jetspeed/container
                        JetspeedContainerServlet.java
                        JetspeedPortletContext.java
               commons/src/java/org/apache/jetspeed/om/common/portlet
                        MutablePortletApplication.java
               portal   maven.xml project.xml
               portal/src/java/org/apache/jetspeed
                        JetspeedPortalContext.java
               portal/src/java/org/apache/jetspeed/aggregator
                        Aggregator.java PortletWindowFactory.java
               portal/src/java/org/apache/jetspeed/capability
                        CapabilityMap.java
               portal/src/java/org/apache/jetspeed/container
                        JetspeedPortletContainerWrapper.java
               portal/src/java/org/apache/jetspeed/container/invoker
                        PortletInvokerFactoryImpl.java
                        ServletPortletInvoker.java
               portal/src/java/org/apache/jetspeed/engine
                        JetspeedEngineConstants.java
               portal/src/java/org/apache/jetspeed/engine/servlet
                        ServletRequestImpl.java
               portal/src/java/org/apache/jetspeed/request
                        JetspeedRequestContext.java RequestContext.java
               portal/src/java/org/apache/jetspeed/services/entity
                        PortletEntityAccess.java
                        PortletEntityServiceImpl.java
               portal/src/java/org/apache/jetspeed/tools/pamanager
                        DeployUtilities.java FileSystemPAM.java
                        PortletApplicationManager.java
               portal/src/webapp/WEB-INF web.xml
               portal/src/webapp/WEB-INF/conf jetspeed.properties
               portal/src/webapp/WEB-INF/pages p001.psml
  Added:       commons/src/java/org/apache/jetspeed/portlet
                        ServletPortlet.java
               commons/src/java/org/apache/jetspeed/util FIFOQueue.java
                        Queue.java
               portal/src/java/org/apache/jetspeed/aggregator
                        ContentDispatcher.java ContentDispatcherCtrl.java
                        PageAggregator.java PortletRenderer.java
               portal/src/java/org/apache/jetspeed/aggregator/impl
                        ContentDispatcherImpl.java
                        HttpBufferedResponse.java PortletRendererImpl.java
                        RenderingJob.java Worker.java WorkerMonitor.java
               portal/src/java/org/apache/jetspeed/layout
                        LayoutPortlet.java MultiColumnPortlet.java
               portal/src/webapp/WEB-INF portlet.tld portlet.xml
               portal/src/webapp/WEB-INF/layout clear-bottom.jsp
                        clear-top.jsp columns.jsp portletstd-bottom.jsp
                        portletstd-top.jsp
               portal/src/webapp/WEB-INF/pages p002.psml
  Removed:     applications/demo/src/java/org/apache/jetspeed/portlet
                        ServletPortlet.java
  Log:
  - merge with aggreagtion branch
  
  Revision  Changes    Path
  1.9       +10 -1     jakarta-jetspeed-2/applications/demo/project.xml
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/applications/demo/project.xml.diff?r1=1.8&r2=1.9
  
  
  1.6       +40 -40    
jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/portlet.xml
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/portlet.xml.diff?r1=1.5&r2=1.6
  
  
  1.5       +2 -2      jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/web.xml
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/web.xml.diff?r1=1.4&r2=1.5
  
  
  1.4       +12 -18    
jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/container/JetspeedContainerServlet.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/container/JetspeedContainerServlet.java.diff?r1=1.3&r2=1.4
  
  
  1.3       +16 -16    
jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/container/JetspeedPortletContext.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/container/JetspeedPortletContext.java.diff?r1=1.2&r2=1.3
  
  
  1.4       +19 -19    
jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/portlet/MutablePortletApplication.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/portlet/MutablePortletApplication.java.diff?r1=1.3&r2=1.4
  
  
  1.2       +462 -0    
jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/portlet/ServletPortlet.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/portlet/ServletPortlet.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +101 -0    
jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/util/FIFOQueue.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/util/FIFOQueue.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +79 -0     
jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/util/Queue.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/util/Queue.java.diff?r1=1.1&r2=1.2
  
  
  1.22      +82 -44    jakarta-jetspeed-2/portal/maven.xml
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/maven.xml.diff?r1=1.21&r2=1.22
  
  
  1.18      +31 -9     jakarta-jetspeed-2/portal/project.xml
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/project.xml.diff?r1=1.17&r2=1.18
  
  
  1.3       +9 -9      
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/JetspeedPortalContext.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/JetspeedPortalContext.java.diff?r1=1.2&r2=1.3
  
  
  1.3       +4 -7      
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/Aggregator.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/Aggregator.java.diff?r1=1.2&r2=1.3
  
  
  1.9       +18 -2     
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/PortletWindowFactory.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/PortletWindowFactory.java.diff?r1=1.8&r2=1.9
  
  
  1.2       +81 -0     
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/ContentDispatcher.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/ContentDispatcher.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +84 -0     
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/ContentDispatcherCtrl.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/ContentDispatcherCtrl.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +255 -0    
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/PageAggregator.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/PageAggregator.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +99 -0     
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/PortletRenderer.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/PortletRenderer.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +390 -0    
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/ContentDispatcherImpl.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/ContentDispatcherImpl.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +139 -0    
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/HttpBufferedResponse.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/HttpBufferedResponse.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +267 -0    
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +159 -0    
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJob.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJob.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +194 -0    
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/Worker.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/Worker.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +225 -0    
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerMonitor.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerMonitor.java.diff?r1=1.1&r2=1.2
  
  
  1.5       +8 -8      
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/CapabilityMap.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/CapabilityMap.java.diff?r1=1.4&r2=1.5
  
  
  1.5       +6 -6      
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/JetspeedPortletContainerWrapper.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/JetspeedPortletContainerWrapper.java.diff?r1=1.4&r2=1.5
  
  
  1.3       +20 -20    
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/PortletInvokerFactoryImpl.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/PortletInvokerFactoryImpl.java.diff?r1=1.2&r2=1.3
  
  
  1.7       +15 -15    
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java.diff?r1=1.6&r2=1.7
  
  
  1.3       +8 -8      
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/JetspeedEngineConstants.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/JetspeedEngineConstants.java.diff?r1=1.2&r2=1.3
  
  
  1.5       +6 -6      
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java.diff?r1=1.4&r2=1.5
  
  
  1.2       +135 -0    
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/layout/LayoutPortlet.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/layout/LayoutPortlet.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +311 -0    
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/layout/MultiColumnPortlet.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/layout/MultiColumnPortlet.java.diff?r1=1.1&r2=1.2
  
  
  1.8       +63 -41    
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java.diff?r1=1.7&r2=1.8
  
  
  1.7       +125 -94   
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/RequestContext.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/RequestContext.java.diff?r1=1.6&r2=1.7
  
  
  1.7       +8 -2      
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityAccess.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityAccess.java.diff?r1=1.6&r2=1.7
  
  
  1.12      +2 -2      
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityServiceImpl.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityServiceImpl.java.diff?r1=1.11&r2=1.12
  
  
  1.3       +57 -57    
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/DeployUtilities.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/DeployUtilities.java.diff?r1=1.2&r2=1.3
  
  
  1.10      +123 -49   
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java.diff?r1=1.9&r2=1.10
  
  
  1.3       +112 -47   
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java.diff?r1=1.2&r2=1.3
  
  
  1.5       +25 -12    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/web.xml
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/web.xml.diff?r1=1.4&r2=1.5
  
  
  1.2       +87 -0     jakarta-jetspeed-2/portal/src/webapp/WEB-INF/portlet.tld
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/portlet.tld.diff?r1=1.1&r2=1.2
  
  
  1.2       +32 -0     jakarta-jetspeed-2/portal/src/webapp/WEB-INF/portlet.xml
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/portlet.xml.diff?r1=1.1&r2=1.2
  
  
  1.17      +10 -3     
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/jetspeed.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/jetspeed.properties.diff?r1=1.16&r2=1.17
  
  
  1.2       +5 -0      
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout/clear-bottom.jsp
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout/clear-bottom.jsp.diff?r1=1.1&r2=1.2
  
  
  1.2       +5 -0      
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout/clear-top.jsp
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout/clear-top.jsp.diff?r1=1.1&r2=1.2
  
  
  1.2       +120 -0    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout/columns.jsp
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout/columns.jsp.diff?r1=1.1&r2=1.2
  
  
  1.2       +8 -0      
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout/portletstd-bottom.jsp
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout/portletstd-bottom.jsp.diff?r1=1.1&r2=1.2
  
  
  1.2       +23 -0     
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout/portletstd-top.jsp
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout/portletstd-top.jsp.diff?r1=1.1&r2=1.2
  
  
  1.2       +8 -8      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p001.psml
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p001.psml.diff?r1=1.1&r2=1.2
  
  
  1.2       +19 -0     jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p002.psml
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p002.psml.diff?r1=1.1&r2=1.2


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages p002.psml p001.psml

Reply via email to