You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by at...@apache.org on 2009/03/10 00:55:45 UTC
svn commit: r751911 - in /portals/pluto/trunk:
pluto-container-api/src/main/java/org/apache/pluto/core/
pluto-container-api/src/main/java/org/apache/pluto/driver/
pluto-container-api/src/main/java/org/apache/pluto/services/
pluto-container/src/main/jav...
Author: ate
Date: Mon Mar 9 23:55:44 2009
New Revision: 751911
URL: http://svn.apache.org/viewvc?rev=751911&view=rev
Log:
PLUTO-537: Cleaning up Pluto packages
See: https://issues.apache.org/jira/browse/PLUTO-537
- renaming container-api/o.a.p.core to o.a.p.driver
- moving PlutoServices to o.a.p.driver
Added:
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/driver/
- copied from r751910, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/core/
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/driver/PlutoServices.java (contents, props changed)
- copied, changed from r751910, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/services/PlutoServices.java
Removed:
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/core/
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/services/PlutoServices.java
Modified:
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/driver/PortletServlet.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInvokerService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java
portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java
portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/Assembler.java
portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/file/assembled.web.xml
portals/pluto/trunk/src/site/xdoc/v11/deploying.xml
Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/driver/PlutoServices.java (from r751910, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/services/PlutoServices.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/driver/PlutoServices.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/driver/PlutoServices.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/services/PlutoServices.java&r1=751910&r2=751911&rev=751911&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/services/PlutoServices.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/driver/PlutoServices.java Mon Mar 9 23:55:44 2009
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.services;
+package org.apache.pluto.driver;
import javax.portlet.PortalContext;
import org.apache.pluto.NamespaceMapper;
+import org.apache.pluto.services.ContainerServices;
import org.apache.pluto.spi.CCPPProfileService;
import org.apache.pluto.spi.ContainerInvocationService;
import org.apache.pluto.spi.EventCoordinationService;
Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/driver/PlutoServices.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/driver/PortletServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/driver/PortletServlet.java?rev=751911&r1=751910&r2=751911&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/driver/PortletServlet.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/driver/PortletServlet.java Mon Mar 9 23:55:44 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.core;
+package org.apache.pluto.driver;
import java.io.IOException;
import java.util.Timer;
@@ -50,7 +50,6 @@
import org.apache.pluto.internal.InternalPortletConfig;
import org.apache.pluto.internal.InternalPortletContext;
import org.apache.pluto.om.portlet.PortletDefinition;
-import org.apache.pluto.services.PlutoServices;
import org.apache.pluto.spi.ContainerInvocationService;
import org.apache.pluto.spi.FilterManager;
import org.apache.pluto.spi.optional.AdministrativeRequestListener;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInvokerService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInvokerService.java?rev=751911&r1=751910&r2=751911&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInvokerService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInvokerService.java Mon Mar 9 23:55:44 2009
@@ -40,7 +40,7 @@
import org.apache.pluto.Constants;
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.core.PortletServlet;
+import org.apache.pluto.driver.PortletServlet;
import org.apache.pluto.spi.FilterManager;
import org.apache.pluto.spi.optional.PortletContextService;
import org.apache.pluto.spi.optional.PortletInvokerService;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java?rev=751911&r1=751910&r2=751911&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java Mon Mar 9 23:55:44 2009
@@ -26,9 +26,9 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.ContainerInvocation;
import org.apache.pluto.PortletWindow;
+import org.apache.pluto.driver.PlutoServices;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.portlet.PortletInfo;
-import org.apache.pluto.services.PlutoServices;
import org.apache.pluto.spi.optional.PortletInfoService;
import org.apache.pluto.util.StringManager;
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java?rev=751911&r1=751910&r2=751911&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java Mon Mar 9 23:55:44 2009
@@ -20,8 +20,8 @@
import java.lang.reflect.Method;
import org.apache.pluto.core.PlutoContainerServices;
+import org.apache.pluto.driver.PlutoServices;
import org.apache.pluto.services.ContainerServices;
-import org.apache.pluto.services.PlutoServices;
import org.jmock.MockObjectTestCase;
/**
Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java?rev=751911&r1=751910&r2=751911&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java Mon Mar 9 23:55:44 2009
@@ -30,6 +30,7 @@
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.descriptors.portlet.CustomPortletModeType;
import org.apache.pluto.driver.AttributeKeys;
+import org.apache.pluto.driver.PlutoServices;
import org.apache.pluto.driver.config.DriverConfigurationException;
import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.services.portal.PropertyConfigService;
@@ -37,7 +38,6 @@
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.om.portlet.Supports;
-import org.apache.pluto.services.PlutoServices;
import org.apache.pluto.spi.optional.PortletContextService;
import org.apache.pluto.spi.optional.PortletRegistryService;
Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml?rev=751911&r1=751910&r2=751911&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml (original)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml Mon Mar 9 23:55:44 2009
@@ -45,7 +45,7 @@
<beans>
<bean id="PlutoServices"
- class="org.apache.pluto.services.PlutoServices"
+ class="org.apache.pluto.driver.PlutoServices"
singleton="true">
<constructor-arg><ref bean="RequiredContainerServices"/></constructor-arg>
</bean>
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=751911&r1=751910&r2=751911&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 Mon Mar 9 23:55:44 2009
@@ -84,7 +84,7 @@
<servlet>
<servlet-name>AboutPortlet</servlet-name>
- <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+ <servlet-class>org.apache.pluto.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.core.PortletServlet</servlet-class>
+ <servlet-class>org.apache.pluto.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.core.PortletServlet</servlet-class>
+ <servlet-class>org.apache.pluto.driver.PortletServlet</servlet-class>
<init-param>
<param-name>portlet-name</param-name>
<param-value>PlutoPageAdmin</param-value>
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=751911&r1=751910&r2=751911&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 Mon Mar 9 23:55:44 2009
@@ -44,7 +44,7 @@
* dispatching requests from the Pluto container to portlets.
*/
String DISPATCH_SERVLET_CLASS =
- "org.apache.pluto.core.PortletServlet";
+ "org.apache.pluto.driver.PortletServlet";
/**
* Assemble a web application into a portlet web application which is
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=751911&r1=751910&r2=751911&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 Mon Mar 9 23:55:44 2009
@@ -3,7 +3,7 @@
<display-name>WarTestServletDisplayName</display-name>
<servlet>
<servlet-name>WarTestPortletName</servlet-name>
- <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+ <servlet-class>org.apache.pluto.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=751911&r1=751910&r2=751911&view=diff
==============================================================================
--- portals/pluto/trunk/src/site/xdoc/v11/deploying.xml (original)
+++ portals/pluto/trunk/src/site/xdoc/v11/deploying.xml Mon Mar 9 23:55:44 2009
@@ -36,7 +36,8 @@
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
+ 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.
</li>
<li>