portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r752341 [1/2] - in /portals/pluto/trunk: pluto-container/src/main/java/org/apache/pluto/container/driver/ pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ pluto-container/src/main/java/org/apache/pluto/container/impl/ p...
Date Wed, 11 Mar 2009 01:44:53 GMT
Author: ate
Date: Wed Mar 11 01:44:50 2009
New Revision: 752341

URL: http://svn.apache.org/viewvc?rev=752341&view=rev
Log:
PLUTO-537: Cleaning up Pluto packages
See: https://issues.apache.org/jira/browse/PLUTO-537
- fixing more package names
- moved o.a.p.container.driver.impl.DefaultPorletEnvironmentService to o.a.p.container.impl.PortletEnvironmentServiceImpl as this really is a core/container service (still pluggable though)
- moving PortletConfigImpl and PortletContextImpl to o.a.p.container.driver.impl
  I'll add abstract base class implementation for these in o.a.p.container.impl shortly moving the generic container features down from the driver.impl
  I'll move the ContainerPortletConfig and ContainerPortletContext extended interfaces to o.a.p.container.driver (and renaming them to Driver-) also
  as the container doesn't really need the extended features of these interfaces, only the default Pluto Driver services
- merged/moved two Configuration and one Environment properties configuration access classes into a single o.a.p.container.driver.impl.Configuration class
- fixed the resources folder, including cleaning up and moving the LocalString.properties files (not much StringManager usage/coverage within the code however, not sure how useful these are really)  
- deleted several not/never and/or no longer used "utility" classes like RandomStringUtils (???) and StringUtils

Added:
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/
      - copied from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/CombinedPortletResourceBundle.java   (contents, props changed)
      - copied, changed from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/CombinedPortletResourceBundle.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyProfile.java   (contents, props changed)
      - copied, changed from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/DummyProfile.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Environment.java   (contents, props changed)
      - copied, changed from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/Environment.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InlinePortletResourceBundle.java   (contents, props changed)
      - copied, changed from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/InlinePortletResourceBundle.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletConfigImpl.java   (contents, props changed)
      - copied, changed from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletConfigImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletContextImpl.java   (contents, props changed)
      - copied, changed from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ResourceBundleFactory.java   (contents, props changed)
      - copied, changed from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceBundleFactory.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletEnvironmentServiceImpl.java   (with props)
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/
      - copied from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/
    portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/
    portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/
    portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/impl/
    portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/impl/LocalStrings.properties   (contents, props changed)
      - copied, changed from r752154, portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/internal/LocalStrings.properties
    portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/impl/pluto-configuration.properties   (contents, props changed)
      - copied, changed from r752154, portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/core/pluto-configuration.properties
    portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/
      - copied from r752154, portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/internal/impl/
    portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_1_0.xsd   (contents, props changed)
      - copied, changed from r752154, portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/descriptors/services/jaxb/portlet-app_1_0.xsd
    portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_2_0.xsd   (contents, props changed)
      - copied, changed from r752154, portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/descriptors/services/jaxb/portlet-app_2_0.xsd
    portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/web-app_2_3.dtd   (contents, props changed)
      - copied, changed from r752154, portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/descriptors/services/jaxb/web-app_2_3.dtd
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventImpl.java   (contents, props changed)
      - copied, changed from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventImpl.java
Removed:
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletEnvironmentService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/CacheControlImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/CombinedPortletResourceBundle.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/Configuration.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/DummyProfile.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/Environment.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/EventImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/InlinePortletResourceBundle.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletConfigImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RandomStringUtils.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceBundleFactory.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/portlet10/impl/
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/Enumerator.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/StringUtils.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/services/
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/driver/impl/
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/
    portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/core/
    portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/descriptors/
    portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/environment.properties
    portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/internal/
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/ConfigurationTest.java
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/EnvironmentTest.java
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/StringUtilsTest.java
Modified:
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ApplicationIdResolver.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/AttributeApplicationIdResolver.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Configuration.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultApplicationIdResolver.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultNamespaceMapper.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultOptionalContainerServices.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortalAdministrationService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletInvokerService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletPreferencesService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultUserInfoService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyCCPPProfileServiceImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InitParameterApplicationIdResolver.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PlutoContainerServices.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletContextManager.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletDescriptorRegistry.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferencesImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RenderResponseImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/ContainerRuntimeOptionType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/CustomPortletModeType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/CustomWindowStateType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/DescriptionType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/DisplayNameType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/InitParamType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/ObjectFactory.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletAppType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletCollectionType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletInfoType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletPreferencesType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PreferenceType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SecurityConstraintType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SecurityRoleRefType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SupportsType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/UserAttributeType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/UserDataConstraintType.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/package-info.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/PrintWriterServletOutputStream.java
    portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/LocalStrings.properties
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/DefaultNamespaceMapperTest.java
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ApplicationIdResolver.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ApplicationIdResolver.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ApplicationIdResolver.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ApplicationIdResolver.java Wed Mar 11 01:44:50 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.impl;
+package org.apache.pluto.container.driver.impl;
 
 import javax.servlet.ServletContext;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/AttributeApplicationIdResolver.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/AttributeApplicationIdResolver.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/AttributeApplicationIdResolver.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/AttributeApplicationIdResolver.java Wed Mar 11 01:44:50 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.impl;
