svn commit: r348222 - in /portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto: ./ core/ core/impl/ services/ services/optional/

[dd...@apache.org]

Author: ddewolf
Date: Tue Nov 22 11:31:13 2005
New Revision: 348222

URL: http://svn.apache.org/viewcvs?rev=348222&view=rev
Log:
Refactor pluto-deploy module into pluto-util.  All utilities now have a single home.  Preparing to enhance Assemble, Deploy, and Publish Mojos so to all act consistently and be usable within a portlet war project and have an archetype.

Added:
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/optional/
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/optional/PortletEnvironmentService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/optional/PortletInvokerService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/optional/PortletPreferencesService.java
      - copied, changed from r345288, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/PortletPreferencesService.java
Removed:
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/OptionalPortletContainerServices.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/PortletPreferencesService.java
Modified:
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/OptionalPortletContainerServices.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalServices.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/OptionalPortletContainerServices.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/OptionalPortletContainerServices.java?rev=348222&r1=348221&r2=348222&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/OptionalPortletContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/OptionalPortletContainerServices.java Tue Nov 22 11:31:13 2005
@@ -1,6 +1,24 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.pluto;
 
-import org.apache.pluto.services.PortletPreferencesService;
+import org.apache.pluto.services.optional.PortletPreferencesService;
+import org.apache.pluto.services.optional.PortletEnvironmentService;
+import org.apache.pluto.services.optional.PortletInvokerService;
+import org.apache.pluto.core.InternalPortletWindow;
 
 /**
  * Defines the services necessary for integration between the Pluto Container
@@ -9,6 +27,16 @@
  */
 public interface OptionalPortletContainerServices {
 
+    PortletEnvironmentService getPortletEnvironmentService();
+
     PortletPreferencesService getPortletPreferencesService();
+
+    /**
+     * Retrieve an invoker for the specified PortletWindow.
+     *
+     * @param window the InternalPortletWindow used for invocation
+     * @return an invoker which can be used to service the indicated portlet
+     */
+    PortletInvokerService getPortletInvokerService(InternalPortletWindow window);
 
 }

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalServices.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalServices.java?rev=348222&r1=348221&r2=348222&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalServices.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalServices.java Tue Nov 22 11:31:13 2005
@@ -22,7 +22,9 @@
 import org.apache.pluto.PortletContainerException;
 import org.apache.pluto.PortletWindow;
 import org.apache.pluto.OptionalPortletContainerServices;
-import org.apache.pluto.services.PortletPreferencesService;
+import org.apache.pluto.services.optional.PortletPreferencesService;
+import org.apache.pluto.services.optional.PortletEnvironmentService;
+import org.apache.pluto.services.optional.PortletInvokerService;
 
 /**
  * Default Optional Services implementation.
@@ -61,6 +63,15 @@
                           PortletPreference[] preferences) throws PortletContainerException {
 
         }
+    }
+
+
+    public PortletEnvironmentService getPortletEnvironmentService() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public PortletInvokerService getPortletInvokerService(InternalPortletWindow window) {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 }
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java?rev=348222&r1=348221&r2=348222&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java Tue Nov 22 11:31:13 2005
@@ -37,7 +37,7 @@
 import org.apache.pluto.core.InternalPortletWindow;
 import org.apache.pluto.core.PortletPreference;
 import org.apache.pluto.core.PortletEntity;
-import org.apache.pluto.services.PortletPreferencesService;
+import org.apache.pluto.services.optional.PortletPreferencesService;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.Log;
 

Added: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/optional/PortletEnvironmentService.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/optional/PortletEnvironmentService.java?rev=348222&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/optional/PortletEnvironmentService.java (added)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/optional/PortletEnvironmentService.java Tue Nov 22 11:31:13 2005
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.services.optional;
+
+import org.apache.pluto.core.InternalPortletWindow;
+import org.apache.pluto.core.InternalPortletRequest;
+import org.apache.pluto.core.InternalPortletResponse;
+import org.apache.pluto.core.InternalActionResponse;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Factory Service for creating Portlet request and responses.
+ *
+ */
+public interface PortletEnvironmentService {
+
+   InternalPortletRequest createActionRequest(HttpServletRequest req,
+                                               HttpServletResponse res,
+                                               InternalPortletWindow window);
+
+   InternalActionResponse createActionRespose(HttpServletRequest req,
+                                               HttpServletResponse res,
+                                               InternalPortletWindow window);
+
+    InternalPortletRequest createRenderRequest(HttpServletRequest req,
+                                               HttpServletResponse res,
+                                               InternalPortletWindow window);
+
+    InternalPortletResponse createRenderRespose(HttpServletRequest req,
+                                                HttpServletResponse res,
+                                                InternalPortletWindow window);
+
+
+
+}

Added: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/optional/PortletInvokerService.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/optional/PortletInvokerService.java?rev=348222&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/optional/PortletInvokerService.java (added)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/optional/PortletInvokerService.java Tue Nov 22 11:31:13 2005
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.services.optional;
+
+import org.apache.pluto.core.InternalPortletWindow;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+
+/**
+ * Service used to invoke portlets
+ *
+ */
+public interface PortletInvokerService {
+
+    void action(ActionRequest req, ActionResponse res, InternalPortletWindow window);
+
+    void render(RenderRequest req, RenderResponse res, InternalPortletWindow window);
+
+    void load(PortletRequest req, PortletResponse res, InternalPortletWindow window);
+}

Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/optional/PortletPreferencesService.java (from r345288, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/PortletPreferencesService.java)
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/optional/PortletPreferencesService.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/optional/PortletPreferencesService.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/PortletPreferencesService.java&r1=345288&r2=348222&rev=348222&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/PortletPreferencesService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/optional/PortletPreferencesService.java Tue Nov 22 11:31:13 2005
@@ -17,12 +17,13 @@
 
  */
 
-package org.apache.pluto.services;
+package org.apache.pluto.services.optional;
 
 import javax.portlet.PortletRequest;
 
 import org.apache.pluto.PortletWindow;
 import org.apache.pluto.PortletContainerException;
+import org.apache.pluto.services.ContainerService;
 import org.apache.pluto.core.PortletPreference;
 
 public interface PortletPreferencesService extends ContainerService {