svn commit: r502077 [1/2] - in /incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad: trinidad-api/src/main/java/org/apache/myfaces/trinidad/config/ trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ trinidad-impl/src/main/ja...

[jw...@apache.org]

Author: jwaldman
Date: Wed Jan 31 18:09:28 2007
New Revision: 502077

URL: http://svn.apache.org/viewvc?view=rev&rev=502077
Log:
Changed the license header for our new files to match the license header of our other files.
(jwaldman-portal-pretrunkmerge branch)

Modified:
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/config/Configurator.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ExternalContextDecorator.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/ConfigParser.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/LazyValueBinding.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchRenderResponse.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchResponseConfiguratorImpl.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchServletResponse.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/PortletUploadedExternalContext.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/ServletUploadedExternalContext.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileImpl.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileProcessorImpl.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFiles.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/AbstractAttributeMap.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/EnumerationIterator.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ModifiableAbstractAttributeMap.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/NullEnumeration.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletApplicationMap.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletInitParameterMap.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletRequestMap.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletRequestParameterMap.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletRequestParameterValuesMap.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletApplicationMap.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletCookieMap.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletInitParameterMap.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestHeaderMap.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestHeaderValuesMap.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestMap.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestParameterMap.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestParameterValuesMap.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletSessionMap.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/ExternalContextUtils.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadListenerImpl.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/ActionRequestWrapper.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/ActionResponseWrapper.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletContextWrapper.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletRequestDispatcherWrapper.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletRequestWrapper.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletResponseWrapper.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/RenderRequestWrapper.java
    incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/RenderResponseWrapper.java

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/config/Configurator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/config/Configurator.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/config/Configurator.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/config/Configurator.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
 /*
- * Copyright  2004-2006 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  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.myfaces.trinidad.config;
 
@@ -40,18 +43,18 @@
  * be able to coexist, any services provided by the filter service will not
  * run in a portal and should therefore be considered optional to the run of
  * the renderkit or application if Portal compatibility is important.
- *  
+ *
  * @author Scott O'Bryan (latest modification by $Author$)
  * @author Adam Winer
- * 
+ *
  * @version $Revision$ $Date$
  */
 public abstract class Configurator
 {
   /**
    * Initializes the Configurator.  This method is guaranteed to run before
-   * any other method within this Configurator and will be called only once 
-   * per webapp context.  This init is guaranteed to be executed before 
+   * any other method within this Configurator and will be called only once
+   * per webapp context.  This init is guaranteed to be executed before
    * completion of the first call to the
    * {@link javax.faces.FacesContextFactory#getFacesContext(Object, Object, Object,javax.faces.lifecycle.Lifecycle)}
    * is completed.
@@ -70,7 +73,7 @@
 
   /**
    * Cleans up the Configurator.  This method is guaranteed to run at some
-   * point after the Servlet or Portlet context falls out of scope and will 
+   * point after the Servlet or Portlet context falls out of scope and will
    * typically be determined by the context listener.
    */
   public void destroy() {}
@@ -92,7 +95,7 @@
    * may or may not be the same as the ExternalContext provided to
    * getExternalContext().  But it will have a valid request and response
    * object.
-   * 
+   *
    * By contract, the {@link org.apache.myfaces.trinidad.context.RequestContext}
    * object will be initialized and available when this method is run.
    *
@@ -117,7 +120,7 @@
    *
    * By contract, the {@link org.apache.myfaces.trinidad.context.RequestContext}
    * object will be initialized and available when this method is run.
-   * 
+   *
    * @param externalContext the ExternalContext to wrap
    * @return a wrapper of the ExternalContext
    */
@@ -134,7 +137,7 @@
    * may or may not be the same as the ExternalContext provided to
    * getExternalContext().  But it will have a valid request and response
    * object.
-   * 
+   *
    * By contract, the {@link org.apache.myfaces.trinidad.context.RequestContext}
    * object will be initialized and available when this method is run.
    *
@@ -145,14 +148,14 @@
   /**
    * Disables Configurator services for the current request.  When this method
    * has been called on a request, then the {{@link #beginRequest(ExternalContext)},
-   * {@link #endRequest(ExternalContext)}, and 
-   * {@link #getExternalContext(ExternalContext)} methods will not be called durring 
+   * {@link #endRequest(ExternalContext)}, and
+   * {@link #getExternalContext(ExternalContext)} methods will not be called durring
    * a request.
-   * 
+   *
    * <strong>Note:</strong> is this method is called after the beginRequest() method,
    * an error will be logged in the trinidad logger and the services will continue to
    * execute.
-   * 
+   *
    * @param srq the servlet request
    */
   public static final void disableConfiguratorServices(ServletRequest srq)
@@ -163,24 +166,24 @@
   /**
    * Returns <code>true</code> if the {@link #disableConfiguratorServices(ServletRequest)}
    * has been executed on the current request and <code>false</code> if it has not.
-   * 
+   *
    * <strong>Note:</strong>it is important to understand that this method will not
    * properly reflect if the services have actually been disabled or not.  It simply
    * returns whether they "should" have been disabled.  If the disableConfiguratorServices
    * was executed after the beginRequest methods have been executed, then the services
    * will continue to function so that {{@link #getExternalContext(ExternalContext)}
    * and {@link #endRequest(ExternalContext)} will still be called.
-   * 
+   *
    * @param ec the ExternalContext object
-   * 
-   * @return a <code>boolean</code> containing <code>true</code> if the 
-   *         <code>disableConfiguratorServices()</code> method has been 
+   *
+   * @return a <code>boolean</code> containing <code>true</code> if the
+   *         <code>disableConfiguratorServices()</code> method has been
    *         called and <code>false</code> if it has not.
    */
   protected static final boolean isConfiguratorServiceDisabled(ExternalContext ec)
   {
     return Boolean.TRUE.equals(ec.getRequestMap().get(_DISABLE_SERVICES));
   }
-  
+
   static private final String _DISABLE_SERVICES =  Configurator.class.getName()+".DISABLE_SERVICES";
 }

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ExternalContextDecorator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ExternalContextDecorator.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ExternalContextDecorator.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ExternalContextDecorator.java Wed Jan 31 18:09:28 2007
@@ -1,18 +1,21 @@
 /*
-* Copyright 2006 The Apache Software Foundation.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ *  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.myfaces.trinidad.context;
 
 import java.io.IOException;

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/ConfigParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/ConfigParser.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/ConfigParser.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/ConfigParser.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
 /*
- * Copyright  2004-2006 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  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.myfaces.trinidadinternal.config;
 

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java Wed Jan 31 18:09:28 2007
@@ -1,16 +1,20 @@
-/* Copyright  2003-2006 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+/*
+ *  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.myfaces.trinidadinternal.config;
@@ -40,7 +44,7 @@
  * the Configurator class, making it more convenient to use ConfiguratorServices from within the
  * Trinidad renderkit. Where appropriate, these differences will be documented for the benifit of
  * the Trindad developer.
- * 
+ *
  * @see org.apache.myfaces.trinidad.config.Configurator
  * @author Scott O'Bryan (latest modification by $Author$)
  * @version $Revision$ $Date$
@@ -52,10 +56,10 @@
    * GlobalConfigurator is responsible for enforcing the contract on the other methods of this
    * class. This means that if {@link #init(ExternalContext)} is called multiple times, the global
    * configurator will call all subordinate configurators only once.
-   * 
+   *
    * Likewise, the GlobalConfigurator will return exceptions when the contract is expressly violated
    * (like if {@link #getExternalContext(ExternalContext)} is called before a {{@link #beginRequest(ExternalContext)}.
-   * 
+   *
    * @return a GlobalConfigurator or <code>null</code> is one was unable to be obtained.
    */
   static public final GlobalConfiguratorImpl getInstance()
