portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r607448 [3/36] - in /portals/pluto/branches/pluto-1.1.x: ./ assembly/src/main/assembly/ assembly/src/main/resources/ maven-pluto-plugin/ maven-pluto-plugin/src/main/java/org/apache/pluto/maven/ pluto-ant-tasks/ pluto-ant-tasks/src/assemble/...
Date Sat, 29 Dec 2007 17:20:42 GMT
Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/Constants.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/Constants.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/Constants.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/Constants.java Sat Dec 29 09:20:23 2007
@@ -1,97 +1,97 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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;
-
-/**
- * Constant values used to bind internal portlet objects as attributes,
- * typically to a request.
- * @version 1.0
- */
-public class Constants {
-
-    /**
-     * The key used to bind the <code>PortletRequest</code> to the underlying
-     * <code>HttpServletRequest</code>.
-     */
-    public final static String PORTLET_REQUEST = "javax.portlet.request";
-
-    /**
-     * The key used to bind the <code>PortletResponse</code> to the underlying
-     * <code>HttpServletRequest</code>.
-     */
-    public final static String PORTLET_RESPONSE = "javax.portlet.response";
-
-    /**
-     * The key used to bind the <code>PortletConfig</code> to the underlying
-     * PortletConfig.
-     */
-    public final static String PORTLET_CONFIG = "javax.portlet.config";
-
-    /**
-     *
-     */
-    public final static String TITLE_KEY = "javax.portlet.title";
-
-    /**
-     *
-     */
-    public final static String SHORT_TITLE_KEY = "javax.portlet.short-title";
-
-    /**
-     * 
-     */
-    public final static String KEYWORDS_KEY = "javax.portlet.keywords";
-
-    /**
-     * The key used to bind the method of processing being requested by the
-     * container to the underlying <code>PortletRquest</code>.
-     */
-    public final static String METHOD_ID = "org.apache.pluto.core.method";
-
-
-    /**
-     * The unique method identifier for render requests.  Render requests are
-     * requested through a call to the {@link PortletContainer#doRender(org.apache.pluto.PortletWindow,
-        * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
-     * method.
-     */
-    public final static Integer METHOD_RENDER = new Integer(1);
-
-    /**
-     * The unique method identifier for render requests.  Render requests are
-     * requested through a call to the {@link PortletContainer#doAction(org.apache.pluto.PortletWindow,
-        * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
-     * method.
-     */
-    public final static Integer METHOD_ACTION = new Integer(3);
-
-    /**
-     * The unique method identifier for noop (load) requests.  Load requests are
-     * requested through a call to the {@link PortletContainer#doLoad(org.apache.pluto.PortletWindow,
-        * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
-     * method.
-     */
-    public final static Integer METHOD_NOOP = new Integer(5);
-
-
-    /**
-     * The unique method identifier for admin requests.  Admin requests
-     * are requested through a call to the {@link PortletContainer#doAdmin(PortletWindow, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
-     * method.
-     */
-    public final static Integer  METHOD_ADMIN = new Integer(7);
-}
+ * 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;
+
+/**
+ * Constant values used to bind internal portlet objects as attributes,
+ * typically to a request.
+ * @version 1.0
+ */
+public class Constants {
+
+    /**
+     * The key used to bind the <code>PortletRequest</code> to the underlying
+     * <code>HttpServletRequest</code>.
+     */
+    public final static String PORTLET_REQUEST = "javax.portlet.request";
+
+    /**
+     * The key used to bind the <code>PortletResponse</code> to the underlying
+     * <code>HttpServletRequest</code>.
+     */
+    public final static String PORTLET_RESPONSE = "javax.portlet.response";
+
+    /**
+     * The key used to bind the <code>PortletConfig</code> to the underlying
+     * PortletConfig.
+     */
+    public final static String PORTLET_CONFIG = "javax.portlet.config";
+
+    /**
+     *
+     */
+    public final static String TITLE_KEY = "javax.portlet.title";
+
+    /**
+     *
+     */
+    public final static String SHORT_TITLE_KEY = "javax.portlet.short-title";
+
+    /**
+     * 
+     */
+    public final static String KEYWORDS_KEY = "javax.portlet.keywords";
+
+    /**
+     * The key used to bind the method of processing being requested by the
+     * container to the underlying <code>PortletRquest</code>.
+     */
+    public final static String METHOD_ID = "org.apache.pluto.core.method";
+
+
+    /**
+     * The unique method identifier for render requests.  Render requests are
+     * requested through a call to the {@link PortletContainer#doRender(org.apache.pluto.PortletWindow,
+        * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+     * method.
+     */
+    public final static Integer METHOD_RENDER = new Integer(1);
+
+    /**
+     * The unique method identifier for render requests.  Render requests are
+     * requested through a call to the {@link PortletContainer#doAction(org.apache.pluto.PortletWindow,
+        * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+     * method.
+     */
+    public final static Integer METHOD_ACTION = new Integer(3);
+
+    /**
+     * The unique method identifier for noop (load) requests.  Load requests are
+     * requested through a call to the {@link PortletContainer#doLoad(org.apache.pluto.PortletWindow,
+        * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+     * method.
+     */
+    public final static Integer METHOD_NOOP = new Integer(5);
+
+
+    /**
+     * The unique method identifier for admin requests.  Admin requests
+     * are requested through a call to the {@link PortletContainer#doAdmin(PortletWindow, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+     * method.
+     */
+    public final static Integer  METHOD_ADMIN = new Integer(7);
+}

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/Constants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/OptionalContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/OptionalContainerServices.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/OptionalContainerServices.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/OptionalContainerServices.java Sat Dec 29 09:20:23 2007
@@ -1,98 +1,98 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.spi.optional.PortletPreferencesService;
-import org.apache.pluto.spi.optional.PortletEnvironmentService;
-import org.apache.pluto.spi.optional.PortletInvokerService;
-import org.apache.pluto.spi.optional.PortletRegistryService;
-import org.apache.pluto.spi.optional.PortletInfoService;
-import org.apache.pluto.spi.optional.PortalAdministrationService;
-import org.apache.pluto.spi.optional.UserInfoService;
-
-/**
- * Defines the services necessary for integration between the Pluto Container
- * and a Portal.
- *
- * <p>NOTE: Backwards compatibility is not garaunteed against
- * this interface as additional services may be needed.
- * Please extend the DefaultOptionalContainerServices
- * class to ensure your implementation can be used without
- * modicications in the future.</p>
- *
- * @since 1.1.0
- */
-public interface OptionalContainerServices {
-
-    /**
-     * Returns the portlet preferences service implementation
-     * used by the container.
-     *
-     * @return portlet preferences service implementation.
-     */
-    PortletPreferencesService getPortletPreferencesService();
-
-    /**
-     * Returns the environment services implementation
-     * used by the container.
-     *
-     * @return portlet environment services implementation.
-     */
-    PortletEnvironmentService getPortletEnvironmentService();
-
-    /**
-     * Returns the portlet registry services implementation
-     * used by the container.
-     *
-     * @return registry service implementation
-     */
-    PortletRegistryService getPortletRegistryService();
-
-
-    /**
-     * Returns an invoker for the specified PortletWindow.
-     *
-     * @return an invoker which can be used to service the indicated portlet.
-     */
-    PortletInvokerService getPortletInvokerService();
-
-    /**
-     * Returns the portlet info service implementation used
-     * by the container.
-     *
-     * @return portlet info service implementation.
-     */
-    PortletInfoService getPortletInfoService();
-
-    /**
-     * Returns the admin service implementation used by
-     * the container.
-     *
-     * @return portal admin service
-     */
-    PortalAdministrationService getPortalAdministrationService();
-
-
-    /**
-     * Returns the user info service implementation used
-     * by the container.
-     *
-     * @return user info service
-     */
-    UserInfoService getUserInfoService();
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.spi.optional.PortletPreferencesService;
+import org.apache.pluto.spi.optional.PortletEnvironmentService;
+import org.apache.pluto.spi.optional.PortletInvokerService;
+import org.apache.pluto.spi.optional.PortletRegistryService;
+import org.apache.pluto.spi.optional.PortletInfoService;
+import org.apache.pluto.spi.optional.PortalAdministrationService;
+import org.apache.pluto.spi.optional.UserInfoService;
+
+/**
+ * Defines the services necessary for integration between the Pluto Container
+ * and a Portal.
+ *
+ * <p>NOTE: Backwards compatibility is not garaunteed against
+ * this interface as additional services may be needed.
+ * Please extend the DefaultOptionalContainerServices
+ * class to ensure your implementation can be used without
+ * modicications in the future.</p>
+ *
+ * @since 1.1.0
+ */
+public interface OptionalContainerServices {
+
+    /**
+     * Returns the portlet preferences service implementation
+     * used by the container.
+     *
+     * @return portlet preferences service implementation.
+     */
+    PortletPreferencesService getPortletPreferencesService();
+
+    /**
+     * Returns the environment services implementation
+     * used by the container.
+     *
+     * @return portlet environment services implementation.
+     */
+    PortletEnvironmentService getPortletEnvironmentService();
+
+    /**
+     * Returns the portlet registry services implementation
+     * used by the container.
+     *
+     * @return registry service implementation
+     */
+    PortletRegistryService getPortletRegistryService();
+
+
+    /**
+     * Returns an invoker for the specified PortletWindow.
+     *
+     * @return an invoker which can be used to service the indicated portlet.
+     */
+    PortletInvokerService getPortletInvokerService();
+
+    /**
+     * Returns the portlet info service implementation used
+     * by the container.
+     *
+     * @return portlet info service implementation.
+     */
+    PortletInfoService getPortletInfoService();
+
+    /**
+     * Returns the admin service implementation used by
+     * the container.
+     *
+     * @return portal admin service
+     */
+    PortalAdministrationService getPortalAdministrationService();
+
+
+    /**
+     * Returns the user info service implementation used
+     * by the container.
+     *
+     * @return user info service
+     */
+    UserInfoService getUserInfoService();
+
+}

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/OptionalContainerServices.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PlutoConfigurationException.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PlutoConfigurationException.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PlutoConfigurationException.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PlutoConfigurationException.java Sat Dec 29 09:20:23 2007
@@ -1,33 +1,33 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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;
-
-/**
- * Exception thrown when Pluto configuration fails.
- *
- * @since Jul 2, 2005
- */
-public class PlutoConfigurationException extends RuntimeException {
-
-    public PlutoConfigurationException(String message) {
-        super(message);
-    }
-
-    public PlutoConfigurationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
+ * 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;
+
+/**
+ * Exception thrown when Pluto configuration fails.
+ *
+ * @since Jul 2, 2005
+ */
+public class PlutoConfigurationException extends RuntimeException {
+
+    public PlutoConfigurationException(String message) {
+        super(message);
+    }
+
+    public PlutoConfigurationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PlutoConfigurationException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java Sat Dec 29 09:20:23 2007
@@ -1,171 +1,171 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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 java.io.IOException;
-
-import javax.portlet.PortletException;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-
-/**
- * The publicized entry point into Pluto. The base functionality of the portlet
- * container can be enhanced or even modified by PortletContainerServices.
- * <p/>
- * <P> The methods of this class have to be called in the following order:
- * <TABLE> <TR><TH>Method</TH><TH>Description</TH><TH>Constraints</TH></TR>
- * <TR><TD>{@link #init(javax.servlet.ServletContext)}</TD> <TD>Initialized the
- * portlet container.</TD> <TD>Performed only once per container
- * lifecycle.</TD></TR>
- * <p/>
- * <TR><TD>{@link #doAction(org.apache.pluto.PortletWindow,
-    * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}</TD>
- * <TD>Perform the action for the targeted portlet</TD> <TD>Optionally performed
- * for a single portlet per request</TD></TR>
- * <p/>
- * <TR><TD>{@link #doRender(org.apache.pluto.PortletWindow,
-    * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}</TD>
- * <TD>Render the portlet</TD> <TD>Performed once for each portlet per
- * request.</TD></TR>
- * <p/>
- * <TR><TD>{@link #destroy()}</TD> <TD>Destroy and remove container from
- * service.</TD> <TD>Performed only once per container lifecylce</TD></TR>
- * @version $Id: PortletContainer.java 36010 2004-07-30 14:16:06Z ddewolf $
- */
-public interface PortletContainer {
-
-    /**
-     * Initializes the container for use within the given servlet context.
-     * @param servletContext  the servlet context.
-     * @throws PortletContainerException if an error occurs.
-     */
-    void init(ServletContext servletContext)
-    throws PortletContainerException;
-
-    /**
-     * Shuts down the container. After calling this method it is no longer valid
-     * to call any method on the portlet container.
-     * @throws PortletContainerException if an error occurs while shutting down
-     *                                   the container
-     */
-    void destroy() throws PortletContainerException;
-
-    /**
-     * Calls the render method of the given portlet window.
-     * @param portletWindow  the portlet Window
-     * @param request               the servlet request
-     * @param response              the servlet response
-     * @throws PortletException          if one portlet has trouble fulfilling
-     *                                   the request
-     * @throws IOException               if the streaming causes an I/O problem
-     * @throws PortletContainerException if the portlet container implementation
-     *                                   has trouble fulfilling the request
-     */
-    void doRender(PortletWindow portletWindow,
-                  HttpServletRequest request,
-                  HttpServletResponse response)
-    throws PortletException, IOException, PortletContainerException;
-
-
-    /**
-     * Indicates that a portlet action occured in the current request and calls
-     * the processAction method of this portlet.
-     * @param portletWindow the portlet Window
-     * @param request               the servlet request
-     * @param response              the servlet response
-     * @throws PortletException          if one portlet has trouble fulfilling
-     *                                   the request
-     * @throws PortletContainerException if the portlet container implementation
-     *                                   has trouble fulfilling the request
-     */
-    void doAction(PortletWindow portletWindow,
-                 HttpServletRequest request,
-                 HttpServletResponse response)
-    throws PortletException, IOException, PortletContainerException;
-
-    /**
-     * Indicates that the portlet must be initialized
-     * @param portletWindow the portlet Window
-     * @param servletRequest        the servlet request
-     * @param servletResponse       the servlet response
-     * @throws PortletException          if one portlet has trouble fulfilling
-     *                                   the request
-     * @throws PortletContainerException if the portlet container implementation
-     *                                   has trouble fulfilling the request
-     */
-    void doLoad(PortletWindow portletWindow,
-                HttpServletRequest servletRequest,
-                HttpServletResponse servletResponse)
-   throws PortletException, IOException, PortletContainerException;
-
-    /**
-     * Indicates that the portal needs to perform administrative
-     * actions upon the portlet and/or portlet application.  An
-     * administrative request will be spawned and any registered
-     * handlers invoked.
-     * @param portletWindow   the portlet window
-     * @param servletRequest  the servlet request
-     * @param servletResponse the servlet response
-     * @throws PortletContainerException if the request can not be fullfilled.
-     */
-    void doAdmin(PortletWindow portletWindow,
-                 HttpServletRequest servletRequest,
-                 HttpServletResponse servletResponse)
-    throws PortletException, IOException, PortletContainerException;
-
-    /**
-     * Returns whether the container is already initialized or not.
-     * @return <code>true</code> if the container is initialized
-     */
-    boolean isInitialized();
-
-    /**
-     * Retrieve the unique container name
-     * @return the container name.
-     */
-    String getName();
-
-    /**
-     * Retreive the required container services associated with this container.
-     * @return the required container services associated with this container.
-     */
-    RequiredContainerServices getRequiredContainerServices();
-
-    /**
-     * Retrieve the optional container services associated with this contianer.
-     * @return the container services provided by either the portal or the defaults.
-     */
-    OptionalContainerServices getOptionalContainerServices();
-
-    /**
-     * Retrieve the {@link PortletAppDD} for the portlet
-     * located at the supplied context.
-     *
-     * Must not return null.
-     *
-     * @param context the context of the portlet
-     * @return the portlet application descriptor
-     * @throws PortletContainerException if the container has trouble obtaining
-     *                                   the context of the portlet, or retrieving
-     *                                   the <code>PortletAppDD</code>
-     */
-    PortletAppDD getPortletApplicationDescriptor(String context)
-    throws PortletContainerException;
-}
+ * 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 java.io.IOException;
+
+import javax.portlet.PortletException;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.pluto.descriptors.portlet.PortletAppDD;
+
+/**
+ * The publicized entry point into Pluto. The base functionality of the portlet
+ * container can be enhanced or even modified by PortletContainerServices.
+ * <p/>
+ * <P> The methods of this class have to be called in the following order:
+ * <TABLE> <TR><TH>Method</TH><TH>Description</TH><TH>Constraints</TH></TR>
+ * <TR><TD>{@link #init(javax.servlet.ServletContext)}</TD> <TD>Initialized the
+ * portlet container.</TD> <TD>Performed only once per container
+ * lifecycle.</TD></TR>
+ * <p/>
+ * <TR><TD>{@link #doAction(org.apache.pluto.PortletWindow,
+    * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}</TD>
+ * <TD>Perform the action for the targeted portlet</TD> <TD>Optionally performed
+ * for a single portlet per request</TD></TR>
+ * <p/>
+ * <TR><TD>{@link #doRender(org.apache.pluto.PortletWindow,
+    * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}</TD>
+ * <TD>Render the portlet</TD> <TD>Performed once for each portlet per
+ * request.</TD></TR>
+ * <p/>
+ * <TR><TD>{@link #destroy()}</TD> <TD>Destroy and remove container from
+ * service.</TD> <TD>Performed only once per container lifecylce</TD></TR>
+ * @version $Id: PortletContainer.java 36010 2004-07-30 14:16:06Z ddewolf $
+ */
+public interface PortletContainer {
+
+    /**
+     * Initializes the container for use within the given servlet context.
+     * @param servletContext  the servlet context.
+     * @throws PortletContainerException if an error occurs.
+     */
+    void init(ServletContext servletContext)
+    throws PortletContainerException;
+
+    /**
+     * Shuts down the container. After calling this method it is no longer valid
+     * to call any method on the portlet container.
+     * @throws PortletContainerException if an error occurs while shutting down
+     *                                   the container
+     */
+    void destroy() throws PortletContainerException;
+
+    /**
+     * Calls the render method of the given portlet window.
+     * @param portletWindow  the portlet Window
+     * @param request               the servlet request
+     * @param response              the servlet response
+     * @throws PortletException          if one portlet has trouble fulfilling
+     *                                   the request
+     * @throws IOException               if the streaming causes an I/O problem
+     * @throws PortletContainerException if the portlet container implementation
+     *                                   has trouble fulfilling the request
+     */
+    void doRender(PortletWindow portletWindow,
+                  HttpServletRequest request,
+                  HttpServletResponse response)
+    throws PortletException, IOException, PortletContainerException;
+
+
+    /**
+     * Indicates that a portlet action occured in the current request and calls
+     * the processAction method of this portlet.
+     * @param portletWindow the portlet Window
+     * @param request               the servlet request
+     * @param response              the servlet response
+     * @throws PortletException          if one portlet has trouble fulfilling
+     *                                   the request
+     * @throws PortletContainerException if the portlet container implementation
+     *                                   has trouble fulfilling the request
+     */
+    void doAction(PortletWindow portletWindow,
+                 HttpServletRequest request,
+                 HttpServletResponse response)
+    throws PortletException, IOException, PortletContainerException;
+
+    /**
+     * Indicates that the portlet must be initialized
+     * @param portletWindow the portlet Window
+     * @param servletRequest        the servlet request
+     * @param servletResponse       the servlet response
+     * @throws PortletException          if one portlet has trouble fulfilling
+     *                                   the request
+     * @throws PortletContainerException if the portlet container implementation
+     *                                   has trouble fulfilling the request
+     */
+    void doLoad(PortletWindow portletWindow,
+                HttpServletRequest servletRequest,
+                HttpServletResponse servletResponse)
+   throws PortletException, IOException, PortletContainerException;
+
+    /**
+     * Indicates that the portal needs to perform administrative
+     * actions upon the portlet and/or portlet application.  An
+     * administrative request will be spawned and any registered
+     * handlers invoked.
+     * @param portletWindow   the portlet window
+     * @param servletRequest  the servlet request
+     * @param servletResponse the servlet response
+     * @throws PortletContainerException if the request can not be fullfilled.
+     */
+    void doAdmin(PortletWindow portletWindow,
+                 HttpServletRequest servletRequest,
+                 HttpServletResponse servletResponse)
+    throws PortletException, IOException, PortletContainerException;
+
+    /**
+     * Returns whether the container is already initialized or not.
+     * @return <code>true</code> if the container is initialized
+     */
+    boolean isInitialized();
+
+    /**
+     * Retrieve the unique container name
+     * @return the container name.
+     */
+    String getName();
+
+    /**
+     * Retreive the required container services associated with this container.
+     * @return the required container services associated with this container.
+     */
+    RequiredContainerServices getRequiredContainerServices();
+
+    /**
+     * Retrieve the optional container services associated with this contianer.
+     * @return the container services provided by either the portal or the defaults.
+     */
+    OptionalContainerServices getOptionalContainerServices();
+
+    /**
+     * Retrieve the {@link PortletAppDD} for the portlet
+     * located at the supplied context.
+     *
+     * Must not return null.
+     *
+     * @param context the context of the portlet
+     * @return the portlet application descriptor
+     * @throws PortletContainerException if the container has trouble obtaining
+     *                                   the context of the portlet, or retrieving
+     *                                   the <code>PortletAppDD</code>
+     */
+    PortletAppDD getPortletApplicationDescriptor(String context)
+    throws PortletContainerException;
+}

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainerException.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainerException.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainerException.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainerException.java Sat Dec 29 09:20:23 2007
@@ -1,74 +1,74 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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;
-
-/**
- * Thrown when an internal portlet container exception occurs within Pluto.
- * This type of exception indicates an error from which the container is not
- * able to recover.
- *
- * @version 1.0
- */
-public class PortletContainerException extends Exception {
-    private Throwable cause;
-
-    /**
-     * Constructs a new PortletContainerException.
-     * This exception will have no message and no root cause.
-     */
-    public PortletContainerException() {
-
-    }
-
-    /**
-     * Constructs a new PortletContainerException with the given message.
-     * @param text the message explaining the exception occurance
-     */
-    public PortletContainerException(String text) {
-        super(text);
-    }
-
-    /**
-     * Constructs a new PortletContainerException with the given message and
-     * root cause.
-     * @param text  the message explaining the exception occurance
-     * @param cause the root cause of the is exception
-     */
-    public PortletContainerException(String text, Throwable cause) {
-        super(text);
-        this.cause = cause;
-    }
-
-    /**
-     * Constructs a new portlet invoker exception when the portlet needs to
-     * throw an exception. The exception's message is based on the localized
-     * message of the underlying exception.
-     * @param cause the root cause
-     */
-    public PortletContainerException(Throwable cause) {
-        super(cause.getLocalizedMessage());
-        this.cause = cause;
-    }
-
-    /**
-     * Returns the exception that cause this portlet exception.
-     * @return the <CODE>Throwable</CODE> that caused this portlet exception.
-     */
-    public Throwable getRootCause() {
-        return (cause);
-    }
-}
+ * 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;
+
+/**
+ * Thrown when an internal portlet container exception occurs within Pluto.
+ * This type of exception indicates an error from which the container is not
+ * able to recover.
+ *
+ * @version 1.0
+ */
+public class PortletContainerException extends Exception {
+    private Throwable cause;
+
+    /**
+     * Constructs a new PortletContainerException.
+     * This exception will have no message and no root cause.
+     */
+    public PortletContainerException() {
+
+    }
+
+    /**
+     * Constructs a new PortletContainerException with the given message.
+     * @param text the message explaining the exception occurance
+     */
+    public PortletContainerException(String text) {
+        super(text);
+    }
+
+    /**
+     * Constructs a new PortletContainerException with the given message and
+     * root cause.
+     * @param text  the message explaining the exception occurance
+     * @param cause the root cause of the is exception
+     */
+    public PortletContainerException(String text, Throwable cause) {
+        super(text);
+        this.cause = cause;
+    }
+
+    /**
+     * Constructs a new portlet invoker exception when the portlet needs to
+     * throw an exception. The exception's message is based on the localized
+     * message of the underlying exception.
+     * @param cause the root cause
+     */
+    public PortletContainerException(Throwable cause) {
+        super(cause.getLocalizedMessage());
+        this.cause = cause;
+    }
+
+    /**
+     * Returns the exception that cause this portlet exception.
+     * @return the <CODE>Throwable</CODE> that caused this portlet exception.
+     */
+    public Throwable getRootCause() {
+        return (cause);
+    }
+}

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainerException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java Sat Dec 29 09:20:23 2007
@@ -1,95 +1,95 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.core.PortletContainerImpl;
-import org.apache.pluto.core.DefaultOptionalContainerServices;
-import org.apache.pluto.util.ArgumentUtility;
-
-/**
- * Factory used to create new PortletContainer instances.  The factor constructs
- * the underlying pluto container implementation by using the the given
- * container services.
- *
- * @version 1.0
- * @since Sep 18, 2004
- */
-public class PortletContainerFactory {
-
-    /** Logger. */
-    private static final Log LOG = LogFactory.getLog(PortletContainerFactory.class);
-
-
-    /** Singleton instance of the <code>PortletContainerFactory</code>. */
-    private static final PortletContainerFactory FACTORY =
-    		new PortletContainerFactory();
-
-    /**
-     * Accessor method for the singleton instance of the
-     * <code>PortletContainerFactory</code>.
-     * @return singleton instance of the PortletContainerFactory
-     */
-    public static PortletContainerFactory getInstance() {
-    	return FACTORY;
-    }
-
-    /**
-     * Private constructor that prevents external instantiation.
-     */
-    private PortletContainerFactory() {
-    	// Do nothing.
-    }
-
-    /**
-     * Create a container with the given containerName, initialized from the given
-     * servlet config, and using the given container services.
-     * @param containerName  the name of the portlet container.
-     * @param requiredServices  the required portlet container services.
-     * @return newly created PortletContainer instance.
-     * @throws PortletContainerException
-     */
-    public PortletContainer createContainer(
-    		String containerName,
-    		RequiredContainerServices requiredServices)
-        throws PortletContainerException {
-        return createContainer(containerName,
-                               requiredServices,
-                               new DefaultOptionalContainerServices());
-   }
-
-    public PortletContainer createContainer(
-    		String containerName,
-    		RequiredContainerServices requiredServices,
-    		OptionalContainerServices optionalServices) {
-
-        ArgumentUtility.validateNotNull("requiredServices", requiredServices);
-        ArgumentUtility.validateNotEmpty("containerName", containerName);
-
-        DefaultOptionalContainerServices optionalServicesWrapper =
-        		new DefaultOptionalContainerServices(optionalServices);
-        PortletContainer container = new PortletContainerImpl(
-        		containerName, requiredServices, optionalServicesWrapper);
-
-        if (LOG.isInfoEnabled()) {
-            LOG.info("Portlet Container [" + containerName + "] created.");
-        }
-        return container;
-    }
-}
-
+ * 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.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pluto.core.PortletContainerImpl;
+import org.apache.pluto.core.DefaultOptionalContainerServices;
+import org.apache.pluto.util.ArgumentUtility;
+
+/**
+ * Factory used to create new PortletContainer instances.  The factor constructs
+ * the underlying pluto container implementation by using the the given
+ * container services.
+ *
+ * @version 1.0
+ * @since Sep 18, 2004
+ */
+public class PortletContainerFactory {
+
+    /** Logger. */
+    private static final Log LOG = LogFactory.getLog(PortletContainerFactory.class);
+
+
+    /** Singleton instance of the <code>PortletContainerFactory</code>. */
+    private static final PortletContainerFactory FACTORY =
+    		new PortletContainerFactory();
+
+    /**
+     * Accessor method for the singleton instance of the
+     * <code>PortletContainerFactory</code>.
+     * @return singleton instance of the PortletContainerFactory
+     */
+    public static PortletContainerFactory getInstance() {
+    	return FACTORY;
+    }
+
+    /**
+     * Private constructor that prevents external instantiation.
+     */
+    private PortletContainerFactory() {
+    	// Do nothing.
+    }
+
+    /**
+     * Create a container with the given containerName, initialized from the given
+     * servlet config, and using the given container services.
+     * @param containerName  the name of the portlet container.
+     * @param requiredServices  the required portlet container services.
+     * @return newly created PortletContainer instance.
+     * @throws PortletContainerException
+     */
+    public PortletContainer createContainer(
+    		String containerName,
+    		RequiredContainerServices requiredServices)
+        throws PortletContainerException {
+        return createContainer(containerName,
+                               requiredServices,
+                               new DefaultOptionalContainerServices());
+   }
+
+    public PortletContainer createContainer(
+    		String containerName,
+    		RequiredContainerServices requiredServices,
+    		OptionalContainerServices optionalServices) {
+
+        ArgumentUtility.validateNotNull("requiredServices", requiredServices);
+        ArgumentUtility.validateNotEmpty("containerName", containerName);
+
+        DefaultOptionalContainerServices optionalServicesWrapper =
+        		new DefaultOptionalContainerServices(optionalServices);
+        PortletContainer container = new PortletContainerImpl(
+        		containerName, requiredServices, optionalServicesWrapper);
+
+        if (LOG.isInfoEnabled()) {
+            LOG.info("Portlet Container [" + containerName + "] created.");
+        }
+        return container;
+    }
+}
+

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainerRuntimeException.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainerRuntimeException.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainerRuntimeException.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainerRuntimeException.java Sat Dec 29 09:20:23 2007
@@ -1,41 +1,41 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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;
-
-/**
- * Runtime exception thrown when an unexpected condition is encountered.
- *
- * @version 1.0
- */
-public class PortletContainerRuntimeException extends RuntimeException {
-
-    public PortletContainerRuntimeException() {
-
-    }
-
-    public PortletContainerRuntimeException(String message) {
-        super(message);
-    }
-
-    public PortletContainerRuntimeException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public PortletContainerRuntimeException(Throwable cause) {
-        super(cause);
-    }
-}
+ * 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;
+
+/**
+ * Runtime exception thrown when an unexpected condition is encountered.
+ *
+ * @version 1.0
+ */
+public class PortletContainerRuntimeException extends RuntimeException {
+
+    public PortletContainerRuntimeException() {
+
+    }
+
+    public PortletContainerRuntimeException(String message) {
+        super(message);
+    }
+
+    public PortletContainerRuntimeException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public PortletContainerRuntimeException(Throwable cause) {
+        super(cause);
+    }
+}

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletContainerRuntimeException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletWindow.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletWindow.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletWindow.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletWindow.java Sat Dec 29 09:20:23 2007
@@ -1,67 +1,67 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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 javax.portlet.PortletMode;
-import javax.portlet.WindowState;
-
-/**
- * Thin representation of the portlet window for which the container
- * request should be processed.  The PortletWindow is used internally
- * to map the request to the configured Portlet Application and Portlet.
- *
- * @see org.apache.pluto.internal.impl.InternalPortletWindowImpl
- * @see org.apache.pluto.descriptors.portlet.PortletDD
- *
- * @version 1.0
- * @since Sep 22, 2004
- */
-public interface PortletWindow {
-
-    /**
-     * Retrieve this windows unique id which will be
-     *  used to communicate back to the referencing portal.
-     * @return unique id.
-     */
-    public PortletWindowID getId();
-
-    /**
-     * Retrieve the context path in which the Portlet resides.
-     * @return context path
-     */
-    public String getContextPath();
-
-    /**
-     * Retrieve the name of the portlet as configured in the
-     * <code>portlet.xml</code>.
-     * @return the name of the portlet.
-     */
-    public String getPortletName();
-
-    /**
-     * Retrieve the current window state for this window.
-     * @return the current window state.
-     */
-    public WindowState getWindowState();
-
-    /**
-     * Retrieve the current portlet mode for this window.
-     * @return the current portlet mode.
-     */
-    public PortletMode getPortletMode();
-
-}
+ * 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 javax.portlet.PortletMode;
+import javax.portlet.WindowState;
+
+/**
+ * Thin representation of the portlet window for which the container
+ * request should be processed.  The PortletWindow is used internally
+ * to map the request to the configured Portlet Application and Portlet.
+ *
+ * @see org.apache.pluto.internal.impl.InternalPortletWindowImpl
+ * @see org.apache.pluto.descriptors.portlet.PortletDD
+ *
+ * @version 1.0
+ * @since Sep 22, 2004
+ */
+public interface PortletWindow {
+
+    /**
+     * Retrieve this windows unique id which will be
+     *  used to communicate back to the referencing portal.
+     * @return unique id.
+     */
+    public PortletWindowID getId();
+
+    /**
+     * Retrieve the context path in which the Portlet resides.
+     * @return context path
+     */
+    public String getContextPath();
+
+    /**
+     * Retrieve the name of the portlet as configured in the
+     * <code>portlet.xml</code>.
+     * @return the name of the portlet.
+     */
+    public String getPortletName();
+
+    /**
+     * Retrieve the current window state for this window.
+     * @return the current window state.
+     */
+    public WindowState getWindowState();
+
+    /**
+     * Retrieve the current portlet mode for this window.
+     * @return the current portlet mode.
+     */
+    public PortletMode getPortletMode();
+
+}

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletWindow.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletWindowID.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletWindowID.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletWindowID.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletWindowID.java Sat Dec 29 09:20:23 2007
@@ -1,36 +1,36 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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;
-
-/**
- * The portlet window ID.
- * @version 1.0
- */
-public interface PortletWindowID {
-
-	/**
-	 * Returns the unique string ID of the portlet window.
-	 * <p>
-	 * Depending on the implementation of <code>toString()</code> is dangerous,
-	 * because the original implementation in <code>Object</code> is not
-	 * qualified.
-	 * </p>
-	 * @return the unique string ID of the portlet window.
-	 */
-	public String getStringId();
-
-}
+ * 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;
+
+/**
+ * The portlet window ID.
+ * @version 1.0
+ */
+public interface PortletWindowID {
+
+	/**
+	 * Returns the unique string ID of the portlet window.
+	 * <p>
+	 * Depending on the implementation of <code>toString()</code> is dangerous,
+	 * because the original implementation in <code>Object</code> is not
+	 * qualified.
+	 * </p>
+	 * @return the unique string ID of the portlet window.
+	 */
+	public String getStringId();
+
+}

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/PortletWindowID.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/RequiredContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/RequiredContainerServices.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/RequiredContainerServices.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/RequiredContainerServices.java Sat Dec 29 09:20:23 2007
@@ -1,44 +1,44 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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.spi.PortalCallbackService;
-
-import javax.portlet.PortalContext;
-
-/**
- * This interface defines the services required for integration between the
- * Pluto Portlet Container and a Portal.
- *
- */
-public interface RequiredContainerServices {
-
-    /**
-     * Returns the PortalContext instance associated with this group of
-     * portlet container services.
-     * @return a PortalContext implementation.
-     */
-    public PortalContext getPortalContext();
-
-    /**
-     * Returns the portal callback service implementation instance associated
-     * with this group of portlet container services.
-     * @return a PortalCallbackService implementation.
-     */
-    public PortalCallbackService getPortalCallbackService();
-
-}
+ * 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.spi.PortalCallbackService;
+
+import javax.portlet.PortalContext;
+
+/**
+ * This interface defines the services required for integration between the
+ * Pluto Portlet Container and a Portal.
+ *
+ */
+public interface RequiredContainerServices {
+
+    /**
+     * Returns the PortalContext instance associated with this group of
+     * portlet container services.
+     * @return a PortalContext implementation.
+     */
+    public PortalContext getPortalContext();
+
+    /**
+     * Returns the portal callback service implementation instance associated
+     * with this group of portlet container services.
+     * @return a PortalCallbackService implementation.
+     */
+    public PortalCallbackService getPortalCallbackService();
+
+}

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/RequiredContainerServices.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java Sat Dec 29 09:20:23 2007
@@ -1,134 +1,134 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.core;
-
-import org.apache.pluto.OptionalContainerServices;
-import org.apache.pluto.spi.optional.PortletPreferencesService;
-import org.apache.pluto.spi.optional.PortletEnvironmentService;
-import org.apache.pluto.spi.optional.PortletInvokerService;
-import org.apache.pluto.spi.optional.PortletRegistryService;
-import org.apache.pluto.spi.optional.PortletInfoService;
-import org.apache.pluto.spi.optional.PortalAdministrationService;
-import org.apache.pluto.spi.optional.UserInfoService;
-
-/**
- * Default Optional Container Services implementation.
- *
- * @version 1.0
- * @since Sep 18, 2004
- */
-public class DefaultOptionalContainerServices implements OptionalContainerServices {
-
-    private PortletPreferencesService portletPreferencesService;
-    private PortletRegistryService portletRegistryService;
-    private PortletInvokerService portletInvokerService;
-    private PortletEnvironmentService portletEnvironmentService;
-    private PortletInfoService portletInfoService;
-    private PortalAdministrationService portalAdministrationService;
-    private UserInfoService userInfoService;
-
-
-    /**
-     * Constructs an instance using the default portlet preferences service
-     * implementation.
-     */
-    public DefaultOptionalContainerServices() {
-        portletPreferencesService = new DefaultPortletPreferencesService();
-        portletRegistryService = PortletContextManager.getManager();
-        portletInvokerService = new DefaultPortletInvokerService();
-        portletEnvironmentService = new DefaultPortletEnvironmentService();
-        portletInfoService = new DefaultPortletInfoService();
-        portalAdministrationService = new DefaultPortalAdministrationService();
-        userInfoService = new DefaultUserInfoService();
-    }
-
-    /**
-     * Constructs an instance using specified optional container services
-     * implementation. If the portlet preferences service is provided, it will
-     * be used. Otherwise, the default portlet preferences service will be used.
-     * @param root  the root optional container services implementation.
-     */
-    public DefaultOptionalContainerServices(OptionalContainerServices root) {
-        this();
-        if (root.getPortletPreferencesService() != null) {
-            portletPreferencesService = root.getPortletPreferencesService();
-        }
-
-        if (root.getPortletRegistryService() != null) {
-            portletRegistryService = root.getPortletRegistryService();
-        }
-
-        if(root.getPortletEnvironmentService() != null) {
-            portletEnvironmentService = root.getPortletEnvironmentService();
-        }
-
-        if(root.getPortletInvokerService() != null) {
-            portletInvokerService = root.getPortletInvokerService();
-        }
-
-        if(root.getPortletEnvironmentService() != null) {
-            portletEnvironmentService = root.getPortletEnvironmentService();
-        }
-
-        if(root.getPortletInfoService() != null) {
-            portletInfoService = root.getPortletInfoService();
-        }
-
-        if(root.getPortalAdministrationService() != null) {
-            portalAdministrationService = root.getPortalAdministrationService();
-        }
-
-		 if(root.getUserInfoService() != null) {
-			 userInfoService = root.getUserInfoService();
-		 }
-
-    }
-
-
-    // OptionalContainerServices Impl ------------------------------------------
-
-    public PortletPreferencesService getPortletPreferencesService() {
-        return portletPreferencesService;
-    }
-
-
-    public PortletRegistryService getPortletRegistryService() {
-        return portletRegistryService;
-    }
-
-    public PortletEnvironmentService getPortletEnvironmentService() {
-        return portletEnvironmentService;
-    }
-
-    public PortletInvokerService getPortletInvokerService() {
-        return portletInvokerService;
-    }
-
-    public PortletInfoService getPortletInfoService() {
-        return portletInfoService;
-    }
-
-    public PortalAdministrationService getPortalAdministrationService() {
-        return portalAdministrationService;
-    }
-
-    public UserInfoService getUserInfoService() {
-        return userInfoService;
-    }
-
-}
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.core;
+
+import org.apache.pluto.OptionalContainerServices;
+import org.apache.pluto.spi.optional.PortletPreferencesService;
+import org.apache.pluto.spi.optional.PortletEnvironmentService;
+import org.apache.pluto.spi.optional.PortletInvokerService;
+import org.apache.pluto.spi.optional.PortletRegistryService;
+import org.apache.pluto.spi.optional.PortletInfoService;
+import org.apache.pluto.spi.optional.PortalAdministrationService;
+import org.apache.pluto.spi.optional.UserInfoService;
+
+/**
+ * Default Optional Container Services implementation.
+ *
+ * @version 1.0
+ * @since Sep 18, 2004
+ */
+public class DefaultOptionalContainerServices implements OptionalContainerServices {
+
+    private PortletPreferencesService portletPreferencesService;
+    private PortletRegistryService portletRegistryService;
+    private PortletInvokerService portletInvokerService;
+    private PortletEnvironmentService portletEnvironmentService;
+    private PortletInfoService portletInfoService;
+    private PortalAdministrationService portalAdministrationService;
+    private UserInfoService userInfoService;
+
+
+    /**
+     * Constructs an instance using the default portlet preferences service
+     * implementation.
+     */
+    public DefaultOptionalContainerServices() {
+        portletPreferencesService = new DefaultPortletPreferencesService();
+        portletRegistryService = PortletContextManager.getManager();
+        portletInvokerService = new DefaultPortletInvokerService();
+        portletEnvironmentService = new DefaultPortletEnvironmentService();
+        portletInfoService = new DefaultPortletInfoService();
+        portalAdministrationService = new DefaultPortalAdministrationService();
+        userInfoService = new DefaultUserInfoService();
+    }
+
+    /**
+     * Constructs an instance using specified optional container services
+     * implementation. If the portlet preferences service is provided, it will
+     * be used. Otherwise, the default portlet preferences service will be used.
+     * @param root  the root optional container services implementation.
+     */
+    public DefaultOptionalContainerServices(OptionalContainerServices root) {
+        this();
+        if (root.getPortletPreferencesService() != null) {
+            portletPreferencesService = root.getPortletPreferencesService();
+        }
+
+        if (root.getPortletRegistryService() != null) {
+            portletRegistryService = root.getPortletRegistryService();
+        }
+
+        if(root.getPortletEnvironmentService() != null) {
+            portletEnvironmentService = root.getPortletEnvironmentService();
+        }
+
+        if(root.getPortletInvokerService() != null) {
+            portletInvokerService = root.getPortletInvokerService();
+        }
+
+        if(root.getPortletEnvironmentService() != null) {
+            portletEnvironmentService = root.getPortletEnvironmentService();
+        }
+
+        if(root.getPortletInfoService() != null) {
+            portletInfoService = root.getPortletInfoService();
+        }
+
+        if(root.getPortalAdministrationService() != null) {
+            portalAdministrationService = root.getPortalAdministrationService();
+        }
+
+		 if(root.getUserInfoService() != null) {
+			 userInfoService = root.getUserInfoService();
+		 }
+
+    }
+
+
+    // OptionalContainerServices Impl ------------------------------------------
+
+    public PortletPreferencesService getPortletPreferencesService() {
+        return portletPreferencesService;
+    }
+
+
+    public PortletRegistryService getPortletRegistryService() {
+        return portletRegistryService;
+    }
+
+    public PortletEnvironmentService getPortletEnvironmentService() {
+        return portletEnvironmentService;
+    }
+
+    public PortletInvokerService getPortletInvokerService() {
+        return portletInvokerService;
+    }
+
+    public PortletInfoService getPortletInfoService() {
+        return portletInfoService;
+    }
+
+    public PortalAdministrationService getPortalAdministrationService() {
+        return portalAdministrationService;
+    }
+
+    public UserInfoService getUserInfoService() {
+        return userInfoService;
+    }
+
+}
+

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message