portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r752027 [4/4] - in /portals/pluto/trunk: pluto-container-api/src/main/java/org/apache/pluto/ pluto-container-api/src/main/java/org/apache/pluto/container/ pluto-container-api/src/main/java/org/apache/pluto/container/driver/ pluto-container-...
Date Tue, 10 Mar 2009 09:24:49 GMT
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java
(original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java
Tue Mar 10 09:24:41 2009
@@ -22,12 +22,12 @@
 import javax.portlet.PortletMode;
 import javax.servlet.ServletContext;
 
-import org.apache.pluto.PortletContainerException;
+import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.spi.PortalCallbackService;
+import org.apache.pluto.container.spi.optional.PortletPreferencesService;
 import org.apache.pluto.driver.services.portal.PageConfig;
 import org.apache.pluto.driver.services.portal.RenderConfigService;
 import org.apache.pluto.driver.url.PortalURLParser;
-import org.apache.pluto.spi.PortalCallbackService;
-import org.apache.pluto.spi.optional.PortletPreferencesService;
 
 /**
  * Interface defining a means for retrieving driver services

Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalServletRequest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalServletRequest.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalServletRequest.java
(original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalServletRequest.java
Tue Mar 10 09:24:41 2009
@@ -27,7 +27,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.container.PortletWindow;
 import org.apache.pluto.driver.url.PortalURL;
 import org.apache.pluto.driver.url.PortalURLParameter;
 

Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowIDImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowIDImpl.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowIDImpl.java
(original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowIDImpl.java
Tue Mar 10 09:24:41 2009
@@ -21,7 +21,7 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
-import org.apache.pluto.PortletWindowID;
+import org.apache.pluto.container.PortletWindowID;
 
 /**
  * Wraps around the internal Object IDs. By holding both the string and the

Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java
(original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortletWindowImpl.java
Tue Mar 10 09:24:41 2009
@@ -21,11 +21,11 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.PortletEntity;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.PortletWindowID;
+import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.PortletEntity;
+import org.apache.pluto.container.PortletWindow;
+import org.apache.pluto.container.PortletWindowID;
 import org.apache.pluto.driver.services.portal.PortletWindowConfig;
 import org.apache.pluto.driver.url.PortalURL;
 import org.apache.pluto.internal.impl.PortletEntityImpl;

Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/ResourceURLProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/ResourceURLProviderImpl.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/ResourceURLProviderImpl.java
(original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/ResourceURLProviderImpl.java
Tue Mar 10 09:24:41 2009
@@ -27,8 +27,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.spi.ResourceURLProvider;
+import org.apache.pluto.container.PortletWindow;
+import org.apache.pluto.container.spi.ResourceURLProvider;
 
 public class ResourceURLProviderImpl implements ResourceURLProvider {
 

Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/SupportedModesService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/SupportedModesService.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/SupportedModesService.java
(original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/SupportedModesService.java
Tue Mar 10 09:24:41 2009
@@ -21,7 +21,7 @@
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletMode;
 
-import org.apache.pluto.PortletContainerException;
+import org.apache.pluto.container.PortletContainerException;
 
 /**
  * Allows clients to determine if a particular PortletMode is supported

Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeDropDownTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeDropDownTag.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeDropDownTag.java
(original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeDropDownTag.java
Tue Mar 10 09:24:41 2009
@@ -34,9 +34,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.PortletWindow;
 import org.apache.pluto.driver.AttributeKeys;
 import org.apache.pluto.driver.config.DriverConfiguration;
 import org.apache.pluto.driver.core.PortalRequestContext;

Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java
(original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTag.java
Tue Mar 10 09:24:41 2009
@@ -28,8 +28,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletWindow;
 import org.apache.pluto.driver.AttributeKeys;
 import org.apache.pluto.driver.core.PortalRequestContext;
 import org.apache.pluto.driver.core.PortalServletRequest;
@@ -43,7 +43,7 @@
  * The portlet tag is used to render a portlet specified by the portlet ID.
  *
  * @see javax.portlet.Portlet#render(javax.portlet.RenderRequest,javax.portlet.RenderResponse)
- * @see org.apache.pluto.PortletContainer#doRender(PortletWindow, HttpServletRequest, HttpServletResponse)
+ * @see org.apache.pluto.container.PortletContainer#doRender(PortletWindow, HttpServletRequest,
HttpServletResponse)
  *
  */
 public class PortletTag extends BodyTagSupport {

Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTitleTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTitleTag.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTitleTag.java
(original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTitleTag.java
Tue Mar 10 09:24:41 2009
@@ -21,7 +21,7 @@
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
 
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.container.PortletWindow;
 import org.apache.pluto.driver.AttributeKeys;
 
 /**

Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml (original)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml Tue Mar 10 09:24:41 2009
@@ -84,7 +84,7 @@
 
     <servlet>
         <servlet-name>AboutPortlet</servlet-name>
-        <servlet-class>org.apache.pluto.driver.PortletServlet</servlet-class>
+        <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
         <init-param>
             <param-name>portlet-name</param-name>
             <param-value>AboutPortlet</param-value>
@@ -94,7 +94,7 @@
 
   <servlet>
     <servlet-name>AdminPortlet</servlet-name>
-    <servlet-class>org.apache.pluto.driver.PortletServlet</servlet-class>
+    <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
     <init-param>
       <param-name>portlet-name</param-name>
       <param-value>AdminPortlet</param-value>
@@ -104,7 +104,7 @@
 
   <servlet>
     <servlet-name>PlutoPageAdmin</servlet-name>
-    <servlet-class>org.apache.pluto.driver.PortletServlet</servlet-class>
+    <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
     <init-param>
       <param-name>portlet-name</param-name>
       <param-value>PlutoPageAdmin</param-value>

Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v11/deploying.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v11/deploying.xml?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v11/deploying.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v11/deploying.xml Tue Mar 10 09:24:41 2009
@@ -36,8 +36,9 @@
             pluto assembler before being deployed. The assembly process injects
             pluto specific information for deployment. Specifically, a servlet
             and servlet mapping are added to the deployment descriptor (web.xml). 
-            This servlet (<code>org.apache.pluto.core.PortletServlet</code>)
will be 
-            used to dispatch portlet requests to the portlet application.
+            This servlet (<code>org.apache.pluto.core.PortletServlet</code> for
Pluto 1.x,
+            <code>org.apache.pluto.container.driver.PortletServlet</code> for
Pluto 2.x) 
+            will be used to dispatch portlet requests to the portlet application.
           </li>
           <li>
             <b>Deployment</b>: After portlet applications are assembled properly

Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/Assembler.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/Assembler.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/Assembler.java
(original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/Assembler.java
Tue Mar 10 09:24:41 2009
@@ -44,7 +44,7 @@
      * dispatching requests from the Pluto container to portlets. 
      */
     String DISPATCH_SERVLET_CLASS =
-        	"org.apache.pluto.driver.PortletServlet";
+        	"org.apache.pluto.container.driver.PortletServlet";
 
     /**
      * Assemble a web application into a portlet web application which is

Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java
(original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java
Tue Mar 10 09:24:41 2009
@@ -20,9 +20,9 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.container.om.portlet.PortletDefinition;
 import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
-import org.apache.pluto.om.portlet.PortletDefinition;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
 import org.apache.pluto.util.assemble.Assembler;
 import org.apache.pluto.util.descriptors.web.PlutoWebXmlRewriter;
 

Modified: portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java
(original)
+++ portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java
Tue Mar 10 09:24:41 2009
@@ -26,10 +26,10 @@
 import java.util.jar.JarInputStream;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.container.om.portlet.PortletDefinition;
+import org.apache.pluto.container.services.PortletAppDescriptorService;
 import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
-import org.apache.pluto.om.portlet.PortletDefinition;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
-import org.apache.pluto.services.PortletAppDescriptorService;
 import org.apache.pluto.util.assemble.ArchiveBasedAssemblyTest;
 import org.apache.pluto.util.assemble.Assembler;
 import org.apache.pluto.util.assemble.AssemblerConfig;

Modified: portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java
(original)
+++ portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java
Tue Mar 10 09:24:41 2009
@@ -24,10 +24,10 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.container.om.portlet.PortletDefinition;
+import org.apache.pluto.container.services.PortletAppDescriptorService;
 import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
-import org.apache.pluto.om.portlet.PortletDefinition;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
-import org.apache.pluto.services.PortletAppDescriptorService;
 import org.apache.pluto.util.assemble.ArchiveBasedAssemblyTest;
 import org.apache.pluto.util.assemble.Assembler;
 import org.apache.pluto.util.assemble.AssemblerConfig;

Modified: portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java
(original)
+++ portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java
Tue Mar 10 09:24:41 2009
@@ -30,10 +30,10 @@
 import junit.framework.TestCase;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.container.om.portlet.PortletDefinition;
+import org.apache.pluto.container.services.PortletAppDescriptorService;
 import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
-import org.apache.pluto.om.portlet.PortletDefinition;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
-import org.apache.pluto.services.PortletAppDescriptorService;
 import org.apache.pluto.util.assemble.Assembler;
 import org.apache.pluto.util.descriptors.web.PlutoWebXmlRewriter;
 

Modified: portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/assembled.web.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/assembled.web.xml?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/assembled.web.xml
(original)
+++ portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/assembled.web.xml
Tue Mar 10 09:24:41 2009
@@ -3,7 +3,7 @@
     <display-name>WarTestServletDisplayName</display-name>
     <servlet>
         <servlet-name>WarTestPortletName</servlet-name>
-        <servlet-class>org.apache.pluto.driver.PortletServlet</servlet-class>
+        <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
         <init-param>
             <param-name>portlet-name</param-name>
             <param-value>WarTestPortletName</param-value>

Modified: portals/pluto/trunk/src/site/xdoc/v11/deploying.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/src/site/xdoc/v11/deploying.xml?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/src/site/xdoc/v11/deploying.xml (original)
+++ portals/pluto/trunk/src/site/xdoc/v11/deploying.xml Tue Mar 10 09:24:41 2009
@@ -37,8 +37,8 @@
             pluto specific information for deployment. Specifically, a servlet
             and servlet mapping are added to the deployment descriptor (web.xml). 
             This servlet (<code>org.apache.pluto.core.PortletServlet</code> for
Pluto 1.x,
-            <code>org.apache.pluto.driver.PortletServlet</code> for Pluto 2.x)
will be 
-            used to dispatch portlet requests to the portlet application.
+            <code>org.apache.pluto.container.driver.PortletServlet</code> for
Pluto 2.x)
+            will be used to dispatch portlet requests to the portlet application.
           </li>
           <li>
             <b>Deployment</b>: After portlet applications are assembled properly



Mime
View raw message