@@ -91,16 +95,16 @@
     }
     return null;
   }
-  
+
   /**
    * Returns true if the request has not been stated for the current "virtual"
-   * request.  In the servlet environment this will be true after 
-   * {@link #beginRequest(ExternalContext)} is executed and before 
+   * request.  In the servlet environment this will be true after
+   * {@link #beginRequest(ExternalContext)} is executed and before
    * {@link #endRequest(ExternalContext)} is executed.  This will generally
    * happen once per request.  In the Portlet Environment, the request must be
    * be started and ended at the beginning and end of both the actionRequest
    * and the RenderRequest.
-   *  
+   *
    * @param ec
    * @return
    */
@@ -111,7 +115,7 @@
 
   /**
    * Returns "true" if the services should be considered enabled or disabled.
-   * 
+   *
    * @param ec
    * @return
    */
@@ -147,16 +151,16 @@
    * Executes the beginRequest methods of all of the configurator services. This method will also
    * initizlize the configurator if it has not already been initialized, so there may be no need to
    * call the {@link #init(ExternalContext)} method directly.
-   * 
+   *
    * This method also ensures that the requestContext is attached before the beginRequest methods
    * are called, so there is no reason to initialize the request context before calling this method.
    * In portal environments, it is important to execute this method once for each Portlet action and
    * render request so that the requestContext may be properly initialized even though the
    * underlying services will be called only once per physical request.
-   * 
+   *
    * @param externalContext
    *          the externalContext to use to begin the request.
-   * 
+   *
    * @see org.apache.myfaces.trinidad.config.Configurator#beginRequest(javax.faces.context.ExternalContext)
    */
   @SuppressWarnings("unchecked") // TODO: remove this for Faces 1.2
@@ -213,10 +217,10 @@
    * configurator services. Generally this will be called by Trinidad's context listener when the
    * context is destroyed, but it may be used manually to allow the configurator to be
    * re-initialized.
-   * 
+   *
    * Calling this method while the configurator is not initialized will not re-execute the destroy
    * methods on the services.
-   * 
+   *
    * @see org.apache.myfaces.trinidad.config.Configurator#destroy()
    */
   @Override
@@ -244,7 +248,7 @@
   /**
    * Ends the currently begun request. It is important to note that this should be executed only
    * once per physical request.
-   * 
+   *
    * @see org.apache.myfaces.trinidad.config.Configurator#endRequest(javax.faces.context.ExternalContext)
    */
   @Override
@@ -280,10 +284,10 @@
    * beginRequest(). It is important to note, however, that even though beginRequest does not need
    * to be explicitly called, {{@link #endRequest(ExternalContext)} does need to be called when the
    * request has completed or the contract to the configurators will be broken.
-   * 
+   *
    * @param externalContext
    *          the ExternalContext object that should be wrapped.
-   * 
+   *
    * @return a decorated ExternalContext object
    */
   @Override
@@ -312,10 +316,10 @@
    * is also possible to execute this method more then once, although if initialization has already
    * happened then a call to this method will not do anything. To re-initialize this class, call
    * {@link #destroy()} first and then call this method.
-   * 
+   *
    * @param externalContext
    *          the externalContext needed to initialize this class
-   * 
+   *
    * @see org.apache.myfaces.trinidad.config.Configurator#init(javax.faces.context.ExternalContext)
    */
   @Override
@@ -447,8 +451,8 @@
 
   private enum RequestType
   {
-    PORTAL_ACTION, 
-    PORTAL_RENDER, 
+    PORTAL_ACTION,
+    PORTAL_RENDER,
     SERVLET;
 
     public static void clearType(final ExternalContext ec)

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/LazyValueBinding.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/LazyValueBinding.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/LazyValueBinding.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/LazyValueBinding.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
 /*
- * Copyright  2004-2006 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  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.myfaces.trinidadinternal.config;
 

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchRenderResponse.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchRenderResponse.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchRenderResponse.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchRenderResponse.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
 /*
- * Copyright  2004-2006 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  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.myfaces.trinidadinternal.config.dispatch;
 
@@ -43,21 +46,21 @@
       if (matcher.matches())
       {
         String contentType = matcher.group(1);
-        String charset = (matcher.groupCount() > 1) ? matcher.group(2) : null; 
-        
+        String charset = (matcher.groupCount() > 1) ? matcher.group(2) : null;
+
         // capture the content type on the request
         _request.setAttribute(DispatchResponseConfiguratorImpl.__CONTENT_TYPE_KEY, contentType);
-  
+
         // TODO: use Agent APIs when available
         if ("application/xhtml+xml".equals(contentType))
         {
           //TODO: Is this still needed in IE7??
-          String userAgent = _request.getProperty("User-agent");          
+          String userAgent = _request.getProperty("User-agent");
           if (userAgent != null && userAgent.indexOf("compatible; MSIE") != -1)
           {
             // IE must serve XHTML as text/html
             contentTypeAndCharset = "text/html";
-  
+
             if (charset != null)
               contentTypeAndCharset += ";charset=" + charset;
           }
@@ -66,9 +69,9 @@
     }
     super.setContentType(contentTypeAndCharset);
   }
-  
+
   private final RenderRequest _request;
-                                   
-  static private final Pattern _CONTENT_TYPE_PATTERN = 
+
+  static private final Pattern _CONTENT_TYPE_PATTERN =
                                   Pattern.compile("([^;]+)(?:;charset=(.*))?");
 }

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchResponseConfiguratorImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchResponseConfiguratorImpl.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchResponseConfiguratorImpl.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchResponseConfiguratorImpl.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
 /*
- * Copyright  2004-2006 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  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.myfaces.trinidadinternal.config.dispatch;
 
@@ -34,7 +37,7 @@
 import org.apache.myfaces.trinidadinternal.webapp.wrappers.PortletContextWrapper;
 
 /**
- * TODO: Document this 
+ * TODO: Document this
  *
  * @author Scott O'Bryan (latest modification by $Author$)
  * @version $Revision$ $Date$
@@ -65,12 +68,12 @@
         return new ServletExternalContext(externalContext);
       }
     }
-     
-      
+
+
     //return the origional
     return externalContext;
   }
-  
+
   @SuppressWarnings("unchecked")
   static public String getContentType(
     FacesContext context)
@@ -78,14 +81,14 @@
     Map<String, Object> requestMap = context.getExternalContext().getRequestMap();
     return (String) requestMap.get(__CONTENT_TYPE_KEY);
   }
-  
+
   private class ServletExternalContext extends ExternalContextDecorator
   {
     public ServletExternalContext(ExternalContext ec)
     {
       _ec = ec;
     }
-    
+
     @Override
     public Object getResponse()
     {
@@ -93,7 +96,7 @@
       {
         _response = new DispatchServletResponse(_ec);
       }
-      
+
       return _response;
     }
 
@@ -102,7 +105,7 @@
     {
       return _ec;
     }
-    
+
     private ServletResponse  _response;
     private ExternalContext _ec;
   }
@@ -113,7 +116,7 @@
     {
       _ec = ec;
     }
-  
+
     @Override
     public Object getContext()
     {
@@ -125,12 +128,12 @@
     {
       return _getRenderResponse();
     }
-    
+
     @Override
     public void dispatch(String path) throws IOException
     {
       final PortletRequestDispatcher requestDispatcher =
-        ((PortletContext)getContext()).getRequestDispatcher(path); 
+        ((PortletContext)getContext()).getRequestDispatcher(path);
       try
       {
         requestDispatcher.include((RenderRequest)getRequest(), (RenderResponse)getResponse());
@@ -145,7 +148,7 @@
         {
           throw new FacesException(e);
         }
-      }   
+      }
     }
 
     @Override
@@ -160,9 +163,9 @@
       {
         _context = new PortletContextWrapper((PortletContext)_ec.getContext());
       }
-      return _context;     
+      return _context;
     }
-    
+
     private RenderResponse _getRenderResponse()
     {
       if(_response == null)
@@ -171,15 +174,15 @@
       }
       return _response;
     }
-    
+
     private ExternalContext _ec;
     private RenderResponse _response;
     private PortletContext _context;
   }
-  
+
   /**
    * Returns <code>true</code> if the request wrapper has been applied.
-   * 
+   *
    * @param context
    * @return
    */
@@ -187,18 +190,18 @@
   {
     return (context.getRequestMap().get(_APPLIED)!=null);
   }
-  
+
   /**
-   * 
+   *
    */
   @SuppressWarnings("unchecked")
   static public void apply(ExternalContext context)
   {
     context.getRequestMap().put(_APPLIED, Boolean.TRUE);
   }
-  
+
   static private final String _APPLIED =
     DispatchResponseConfiguratorImpl.class.getName()+".APPLIED";
-  static final String __CONTENT_TYPE_KEY = 
+  static final String __CONTENT_TYPE_KEY =
     DispatchResponseConfiguratorImpl.class.getName() + ".CONTENT_TYPE";
 }

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchServletResponse.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchServletResponse.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchServletResponse.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchServletResponse.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
 /*
- * Copyright  2004-2006 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  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.myfaces.trinidadinternal.config.dispatch;
 
@@ -42,11 +45,11 @@
       if (matcher.matches())
       {
         String contentType = matcher.group(1);
-        String charset = (matcher.groupCount() > 1) ? matcher.group(2) : null; 
-        
+        String charset = (matcher.groupCount() > 1) ? matcher.group(2) : null;
+
         // capture the content type on the request
         _request.setAttribute(DispatchResponseConfiguratorImpl.__CONTENT_TYPE_KEY, contentType);
-  
+
         // TODO: use Agent APIs when available
         if ("application/xhtml+xml".equals(contentType))
         {
@@ -55,7 +58,7 @@
           {
             // IE must serve XHTML as text/html
             contentTypeAndCharset = "text/html";
-  
+
             if (charset != null)
               contentTypeAndCharset += ";charset=" + charset;
           }
@@ -64,10 +67,10 @@
     }
     super.setContentType(contentTypeAndCharset);
   }
-  
+
    private final HttpServletRequest _request;
- 
-                                  
-  static private final Pattern _CONTENT_TYPE_PATTERN = 
+
+
+  static private final Pattern _CONTENT_TYPE_PATTERN =
                                   Pattern.compile("([^;]+)(?:;charset=(.*))?");
 }

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,21 @@
 /*
- * Copyright  2004-2006 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+/*
+ *  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.myfaces.trinidadinternal.config.upload;
 
@@ -39,10 +43,10 @@
  */
 public class FileUploadConfiguratorImpl extends Configurator
 {
-  
+
   /**
    * Returns the added parameters
-   * 
+   *
    * @param externalContext
    * @return
    */
@@ -50,13 +54,13 @@
   {
     @SuppressWarnings("unchecked")
     Map<String, String[]> map = (Map<String, String[]>) externalContext.getRequestMap().get(_PARAMS);
-    
+
     return map;
   }
-  
+
   /**
    * Returns <code>true</code> if the request wrapper has been applied.
-   * 
+   *
    * @param context
    * @return
    */
@@ -64,9 +68,9 @@
   {
     return (context.getRequestMap().get(_APPLIED)!=null);
   }
-  
+
   /**
-   * 
+   *
    */
   @SuppressWarnings("unchecked")
   static public void apply(ExternalContext context)
@@ -93,8 +97,8 @@
     // large allocations of memory and file, so cleaning up as soon
     // as possible is a good thing
     //Process MultipartForm if need be
-    if (MultipartFormHandler.isMultipartRequest(externalContext) && 
-       (externalContext.getRequest() instanceof HttpServletRequest || 
+    if (MultipartFormHandler.isMultipartRequest(externalContext) &&
+       (externalContext.getRequest() instanceof HttpServletRequest ||
           ExternalContextUtils.isPortlet(externalContext)))
     {
       try
@@ -109,7 +113,7 @@
 
         final HashMap<String, String[]> parameters = new HashMap<String, String[]>();
         MultipartFormItem item;
-        final UploadedFiles files = new UploadedFiles(externalContext); 
+        final UploadedFiles files = new UploadedFiles(externalContext);
         while ((item = mfh.getNextPart()) != null)
         {
           final String name = item.getName();
@@ -158,19 +162,19 @@
   {
     //Wrap only if there are parameters present
     Map<String, String[]> addedParams = getAddedParameters(externalContext);
-    
+
     if(addedParams != null)
     {
       @SuppressWarnings("unchecked")
       Map<String, String[]> parameters = new HashMap<String, String[]>(externalContext.getRequestParameterValuesMap());
       parameters.putAll(addedParams);
-      
+
       // TODO sobryan (dependency = JSF 1.2)
       // For JSF 1.2, we can probably simply wrap the request objects and set them on
       // the existing ExternalContext.
       return _getExternalContextWrapper(externalContext, addedParams);
     }
-    
+
     return externalContext;
   }
 
@@ -183,7 +187,7 @@
     super.init(externalContext);
     //TODO initialize _maxAllowedBytes
   }
-  
+
   private void _doUploadFile(
       final RequestContext   context,
       final ExternalContext  externalContext,
@@ -207,7 +211,7 @@
       }
     }
   }
-  
+
   static private ExternalContext _getExternalContextWrapper(ExternalContext externalContext, Map<String, String[]> addedParams)
   {
     if(!isApplied(externalContext))
@@ -227,7 +231,7 @@
         return new PortletUploadedExternalContext(externalContext, addedParams);
       }
     }
-    
+
     //If we don't have any wrapped params or we have a render portal request,
     //return the origional external context
     return externalContext;

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/PortletUploadedExternalContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/PortletUploadedExternalContext.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/PortletUploadedExternalContext.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/PortletUploadedExternalContext.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
 /*
- * Copyright  2004-2006 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  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.myfaces.trinidadinternal.config.upload;
 
@@ -35,7 +38,7 @@
 import org.apache.myfaces.trinidadinternal.webapp.wrappers.ActionRequestWrapper;
 
 /**
- * TODO: Document this 
+ * TODO: Document this
  *
  * @author Scott O'Bryan (latest modification by $Author$)
  * @version $Revision$ $Date$
@@ -47,14 +50,14 @@
   {
     _externalContext = externalContext;
     FileUploadConfiguratorImpl.apply(externalContext);
-    
+
     @SuppressWarnings("unchecked")
     Map<String, String[]> params = new HashMap<String, String[]>(externalContext.getRequestParameterValuesMap());
     params.putAll(extractedParams);
-    
+
     _wrappedRequest  = new PortletUploadRequestWrapper((ActionRequest)_externalContext.getRequest(), (ActionResponse)_externalContext.getResponse(), params);
   }
-  
+
   /* (non-Javadoc)
    * @see org.apache.myfaces.trinidadinternal.context.ExternalContextDecorator#getRequest()
    */
@@ -73,7 +76,7 @@
     if(_requestParameterMap == null)
     {
       _requestParameterMap = new PortletRequestParameterMap(_wrappedRequest);
-    }        
+    }
     return _requestParameterMap;
   }
 
@@ -86,14 +89,14 @@
     if(_requestParameterNames == null)
     {
       if(_requestParameterMap != null)
-      {        
+      {
         _requestParameterNames = _requestParameterMap.keySet().iterator();
       }
       else
       {
         _requestParameterNames = getRequestParameterValuesMap().keySet().iterator();
       }
-    }  
+    }
     return _requestParameterNames;
   }
 
@@ -111,7 +114,7 @@
   }
 
   private ExternalContext _externalContext;
-  private PortletRequest _wrappedRequest;  
+  private PortletRequest _wrappedRequest;
   private Map<String, String>   _requestParameterMap;
   private Map<String, String[]> _requestParameterValuesMap;
   private Iterator<String>      _requestParameterNames;
@@ -124,7 +127,7 @@
   {
     return _externalContext;
   }
-  
+
   private class PortletUploadRequestWrapper extends ActionRequestWrapper
   {
     public PortletUploadRequestWrapper(
@@ -134,17 +137,17 @@
     {
       super(request);
       _response = response;
-      
-      @SuppressWarnings("unchecked") 
+
+      @SuppressWarnings("unchecked")
       Map<String, String[]> origionalMap = super.getParameterMap();
-      
+
       _extractedParams = new HashMap<String, String[]>(origionalMap);
       _extractedParams.putAll(params);
-      
+
       //add these params to the render request
       response.setRenderParameters(_extractedParams);
     }
-    
+
     /**
      * Hide the content type so that no one tries to re-download the
      * uploaded files.
@@ -166,11 +169,11 @@
       if (_LOG.isFine())
         _LOG.fine("Switching encoding of wrapper to " + encoding);
 
-      _extractedAndDecodedParams = 
+      _extractedAndDecodedParams =
         new HashMap<String, String[]>(_extractedParams.size());
-        
+
       byte[] buffer = new byte[256];
-      
+
       for(Map.Entry<String, String[]> entry : _extractedParams.entrySet())
       {
         String key = entry.getKey();
@@ -253,6 +256,6 @@
     private static final String _WWW_FORM_URLENCODED_TYPE =
       "application/x-www-form-urlencoded";
   }
-  
+
   private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(PortletUploadedExternalContext.class);
 }

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/ServletUploadedExternalContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/ServletUploadedExternalContext.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/ServletUploadedExternalContext.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/ServletUploadedExternalContext.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
 /*
- * Copyright  2004-2006 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  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.myfaces.trinidadinternal.config.upload;
 
@@ -27,26 +30,26 @@
 import org.apache.myfaces.trinidadinternal.context.external.ServletRequestParameterValuesMap;
 
 /**
- * TODO: Document this 
+ * TODO: Document this
  *
  * @author Scott O'Bryan (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
 
 class ServletUploadedExternalContext extends ExternalContextDecorator
-{ 
+{
   ServletUploadedExternalContext(ExternalContext externalContext, Map<String, String[]> extractedParams)
   {
     _externalContext = externalContext;
     FileUploadConfiguratorImpl.apply(externalContext);
-    
+
     @SuppressWarnings("unchecked")
     Map<String, String[]> params = new HashMap<String, String[]>(externalContext.getRequestParameterValuesMap());
     params.putAll(extractedParams);
-    
+
     _wrappedRequest  = new UploadRequestWrapper((HttpServletRequest)_externalContext.getRequest(), params);
   }
-  
+
   /* (non-Javadoc)
    * @see org.apache.myfaces.trinidadinternal.context.ExternalContextDecorator#getRequest()
    */
@@ -65,7 +68,7 @@
     if(_requestParameterMap == null)
     {
       _requestParameterMap = new ServletRequestParameterMap(_wrappedRequest);
-    }        
+    }
     return _requestParameterMap;
   }
 
@@ -78,14 +81,14 @@
     if(_requestParameterNames == null)
     {
       if(_requestParameterMap != null)
-      {        
+      {
         _requestParameterNames = _requestParameterMap.keySet().iterator();
       }
       else
       {
         _requestParameterNames = getRequestParameterValuesMap().keySet().iterator();
       }
-    }  
+    }
     return _requestParameterNames;
   }
 
