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 ta...@apache.org on 2008/10/22 09:01:03 UTC

svn commit: r706872 - in /portals/pluto/branches/2.0-spi-refactoring: pluto-container-api/src/main/java/org/apache/pluto/core/ pluto-container-api/src/main/java/org/apache/pluto/spi/optional/ pluto-container/src/main/java/org/apache/pluto/core/

Author: taylor
Date: Wed Oct 22 00:01:03 2008
New Revision: 706872

URL: http://svn.apache.org/viewvc?rev=706872&view=rev
Log:
https://issues.apache.org/jira/browse/PLUTO-481

Modified:
    portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/core/PortletServlet.java
    portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java
    portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java

Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/core/PortletServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/core/PortletServlet.java?rev=706872&r1=706871&r2=706872&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/core/PortletServlet.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/core/PortletServlet.java Wed Oct 22 00:01:03 2008
@@ -206,7 +206,7 @@
         else if ( started )
         {
           started = false;
-          registryService.remove(portletContext);
+          registryService.unregister(portletContext);
           if (portlet != null)
           {
               portlet.destroy();

Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java?rev=706872&r1=706871&r2=706872&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java Wed Oct 22 00:01:03 2008
@@ -125,7 +125,19 @@
      */
     void removePortletRegistryListener(PortletRegistryListener listener);
     
+    /**
+     * Register a portlet application
+     * 
+     * @param config
+     * @return
+     * @throws PortletContainerException
+     */
     String register(ServletConfig config) throws PortletContainerException;
     
-    void remove(InternalPortletContext context);
+    /**
+     * Unregister a portlet application
+     * 
+     * @param context
+     */
+    void unregister(InternalPortletContext context);
 }
\ No newline at end of file

Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java?rev=706872&r1=706871&r2=706872&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java Wed Oct 22 00:01:03 2008
@@ -145,7 +145,7 @@
         return applicationName;
     }
 
-    public void remove(InternalPortletContext context) {
+    public void unregister(InternalPortletContext context) {
         portletContexts.remove(context.getApplicationName());
         classLoaders.remove(context.getApplicationName());
         Iterator<String> configs = portletConfigs.keySet().iterator();