struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject svn commit: r471756 [14/31] - in /struts/struts2/trunk: apps/blank/ apps/blank/src/main/java/example/ apps/blank/src/test/java/example/ apps/mailreader/src/main/java/mailreader2/ apps/portlet/src/main/java/org/apache/struts2/portlet/example/ apps/portl...
Date Mon, 06 Nov 2006 15:02:22 GMT
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.portlet;
 
@@ -33,17 +36,17 @@
  * A simple implementation of the {@link java.util.Map} interface to handle a collection of portlet session
  * attributes. The {@link #entrySet()} method enumerates over all session attributes and creates a Set of entries.
  * Note, this will occur lazily - only when the entry set is asked for.
- * 
+ *
  */
 public class PortletSessionMap extends AbstractMap {
-    
+
     private static final Log LOG = LogFactory.getLog(PortletSessionMap.class);
 
     private PortletSession session = null;
     private Set<Object> entries = null;
 
     /**
-     * Creates a new session map given a portlet request. 
+     * Creates a new session map given a portlet request.
      *
      * @param request the portlet request object.
      */
@@ -112,7 +115,7 @@
     /**
      * Returns the session attribute associated with the given key or
      * <tt>null</tt> if it doesn't exist.
-     * 
+     *
      * @param key the name of the session attribute.
      * @return the session attribute or <tt>null</tt> if it doesn't exist.
      */
@@ -124,7 +127,7 @@
 
     /**
      * Saves an attribute in the session.
-     * 
+     *
      * @param key the name of the session attribute.
      * @param value the value to set.
      * @return the object that was just set.
@@ -150,7 +153,7 @@
 
     /**
      * Removes the specified session attribute.
-     * 
+     *
      * @param key the name of the attribute to remove.
      * @return the value that was removed or <tt>null</tt> if the value was
      * not found (and hence, not removed).

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.portlet.context;
 
@@ -34,7 +37,7 @@
 
 /**
  * PortletActionContext. ActionContext thread local for the portlet environment.
- * 
+ *
  * @version $Revision$ $Date$
  */
 public class PortletActionContext implements PortletActionConstants {
@@ -103,7 +106,7 @@
         }
         return (ActionResponse) getContext().get(RESPONSE);
     }
-    
+
     /**
      * Get the action namespace of the portlet. Used to organize actions for multiple portlets in
      * the same portlet application.
@@ -162,7 +165,7 @@
     private static ActionContext getContext() {
         return ActionContext.getContext();
     }
-    
+
     /**
      * Check to see if the current request is a portlet request.
      *
@@ -183,7 +186,7 @@
 
     /**
      * Get the namespace to mode mappings.
-     * 
+     *
      * @return The map of the namespaces for each mode.
      */
     public static Map getModeNamespaceMap() {

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.portlet.context;
 
@@ -32,18 +35,18 @@
 import com.opensymphony.xwork2.ActionContext;
 
 /**
- * Since a portlet is not dispatched the same way as a servlet, the 
- * {@link org.apache.struts2.ServletActionContext} is not immediately available, as it 
+ * Since a portlet is not dispatched the same way as a servlet, the
+ * {@link org.apache.struts2.ServletActionContext} is not immediately available, as it
  * depends on objects from the servlet API. However, the WW2 view implementations require access
  * to the objects in the {@link org.apache.struts2.ServletActionContext}, and this servlet
  * makes sure that these are available when the portlet actions are executing the render results.
- * 
+ *
  */
 public class PreparatorServlet extends HttpServlet implements StrutsStatics {
 
-	private static final long serialVersionUID = 1853399729352984089L;
-	
-	private final static Log LOG = LogFactory.getLog(PreparatorServlet.class);
+    private static final long serialVersionUID = 1853399729352984089L;
+
+    private final static Log LOG = LogFactory.getLog(PreparatorServlet.class);
 
     /**
      * Prepares the {@link org.apache.struts2.ServletActionContext} with the

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.portlet.context;
 
@@ -22,12 +25,12 @@
 import javax.servlet.ServletContextListener;
 
 /**
- * Some of the factory/managers (e.g. the ObjectFactory) need access to 
+ * Some of the factory/managers (e.g. the ObjectFactory) need access to
  * the {@link org.apache.struts2.ServletActionContext} object when initializing.
- * This {@link javax.servlet.ServletContextListener} keeps a reference to the 
+ * This {@link javax.servlet.ServletContextListener} keeps a reference to the
  * {@link javax.servlet.ServletContext} and exposes it through a <code>public static</code>
  * method.
- * 
+ *
  */
 public class ServletContextHolderListener implements ServletContextListener {
 
@@ -42,19 +45,19 @@
 
     /**
      * Stores the reference to the {@link ServletContext}.
-     * 
+     *
      * @see javax.servlet.ServletContextListener#contextInitialized(javax.servlet.ServletContextEvent)
      */
     public void contextInitialized(ServletContextEvent event) {
         context = event.getServletContext();
-        
+
     }
 
     /**
      * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent)
      */
     public void contextDestroyed(ServletContextEvent event) {
-    	context = null;
+        context = null;
     }
 
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.portlet.dispatcher;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.portlet.dispatcher;
 
@@ -70,55 +73,55 @@
  * but adjusted to a portal environment. The portlet is configured through the <tt>portlet.xml</tt>
  * descriptor. Examples and descriptions follow below:
  * </p>
- * <!-- END SNIPPET: javadoc --> 
- * 
+ * <!-- END SNIPPET: javadoc -->
+ *
  * @author <a href="nils-helge.garli@bekk.no">Nils-Helge Garli </a>
  * @author Rainer Hermanns
- * 
+ *
  * <p><b>Init parameters</b></p>
  * <!-- START SNIPPET: params -->
  * <table class="confluenceTable">
  * <tr>
- * 	<th class="confluenceTh">Name</th>
+ *  <th class="confluenceTh">Name</th>
  * <th class="confluenceTh">Description</th>
  * <th class="confluenceTh">Default value</th>
  * </tr>
  * <tr>
- * 	<td class="confluenceTd">portletNamespace</td><td class="confluenceTd">The namespace for the portlet in the xwork configuration. This 
- * 		namespace is prepended to all action lookups, and makes it possible to host multiple 
- * 		portlets in the same portlet application. If this parameter is set, the complete namespace 
- * 		will be <tt>/portletNamespace/modeNamespace/actionName</tt></td><td class="confluenceTd">The default namespace</td>
+ *  <td class="confluenceTd">portletNamespace</td><td class="confluenceTd">The namespace for the portlet in the xwork configuration. This
+ *      namespace is prepended to all action lookups, and makes it possible to host multiple
+ *      portlets in the same portlet application. If this parameter is set, the complete namespace
+ *      will be <tt>/portletNamespace/modeNamespace/actionName</tt></td><td class="confluenceTd">The default namespace</td>
  * </tr>
  * <tr>
- *  <td class="confluenceTd">viewNamespace</td><td class="confluenceTd">Base namespace in the xwork configuration for the <tt>view</tt> portlet 
- * 		mode</td><td class="confluenceTd">The default namespace</td>
+ *  <td class="confluenceTd">viewNamespace</td><td class="confluenceTd">Base namespace in the xwork configuration for the <tt>view</tt> portlet
+ *      mode</td><td class="confluenceTd">The default namespace</td>
  * </tr>
  * <tr>
- *  <td class="confluenceTd">editNamespace</td><td class="confluenceTd">Base namespace in the xwork configuration for the <tt>edit</tt> portlet 
- * 		mode</td><td class="confluenceTd">The default namespace</td>
+ *  <td class="confluenceTd">editNamespace</td><td class="confluenceTd">Base namespace in the xwork configuration for the <tt>edit</tt> portlet
+ *      mode</td><td class="confluenceTd">The default namespace</td>
  * </tr>
  * <tr>
- *  <td class="confluenceTd">helpNamespace</td><td class="confluenceTd">Base namespace in the xwork configuration for the <tt>help</tt> portlet 
- * 		mode</td><td class="confluenceTd">The default namespace</td>
+ *  <td class="confluenceTd">helpNamespace</td><td class="confluenceTd">Base namespace in the xwork configuration for the <tt>help</tt> portlet
+ *      mode</td><td class="confluenceTd">The default namespace</td>
  * </tr>
  * <tr>
  *  <td class="confluenceTd">defaultViewAction</td><td class="confluenceTd">Default action to invoke in the <tt>view</tt> portlet mode if no action is
- * 		specified</td><td class="confluenceTd"><tt>default</tt></td>
+ *      specified</td><td class="confluenceTd"><tt>default</tt></td>
  * </tr>
  * <tr>
  *  <td class="confluenceTd">defaultEditAction</td><td class="confluenceTd">Default action to invoke in the <tt>edit</tt> portlet mode if no action is
- * 		specified</td><td class="confluenceTd"><tt>default</tt></td>
+ *      specified</td><td class="confluenceTd"><tt>default</tt></td>
  * </tr>
  * <tr>
  *  <td class="confluenceTd">defaultHelpAction</td><td class="confluenceTd">Default action to invoke in the <tt>help</tt> portlet mode if no action is
- * 		specified</td><td class="confluenceTd"><tt>default</tt></td>
+ *      specified</td><td class="confluenceTd"><tt>default</tt></td>
  * </tr>
  * </table>
  * <!-- END SNIPPET: params -->
  * <p><b>Example:</b></p>
  * <pre>
  * <!-- START SNIPPET: example -->
- * 
+ *
  * &lt;init-param&gt;
  *     &lt;!-- The view mode namespace. Maps to a namespace in the xwork config file --&gt;
  *     &lt;name&gt;viewNamespace&lt;/name&gt;
@@ -126,7 +129,7 @@
  * &lt;/init-param&gt;
  * &lt;init-param&gt;
  *    &lt;!-- The default action to invoke in view mode --&gt;
- *	  &lt;name&gt;defaultViewAction&lt;/name&gt;
+ *    &lt;name&gt;defaultViewAction&lt;/name&gt;
  *    &lt;value&gt;index&lt;/value&gt;
  * &lt;/init-param&gt;
  * &lt;init-param&gt;
@@ -137,7 +140,7 @@
  * &lt;init-param&gt;
  *     &lt;!-- The default action to invoke in view mode --&gt;
  *     &lt;name&gt;defaultEditAction&lt;/name&gt;
- *	   &lt;value&gt;index&lt;/value&gt;
+ *     &lt;value&gt;index&lt;/value&gt;
  * &lt;/init-param&gt;
  * &lt;init-param&gt;
  *     &lt;!-- The view mode namespace. Maps to a namespace in the xwork config file --&gt;
@@ -149,7 +152,7 @@
  *     &lt;name&gt;defaultHelpAction&lt;/name&gt;
  *     &lt;value&gt;index&lt;/value&gt;
  * &lt;/init-param&gt;
- *   
+ *
  * <!-- END SNIPPET: example -->
  * </pre>
  */
@@ -165,7 +168,7 @@
     private Map<PortletMode,ActionMapping> actionMap = new HashMap<PortletMode,ActionMapping>(3);
 
     private String portletNamespace = null;
-    
+
     private Dispatcher dispatcherUtils;
 
     /**
@@ -460,7 +463,7 @@
     /**
      * Returns a Map of all application attributes. Copies all attributes from
      * the {@link PortletActionContext}into an {@link ApplicationMap}.
-     * 
+     *
      * @return a Map of all application attributes.
      */
     protected Map getApplicationMap() {
@@ -472,7 +475,7 @@
      * same as the portlet mode. E.g, view mode is mapped to namespace
      * <code>view</code>, and edit mode is mapped to the namespace
      * <code>edit</code>
-     * 
+     *
      * @param request the PortletRequest object.
      * @return the namespace of the action.
      */
@@ -531,7 +534,7 @@
     /**
      * Returns a Map of all request parameters. This implementation just calls
      * {@link PortletRequest#getParameterMap()}.
-     * 
+     *
      * @param request the PortletRequest object.
      * @return a Map of all request parameters.
      * @throws IOException if an exception occurs while retrieving the parameter
@@ -545,7 +548,7 @@
      * Returns a Map of all request attributes. The default implementation is to
      * wrap the request in a {@link RequestMap}. Override this method to
      * customize how request attributes are mapped.
-     * 
+     *
      * @param request the PortletRequest object.
      * @return a Map of all request attributes.
      */
@@ -557,7 +560,7 @@
      * Returns a Map of all session attributes. The default implementation is to
      * wrap the reqeust in a {@link SessionMap}. Override this method to
      * customize how session attributes are mapped.
-     * 
+     *
      * @param request the PortletRequest object.
      * @return a Map of all session attributes.
      */
@@ -576,7 +579,7 @@
     /**
      * Check to see if the action parameter is valid for the current portlet mode. If the portlet
      * mode has been changed with the portal widgets, the action name is invalid, since the
-     * action name belongs to the previous executing portlet mode. If this method evaluates to 
+     * action name belongs to the previous executing portlet mode. If this method evaluates to
      * <code>true</code> the <code>default&lt;Mode&gt;Action</code> is used instead.
      * @param request The portlet request.
      * @return <code>true</code> if the action should be reset.

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletResult.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletResult.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.portlet.result;
 
@@ -43,13 +46,13 @@
 
 /**
  * Result type that includes a JSP to render.
- * 
+ *
  */
 public class PortletResult extends StrutsResultSupport {
 
-	private static final long serialVersionUID = 434251393926178567L;
+    private static final long serialVersionUID = 434251393926178567L;
 
-	/**
+    /**
      * Logger instance.
      */
     private static final Log LOG = LogFactory.getLog(PortletResult.class);
@@ -57,20 +60,20 @@
     private String contentType = "text/html";
 
     private String title;
-    
+
     public PortletResult() {
-    	super();
+        super();
     }
-    
+
     public PortletResult(String location) {
-    	super(location);
+        super(location);
     }
 
     /**
      * Execute the result. Obtains the
      * {@link javax.portlet.PortletRequestDispatcher}from the
      * {@link PortletActionContext}and includes the JSP.
-     * 
+     *
      * @see com.opensymphony.xwork2.Result#execute(com.opensymphony.xwork2.ActionInvocation)
      */
     public void doExecute(String finalLocation,
@@ -179,7 +182,7 @@
                 .getNamedDispatcher("preparator");
         if(preparator == null) {
             throw new PortletException("Cannot look up 'preparator' servlet. Make sure that you" +
-            		"have configured it correctly in the web.xml file.");
+                    "have configured it correctly in the web.xml file.");
         }
         new IncludeTemplate() {
             protected void when(PortletException e) {
@@ -220,7 +223,7 @@
     public void setTitle(String title) {
         this.title = title;
     }
-    
+
     static class IncludeTemplate {
         protected void include(PortletRequestDispatcher dispatcher, RenderRequest req, RenderResponse res) throws PortletException, IOException{
             try {
@@ -235,9 +238,9 @@
                 throw e;
             }
         }
-        
+
         protected void when(PortletException e) {}
-        
+
         protected void when(IOException e) {}
     }
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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
- *
- * 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.
+ *  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.struts2.portlet.result;
 
@@ -51,33 +54,33 @@
 
 /**
  * <!-- START SNIPPET: description -->
- * 
+ *
  * Using the Servlet container's {@link JspFactory}, this result mocks a JSP
  * execution environment and then displays a Velocity template that will be
  * streamed directly to the servlet output.
- * 
+ *
  * <!-- END SNIPPET: description --> <p/><b>This result type takes the
  * following parameters: </b>
- * 
+ *
  * <!-- START SNIPPET: params -->
- * 
+ *
  * <ul>
- * 
+ *
  * <li><b>location (default) </b>- the location of the template to process.
  * </li>
- * 
+ *
  * <li><b>parse </b>- true by default. If set to false, the location param
  * will not be parsed for Ognl expressions.</li>
- * 
+ *
  * </ul>
  * <p>
  * This result follows the same rules from {@link StrutsResultSupport}.
  * </p>
- * 
+ *
  * <!-- END SNIPPET: params -->
- * 
+ *
  * <b>Example: </b>
- * 
+ *
  * <pre>
  * &lt;!-- START SNIPPET: example --&gt;
  *  &lt;result name=&quot;success&quot; type=&quot;velocity&quot;&gt;
@@ -85,23 +88,23 @@
  *  &lt;/result&gt;
  *  &lt;!-- END SNIPPET: example --&gt;
  * </pre>
- * 
+ *
  */
 public class PortletVelocityResult extends StrutsResultSupport {
 
-	private static final long serialVersionUID = -8241086555872212274L;
-	
-	private static final Log log = LogFactory
+    private static final long serialVersionUID = -8241086555872212274L;
+
+    private static final Log log = LogFactory
             .getLog(PortletVelocityResult.class);
 
-	public PortletVelocityResult() {
-		super();
-	}
-	
-	public PortletVelocityResult(String location) {
-		super(location);
-	}
-	
+    public PortletVelocityResult() {
+        super();
+    }
+
+    public PortletVelocityResult(String location) {
+        super(location);
+    }
+
     /* (non-Javadoc)
      * @see org.apache.struts2.dispatcher.StrutsResultSupport#doExecute(java.lang.String, com.opensymphony.xwork2.ActionInvocation)
      */
@@ -116,7 +119,7 @@
 
     /**
      * Executes the result
-     * 
+     *
      * @param location The location string
      * @param invocation The action invocation
      */
@@ -135,7 +138,7 @@
     /**
      * Creates a Velocity context from the action, loads a Velocity template and
      * executes the template. Output is written to the servlet output stream.
-     * 
+     *
      * @param finalLocation the location of the Velocity template
      * @param invocation an encapsulation of the action execution state.
      * @throws Exception if an error occurs when creating the Velocity context,
@@ -213,7 +216,7 @@
      * Retrieve the content type for this template. <p/>People can override
      * this method if they want to provide specific content types for specific
      * templates (eg text/xml).
-     * 
+     *
      * @return The content type associated with this template (default
      *         "text/html")
      */
@@ -224,7 +227,7 @@
     /**
      * Retrieve the encoding for this template. <p/>People can override this
      * method if they want to provide specific encodings for specific templates.
-     * 
+     *
      * @return The encoding associated with this template (defaults to the value
      *         of 'struts.i18n.encoding' property)
      */
@@ -243,7 +246,7 @@
     /**
      * Given a value stack, a Velocity engine, and an action invocation, this
      * method returns the appropriate Velocity template to render.
-     * 
+     *
      * @param stack the value stack to resolve the location again (when parse
      *        equals true)
      * @param velocity the velocity engine to process the request against
@@ -267,7 +270,7 @@
 
     /**
      * Creates the VelocityContext that we'll use to render this page.
-     * 
+     *
      * @param velocityManager a reference to the velocityManager to use
      * @param stack the value stack to resolve the location against (when parse
      *        equals true)

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.portlet.util;
 
@@ -41,19 +44,19 @@
 /**
  * Helper class for creating Portlet URLs. Portlet URLs are fundamentally different from regular
  * servlet URLs since they never target the application itself; all requests go through the portlet
- * container and must therefore be programatically constructed using the 
- * {@link javax.portlet.RenderResponse#createActionURL()} and 
+ * container and must therefore be programatically constructed using the
+ * {@link javax.portlet.RenderResponse#createActionURL()} and
  * {@link javax.portlet.RenderResponse#createRenderURL()} APIs.
- * 
+ *
  */
 public class PortletUrlHelper {
     public static final String ENCODING = "UTF-8";
-    
+
     private static final Log LOG = LogFactory.getLog(PortletUrlHelper.class);
 
     /**
      * Create a portlet URL with for the specified action and namespace.
-     * 
+     *
      * @param action The action the URL should invoke.
      * @param namespace The namespace of the action to invoke.
      * @param params The parameters of the URL.
@@ -69,8 +72,8 @@
     }
 
     /**
-     * Create a portlet URL with for the specified action and namespace. 
-     * 
+     * Create a portlet URL with for the specified action and namespace.
+     *
      * @see #buildUrl(String, String, Map, String, String, String)
      */
     public static String buildUrl(String action, String namespace, Map params,
@@ -144,12 +147,12 @@
     }
 
     /**
-     * 
+     *
      * Prepend the namespace configuration for the specified namespace and PortletMode.
-     * 
+     *
      * @param namespace The base namespace.
      * @param portletMode The PortletMode.
-     * 
+     *
      * @return prepended namespace.
      */
     private static String prependNamespace(String namespace, String portletMode) {
@@ -183,7 +186,7 @@
     /**
      * Encode an url to a non Struts action resource, like stylesheet, image or
      * servlet.
-     * 
+     *
      * @param value
      * @return encoded url to non Struts action resources.
      */
@@ -201,7 +204,7 @@
             while(it.hasNext()) {
                 String key = (String)it.next();
                 String val = (String)params.get(key);
-                
+
                 sb.append(URLEncoder.encode(key, ENCODING)).append("=");
                 sb.append(URLEncoder.encode(val, ENCODING));
                 if(it.hasNext()) {
@@ -220,7 +223,7 @@
     /**
      * Will ensure that all entries in <code>params</code> are String arrays,
      * as requried by the setParameters on the PortletURL.
-     * 
+     *
      * @param params The parameters to the URL.
      * @return A Map with all parameters as String arrays.
      */
@@ -244,7 +247,7 @@
 
     /**
      * Convert the given String to a WindowState object.
-     * 
+     *
      * @param portletReq The RenderRequest.
      * @param windowState The WindowState as a String.
      * @return The WindowState that mathces the <tt>windowState</tt> String, or if
@@ -271,7 +274,7 @@
 
     /**
      * Convert the given String to a PortletMode object.
-     * 
+     *
      * @param portletReq The RenderRequest.
      * @param portletMode The PortletMode as a String.
      * @return The PortletMode that mathces the <tt>portletMode</tt> String, or if

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.spring;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.spring.lifecycle;
 
@@ -44,9 +47,9 @@
  */
 public class SpringExternalReferenceResolverSetupListener implements
         ServletContextListener {
-    
+
     private Map<ServletContext,Listener> listeners = new HashMap<ServletContext,Listener>();
-    
+
     /* (non-Javadoc)
      * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent)
      */
@@ -64,7 +67,7 @@
         Dispatcher.addDispatcherListener(l);
         listeners.put(event.getServletContext(), l);
     }
-    
+
     /**
      * Handles initializing and cleaning up the dispatcher
      * @author brownd
@@ -73,16 +76,16 @@
     private class Listener implements DispatcherListener {
 
         private ServletContext servletContext;
-        
+
         /**
          * Constructs the listener
-         * 
+         *
          * @param ctx The servlet context
          */
         public Listener(ServletContext ctx) {
             this.servletContext = ctx;
         }
-        
+
         /* (non-Javadoc)
          * @see org.apache.struts2.dispatcher.DispatcherListener#dispatcherInitialized(org.apache.struts2.dispatcher.Dispatcher)
          */
@@ -93,7 +96,7 @@
             Configuration xworkConfig = du.getConfigurationManager().getConfiguration();
             Map packageConfigs = xworkConfig.getPackageConfigs();
             Iterator i = packageConfigs.values().iterator();
-        
+
             while (i.hasNext()) {
                 PackageConfig packageConfig = (PackageConfig) i.next();
                 ExternalReferenceResolver resolver = packageConfig.getExternalRefResolver();
@@ -102,7 +105,7 @@
                 ApplicationContextAware contextAware = (ApplicationContextAware) resolver;
                 contextAware.setApplicationContext(appContext);
             }
-            
+
         }
 
         /* (non-Javadoc)

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AttributeMap.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AttributeMap.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AttributeMap.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AttributeMap.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ClassLoaderUtils.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ClassLoaderUtils.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ClassLoaderUtils.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ClassLoaderUtils.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ContainUtil.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ContainUtil.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ContainUtil.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ContainUtil.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 
@@ -30,41 +33,41 @@
  */
 public class ContainUtil {
 
-	/**
-	 * Determine if <code>obj2</code> exists in <code>obj1</code>.
-	 * 
-	 * <table borer="1">
-	 *  <tr>
-	 *  	<td>Type Of obj1</td>
-	 *      <td>Comparison type</td>
-	 *  </tr>
-	 *  <tr>
-	 *  	<td>null<td>
-	 *		<td>always return false</td>  
-	 *  </tr>
-	 *  <tr>
-	 *  	<td>Map</td>
-	 *  	<td>Map containsKey(obj2)</td>
-	 *  </tr>
-	 *  <tr>
-	 *  	<td>Collection</td>
-	 *      <td>Collection contains(obj2)</td>
-	 *  </tr>
-	 *  <tr>
-	 *  	<td>Array</td>
-	 *  	<td>there's an array element (e) where e.equals(obj2)</td>
-	 *  </tr>
-	 *  <tr>
-	 *  	<td>Object</td>
-	 *      <td>obj1.equals(obj2)</td>
-	 *  </tr>
-	 * </table>
-	 * 
-	 * 
-	 * @param obj1
-	 * @param obj2
-	 * @return
-	 */
+    /**
+     * Determine if <code>obj2</code> exists in <code>obj1</code>.
+     *
+     * <table borer="1">
+     *  <tr>
+     *      <td>Type Of obj1</td>
+     *      <td>Comparison type</td>
+     *  </tr>
+     *  <tr>
+     *      <td>null<td>
+     *      <td>always return false</td>
+     *  </tr>
+     *  <tr>
+     *      <td>Map</td>
+     *      <td>Map containsKey(obj2)</td>
+     *  </tr>
+     *  <tr>
+     *      <td>Collection</td>
+     *      <td>Collection contains(obj2)</td>
+     *  </tr>
+     *  <tr>
+     *      <td>Array</td>
+     *      <td>there's an array element (e) where e.equals(obj2)</td>
+     *  </tr>
+     *  <tr>
+     *      <td>Object</td>
+     *      <td>obj1.equals(obj2)</td>
+     *  </tr>
+     * </table>
+     *
+     *
+     * @param obj1
+     * @param obj2
+     * @return
+     */
     public static boolean contains(Object obj1, Object obj2) {
         if ((obj1 == null) || (obj2 == null)) {
             //log.debug("obj1 or obj2 are null.");

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/Counter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/Counter.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/Counter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/Counter.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 
@@ -28,9 +31,9 @@
  */
 public class Counter implements java.util.Iterator, Serializable {
 
-	private static final long serialVersionUID = 2796965884308060179L;
+    private static final long serialVersionUID = 2796965884308060179L;
 
-	boolean wrap = false;
+    boolean wrap = false;
 
     // Attributes ----------------------------------------------------
     long first = 1;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/DateFormatter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/DateFormatter.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/DateFormatter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/DateFormatter.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 
@@ -104,10 +107,10 @@
 
 
     private static class InvocationContext implements Serializable {
-    	
-		private static final long serialVersionUID = -286697666275777888L;
-		
-		ActionInvocation invocation;
+
+        private static final long serialVersionUID = -286697666275777888L;
+
+        ActionInvocation invocation;
         String token;
 
         public InvocationContext(ActionInvocation invocation, String token) {

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/IteratorFilterSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/IteratorFilterSupport.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/IteratorFilterSupport.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/IteratorFilterSupport.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 
@@ -30,12 +33,12 @@
 
 /**
  * A bean that generates an iterator filled with a given object depending on the count,
- * separator and converter defined. It is being used by IteratorGeneratorTag. 
+ * separator and converter defined. It is being used by IteratorGeneratorTag.
  *
  */
 public class IteratorGenerator implements Iterator, Action {
-	
-	private static final Log _log = LogFactory.getLog(IteratorGenerator.class);
+
+    private static final Log _log = LogFactory.getLog(IteratorGenerator.class);
 
     List values;
     Object value;
@@ -62,9 +65,9 @@
     public void setSeparator(String aChar) {
         separator = aChar;
     }
-    
+
     public void setConverter(Converter aConverter) {
-    	converter = aConverter;
+        converter = aConverter;
     }
 
     // Public --------------------------------------------------------
@@ -83,19 +86,19 @@
                 StringTokenizer tokens = new StringTokenizer(value.toString(), separator);
 
                 while (tokens.hasMoreTokens()) {
-                	String token = tokens.nextToken().trim();
-                	if (converter != null) {
-                		try {
-                			Object convertedObj = converter.convert(token);
-                			values.add(convertedObj);
-                		}
-                		catch(Exception e) { // make sure things, goes on, we just ignore the bad ones
-                			_log.warn("unable to convert ["+token+"], skipping this token, it will not appear in the generated iterator", e);
-                		}
-                	}
-                	else {
-                		values.add(token);
-                	}
+                    String token = tokens.nextToken().trim();
+                    if (converter != null) {
+                        try {
+                            Object convertedObj = converter.convert(token);
+                            values.add(convertedObj);
+                        }
+                        catch(Exception e) { // make sure things, goes on, we just ignore the bad ones
+                            _log.warn("unable to convert ["+token+"], skipping this token, it will not appear in the generated iterator", e);
+                        }
+                    }
+                    else {
+                        values.add(token);
+                    }
                 }
             } else {
                 values.add(value.toString());
@@ -126,13 +129,13 @@
     public void remove() {
         throw new UnsupportedOperationException("Remove is not supported in IteratorGenerator.");
     }
-    
-    
+
+
     // Inner class --------------------------------------------------
     /**
      * Interface for converting each separated token into an Object of choice.
      */
     public static interface Converter {
-    	Object convert(String token) throws Exception;
+        Object convert(String token) throws Exception;
     }
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ListEntry.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ListEntry.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ListEntry.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ListEntry.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MakeIterator.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MakeIterator.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MakeIterator.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MakeIterator.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 
@@ -25,7 +28,7 @@
 
 
 /**
- * A bean that takes several iterators and outputs the merge of them. Used by 
+ * A bean that takes several iterators and outputs the merge of them. Used by
  * MergeIteratorTag.
  *
  * @see org.apache.struts2.views.jsp.iterator.MergeIteratorTag

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryDestroyable.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryDestroyable.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryDestroyable.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryDestroyable.java Mon Nov  6 07:01:43 2006
@@ -1,30 +1,33 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 
 /**
- * An interface to be implemented by any ObjectFactory implementation 
- * if it requires shutdown hook whenever an ObjectFactory is to be 
- * destroyed. 
- * 
+ * An interface to be implemented by any ObjectFactory implementation
+ * if it requires shutdown hook whenever an ObjectFactory is to be
+ * destroyed.
+ *
  * @see org.apache.struts2.dispatcher.FilterDispatcher
  * @see org.apache.struts2.dispatcher.Dispatcher
  */
 public interface ObjectFactoryDestroyable {
-	void destroy();
+    void destroy();
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryInitializable.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryInitializable.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryInitializable.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryInitializable.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryLifecycle.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryLifecycle.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryLifecycle.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryLifecycle.java Mon Nov  6 07:01:43 2006
@@ -1,30 +1,33 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 
 /**
  * An interface indicating the lifecycle of an ObjectFactory implementation.
- * 
+ *
  * @see ObjectFactoryLifecycle
  * @see com.opensymphony.xwork2.ObjectFactory
  * @see org.apache.struts2.util.ObjectFactoryInitializable
  * @see org.apache.struts2.util.ObjectFactoryDestroyable
  */
 public interface ObjectFactoryLifecycle extends ObjectFactoryInitializable, ObjectFactoryDestroyable {
-	
+
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/PrefixTrie.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/PrefixTrie.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/PrefixTrie.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/PrefixTrie.java Mon Nov  6 07:01:43 2006
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 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.struts2.util;
 



Mime
View raw message