@@ -103,7 +106,7 @@
   }
 
   private ExternalContext _externalContext;
-  private HttpServletRequest _wrappedRequest;  
+  private HttpServletRequest _wrappedRequest;
   private Map<String, String>   _requestParameterMap;
   private Map<String, String[]> _requestParameterValuesMap;
   private Iterator<String>      _requestParameterNames;

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileImpl.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileImpl.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileImpl.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
 /*
- * Copyright  2002-2006 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  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.myfaces.trinidadinternal.config.upload;
 
@@ -33,17 +36,17 @@
 /**
  * UploadedFileImpl defines a single file that has been uploaded
  * to the server.
- * 
+ *
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/webapp/UploadedFileImpl.java#0 $) $Date: 10-nov-2005.18:49:03 $
  * @author The Oracle ADF Faces Team
  */
 public class UploadedFileImpl implements UploadedFile, Serializable
 {
   /**
-   * 
+   *
    */
   private static final long serialVersionUID = 1592383482116327497L;
-  
+
   UploadedFileImpl()
   {
   }
@@ -138,7 +141,7 @@
 
   /**
    * Disposes of all resources used to store this file.
-   */ 
+   */
   public void dispose()
   {
     _length = 0;
@@ -149,7 +152,7 @@
       _file = null;
     }
   }