+package org.apache.pluto.container.driver.impl;
 
 import javax.servlet.ServletContext;
 

Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/CombinedPortletResourceBundle.java (from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/CombinedPortletResourceBundle.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/CombinedPortletResourceBundle.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/CombinedPortletResourceBundle.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/CombinedPortletResourceBundle.java&r1=752156&r2=752341&rev=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/CombinedPortletResourceBundle.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/CombinedPortletResourceBundle.java Wed Mar 11 01:44:50 2009
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.impl;
+package org.apache.pluto.container.driver.impl;
 
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.ResourceBundle;
 import java.util.Vector;
 
-import org.apache.pluto.container.util.StringManager;
+import org.apache.pluto.container.util.ArgumentUtility;
 
 /**
  *
@@ -30,9 +30,6 @@
  */
 class CombinedPortletResourceBundle extends ResourceBundle {
 
-    private static final StringManager EXCEPTIONS =
-        StringManager.getManager(CombinedPortletResourceBundle.class.getPackage().getName());
-
     private HashMap contents = new HashMap();
 
     public CombinedPortletResourceBundle(InlinePortletResourceBundle inlineBundle, ResourceBundle resourceBundle) {
@@ -41,9 +38,7 @@
     }
 
     protected Object handleGetObject(String key) {
-        if(key == null) {
-            throw new NullPointerException(EXCEPTIONS.getString("error.null"));
-        }
+        ArgumentUtility.validateNotNull("key", key);
         return contents.get(key);
     }
 

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/CombinedPortletResourceBundle.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Configuration.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Configuration.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Configuration.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Configuration.java Wed Mar 11 01:44:50 2009
@@ -14,8 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.impl;
+package org.apache.pluto.container.driver.impl;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
@@ -33,11 +35,19 @@
         LogFactory.getLog(Configuration.class);
 
     public static final ResourceBundle BUNDLE =
-        ResourceBundle.getBundle("org.apache.pluto.core.pluto-configuration");
+        ResourceBundle.getBundle("org.apache.pluto.container.driver.impl.pluto-configuration");
 
     private static final String DESCRIPTOR_SERVICE =
         "org.apache.pluto.descriptors.services.PortletAppDescriptorService";
 
+    private static final String CONTAINER_RUNTIME_OPTIONS =
+        "org.apache.pluto.container.supportedContainerRuntimeOptions";
+
+    /**
+     * org.apache.pluto.PREVENT_UNECESSARY_CROSS_CONTEXT
+     */
+    private static final String PREVENT_UNECESSARY_CROSS_CONTEXT =
+        "org.apache.pluto.PREVENT_UNECESSARY_CROSS_CONTEXT";
 
     /**
      * org.apache.pluto.ALLOW_BUFFER
@@ -45,6 +55,9 @@
     private static final String BUFFER_SUPPORT =
         "org.apache.pluto.ALLOW_BUFFER";
 
+    private static Boolean prevent;
+    private static Boolean buffering;
+
     public static String getPortletAppDescriptorServiceImpl() {
         String impl = BUNDLE.getString(DESCRIPTOR_SERVICE);
         if (LOG.isDebugEnabled()) {
@@ -53,7 +66,6 @@
         return impl;
     }
 
-    private static Boolean buffering;
     public static boolean isBufferingSupported() {
         if (buffering == null) {
             try {
@@ -65,4 +77,74 @@
         }
         return buffering.booleanValue();
     }
+
+    public static List<String> getSupportedContainerRuntimeOptions() {
+        String options =  BUNDLE.getString(CONTAINER_RUNTIME_OPTIONS);
+        List<String> result = new ArrayList<String>();
+        String[] s = options.split(",");
+        for (String string : s) {
+            result.add(string);
+        }
+        return result;
+    }
+
+    public static boolean preventUnecessaryCrossContext() {
+        if (prevent == null) {
+            try {
+                String test = BUNDLE.getString(PREVENT_UNECESSARY_CROSS_CONTEXT);
+                prevent = new Boolean(test);
+            } catch (MissingResourceException mre) {
+                LOG.warn(mre.getMessage());
+                prevent = Boolean.FALSE;
+            }
+        }
+        return prevent.booleanValue();
+    }
+
+    /**
+     * Retrieve the name of the container.
+     * @return the container name.
+     */
+    public static final String getPortletContainerName() {
+        return BUNDLE.getString("pluto.container.name");
+    }
+
+    /**
+     * Retrieve the portlet container version.
+     *
+     * @return container version
+     */
+    public static final String getPortletContainerVersion() {
+        return BUNDLE.getString("pluto.container.version");
+    }
+
+    /**
+     * Retrieve the major version number of the specification which this version
+     * of pluto supports.
+     * @return te major specification version.
+     */
+    public static final int getMajorSpecificationVersion() {
+        return Integer.parseInt(BUNDLE.getString("javax.portlet.version.major"));
+    }
+
+    /**
+     * Retrieve the minor version number of the specification which this version
+     * of pluto supports.
+     * @return the minor specification version.
+     */
+    public static final int getMinorSpecificationVersion() {
+        return Integer.parseInt(BUNDLE.getString("javax.portlet.version.minor"));
+    }
+
+    /**
+     * Retrieve the formatted server info String required to be returned by the
+     * PortletContext.
+     * @return the server info.
+     */
+    public static final String getServerInfo() {
+        StringBuffer sb = new StringBuffer(getPortletContainerName())
+            .append("/")
+            .append(getPortletContainerVersion());
+        return sb.toString();
+    }
 }

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultApplicationIdResolver.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultApplicationIdResolver.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultApplicationIdResolver.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultApplicationIdResolver.java Wed Mar 11 01:44:50 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.impl;
+package org.apache.pluto.container.driver.impl;
 
 import java.net.MalformedURLException;
 import java.net.URL;

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultNamespaceMapper.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultNamespaceMapper.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultNamespaceMapper.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultNamespaceMapper.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.impl;
+package org.apache.pluto.container.driver.impl;
 
 import org.apache.pluto.container.NamespaceMapper;
 import org.apache.pluto.container.PortletWindowID;

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultOptionalContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultOptionalContainerServices.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultOptionalContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultOptionalContainerServices.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.impl;
+package org.apache.pluto.container.driver.impl;
 
 import org.apache.pluto.container.CCPPProfileService;
 import org.apache.pluto.container.NamespaceMapper;
@@ -28,6 +28,7 @@
 import org.apache.pluto.container.driver.PortalDriverServices;
 import org.apache.pluto.container.driver.PortletContextService;
 import org.apache.pluto.container.driver.PortletRegistryService;
+import org.apache.pluto.container.impl.PortletEnvironmentServiceImpl;
 import org.apache.pluto.container.impl.PortletAppDescriptorServiceImpl;
 
 /**
@@ -58,7 +59,7 @@
         portletRegistryService = new PortletContextManager();
         portletContextService = (PortletContextManager)portletRegistryService;
         portletInvokerService = new DefaultPortletInvokerService(portletContextService);
-        portletEnvironmentService = new DefaultPortletEnvironmentService();
+        portletEnvironmentService = new PortletEnvironmentServiceImpl();
         portalAdministrationService = new DefaultPortalAdministrationService();
         userInfoService = new DefaultUserInfoService();
         namespaceMapper = new DefaultNamespaceMapper();

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortalAdministrationService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortalAdministrationService.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortalAdministrationService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortalAdministrationService.java Wed Mar 11 01:44:50 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.impl;
+package org.apache.pluto.container.driver.impl;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletInvokerService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletInvokerService.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletInvokerService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletInvokerService.java Wed Mar 11 01:44:50 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.impl;
+package org.apache.pluto.container.driver.impl;
 
 import java.io.IOException;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletPreferencesService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletPreferencesService.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletPreferencesService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletPreferencesService.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.impl;
+package org.apache.pluto.container.driver.impl;
 
 import java.util.Collections;
 import java.util.HashMap;

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultUserInfoService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultUserInfoService.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultUserInfoService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultUserInfoService.java Wed Mar 11 01:44:50 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.impl;
+package org.apache.pluto.container.driver.impl;
 
 import java.util.Collections;
 import java.util.Map;

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyCCPPProfileServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyCCPPProfileServiceImpl.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyCCPPProfileServiceImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyCCPPProfileServiceImpl.java Wed Mar 11 01:44:50 2009
@@ -1,13 +1,12 @@
 /**
  * 
  */
-package org.apache.pluto.driver.impl;
+package org.apache.pluto.container.driver.impl;
 
 import javax.ccpp.Profile;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.pluto.container.CCPPProfileService;
-import org.apache.pluto.container.impl.DummyProfile;
 
 /**
  *

Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyProfile.java (from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/DummyProfile.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyProfile.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyProfile.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/DummyProfile.java&r1=752156&r2=752341&rev=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/DummyProfile.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyProfile.java Wed Mar 11 01:44:50 2009
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.apache.pluto.container.impl;
+package org.apache.pluto.container.driver.impl;
 
 import java.util.Set;
 

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyProfile.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Environment.java (from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/Environment.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Environment.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Environment.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/Environment.java&r1=752156&r2=752341&rev=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/Environment.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Environment.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.impl;
+package org.apache.pluto.container.driver.impl;
 
 import java.util.ResourceBundle;
 

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Environment.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InitParameterApplicationIdResolver.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InitParameterApplicationIdResolver.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InitParameterApplicationIdResolver.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InitParameterApplicationIdResolver.java Wed Mar 11 01:44:50 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.impl;
+package org.apache.pluto.container.driver.impl;
 
 import javax.servlet.ServletContext;
 

Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InlinePortletResourceBundle.java (from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/InlinePortletResourceBundle.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InlinePortletResourceBundle.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InlinePortletResourceBundle.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/InlinePortletResourceBundle.java&r1=752156&r2=752341&rev=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/InlinePortletResourceBundle.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InlinePortletResourceBundle.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.impl;
+package org.apache.pluto.container.driver.impl;
 
 import java.util.ArrayList;
 import java.util.ListResourceBundle;

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InlinePortletResourceBundle.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PlutoContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PlutoContainerServices.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PlutoContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PlutoContainerServices.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.impl;
+package org.apache.pluto.container.driver.impl;
 
 import javax.portlet.PortalContext;
 
@@ -35,6 +35,7 @@
 import org.apache.pluto.container.driver.PortalDriverServices;
 import org.apache.pluto.container.driver.PortletContextService;
 import org.apache.pluto.container.driver.PortletRegistryService;
+import org.apache.pluto.container.impl.PortletEnvironmentServiceImpl;
 
 
 public class PlutoContainerServices implements ContainerServices, PortalDriverServices
@@ -122,7 +123,7 @@
             portletInvokerService = new DefaultPortletInvokerService(portletContextService);
         portletEnvironmentService = optionalServices.getPortletEnvironmentService();
         if (portletEnvironmentService == null)
-            portletEnvironmentService = new DefaultPortletEnvironmentService();
+            portletEnvironmentService = new PortletEnvironmentServiceImpl();
         portalAdministrationService = portalDriverServices != null ? portalDriverServices.getPortalAdministrationService() : null;
         if (portalAdministrationService == null)
             portalAdministrationService = new DefaultPortalAdministrationService();
@@ -146,7 +147,7 @@
         ccppProfileService = new DummyCCPPProfileServiceImpl();
         portletPreferencesService = new DefaultPortletPreferencesService();
         portletInvokerService = new DefaultPortletInvokerService(portletContextService);
-        portletEnvironmentService = new DefaultPortletEnvironmentService();
+        portletEnvironmentService = new PortletEnvironmentServiceImpl();
         userInfoService = new DefaultUserInfoService();
         namespaceMapper = new DefaultNamespaceMapper();
     }

Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletConfigImpl.java (from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletConfigImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletConfigImpl.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletConfigImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletConfigImpl.java&r1=752156&r2=752341&rev=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletConfigImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletConfigImpl.java Wed Mar 11 01:44:50 2009
@@ -14,17 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.impl;
+package org.apache.pluto.container.driver.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
+import java.util.Set;
 
 import javax.portlet.PortletConfig;
 import javax.xml.XMLConstants;
@@ -62,6 +64,8 @@
     protected ResourceBundleFactory bundles;
     
     protected Map<String, String[]> containerRuntimeOptions;
+    
+    protected Set<String> supportedContainerRuntimeOptions; 
 
     public PortletConfigImpl(ContainerPortletContext portletContext,
                              PortletDefinition portletDD,
@@ -69,6 +73,11 @@
         this.portletContext = portletContext;
         this.portlet = portletDD;
         this.portletApp = portletAppDD;
+        this.supportedContainerRuntimeOptions = new HashSet<String>();
+        for (Enumeration<String> e = portletContext.getContainerRuntimeOptions(); e.hasMoreElements(); )
+        {
+            supportedContainerRuntimeOptions.add(e.nextElement());
+        }
     }
 
     public String getPortletName() {
@@ -223,7 +232,7 @@
 	            for (Iterator<String> iter = containerRuntimeOptions.keySet().iterator(); iter.hasNext(); )
 	            {
 	                String key = iter.next();
-	                if (!getSupportedContainerRuntimeOptions().contains(key))
+	                if (!supportedContainerRuntimeOptions.contains(key))
 	                {
 	                    iter.remove();
 	                }
@@ -248,10 +257,4 @@
             return Collections.emptyMap();
         }
 	}
-	
-    protected List<String> getSupportedContainerRuntimeOptions()
-    {
-        return Configuration.getSupportedContainerRuntimeOptions();
-    }
-	
 }

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletConfigImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletContextImpl.java (from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContextImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletContextImpl.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletContextImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContextImpl.java&r1=752156&r2=752341&rev=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContextImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletContextImpl.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.impl;
+package org.apache.pluto.container.driver.impl;
 
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -34,6 +34,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.pluto.container.ContainerPortletContext;
 import org.apache.pluto.container.RequestDispatcherPathInfo;
+import org.apache.pluto.container.impl.PortletRequestDispatcherImpl;
+import org.apache.pluto.container.impl.RequestDispatcherPathInfoImpl;
 import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
 
 /**
@@ -117,7 +119,7 @@
      * @see Environment#getServerInfo()
      */
     public String getServerInfo() {
-        return Environment.getServerInfo();
+        return Configuration.getServerInfo();
     }
     
     public RequestDispatcherPathInfo getPathInfo(String path)
@@ -280,11 +282,11 @@
     }
 
     public int getMajorVersion() {
-        return Environment.getMajorSpecificationVersion();
+        return Configuration.getMajorSpecificationVersion();
     }
 
     public int getMinorVersion() {
-        return Environment.getMinorSpecificationVersion();
+        return Configuration.getMinorSpecificationVersion();
     }
 
     public String getMimeType(String file) {

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletContextImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletContextManager.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletContextManager.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletContextManager.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletContextManager.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.impl;
+package org.apache.pluto.container.driver.impl;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -38,9 +38,6 @@
 import org.apache.pluto.container.driver.PortletRegistryEvent;
 import org.apache.pluto.container.driver.PortletRegistryListener;
 import org.apache.pluto.container.driver.PortletRegistryService;
-import org.apache.pluto.container.impl.Configuration;
-import org.apache.pluto.container.impl.PortletConfigImpl;
-import org.apache.pluto.container.impl.PortletContextImpl;
 import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
 import org.apache.pluto.container.om.portlet.PortletDefinition;
 import org.apache.pluto.container.util.ClasspathScanner;

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletDescriptorRegistry.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletDescriptorRegistry.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletDescriptorRegistry.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletDescriptorRegistry.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.impl;
+package org.apache.pluto.container.driver.impl;
 
 import java.io.InputStream;
 import java.util.Map;

Copied: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ResourceBundleFactory.java (from r752156, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceBundleFactory.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ResourceBundleFactory.java?p2=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ResourceBundleFactory.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceBundleFactory.java&r1=752156&r2=752341&rev=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/ResourceBundleFactory.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ResourceBundleFactory.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.impl;
+package org.apache.pluto.container.driver.impl;
 
 import java.util.HashMap;
 import java.util.Locale;

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ResourceBundleFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java?rev=752341&r1=752340&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java Wed Mar 11 01:44:50 2009
@@ -144,9 +144,9 @@
         catch(Exception me) {
             throw new IOException(me.getLocalizedMessage());
         }
-        if (app.getValue() instanceof org.apache.pluto.container.portlet10.impl.PortletAppType)
+        if (app.getValue() instanceof org.apache.pluto.container.om.portlet10.impl.PortletAppType)
         {
-            return ((org.apache.pluto.container.portlet10.impl.PortletAppType)app.getValue()).upgrade();
+            return ((org.apache.pluto.container.om.portlet10.impl.PortletAppType)app.getValue()).upgrade();
         }       
         return (PortletApplicationDefinition)app.getValue();
     }
@@ -261,7 +261,7 @@
             if (PortletApplicationDefinition.JSR_168_VERSION.equals(app.getVersion()))
             {                
                 jc = JAXBContext.newInstance("org.apache.pluto.container.om.portlet10.impl");                
-                src = new org.apache.pluto.container.portlet10.impl.PortletAppType(app);
+                src = new org.apache.pluto.container.om.portlet10.impl.PortletAppType(app);
             }
             else
             {

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java?rev=752341&r1=752340&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java Wed Mar 11 01:44:50 2009
@@ -22,8 +22,8 @@
 import org.apache.pluto.container.PortletContainer;
 import org.apache.pluto.container.PortletContainerException;
 import org.apache.pluto.container.RequiredContainerServices;
+import org.apache.pluto.container.driver.impl.DefaultOptionalContainerServices;
 import org.apache.pluto.container.util.ArgumentUtility;
-import org.apache.pluto.driver.impl.DefaultOptionalContainerServices;
 
 /**
  * Factory used to create new PortletContainer instances.  The factor constructs

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerImpl.java?rev=752341&r1=752340&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerImpl.java Wed Mar 11 01:44:50 2009
@@ -53,7 +53,6 @@
 import org.apache.pluto.container.PortletResourceResponseContext;
 import org.apache.pluto.container.PortletWindow;
 import org.apache.pluto.container.RequiredContainerServices;
-import org.apache.pluto.container.util.StringManager;
 
 
 /**
@@ -71,9 +70,6 @@
     
     // Private Member Variables ------------------------------------------------
     
-    private static final StringManager EXCEPTIONS = StringManager.getManager(
-    		    		PortletContainerImpl.class.getPackage().getName());
-    
     /** The portlet container name. */
     private final String name;
     

Added: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletEnvironmentServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletEnvironmentServiceImpl.java?rev=752341&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletEnvironmentServiceImpl.java (added)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletEnvironmentServiceImpl.java Wed Mar 11 01:44:50 2009
@@ -0,0 +1,91 @@
+/*
+/*
+ * 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.container.impl;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.CacheControl;
+import javax.portlet.Event;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletSession;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.pluto.container.PortletActionResponseContext;
+import org.apache.pluto.container.PortletEnvironmentService;
+import org.apache.pluto.container.PortletEventResponseContext;
+import org.apache.pluto.container.PortletRenderResponseContext;
+import org.apache.pluto.container.PortletRequestContext;
+import org.apache.pluto.container.PortletResourceRequestContext;
+import org.apache.pluto.container.PortletResourceResponseContext;
+import org.apache.pluto.container.PortletWindow;
+
+public class PortletEnvironmentServiceImpl implements PortletEnvironmentService
+{
+    public ActionRequest createActionRequest(PortletRequestContext requestContext)
+    {
+        return new ActionRequestImpl(requestContext);
+    }
+
+    public ActionResponse createActionResponse(PortletActionResponseContext responseContext)
+    {
+        return new ActionResponseImpl(responseContext);
+    }
+
+    public EventRequest createEventRequest(PortletRequestContext requestContext, Event event)
+    {
+        return new EventRequestImpl(requestContext, event);
+    }
+
+    public EventResponse createEventResponse(PortletEventResponseContext responseContext)
+    {
+        return new EventResponseImpl(responseContext);
+    }
+
+    public PortletSession createPortletSession(PortletContext portletContext, PortletWindow portletWindow,
+                                               HttpSession session)
+    {
+        return new PortletSessionImpl(portletContext, portletWindow, session);
+    }
+
+    public RenderRequest createRenderRequest(PortletRequestContext requestContext, CacheControl cacheControl)
+    {
+        return new RenderRequestImpl(requestContext, cacheControl);
+    }
+
+    public RenderResponse createRenderResponse(PortletRenderResponseContext responseContext)
+    {
+        return new RenderResponseImpl(responseContext);
+    }
+
+    public ResourceRequest createResourceRequest(PortletResourceRequestContext requestContext, CacheControl cacheControl)
+    {
+        return new ResourceRequestImpl(requestContext, cacheControl);
+    }
+
+    public ResourceResponse createResourceResponse(PortletResourceResponseContext responseContext,
+                                                   String requestCacheLevel)
+    {
+        return new ResourceResponseImpl(responseContext, requestCacheLevel);
+    }
+}
\ No newline at end of file

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

Propchange: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletEnvironmentServiceImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferencesImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferencesImpl.java?rev=752341&r1=752340&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferencesImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletPreferencesImpl.java Wed Mar 11 01:44:50 2009
@@ -183,7 +183,7 @@
     public void setValues(String key, String[] values) throws ReadOnlyException {
         if (isReadOnly(key)) {
             throw new ReadOnlyException(EXCEPTIONS.getString(
-            		"error.preference.readonly"));
+            		"error.preference.readonly", key));
         }
         PortletPreference pref = preferences.get(key);
         if (pref != null) {
@@ -211,7 +211,7 @@
     	// Read-only preferences cannot be reset.
         if (isReadOnly(key)) {
             throw new ReadOnlyException(EXCEPTIONS.getString(
-            		"error.preference.readonly", "Preference key "));
+            		"error.preference.readonly", key));
         }
         // Try to reset preference to the default values.
         PortletPreference p = defaultPreferences.get(key);

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RenderResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RenderResponseImpl.java?rev=752341&r1=752340&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RenderResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/RenderResponseImpl.java Wed Mar 11 01:44:50 2009
@@ -24,7 +24,6 @@
 
 import org.apache.pluto.container.PortletRenderResponseContext;
 import org.apache.pluto.container.util.ArgumentUtility;
-import org.apache.pluto.container.util.StringUtils;
 
 
 /**
@@ -84,12 +83,17 @@
     public void setContentType(String contentType)
     {
         ArgumentUtility.validateNotNull("contentType", contentType);
-        String mimeType = StringUtils.getMimeTypeWithoutEncoding(contentType);
-        if (!isValidContentType(mimeType))
+        int index =contentType.indexOf(';');
+        if (index != -1)
         {
-            throw new IllegalArgumentException("Specified content type '" + mimeType + "' is not supported.");
+            contentType = contentType.substring(0, index);
         }
-        responseContext.setContentType(mimeType);
+        contentType.trim();
+        if (!isValidContentType(contentType))
+        {
+            throw new IllegalArgumentException("Specified content type '" + contentType + "' is not supported.");
+        }
+        responseContext.setContentType(contentType);
     }
     
     public void setNextPossiblePortletModes(Collection<PortletMode> portletModes)

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/ContainerRuntimeOptionType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/ContainerRuntimeOptionType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/ContainerRuntimeOptionType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/ContainerRuntimeOptionType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/CustomPortletModeType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/CustomPortletModeType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/CustomPortletModeType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/CustomPortletModeType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/CustomWindowStateType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/CustomWindowStateType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/CustomWindowStateType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/CustomWindowStateType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/DescriptionType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/DescriptionType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/DescriptionType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/DescriptionType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/DisplayNameType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/DisplayNameType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/DisplayNameType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/DisplayNameType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/InitParamType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/InitParamType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/InitParamType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/InitParamType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/ObjectFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/ObjectFactory.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/ObjectFactory.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/ObjectFactory.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlElementDecl;

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletAppType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletAppType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletAppType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletAppType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletCollectionType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletCollectionType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletCollectionType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletCollectionType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletInfoType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletInfoType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletInfoType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletInfoType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletPreferencesType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletPreferencesType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletPreferencesType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletPreferencesType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PortletType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PreferenceType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PreferenceType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PreferenceType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/PreferenceType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SecurityConstraintType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SecurityConstraintType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SecurityConstraintType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SecurityConstraintType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SecurityRoleRefType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SecurityRoleRefType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SecurityRoleRefType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SecurityRoleRefType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SupportsType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SupportsType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SupportsType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/SupportsType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/UserAttributeType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/UserAttributeType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/UserAttributeType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/UserAttributeType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/UserDataConstraintType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/UserDataConstraintType.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/UserDataConstraintType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/UserDataConstraintType.java Wed Mar 11 01:44:50 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 
 import java.util.List;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/package-info.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/package-info.java?rev=752341&r1=752156&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/package-info.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/om/portlet10/impl/package-info.java Wed Mar 11 01:44:50 2009
@@ -17,5 +17,5 @@
  * @version $Id$
  */
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.pluto.container.portlet10.impl;
+package org.apache.pluto.container.om.portlet10.impl;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/PrintWriterServletOutputStream.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/PrintWriterServletOutputStream.java?rev=752341&r1=752340&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/PrintWriterServletOutputStream.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/util/PrintWriterServletOutputStream.java Wed Mar 11 01:44:50 2009
@@ -40,17 +40,6 @@
      */
     private String characterEncoding;
 
-    /**
-     * Construct a ServletOutputStream that coordinates output using a base
-     * ServletOutputStream and a PrintWriter that is wrapped on top of that
-     * OutputStream.
-     * @deprecated use {@link PrintWriterServletOutputStream(PrintWriter,String)}
-     */
-    public PrintWriterServletOutputStream(PrintWriter pO) {
-        super();
-        mPrintWriter = pO;
-    }
-
     public PrintWriterServletOutputStream(PrintWriter pw, String encoding)
     {
         super();
@@ -141,5 +130,4 @@
     public void println() throws IOException {
         mPrintWriter.println();
     }
-
 }

Copied: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/impl/LocalStrings.properties (from r752154, portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/internal/LocalStrings.properties)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/impl/LocalStrings.properties?p2=portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/impl/LocalStrings.properties&p1=portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/internal/LocalStrings.properties&r1=752154&r2=752341&rev=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/internal/LocalStrings.properties (original)
+++ portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/impl/LocalStrings.properties Wed Mar 11 01:44:50 2009
@@ -19,4 +19,12 @@
 ######################################################################
 
 error.context.descriptor.load=Error loading portlet.xml at context {0}. Please validate the file structure of this portlet's portlet.xml file.
+warning.resourcebundle.notfound=Unable to locate Resource Bundle {0}: {1}
 
+####################################
+##       Portlet Invocation       ##
+####################################
+
+error.portlet.invoker=Unable to successfully invoke portlet.  Error during processing.
+error.portlet.invoker.dispatcher=Unable to locate request dispatcher for context {0} and portlet {1}.
+error.portlet.invoker.unavailable=Unable to invoke portlet.  Resource {0} unavailable for {1} seconds.

Propchange: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/impl/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/impl/pluto-configuration.properties (from r752154, portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/core/pluto-configuration.properties)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/impl/pluto-configuration.properties?p2=portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/impl/pluto-configuration.properties&p1=portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/core/pluto-configuration.properties&r1=752154&r2=752341&rev=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/core/pluto-configuration.properties (original)
+++ portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/impl/pluto-configuration.properties Wed Mar 11 01:44:50 2009
@@ -18,6 +18,11 @@
 #
 ######################################################################
 
-org.apache.pluto.descriptors.services.PortletAppDescriptorService=org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl
+pluto.container.name=${pluto.container.name}
+pluto.container.version=${pom.version}
+
+javax.portlet.version.major=${javax.portlet.version.major}
+javax.portlet.version.minor=${javax.portlet.version.minor}
 
+org.apache.pluto.descriptors.services.PortletAppDescriptorService=org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl
 org.apache.pluto.container.supportedContainerRuntimeOptions=test,escapeXML,value

Propchange: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/impl/pluto-configuration.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/LocalStrings.properties
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/LocalStrings.properties?rev=752341&r1=752154&r2=752341&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/LocalStrings.properties (original)
+++ portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/LocalStrings.properties Wed Mar 11 01:44:50 2009
@@ -17,20 +17,8 @@
 # limitations under the License.
 #
 ######################################################################
-javax.portlet.PortletModeException.null=PortletMode may not be null.
-
-javax.portlet.PortletModeException.portlet=PortletMode is not allowed by portlet: {0}
-
-javax.portlet.PortletModeException.portal=PortletMode not supported by portal: {0}
-
-warning.resourcebundle.notfound=Unable to locate Resource Bundle {0}: {1}
-
 error.null={0} may not be null 
 
 error.session.illegalState=PortletSession may not be retrieved before cross context portlet invocation.
 
-error.config.context.null=Error creating portlet invoker for portlet {0}.  Unable to locate context {1}.  Check your portlet configuration and ensure cross context dispatching is enabled.
-
-error.contenttype.null=setContentType must be called before {0}
-
 error.preference.readonly=Preference {0} may not be modified.  It is marked as read only.

Copied: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_1_0.xsd (from r752154, portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/descriptors/services/jaxb/portlet-app_1_0.xsd)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_1_0.xsd?p2=portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_1_0.xsd&p1=portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/descriptors/services/jaxb/portlet-app_1_0.xsd&r1=752154&r2=752341&rev=752341&view=diff
==============================================================================
    (empty)

Propchange: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_1_0.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_1_0.xsd
------------------------------------------------------------------------------
    svn:mergeinfo = 



Mime
View raw message