portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r607450 [10/36] - in /portals/pluto/trunk: ./ 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/ pluto-ant-tas...
Date Sat, 29 Dec 2007 17:32:18 GMT
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java Sat Dec 29 09:31:56 2007
@@ -1,75 +1,75 @@
-/*
+/*
  * 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.spi;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.pluto.PortletWindow;
-
-import java.util.Map;
-
-/**
- * The callback service interface defining callback methods that will be invoked
- * by the portlet container when necessary.
- * @version 1.0
- * @since Sep 21, 2004
- */
-public interface PortalCallbackService extends ContainerService {
-
-    /**
-     * Set the title to be used for this portlet.
-     * @param request  the servlet request.
-     * @param portletWindow  the portlet window.
-     * @param title  the title to set.
-     */
-    public void setTitle(HttpServletRequest request,
-                         PortletWindow portletWindow,
-                         String title);
-
-    /**
-     * Returns a URL provider used to constuct a URL to the given portlet.
-     * @param request  the servlet request.
-     * @param portletWindow  the portlet window.
-     * @return the URL provider used to construct a URL to the given portlet.
-     */
-    public PortletURLProvider getPortletURLProvider(HttpServletRequest request,
-                                                    PortletWindow portletWindow);
-
-    /**
-     * Returns a URL provider used to construct a URL to a resource in the web
-     * application.
-     * @param request  the servlet request.
-     * @param portletWindow  the portlet window.
-     * @return the URL provider used to construct a URL to a resource.
-     */
-    public ResourceURLProvider getResourceURLProvider(HttpServletRequest request,
-                                                      PortletWindow portletWindow);
-
-    public Map getRequestProperties(HttpServletRequest request,
-                                    PortletWindow portletWindow);
-
-    public void setResponseProperty(HttpServletRequest request,
-                                    PortletWindow portletWindow,
-                                    String property,
-                                    String value);
-
-    public void addResponseProperty(HttpServletRequest request,
-                                    PortletWindow portletWindow,
-                                    String property,
-                                    String value);
-
-}
+ * 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.spi;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.pluto.PortletWindow;
+
+import java.util.Map;
+
+/**
+ * The callback service interface defining callback methods that will be invoked
+ * by the portlet container when necessary.
+ * @version 1.0
+ * @since Sep 21, 2004
+ */
+public interface PortalCallbackService extends ContainerService {
+
+    /**
+     * Set the title to be used for this portlet.
+     * @param request  the servlet request.
+     * @param portletWindow  the portlet window.
+     * @param title  the title to set.
+     */
+    public void setTitle(HttpServletRequest request,
+                         PortletWindow portletWindow,
+                         String title);
+
+    /**
+     * Returns a URL provider used to constuct a URL to the given portlet.
+     * @param request  the servlet request.
+     * @param portletWindow  the portlet window.
+     * @return the URL provider used to construct a URL to the given portlet.
+     */
+    public PortletURLProvider getPortletURLProvider(HttpServletRequest request,
+                                                    PortletWindow portletWindow);
+
+    /**
+     * Returns a URL provider used to construct a URL to a resource in the web
+     * application.
+     * @param request  the servlet request.
+     * @param portletWindow  the portlet window.
+     * @return the URL provider used to construct a URL to a resource.
+     */
+    public ResourceURLProvider getResourceURLProvider(HttpServletRequest request,
+                                                      PortletWindow portletWindow);
+
+    public Map getRequestProperties(HttpServletRequest request,
+                                    PortletWindow portletWindow);
+
+    public void setResponseProperty(HttpServletRequest request,
+                                    PortletWindow portletWindow,
+                                    String property,
+                                    String value);
+
+    public void addResponseProperty(HttpServletRequest request,
+                                    PortletWindow portletWindow,
+                                    String property,
+                                    String value);
+
+}

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java Sat Dec 29 09:31:56 2007
@@ -1,89 +1,89 @@
-/*
- * 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.spi;
-
-import java.util.Map;
-
-import javax.portlet.PortletMode;
-import javax.portlet.WindowState;
-import javax.portlet.PortletSecurityException;
-
-/**
- * Defines the interface used by the portlet container to create Portal URLs.
- * This provider must be implemented by the Portal and provided via the
- * container services upon initialization of the container.
- *
- * @version 1.0
- */
-public interface PortletURLProvider {
-
-
-    /**
-     * Sets the new portlet mode at the URL. If no mode is set at the URL the
-     * currently active mode is used.
-     * @param mode the new portlet mode
-     */
-    public void setPortletMode(PortletMode mode);
-
-    /**
-     * Sets the new window state at the URL. If no state is set at the URL the
-     * currently active state is used.
-     * @param state the new window state
-     */
-    public void setWindowState(WindowState state);
-
-    /**
-     * Specifies whether or not this request should be considered an action
-     * request. If the value specified is false, a render request will be
-     * assumed.
-     */
-    public void setAction(boolean action);
-
-    /**
-     * By calling this method the URL is defined as a secure URL.
-     */
-    public void setSecure() throws PortletSecurityException;
-
-    /**
-     * Determine whether or not this url provider
-     * supports secure urls.
-     * 
-     * @return
-     * @throws PortletSecurityException
-     */
-    public boolean isSecureSupported();
-
-    /**
-     * Removes all pre-existing parameters in this URL
-     */
-    public void clearParameters();
-
-    /**
-     * Sets the given parameters as parameters into the URL, Removes all
-     * previously set parameters.
-     * @param parameters a map containing the name [java.lang.String] and value
-     *                   [java.lang.String[]] of the parameters.
-     */
-    public void setParameters(Map parameters);
-
-    /**
-     * Returns the URL in string format. This method should only be called
-     * once.
-     * @return the URL
-     */
-    public String toString();
-}
+/*
+ * 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.spi;
+
+import java.util.Map;
+
+import javax.portlet.PortletMode;
+import javax.portlet.WindowState;
+import javax.portlet.PortletSecurityException;
+
+/**
+ * Defines the interface used by the portlet container to create Portal URLs.
+ * This provider must be implemented by the Portal and provided via the
+ * container services upon initialization of the container.
+ *
+ * @version 1.0
+ */
+public interface PortletURLProvider {
+
+
+    /**
+     * Sets the new portlet mode at the URL. If no mode is set at the URL the
+     * currently active mode is used.
+     * @param mode the new portlet mode
+     */
+    public void setPortletMode(PortletMode mode);
+
+    /**
+     * Sets the new window state at the URL. If no state is set at the URL the
+     * currently active state is used.
+     * @param state the new window state
+     */
+    public void setWindowState(WindowState state);
+
+    /**
+     * Specifies whether or not this request should be considered an action
+     * request. If the value specified is false, a render request will be
+     * assumed.
+     */
+    public void setAction(boolean action);
+
+    /**
+     * By calling this method the URL is defined as a secure URL.
+     */
+    public void setSecure() throws PortletSecurityException;
+
+    /**
+     * Determine whether or not this url provider
+     * supports secure urls.
+     * 
+     * @return
+     * @throws PortletSecurityException
+     */
+    public boolean isSecureSupported();
+
+    /**
+     * Removes all pre-existing parameters in this URL
+     */
+    public void clearParameters();
+
+    /**
+     * Sets the given parameters as parameters into the URL, Removes all
+     * previously set parameters.
+     * @param parameters a map containing the name [java.lang.String] and value
+     *                   [java.lang.String[]] of the parameters.
+     */
+    public void setParameters(Map parameters);
+
+    /**
+     * Returns the URL in string format. This method should only be called
+     * once.
+     * @return the URL
+     */
+    public String toString();
+}

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/ResourceURLProvider.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/ResourceURLProvider.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/ResourceURLProvider.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/ResourceURLProvider.java Sat Dec 29 09:31:56 2007
@@ -1,46 +1,46 @@
-/*
+/*
  * 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.spi;
-
-/**
- *
- * @version 1.0
- */
-public interface ResourceURLProvider {
-
-    /**
-     * Sets the absolute URL to be returned by the provider. E.g.
-     * http://host/wps/portal/hello.gif
-     * @param path the new absolute url
-     */
-    public void setAbsoluteURL(String path);
-
-    /**
-     * Sets a full path URI including the context root. E.g.
-     * /wps/portal/hello.gif
-     * @param path the new absolute url
-     */
-    public void setFullPath(String path);
-
-    /**
-     * Returns a url to a resource as absolute URL starting with protocol so
-     * that it can be accessed by a browser.
-     * @return the URL as string
-     */
-    public String toString();
-
-}
+ * 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.spi;
+
+/**
+ *
+ * @version 1.0
+ */
+public interface ResourceURLProvider {
+
+    /**
+     * Sets the absolute URL to be returned by the provider. E.g.
+     * http://host/wps/portal/hello.gif
+     * @param path the new absolute url
+     */
+    public void setAbsoluteURL(String path);
+
+    /**
+     * Sets a full path URI including the context root. E.g.
+     * /wps/portal/hello.gif
+     * @param path the new absolute url
+     */
+    public void setFullPath(String path);
+
+    /**
+     * Returns a url to a resource as absolute URL starting with protocol so
+     * that it can be accessed by a browser.
+     * @return the URL as string
+     */
+    public String toString();
+
+}

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/ResourceURLProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/P3PAttributes.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/P3PAttributes.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/P3PAttributes.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/P3PAttributes.java Sat Dec 29 09:31:56 2007
@@ -1,173 +1,173 @@
-/*
+/*
  * 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.spi.optional;
-
-/**
- * As defined in PLT.D of the JSR-168 specification, this class defines a set of
- * attribute names for user information and their intended
- * meaning. To allow portals an automated mapping of commonly used user information
- * attributes portlet programmers should use these attribute names. These attribute names
- * are derived from the Platform for Privacy Preferences 1.0 (P3P 1.0) Specification by the
- * W3C (http://www.w3c.org/TR/P3P).
- *
- */
-public interface P3PAttributes {
-
-	/*	NOTE: The user.bdate must consist of a string that represents the time in milliseconds
-	since January 1, 1970, 00:00:00 GMT. */
-	public static final String USER_BDATE = "user.bdate";
-	public static final String USER_GENDER = "user.gender";
-	public static final String USER_EMPLOYER = "user.employer";
-	public static final String USER_DEPARTMENT = "user.department";
-	public static final String USER_JOBTITLE = "user.jobtitle";
-	public static final String USER_NAME_PREFIX = "user.name.prefix";
-	public static final String USER_NAME_GIVEN = "user.name.given";
-	public static final String USER_NAME_FAMILY = "user.name.family";
-	public static final String USER_NAME_MIDDLE = "user.name.middle";
-	public static final String USER_NAME_SUFFIX = "user.name.suffix";
-	public static final String USER_NAME_NICKNAME = "user.name.nickName";
-	public static final String USER_HOME_INFO_POSTAL_NAME = "user.home-info.postal.name";
-	public static final String USER_HOME_INFO_POSTAL_STREET = "user.home-info.postal.street";
-	public static final String USER_HOME_INFO_POSTAL_CITY = "user.home-info.postal.city";
-	public static final String USER_HOME_INFO_POSTAL_STATEPROV = "user.home-info.postal.stateprov";
-	public static final String USER_HOME_INFO_POSTAL_POSTALCODE = "user.home-info.postal.postalcode";
-	public static final String USER_HOME_INFO_POSTAL_COUNTRY = "user.home-info.postal.country";
-	public static final String USER_HOME_INFO_POSTAL_ORGANIZATION= "user.home-info.postal.organization";
-	public static final String USER_HOME_INFO_TELECOM_TELEPHONE_INTCODE = "user.home-info.telecom.telephone.intcode";
-	public static final String USER_HOME_INFO_TELECOM_TELEPHONE_LOCCODE = "user.home-info.telecom.telephone.loccode";
-	public static final String USER_HOME_INFO_TELECOM_TELEPHONE_NUMBER = "user.home-info.telecom.telephone.number";
-	public static final String USER_HOME_INFO_TELECOM_TELEPHONE_EXT = "user.home-info.telecom.telephone.ext";
-	public static final String USER_HOME_INFO_TELECOM_TELEPHONE_COMMENT = "user.home-info.telecom.telephone.comment";
-	public static final String USER_HOME_INFO_TELECOM_FAX_INTCODE = "user.home-info.telecom.fax.intcode";
-	public static final String USER_HOME_INFO_TELECOM_FAX_LOCCODE = "user.home-info.telecom.fax.loccode";
-	public static final String USER_HOME_INFO_TELECOM_FAX_NUMBER = "user.home-info.telecom.fax.number";
-	public static final String USER_HOME_INFO_TELECOM_FAX_EXT = "user.home-info.telecom.fax.ext";
-	public static final String USER_HOME_INFO_TELECOM_FAX_COMMENT = "user.home-info.telecom.fax.comment";
-	public static final String USER_HOME_INFO_TELECOM_MOBILE_INTCODE = "user.home-info.telecom.mobile.intcode";
-	public static final String USER_HOME_INFO_TELECOM_MOBILE_LOCCODE = "user.home-info.telecom.mobile.loccode";
-	public static final String USER_HOME_INFO_TELECOM_MOBILE_NUMBER = "user.home-info.telecom.mobile.number";
-	public static final String USER_HOME_INFO_TELECOM_MOBILE_EXT = "user.home-info.telecom.mobile.ext";
-	public static final String USER_HOME_INFO_TELECOM_MOBILE_COMMENT = "user.home-info.telecom.mobile.comment";
-	public static final String USER_HOME_INFO_TELECOM_PAGER_INTCODE = "user.home-info.telecom.pager.intcode";
-	public static final String USER_HOME_INFO_TELECOM_PAGER_LOCCODE = "user.home-info.telecom.pager.loccode";
-	public static final String USER_HOME_INFO_TELECOM_PAGER_NUMBER = "user.home-info.telecom.pager.number";
-	public static final String USER_HOME_INFO_TELECOM_PAGER_EXT = "user.home-info.telecom.pager.ext";
-	public static final String USER_HOME_INFO_TELECOM_PAGER_COMMENT = "user.home-info.telecom.pager.comment";
-	public static final String USER_HOME_INFO_ONLINE_EMAIL = "user.home-info.online.email";
-	public static final String USER_HOME_INFO_ONLINE_URI = "user.home-info.online.uri";
-	public static final String USER_BUSINESS_INFO_POSTAL_NAME = "user.business-info.postal.name";
-	public static final String USER_BUSINESS_INFO_POSTAL_STREET = "user.business-info.postal.street";
-	public static final String USER_BUSINESS_INFO_POSTAL_CITY = "user.business-info.postal.city";
-	public static final String USER_BUSINESS_INFO_POSTAL_STATEPROV = "user.business-info.postal.stateprov";
-	public static final String USER_BUSINESS_INFO_POSTAL_POSTALCODE = "user.business-info.postal.postalcode";
-	public static final String USER_BUSINESS_INFO_POSTAL_COUNTRY = "user.business-info.postal.country";
-	public static final String USER_BUSINESS_INFO_POSTAL_ORGANIZATION = "user.business-info.postal.organization";
-	public static final String USER_BUSINESS_INFO_TELECOM_TELEPHONE_INTCODE = "user.business-info.telecom.telephone.intcode";
-	public static final String USER_BUSINESS_INFO_TELECOM_TELEPHONE_LOCCODE= "user.business-info.telecom.telephone.loccode";
-	public static final String USER_BUSINESS_INFO_TELECOM_TELEPHONE_NUMBER = "user.business-info.telecom.telephone.number";
-	public static final String USER_BUSINESS_INFO_TELECOM_TELEPHONE_EXT = "user.business-info.telecom.telephone.ext";
-	public static final String USER_BUSINESS_INFO_TELECOM_TELEPHONE_COMMENT = "user.business-info.telecom.telephone.comment";
-	public static final String USER_BUSINESS_INFO_TELECOM_FAX_INTCODE = "user.business-info.telecom.fax.intcode";
-	public static final String USER_BUSINESS_INFO_TELECOM_FAX_LOCCODE = "user.business-info.telecom.fax.loccode";
-	public static final String USER_BUSINESS_INFO_TELECOM_FAX_NUMBER = "user.business-info.telecom.fax.number";
-	public static final String USER_BUSINESS_INFO_TELECOM_FAX_EXT = "user.business-info.telecom.fax.ext";
-	public static final String USER_BUSINESS_INFO_TELECOM_FAX_COMMENT = "user.business-info.telecom.fax.comment";
-	public static final String USER_BUSINESS_INFO_TELECOM_MOBILE_INTCODE = "user.business-info.telecom.mobile.intcode";
-	public static final String USER_BUSINESS_INFO_TELECOM_MOBILE_LOCCODE = "user.business-info.telecom.mobile.loccode";
-	public static final String USER_BUSINESS_INFO_TELECOM_MOBILE_NUMBER = "user.business-info.telecom.mobile.number";
-	public static final String USER_BUSINESS_INFO_TELECOM_MOBILE_EXT = "user.business-info.telecom.mobile.ext";
-	public static final String USER_BUSINESS_INFO_TELECOM_MOBILE_COMMENT = "user.business-info.telecom.mobile.comment";
-	public static final String USER_BUSINESS_INFO_TELECOM_PAGER_INTCODE = "user.business-info.telecom.pager.intcode";
-	public static final String USER_BUSINESS_INFO_TELECOM_PAGER_LOCCODE = "user.business-info.telecom.pager.loccode";
-	public static final String USER_BUSINESS_INFO_TELECOM_PAGER_NUMBER = "user.business-info.telecom.pager.number";
-	public static final String USER_BUSINESS_INFO_TELECOM_PAGER_EXT = "user.business-info.telecom.pager.ext";
-	public static final String USER_BUSINESS_INFO_TELECOM_PAGER_COMMENT = "user.business-info.telecom.pager.comment";
-	public static final String USER_BUSINESS_INFO_ONLINE_EMAIL = "user.business-info.online.email";
-	public static final String USER_BUSINESS_INFO_ONLINE_URI = "user.business-info.online.uri";
-
-	public static final String[] ATTRIBUTE_ARRAY = {
-		"user.bdate",
-		"user.gender",
-		"user.employer",
-		"user.department",
-		"user.jobtitle",
-		"user.name.prefix",
-		"user.name.given",
-		"user.name.family",
-		"user.name.middle",
-		"user.name.suffix",
-		"user.name.nickName",
-		"user.home-info.postal.name",
-		"user.home-info.postal.street",
-		"user.home-info.postal.city",
-		"user.home-info.postal.stateprov",
-		"user.home-info.postal.postalcode",
-		"user.home-info.postal.country",
-		"user.home-info.postal.organization",
-		"user.home-info.telecom.telephone.intcode",
-		"user.home-info.telecom.telephone.loccode",
-		"user.home-info.telecom.telephone.number",
-		"user.home-info.telecom.telephone.ext",
-		"user.home-info.telecom.telephone.comment",
-		"user.home-info.telecom.fax.intcode",
-		"user.home-info.telecom.fax.loccode",
-		"user.home-info.telecom.fax.number",
-		"user.home-info.telecom.fax.ext",
-		"user.home-info.telecom.fax.comment",
-		"user.home-info.telecom.mobile.intcode",
-		"user.home-info.telecom.mobile.loccode",
-		"user.home-info.telecom.mobile.number",
-		"user.home-info.telecom.mobile.ext",
-		"user.home-info.telecom.mobile.comment",
-		"user.home-info.telecom.pager.intcode",
-		"user.home-info.telecom.pager.loccode",
-		"user.home-info.telecom.pager.number",
-		"user.home-info.telecom.pager.ext",
-		"user.home-info.telecom.pager.comment",
-		"user.home-info.online.email",
-		"user.home-info.online.uri",
-		"user.business-info.postal.name",
-		"user.business-info.postal.street",
-		"user.business-info.postal.city",
-		"user.business-info.postal.stateprov",
-		"user.business-info.postal.postalcode",
-		"user.business-info.postal.country",
-		"user.business-info.postal.organization",
-		"user.business-info.telecom.telephone.intcode",
-		"user.business-info.telecom.telephone.loccode",
-		"user.business-info.telecom.telephone.number",
-		"user.business-info.telecom.telephone.ext",
-		"user.business-info.telecom.telephone.comment",
-		"user.business-info.telecom.fax.intcode",
-		"user.business-info.telecom.fax.loccode",
-		"user.business-info.telecom.fax.number",
-		"user.business-info.telecom.fax.ext",
-		"user.business-info.telecom.fax.comment",
-		"user.business-info.telecom.mobile.intcode",
-		"user.business-info.telecom.mobile.loccode",
-		"user.business-info.telecom.mobile.number",
-		"user.business-info.telecom.mobile.ext",
-		"user.business-info.telecom.mobile.comment",
-		"user.business-info.telecom.pager.intcode",
-		"user.business-info.telecom.pager.loccode",
-		"user.business-info.telecom.pager.number",
-		"user.business-info.telecom.pager.ext",
-		"user.business-info.telecom.pager.comment",
-		"user.business-info.online.email",
-		"user.business-info.online.uri"
-	};
-}
+ * 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.spi.optional;
+
+/**
+ * As defined in PLT.D of the JSR-168 specification, this class defines a set of
+ * attribute names for user information and their intended
+ * meaning. To allow portals an automated mapping of commonly used user information
+ * attributes portlet programmers should use these attribute names. These attribute names
+ * are derived from the Platform for Privacy Preferences 1.0 (P3P 1.0) Specification by the
+ * W3C (http://www.w3c.org/TR/P3P).
+ *
+ */
+public interface P3PAttributes {
+
+	/*	NOTE: The user.bdate must consist of a string that represents the time in milliseconds
+	since January 1, 1970, 00:00:00 GMT. */
+	public static final String USER_BDATE = "user.bdate";
+	public static final String USER_GENDER = "user.gender";
+	public static final String USER_EMPLOYER = "user.employer";
+	public static final String USER_DEPARTMENT = "user.department";
+	public static final String USER_JOBTITLE = "user.jobtitle";
+	public static final String USER_NAME_PREFIX = "user.name.prefix";
+	public static final String USER_NAME_GIVEN = "user.name.given";
+	public static final String USER_NAME_FAMILY = "user.name.family";
+	public static final String USER_NAME_MIDDLE = "user.name.middle";
+	public static final String USER_NAME_SUFFIX = "user.name.suffix";
+	public static final String USER_NAME_NICKNAME = "user.name.nickName";
+	public static final String USER_HOME_INFO_POSTAL_NAME = "user.home-info.postal.name";
+	public static final String USER_HOME_INFO_POSTAL_STREET = "user.home-info.postal.street";
+	public static final String USER_HOME_INFO_POSTAL_CITY = "user.home-info.postal.city";
+	public static final String USER_HOME_INFO_POSTAL_STATEPROV = "user.home-info.postal.stateprov";
+	public static final String USER_HOME_INFO_POSTAL_POSTALCODE = "user.home-info.postal.postalcode";
+	public static final String USER_HOME_INFO_POSTAL_COUNTRY = "user.home-info.postal.country";
+	public static final String USER_HOME_INFO_POSTAL_ORGANIZATION= "user.home-info.postal.organization";
+	public static final String USER_HOME_INFO_TELECOM_TELEPHONE_INTCODE = "user.home-info.telecom.telephone.intcode";
+	public static final String USER_HOME_INFO_TELECOM_TELEPHONE_LOCCODE = "user.home-info.telecom.telephone.loccode";
+	public static final String USER_HOME_INFO_TELECOM_TELEPHONE_NUMBER = "user.home-info.telecom.telephone.number";
+	public static final String USER_HOME_INFO_TELECOM_TELEPHONE_EXT = "user.home-info.telecom.telephone.ext";
+	public static final String USER_HOME_INFO_TELECOM_TELEPHONE_COMMENT = "user.home-info.telecom.telephone.comment";
+	public static final String USER_HOME_INFO_TELECOM_FAX_INTCODE = "user.home-info.telecom.fax.intcode";
+	public static final String USER_HOME_INFO_TELECOM_FAX_LOCCODE = "user.home-info.telecom.fax.loccode";
+	public static final String USER_HOME_INFO_TELECOM_FAX_NUMBER = "user.home-info.telecom.fax.number";
+	public static final String USER_HOME_INFO_TELECOM_FAX_EXT = "user.home-info.telecom.fax.ext";
+	public static final String USER_HOME_INFO_TELECOM_FAX_COMMENT = "user.home-info.telecom.fax.comment";
+	public static final String USER_HOME_INFO_TELECOM_MOBILE_INTCODE = "user.home-info.telecom.mobile.intcode";
+	public static final String USER_HOME_INFO_TELECOM_MOBILE_LOCCODE = "user.home-info.telecom.mobile.loccode";
+	public static final String USER_HOME_INFO_TELECOM_MOBILE_NUMBER = "user.home-info.telecom.mobile.number";
+	public static final String USER_HOME_INFO_TELECOM_MOBILE_EXT = "user.home-info.telecom.mobile.ext";
+	public static final String USER_HOME_INFO_TELECOM_MOBILE_COMMENT = "user.home-info.telecom.mobile.comment";
+	public static final String USER_HOME_INFO_TELECOM_PAGER_INTCODE = "user.home-info.telecom.pager.intcode";
+	public static final String USER_HOME_INFO_TELECOM_PAGER_LOCCODE = "user.home-info.telecom.pager.loccode";
+	public static final String USER_HOME_INFO_TELECOM_PAGER_NUMBER = "user.home-info.telecom.pager.number";
+	public static final String USER_HOME_INFO_TELECOM_PAGER_EXT = "user.home-info.telecom.pager.ext";
+	public static final String USER_HOME_INFO_TELECOM_PAGER_COMMENT = "user.home-info.telecom.pager.comment";
+	public static final String USER_HOME_INFO_ONLINE_EMAIL = "user.home-info.online.email";
+	public static final String USER_HOME_INFO_ONLINE_URI = "user.home-info.online.uri";
+	public static final String USER_BUSINESS_INFO_POSTAL_NAME = "user.business-info.postal.name";
+	public static final String USER_BUSINESS_INFO_POSTAL_STREET = "user.business-info.postal.street";
+	public static final String USER_BUSINESS_INFO_POSTAL_CITY = "user.business-info.postal.city";
+	public static final String USER_BUSINESS_INFO_POSTAL_STATEPROV = "user.business-info.postal.stateprov";
+	public static final String USER_BUSINESS_INFO_POSTAL_POSTALCODE = "user.business-info.postal.postalcode";
+	public static final String USER_BUSINESS_INFO_POSTAL_COUNTRY = "user.business-info.postal.country";
+	public static final String USER_BUSINESS_INFO_POSTAL_ORGANIZATION = "user.business-info.postal.organization";
+	public static final String USER_BUSINESS_INFO_TELECOM_TELEPHONE_INTCODE = "user.business-info.telecom.telephone.intcode";
+	public static final String USER_BUSINESS_INFO_TELECOM_TELEPHONE_LOCCODE= "user.business-info.telecom.telephone.loccode";
+	public static final String USER_BUSINESS_INFO_TELECOM_TELEPHONE_NUMBER = "user.business-info.telecom.telephone.number";
+	public static final String USER_BUSINESS_INFO_TELECOM_TELEPHONE_EXT = "user.business-info.telecom.telephone.ext";
+	public static final String USER_BUSINESS_INFO_TELECOM_TELEPHONE_COMMENT = "user.business-info.telecom.telephone.comment";
+	public static final String USER_BUSINESS_INFO_TELECOM_FAX_INTCODE = "user.business-info.telecom.fax.intcode";
+	public static final String USER_BUSINESS_INFO_TELECOM_FAX_LOCCODE = "user.business-info.telecom.fax.loccode";
+	public static final String USER_BUSINESS_INFO_TELECOM_FAX_NUMBER = "user.business-info.telecom.fax.number";
+	public static final String USER_BUSINESS_INFO_TELECOM_FAX_EXT = "user.business-info.telecom.fax.ext";
+	public static final String USER_BUSINESS_INFO_TELECOM_FAX_COMMENT = "user.business-info.telecom.fax.comment";
+	public static final String USER_BUSINESS_INFO_TELECOM_MOBILE_INTCODE = "user.business-info.telecom.mobile.intcode";
+	public static final String USER_BUSINESS_INFO_TELECOM_MOBILE_LOCCODE = "user.business-info.telecom.mobile.loccode";
+	public static final String USER_BUSINESS_INFO_TELECOM_MOBILE_NUMBER = "user.business-info.telecom.mobile.number";
+	public static final String USER_BUSINESS_INFO_TELECOM_MOBILE_EXT = "user.business-info.telecom.mobile.ext";
+	public static final String USER_BUSINESS_INFO_TELECOM_MOBILE_COMMENT = "user.business-info.telecom.mobile.comment";
+	public static final String USER_BUSINESS_INFO_TELECOM_PAGER_INTCODE = "user.business-info.telecom.pager.intcode";
+	public static final String USER_BUSINESS_INFO_TELECOM_PAGER_LOCCODE = "user.business-info.telecom.pager.loccode";
+	public static final String USER_BUSINESS_INFO_TELECOM_PAGER_NUMBER = "user.business-info.telecom.pager.number";
+	public static final String USER_BUSINESS_INFO_TELECOM_PAGER_EXT = "user.business-info.telecom.pager.ext";
+	public static final String USER_BUSINESS_INFO_TELECOM_PAGER_COMMENT = "user.business-info.telecom.pager.comment";
+	public static final String USER_BUSINESS_INFO_ONLINE_EMAIL = "user.business-info.online.email";
+	public static final String USER_BUSINESS_INFO_ONLINE_URI = "user.business-info.online.uri";
+
+	public static final String[] ATTRIBUTE_ARRAY = {
+		"user.bdate",
+		"user.gender",
+		"user.employer",
+		"user.department",
+		"user.jobtitle",
+		"user.name.prefix",
+		"user.name.given",
+		"user.name.family",
+		"user.name.middle",
+		"user.name.suffix",
+		"user.name.nickName",
+		"user.home-info.postal.name",
+		"user.home-info.postal.street",
+		"user.home-info.postal.city",
+		"user.home-info.postal.stateprov",
+		"user.home-info.postal.postalcode",
+		"user.home-info.postal.country",
+		"user.home-info.postal.organization",
+		"user.home-info.telecom.telephone.intcode",
+		"user.home-info.telecom.telephone.loccode",
+		"user.home-info.telecom.telephone.number",
+		"user.home-info.telecom.telephone.ext",
+		"user.home-info.telecom.telephone.comment",
+		"user.home-info.telecom.fax.intcode",
+		"user.home-info.telecom.fax.loccode",
+		"user.home-info.telecom.fax.number",
+		"user.home-info.telecom.fax.ext",
+		"user.home-info.telecom.fax.comment",
+		"user.home-info.telecom.mobile.intcode",
+		"user.home-info.telecom.mobile.loccode",
+		"user.home-info.telecom.mobile.number",
+		"user.home-info.telecom.mobile.ext",
+		"user.home-info.telecom.mobile.comment",
+		"user.home-info.telecom.pager.intcode",
+		"user.home-info.telecom.pager.loccode",
+		"user.home-info.telecom.pager.number",
+		"user.home-info.telecom.pager.ext",
+		"user.home-info.telecom.pager.comment",
+		"user.home-info.online.email",
+		"user.home-info.online.uri",
+		"user.business-info.postal.name",
+		"user.business-info.postal.street",
+		"user.business-info.postal.city",
+		"user.business-info.postal.stateprov",
+		"user.business-info.postal.postalcode",
+		"user.business-info.postal.country",
+		"user.business-info.postal.organization",
+		"user.business-info.telecom.telephone.intcode",
+		"user.business-info.telecom.telephone.loccode",
+		"user.business-info.telecom.telephone.number",
+		"user.business-info.telecom.telephone.ext",
+		"user.business-info.telecom.telephone.comment",
+		"user.business-info.telecom.fax.intcode",
+		"user.business-info.telecom.fax.loccode",
+		"user.business-info.telecom.fax.number",
+		"user.business-info.telecom.fax.ext",
+		"user.business-info.telecom.fax.comment",
+		"user.business-info.telecom.mobile.intcode",
+		"user.business-info.telecom.mobile.loccode",
+		"user.business-info.telecom.mobile.number",
+		"user.business-info.telecom.mobile.ext",
+		"user.business-info.telecom.mobile.comment",
+		"user.business-info.telecom.pager.intcode",
+		"user.business-info.telecom.pager.loccode",
+		"user.business-info.telecom.pager.number",
+		"user.business-info.telecom.pager.ext",
+		"user.business-info.telecom.pager.comment",
+		"user.business-info.online.email",
+		"user.business-info.online.uri"
+	};
+}

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/P3PAttributes.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java Sat Dec 29 09:31:56 2007
@@ -1,59 +1,59 @@
-/*
+/*
  * 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.spi.optional;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.internal.InternalActionRequest;
-import org.apache.pluto.internal.InternalActionResponse;
-import org.apache.pluto.internal.InternalPortletWindow;
-import org.apache.pluto.internal.InternalRenderRequest;
-import org.apache.pluto.internal.InternalRenderResponse;
-
-/**
- * Factory Service for creating Portlet request and responses.
- *
- * @since 1.1.0
- */
-public interface PortletEnvironmentService {
-
-    InternalActionRequest createActionRequest(
-        PortletContainer container,
-        HttpServletRequest servletRequest,
-        HttpServletResponse servletResponse,
-        InternalPortletWindow internalPortletWindow);
-
-    InternalActionResponse createActionResponse(
-        PortletContainer container,
-        HttpServletRequest servletRequest,
-        HttpServletResponse servletResponse,
-        InternalPortletWindow internalPortletWindow);
-
-    InternalRenderRequest createRenderRequest(
-        PortletContainer container,
-        HttpServletRequest servletRequest,
-        HttpServletResponse servletResponse,
-        InternalPortletWindow internalPortletWindow);
-
-    InternalRenderResponse createRenderResponse(
-        PortletContainer container,
-        HttpServletRequest servletRequest,
-        HttpServletResponse servletResponse,
-        InternalPortletWindow internalPortletWindow);
-}
+ * 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.spi.optional;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.pluto.PortletContainer;
+import org.apache.pluto.internal.InternalActionRequest;
+import org.apache.pluto.internal.InternalActionResponse;
+import org.apache.pluto.internal.InternalPortletWindow;
+import org.apache.pluto.internal.InternalRenderRequest;
+import org.apache.pluto.internal.InternalRenderResponse;
+
+/**
+ * Factory Service for creating Portlet request and responses.
+ *
+ * @since 1.1.0
+ */
+public interface PortletEnvironmentService {
+
+    InternalActionRequest createActionRequest(
+        PortletContainer container,
+        HttpServletRequest servletRequest,
+        HttpServletResponse servletResponse,
+        InternalPortletWindow internalPortletWindow);
+
+    InternalActionResponse createActionResponse(
+        PortletContainer container,
+        HttpServletRequest servletRequest,
+        HttpServletResponse servletResponse,
+        InternalPortletWindow internalPortletWindow);
+
+    InternalRenderRequest createRenderRequest(
+        PortletContainer container,
+        HttpServletRequest servletRequest,
+        HttpServletResponse servletResponse,
+        InternalPortletWindow internalPortletWindow);
+
+    InternalRenderResponse createRenderResponse(
+        PortletContainer container,
+        HttpServletRequest servletRequest,
+        HttpServletResponse servletResponse,
+        InternalPortletWindow internalPortletWindow);
+}

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java Sat Dec 29 09:31:56 2007
@@ -1,46 +1,46 @@
-/*
+/*
  * 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.spi.optional;
-
-import org.apache.pluto.internal.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;
-import javax.portlet.PortletException;
-import java.io.IOException;
-
-/**
- * Service used to invoke portlets.
- */
-public interface PortletInvokerService {
-
-    public void action(ActionRequest req, ActionResponse res, InternalPortletWindow window)
-    throws IOException, PortletException;
-
-    public void render(RenderRequest req, RenderResponse res, InternalPortletWindow window)
-    throws IOException, PortletException;
-
-    public void load(PortletRequest req, PortletResponse res, InternalPortletWindow window)
-    throws IOException, PortletException;
-
-    public void admin(PortletRequest req, PortletResponse res, InternalPortletWindow window)
-    throws IOException, PortletException;
-}
+ * 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.spi.optional;
+
+import org.apache.pluto.internal.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;
+import javax.portlet.PortletException;
+import java.io.IOException;
+
+/**
+ * Service used to invoke portlets.
+ */
+public interface PortletInvokerService {
+
+    public void action(ActionRequest req, ActionResponse res, InternalPortletWindow window)
+    throws IOException, PortletException;
+
+    public void render(RenderRequest req, RenderResponse res, InternalPortletWindow window)
+    throws IOException, PortletException;
+
+    public void load(PortletRequest req, PortletResponse res, InternalPortletWindow window)
+    throws IOException, PortletException;
+
+    public void admin(PortletRequest req, PortletResponse res, InternalPortletWindow window)
+    throws IOException, PortletException;
+}

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletPreferencesService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletPreferencesService.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletPreferencesService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletPreferencesService.java Sat Dec 29 09:31:56 2007
@@ -1,57 +1,57 @@
-/*
+/*
  * 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.spi.optional;
-
-import javax.portlet.PortletRequest;
-
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.internal.InternalPortletPreference;
-import org.apache.pluto.spi.ContainerService;
-
-/**
- * Portlet preferences service that should be implemented by the portal.
- * This is an optional container service.
- *
- */
-public interface PortletPreferencesService extends ContainerService {
-
-	/**
-	 * Returns the stored portlet preferences.
-	 * @param portletWindow  the portlet window.
-	 * @param request  the portlet request.
-	 * @return the stored portlet preferences.
-	 * @throws PortletContainerException  if fail to get stored preferences.
-	 */
-    public InternalPortletPreference[] getStoredPreferences(
-    		PortletWindow portletWindow,
-    		PortletRequest request)
-    throws PortletContainerException;
-
-    /**
-     * Stores the portlet references to the persistent storage.
-     * @param portletWindow  the portlet window.
-     * @param request  the portlet request.
-     * @param preferences  the portlet preferences to store.
-     * @throws PortletContainerException  if fail to store preferences.
-     */
-    public void store(PortletWindow portletWindow,
-                      PortletRequest request,
-                      InternalPortletPreference[] preferences)
-    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.spi.optional;
+
+import javax.portlet.PortletRequest;
+
+import org.apache.pluto.PortletWindow;
+import org.apache.pluto.PortletContainerException;
+import org.apache.pluto.internal.InternalPortletPreference;
+import org.apache.pluto.spi.ContainerService;
+
+/**
+ * Portlet preferences service that should be implemented by the portal.
+ * This is an optional container service.
+ *
+ */
+public interface PortletPreferencesService extends ContainerService {
+
+	/**
+	 * Returns the stored portlet preferences.
+	 * @param portletWindow  the portlet window.
+	 * @param request  the portlet request.
+	 * @return the stored portlet preferences.
+	 * @throws PortletContainerException  if fail to get stored preferences.
+	 */
+    public InternalPortletPreference[] getStoredPreferences(
+    		PortletWindow portletWindow,
+    		PortletRequest request)
+    throws PortletContainerException;
+
+    /**
+     * Stores the portlet references to the persistent storage.
+     * @param portletWindow  the portlet window.
+     * @param request  the portlet request.
+     * @param preferences  the portlet preferences to store.
+     * @throws PortletContainerException  if fail to store preferences.
+     */
+    public void store(PortletWindow portletWindow,
+                      PortletRequest request,
+                      InternalPortletPreference[] preferences)
+    throws PortletContainerException;
+
+}

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletPreferencesService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoAttributesService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoAttributesService.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoAttributesService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoAttributesService.java Sat Dec 29 09:31:56 2007
@@ -1,31 +1,31 @@
-/*
- * 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.spi.optional;
-
-
-/**
- * Used to access user information attributes as described in
- * PLT.17.2 of the JSR-168 specificiation. Attribute persistence is
- * not covered by the spec so it is not done here.
- *
- * @deprecated use UserInfoService
- * @see UserInfoService
- */
-public interface UserInfoAttributesService extends 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.spi.optional;
+
+
+/**
+ * Used to access user information attributes as described in
+ * PLT.17.2 of the JSR-168 specificiation. Attribute persistence is
+ * not covered by the spec so it is not done here.
+ *
+ * @deprecated use UserInfoService
+ * @see UserInfoService
+ */
+public interface UserInfoAttributesService extends UserInfoService {
+
+
+}

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoAttributesService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/ArgumentUtility.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/ArgumentUtility.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/ArgumentUtility.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/ArgumentUtility.java Sat Dec 29 09:31:56 2007
@@ -1,72 +1,72 @@
-/*
+/*
  * 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.util;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Static class that provides utility static methods for argument validation.
- *
- */
-public class ArgumentUtility {
-
-	/** Logger. */
-    public static final Log LOG = LogFactory.getLog(ArgumentUtility.class);
-
-
-    // Static Utility Methods --------------------------------------------------
-
-    /**
-     * Validates that the passed-in argument value is not null.
-     * @param argumentName  the argument name.
-     * @param argument  the argument value.
-     * @throws IllegalArgumentException  if the argument value is null.
-     */
-    public static void validateNotNull(String argumentName, Object argument)
-    throws IllegalArgumentException {
-        if (argument == null) {
-        	if (LOG.isDebugEnabled()) {
-        		LOG.debug("Validation failed for argument: " + argumentName
-        				+ ": argument should not be null.");
-        	}
-        	throw new IllegalArgumentException(
-        			"Illegal Argument: " + argumentName
-        			+ " (argument should not be null)");
-        }
-    }
-
-    /**
-     * Validates that the passed-in string argument value is not null or empty.
-     * @param argumentName  the argument name.
-     * @param argument  the argument value.
-     * @throws IllegalArgumentException  if the argument value is null or empty.
-     */
-    public static void validateNotEmpty(String argumentName, String argument)
-    throws IllegalArgumentException {
-        if (argument == null || "".equals(argument)) {
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("Validation failed for argument: " + argumentName
-                		+ ": argument should not be null or empty.");
-            }
-            throw new IllegalArgumentException(
-            		"Illegal Argument: " + argumentName
-            		+ " (argument should not be null or empty)");
-        }
-    }
-
-}
+ * 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.util;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Static class that provides utility static methods for argument validation.
+ *
+ */
+public class ArgumentUtility {
+
+	/** Logger. */
+    public static final Log LOG = LogFactory.getLog(ArgumentUtility.class);
+
+
+    // Static Utility Methods --------------------------------------------------
+
+    /**
+     * Validates that the passed-in argument value is not null.
+     * @param argumentName  the argument name.
+     * @param argument  the argument value.
+     * @throws IllegalArgumentException  if the argument value is null.
+     */
+    public static void validateNotNull(String argumentName, Object argument)
+    throws IllegalArgumentException {
+        if (argument == null) {
+        	if (LOG.isDebugEnabled()) {
+        		LOG.debug("Validation failed for argument: " + argumentName
+        				+ ": argument should not be null.");
+        	}
+        	throw new IllegalArgumentException(
+        			"Illegal Argument: " + argumentName
+        			+ " (argument should not be null)");
+        }
+    }
+
+    /**
+     * Validates that the passed-in string argument value is not null or empty.
+     * @param argumentName  the argument name.
+     * @param argument  the argument value.
+     * @throws IllegalArgumentException  if the argument value is null or empty.
+     */
+    public static void validateNotEmpty(String argumentName, String argument)
+    throws IllegalArgumentException {
+        if (argument == null || "".equals(argument)) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Validation failed for argument: " + argumentName
+                		+ ": argument should not be null or empty.");
+            }
+            throw new IllegalArgumentException(
+            		"Illegal Argument: " + argumentName
+            		+ " (argument should not be null or empty)");
+        }
+    }
+
+}

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/ArgumentUtility.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/Enumerator.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/Enumerator.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/Enumerator.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/Enumerator.java Sat Dec 29 09:31:56 2007
@@ -1,86 +1,86 @@
-/*
+/*
  * 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.util;
-
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-
-/**
- * Uitlity class to wraps an <code>Enumeration</code> around a Collection, i.e.
- * <code>Iterator</code> classes.
- */
-
-public final class Enumerator implements Enumeration {
-
-
-    // Iterator over which the Enumeration takes place
-    private Iterator iterator = null;
-
-
-    /**
-     * Returns an Enumeration over the specified Collection.
-     * @param collection Collection with values that should be enumerated
-     */
-    public Enumerator(Collection collection) {
-        this(collection.iterator());
-    }
-
-
-    /**
-     * Returns an Enumeration over the values of the specified Iterator.
-     * @param iterator Iterator to be wrapped
-     */
-    public Enumerator(Iterator iterator) {
-        super();
-        this.iterator = iterator;
-    }
-
-
-    /**
-     * Returns an Enumeration over the values of the specified Map.
-     * @param map Map with values that should be enumerated
-     */
-    public Enumerator(Map map) {
-        this(map.values().iterator());
-    }
-
-
-    /**
-     * Tests if this enumeration contains more elements.
-     * @return <code>true</code> if this enumeration contains at least one more
-     *         element to provide, <code>false</code> otherwise.
-     */
-    public boolean hasMoreElements() {
-        return (iterator.hasNext());
-    }
-
-
-    /**
-     * Returns the next element of this enumeration.
-     * @return the next element of this enumeration
-     * @throws NoSuchElementException if no more elements exist
-     */
-    public Object nextElement() throws NoSuchElementException {
-        return (iterator.next());
-    }
-
-
-}
+ * 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.util;
+
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+
+/**
+ * Uitlity class to wraps an <code>Enumeration</code> around a Collection, i.e.
+ * <code>Iterator</code> classes.
+ */
+
+public final class Enumerator implements Enumeration {
+
+
+    // Iterator over which the Enumeration takes place
+    private Iterator iterator = null;
+
+
+    /**
+     * Returns an Enumeration over the specified Collection.
+     * @param collection Collection with values that should be enumerated
+     */
+    public Enumerator(Collection collection) {
+        this(collection.iterator());
+    }
+
+
+    /**
+     * Returns an Enumeration over the values of the specified Iterator.
+     * @param iterator Iterator to be wrapped
+     */
+    public Enumerator(Iterator iterator) {
+        super();
+        this.iterator = iterator;
+    }
+
+
+    /**
+     * Returns an Enumeration over the values of the specified Map.
+     * @param map Map with values that should be enumerated
+     */
+    public Enumerator(Map map) {
+        this(map.values().iterator());
+    }
+
+
+    /**
+     * Tests if this enumeration contains more elements.
+     * @return <code>true</code> if this enumeration contains at least one more
+     *         element to provide, <code>false</code> otherwise.
+     */
+    public boolean hasMoreElements() {
+        return (iterator.hasNext());
+    }
+
+
+    /**
+     * Returns the next element of this enumeration.
+     * @return the next element of this enumeration
+     * @throws NoSuchElementException if no more elements exist
+     */
+    public Object nextElement() throws NoSuchElementException {
+        return (iterator.next());
+    }
+
+
+}

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/Enumerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/NamespaceMapper.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/NamespaceMapper.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/NamespaceMapper.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/NamespaceMapper.java Sat Dec 29 09:31:56 2007
@@ -1,32 +1,32 @@
-/*
+/*
  * 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.util;
-
-import org.apache.pluto.PortletWindowID;
-
-/**
- **/
-public interface NamespaceMapper {
-
-
-    public String encode(PortletWindowID namespace, String name);
-
-    public String encode(PortletWindowID ns1, PortletWindowID ns2, String name);
-
-    public String decode(PortletWindowID ns, String name);
-
-}
+ * 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.util;
+
+import org.apache.pluto.PortletWindowID;
+
+/**
+ **/
+public interface NamespaceMapper {
+
+
+    public String encode(PortletWindowID namespace, String name);
+
+    public String encode(PortletWindowID ns1, PortletWindowID ns2, String name);
+
+    public String decode(PortletWindowID ns, String name);
+
+}

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/NamespaceMapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/PrintWriterServletOutputStream.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/PrintWriterServletOutputStream.java?rev=607450&r1=607449&r2=607450&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/PrintWriterServletOutputStream.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/PrintWriterServletOutputStream.java Sat Dec 29 09:31:56 2007
@@ -1,125 +1,125 @@
-/*
+/*
  * 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.util;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletOutputStream;
-
-/**
- * This is a specialized class implementing a ServletOutputStream that works in
- * conjunction with a PrintWriter to send data to the browser. It is used when a
- * J2EE server throws an IllegalStateException when you call getOutputStream on
- * a response which someone has previously called getWriter on.
- */
-public class PrintWriterServletOutputStream extends ServletOutputStream {
-
-    /**
-     * The PrintWriter that is wrapped on top of the base input stream
-     */
-    PrintWriter mPrintWriter;
-
-    /**
-     * Construct a ServletOutputStream that coordinates output using a base
-     * ServletOutputStream and a PrintWriter that is wrapped on top of that
-     * OutputStream.
-     */
-    public PrintWriterServletOutputStream(PrintWriter pO) {
-        super();
-        mPrintWriter = pO;
-    }
-
-    /**
-     * Writes an array of bytes
-     * @param pBuf the array to be written
-     * @throws IOException if an I/O error occurred
-     */
-    public void write(byte[] pBuf) throws IOException {
-        char[] cbuf = new char[pBuf.length];
-        for (int i = 0; i < cbuf.length; i++) {
-            cbuf[i] = (char) (pBuf[i] & 0xff);
-        }
-        mPrintWriter.write(cbuf, 0, pBuf.length);
-    }
-
-    /**
-     * Writes a single byte to the output stream
-     */
-    public void write(int pVal) throws IOException {
-        mPrintWriter.write(pVal);
-    }
-
-    /**
-     * Writes a subarray of bytes
-     * @param pBuf    the array to be written
-     * @param pOffset the offset into the array
-     * @param pLength the number of bytes to write
-     * @throws IOException if an I/O error occurred
-     */
-    public void write(byte[] pBuf, int pOffset, int pLength)
-        throws IOException {
-        char[] cbuf = new char[pLength];
-        for (int i = 0; i < pLength; i++) {
-            cbuf[i] = (char) (pBuf[i + pOffset] & 0xff);
-        }
-        mPrintWriter.write(cbuf, 0, pLength);
-    }
-
-    /**
-     * Flushes the stream, writing any buffered output bytes
-     * @throws IOException if an I/O error occurred
-     */
-    public void flush() throws IOException {
-        mPrintWriter.flush();
-    }
-
-    /**
-     * Closes the stream
-     * @throws IOException if an I/O error occurred
-     */
-    public void close() throws IOException {
-        mPrintWriter.close();
-    }
-
-    /**
-     * Prints a string.
-     * @param pVal the String to be printed
-     * @throws IOException if an I/O error has occurred
-     */
-    public void print(String pVal) throws IOException {
-        mPrintWriter.print(pVal);
-    }
-
-    /**
-     * Prints an string followed by a CRLF.
-     * @param pVal the String to be printed
-     * @throws IOException if an I/O error has occurred
-     */
-    public void println(String pVal) throws IOException {
-        mPrintWriter.println(pVal);
-    }
-
-    /**
-     * Prints a CRLF
-     * @throws IOException if an I/O error has occurred
-     */
-    public void println() throws IOException {
-        mPrintWriter.println();
-    }
-
-}
+ * 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.util;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletOutputStream;
+
+/**
+ * This is a specialized class implementing a ServletOutputStream that works in
+ * conjunction with a PrintWriter to send data to the browser. It is used when a
+ * J2EE server throws an IllegalStateException when you call getOutputStream on
+ * a response which someone has previously called getWriter on.
+ */
+public class PrintWriterServletOutputStream extends ServletOutputStream {
+
+    /**
+     * The PrintWriter that is wrapped on top of the base input stream
+     */
+    PrintWriter mPrintWriter;
+
+    /**
+     * Construct a ServletOutputStream that coordinates output using a base
+     * ServletOutputStream and a PrintWriter that is wrapped on top of that
+     * OutputStream.
+     */
+    public PrintWriterServletOutputStream(PrintWriter pO) {
+        super();
+        mPrintWriter = pO;
+    }
+
+    /**
+     * Writes an array of bytes
+     * @param pBuf the array to be written
+     * @throws IOException if an I/O error occurred
+     */
+    public void write(byte[] pBuf) throws IOException {
+        char[] cbuf = new char[pBuf.length];
+        for (int i = 0; i < cbuf.length; i++) {
+            cbuf[i] = (char) (pBuf[i] & 0xff);
+        }
+        mPrintWriter.write(cbuf, 0, pBuf.length);
+    }
+
+    /**
+     * Writes a single byte to the output stream
+     */
+    public void write(int pVal) throws IOException {
+        mPrintWriter.write(pVal);
+    }
+
+    /**
+     * Writes a subarray of bytes
+     * @param pBuf    the array to be written
+     * @param pOffset the offset into the array
+     * @param pLength the number of bytes to write
+     * @throws IOException if an I/O error occurred
+     */
+    public void write(byte[] pBuf, int pOffset, int pLength)
+        throws IOException {
+        char[] cbuf = new char[pLength];
+        for (int i = 0; i < pLength; i++) {
+            cbuf[i] = (char) (pBuf[i + pOffset] & 0xff);
+        }
+        mPrintWriter.write(cbuf, 0, pLength);
+    }
+
+    /**
+     * Flushes the stream, writing any buffered output bytes
+     * @throws IOException if an I/O error occurred
+     */
+    public void flush() throws IOException {
+        mPrintWriter.flush();
+    }
+
+    /**
+     * Closes the stream
+     * @throws IOException if an I/O error occurred
+     */
+    public void close() throws IOException {
+        mPrintWriter.close();
+    }
+
+    /**
+     * Prints a string.
+     * @param pVal the String to be printed
+     * @throws IOException if an I/O error has occurred
+     */
+    public void print(String pVal) throws IOException {
+        mPrintWriter.print(pVal);
+    }
+
+    /**
+     * Prints an string followed by a CRLF.
+     * @param pVal the String to be printed
+     * @throws IOException if an I/O error has occurred
+     */
+    public void println(String pVal) throws IOException {
+        mPrintWriter.println(pVal);
+    }
+
+    /**
+     * Prints a CRLF
+     * @throws IOException if an I/O error has occurred
+     */
+    public void println() throws IOException {
+        mPrintWriter.println();
+    }
+
+}

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/PrintWriterServletOutputStream.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message