-  
+
   /**
    * Loads the file from a MultipartFormItem.
    */
@@ -161,7 +164,7 @@
   {
     _filename    = file.getFilename();
     _contentType = file.getContentType();
-    
+
     InputStream in = file.getInputStream();
 
     // First step: try to read it into memory.  Instead of trying
@@ -185,7 +188,7 @@
       if (_buffers == null)
         _buffers = new ArrayList<byte[]>();
       _buffers.add(buffer);
-      
+
       // If we're done, bail right here.
       if (bytes < size)
         return;
@@ -202,7 +205,7 @@
     }
 
     OutputStream out = _createOutputStream(directory);
-      
+
     try
     {
       // First, copy the file from memory to the file
@@ -210,10 +213,10 @@
       {
         _writeFile(out);
       }
-      
+
       // Free the buffers, since we're
       _buffers = null;
-      
+
       // Now, write directly to the file.
       while (_length < remainingDiskSpace)
       {
@@ -241,7 +244,7 @@
       }
     }
   }
-  
+
   @Override
   public int hashCode()
   {
@@ -307,7 +310,7 @@
       int bytes = in.read(buffer, offset, size - offset);
       if (bytes < 0)
         break;
-      
+
       offset = offset + bytes;
     }
     while (offset < size);
@@ -340,10 +343,10 @@
 
       int bufferSize = _getBufferSize(buffer, bufferIndex);
       _advanceTo(_bufferPos + 1, bufferSize);
-     
-      return currByte & 0xff; 
+
+      return currByte & 0xff;
     }
-    
+
     // Read into a buffer.
     @Override
     public int read(byte b[], int off, int len)
@@ -354,7 +357,7 @@
 
       byte[] buffer = _getBuffer(bufferIndex);
       int bufferSize = _getBufferSize(buffer, bufferIndex);
-      
+
       // Read as many bytes are available in the current buffer block,
       // up to "len" bytes.  If "len" is larger, then in theory
       // we could loop and read multiple blocks, but that'd complicate
@@ -364,7 +367,7 @@
       int bytes = Math.min(len, bufferSize - bufferPos);
       System.arraycopy(buffer, bufferPos, b, off, bytes);
       _advanceTo(bufferPos + bytes, bufferSize);
-     
+
       return bytes;
     }
 
@@ -407,7 +410,7 @@
     {
       if (bufferIndex == _bufferList.size() - 1)
         return _sizeOfLastBuffer;
-      
+
       return buffer.length;
     }
 

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileProcessorImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileProcessorImpl.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileProcessorImpl.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileProcessorImpl.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
 /*
- * Copyright  2002-2006 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  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.myfaces.trinidadinternal.config.upload;
 
@@ -76,7 +79,7 @@
         _maxMemory = _DEFAULT_MAX_MEMORY;
       }
     }
-      
+
     if (_maxDiskSpace == -1)
     {
       String maxDiskSpace = info.initParams.get(MAX_DISK_SPACE_PARAM_NAME);
@@ -96,7 +99,7 @@
         _maxDiskSpace = _DEFAULT_MAX_DISK_SPACE;
       }
     }
-    
+
     if (_tempDir == null)
     {
       _tempDir = info.initParams.get(TEMP_DIR_PARAM_NAME);
@@ -114,7 +117,7 @@
 
   public UploadedFile processFile(
       Object request, UploadedFile tempFile) throws IOException
-  {   
+  {
     RequestInfo info = _getRequestInfo(request);
 
     // Process one new file, loading only as much as can fit
@@ -153,57 +156,57 @@
 
 
     RequestInfo info = (RequestInfo) attributes.get(_REQUEST_INFO_KEY);
-    
+
     if (info == null)
     {
       info = new RequestInfo();
       attributes.put(_REQUEST_INFO_KEY, info);
     }
-    
+
     return info;
   }
-  
+
   private static final ContextInfo _getServletContextInfo(final Object context)
   {
     assert(context instanceof ServletContext);
-    
+
     final ServletContext sContext = (ServletContext)context;
     return new ContextInfo(
              new ServletInitParameterMap(sContext),
              new ServletApplicationMap(sContext));
   }
-  
+
   private static final ContextInfo _getPortletContextInfo(final Object context)
   {
     assert(context instanceof PortletContext);
-    
+
     final PortletContext pContext = (PortletContext)context;
     return new ContextInfo(
              new PortletInitParameterMap(pContext),
              new PortletApplicationMap(pContext));
   }
-  
+
   private static final Map<String, Object> _getServletRequestMap(final Object request)
   {
     assert(request instanceof ServletRequest);
-    
+
     return new ServletRequestMap((ServletRequest) request);
   }
-  
+
   private static final Map<String, Object> _getPortletRequestMap(final Object request)
   {
     assert(request instanceof PortletRequest);
-    
+
     return new PortletRequestMap((PortletRequest) request);
   }
 
-  
+
   static private class RequestInfo
   {
     public long totalBytesInMemory;
     public long totalBytesOnDisk;
   }
-  
+
   static private class ContextInfo
   {
     public ContextInfo(Map<String,String> init, Map<String, Object> attrib)
@@ -211,11 +214,11 @@
       initParams= init;
       attributes = attrib;
     }
-    
+
     public Map<String, String> initParams;
     public Map<String, Object> attributes;
   }
-  
+
   private long   _maxMemory = -1;
   private long   _maxDiskSpace = -1;
   private String _tempDir = null;
@@ -225,13 +228,13 @@
 
   private static final String _REQUEST_INFO_KEY = UploadedFileProcessorImpl.class.getName()+
     ".UploadedFilesInfo";
-  
-  private static final TrinidadLogger _LOG = 
+
+  private static final TrinidadLogger _LOG =
     TrinidadLogger.createTrinidadLogger(UploadedFileProcessorImpl.class);
-  
+
   private static final Class          _PORTLET_CONTEXT_CLASS;
   private static final Class          _PORTLET_REQUEST_CLASS;
-  
+
   static
   {
     Class context;

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFiles.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFiles.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFiles.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFiles.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
 /*
- * Copyright  2002-2006 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  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.myfaces.trinidadinternal.config.upload;
 
@@ -36,7 +39,7 @@
 /**
  * UploadedFiles defines the set of files that have been uploaded
  * to the server.
- * 
+ *
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/webapp/UploadedFiles.java#0 $) $Date: 10-nov-2005.18:49:05 $
  * @author The Oracle ADF Faces Team
  */
@@ -48,7 +51,7 @@
   @SuppressWarnings("unchecked")
   static public UploadedFiles getUploadedFiles(FacesContext context)
   {
-    Map<String, Object> requestMap = 
+    Map<String, Object> requestMap =
       context.getExternalContext().getRequestMap();
     return (UploadedFiles) requestMap.get(_UPLOADED_FILES_KEY);
   }
@@ -64,7 +67,7 @@
       externalContext.getRequestMap().get(_UPLOADED_FILES_KEY);
     _setCharacterEncoding(files, encoding);
   }
-  
+
   static public void setCharacterEncoding(
       HttpServletRequest req,
       String encoding)
@@ -73,7 +76,7 @@
       req.getAttribute(_UPLOADED_FILES_KEY);
     _setCharacterEncoding(files, encoding);
   }
-  
+
   static public void setCharacterEncoding(
       PortletRequest req,
       String encoding)
@@ -150,7 +153,7 @@
    */
   void __put(String name, UploadedFile file)
   {
-    _map.put(name, file); 
+    _map.put(name, file);
   }
 
 
@@ -178,16 +181,16 @@
   private String _characterEncoding;
   private final Map<String, UploadedFile> _map;
 
-  private static final String _UPLOADED_FILES_KEY = 
+  private static final String _UPLOADED_FILES_KEY =
     "org.apache.myfaces.trinidadinternal.webapp.UploadedFiles";
 
   static public class FixFilename implements UploadedFile, Serializable
   {
     /**
-     * 
+     *
      */
     private static final long serialVersionUID = -8586594511769079566L;
-    
+
     public FixFilename()
     {
       // For serialization
@@ -198,7 +201,7 @@
       _file = file;
       _encoding = encoding;
     }
-    
+
     public String getFilename()
     {
       String filename = _file.getFilename();

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/AbstractAttributeMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/AbstractAttributeMap.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/AbstractAttributeMap.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/AbstractAttributeMap.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
 /*
- * Copyright 2004 The Apache Software Foundation.
+ *  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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ *  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.myfaces.trinidadinternal.context.external;
 
@@ -27,7 +30,7 @@
  * Helper Map implementation for use with different Attribute Maps.
  * This was origionally taken from MyFaces.
  *
- * @author Anton Koinov 
+ * @author Anton Koinov
  * @author Scott O'Bryan  (latest modification by $Author$)
  * @version $Revision$ $Date$
  */

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/EnumerationIterator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/EnumerationIterator.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/EnumerationIterator.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/EnumerationIterator.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
 /*
- * Copyright 2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  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.myfaces.trinidadinternal.context.external;
 
@@ -20,7 +23,7 @@
 
 /**
  * This was origionally taken from MyFaces
- * 
+ *
  * @author Manfred Geiler
  * @author Scott O'Bryan (latest modification by $Author$)
  * @version $Revision$ $Date$

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ModifiableAbstractAttributeMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ModifiableAbstractAttributeMap.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ModifiableAbstractAttributeMap.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ModifiableAbstractAttributeMap.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
 /*
- * Copyright  2004-2006 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  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.myfaces.trinidadinternal.context.external;
 
@@ -24,7 +27,7 @@
  * Helper Map implementation for use with different modifiable
  * Attribute Maps.
  * This was origionally taken from MyFaces.
- * 
+ *
  * @author Scott O'Bryan (latest modification by $Author$)
  * @version $Revision$ $Date$
  */

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/NullEnumeration.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/NullEnumeration.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/NullEnumeration.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/NullEnumeration.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
 /*
- * Copyright 2004 The Apache Software Foundation.
+ *  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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ *  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.myfaces.trinidadinternal.context.external;
 
@@ -19,7 +22,7 @@
 
 /**
  * Enumeration without elements. This was origionally taken from MyFaces.
- * 
+ *
  * @author Anton Koinov
  * @author Scott O'Bryan (latest modification by $Author$)
  * @version $Revision$ $Date$

Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletApplicationMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletApplicationMap.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletApplicationMap.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletApplicationMap.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
 /*
- * Copyright 2004 The Apache Software Foundation.
+ *  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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
- *      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.
+ *  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.myfaces.trinidadinternal.context.external;