You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2006/07/02 01:37:11 UTC
svn commit: r418521 [5/9] - in /struts/struts2/trunk/core: ./ src/main/java/org/apache/struts/action2/ src/main/java/org/apache/struts2/ src/main/java/org/apache/struts2/components/ src/main/java/org/apache/struts2/components/table/ src/main/java/org/a...

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/problems/CompilationProblemHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/problems/CompilationProblemHandler.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/problems/CompilationProblemHandler.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/problems/CompilationProblemHandler.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.problems;
+package org.apache.struts2.util.classloader.problems;
 
 
 /**

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/problems/ConsoleCompilationProblemHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/problems/ConsoleCompilationProblemHandler.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/problems/ConsoleCompilationProblemHandler.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/problems/ConsoleCompilationProblemHandler.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.problems;
+package org.apache.struts2.util.classloader.problems;
 
 /**
  */

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/problems/DefaultCompilationProblemHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/problems/DefaultCompilationProblemHandler.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/problems/DefaultCompilationProblemHandler.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/problems/DefaultCompilationProblemHandler.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.problems;
+package org.apache.struts2.util.classloader.problems;
 
 import java.util.ArrayList;
 import java.util.Collection;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/problems/LogCompilationProblemHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/problems/LogCompilationProblemHandler.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/problems/LogCompilationProblemHandler.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/problems/LogCompilationProblemHandler.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.problems;
+package org.apache.struts2.util.classloader.problems;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/readers/FileResourceReader.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/readers/FileResourceReader.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/readers/FileResourceReader.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/readers/FileResourceReader.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.readers;
+package org.apache.struts2.util.classloader.readers;
 
 import org.apache.commons.io.FileUtils;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/readers/ResourceReader.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/readers/ResourceReader.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/readers/ResourceReader.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/readers/ResourceReader.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.readers;
+package org.apache.struts2.util.classloader.readers;
 
 /**
  */

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/FileResourceStore.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/FileResourceStore.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/FileResourceStore.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/FileResourceStore.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.stores;
+package org.apache.struts2.util.classloader.stores;
 
 import org.apache.commons.io.IOUtils;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/MemoryResourceStore.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/MemoryResourceStore.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/MemoryResourceStore.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/MemoryResourceStore.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.stores;
+package org.apache.struts2.util.classloader.stores;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/ResourceStore.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/ResourceStore.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/ResourceStore.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/ResourceStore.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.stores;
+package org.apache.struts2.util.classloader.stores;
 
 /**
  */

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/ResourceStoreClassLoader.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/ResourceStoreClassLoader.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/ResourceStoreClassLoader.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/ResourceStoreClassLoader.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.stores;
+package org.apache.struts2.util.classloader.stores;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/TransactionalResourceStore.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/TransactionalResourceStore.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/TransactionalResourceStore.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/stores/TransactionalResourceStore.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.stores;
+package org.apache.struts2.util.classloader.stores;
 
 
 /**

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/utils/ThreadUtils.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/utils/ThreadUtils.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/utils/ThreadUtils.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/classloader/utils/ThreadUtils.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.util.classloader.utils;
+package org.apache.struts2.util.classloader.utils;
 
 
 public final class ThreadUtils {

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/DWRValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/DWRValidator.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/DWRValidator.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/DWRValidator.java Sat Jul  1 16:36:50 2006
@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.validators;
+package org.apache.struts2.validators;
 
-import org.apache.struts.action2.dispatcher.ApplicationMap;
-import org.apache.struts.action2.dispatcher.DispatcherUtils;
-import org.apache.struts.action2.dispatcher.RequestMap;
-import org.apache.struts.action2.dispatcher.SessionMap;
+import org.apache.struts2.dispatcher.ApplicationMap;
+import org.apache.struts2.dispatcher.DispatcherUtils;
+import org.apache.struts2.dispatcher.RequestMap;
+import org.apache.struts2.dispatcher.SessionMap;
 import com.opensymphony.xwork.*;
 import com.opensymphony.xwork.config.entities.ActionConfig;
 import org.apache.commons.logging.Log;
@@ -42,7 +42,7 @@
  * 
  * &lt;dwr&lt;
  *    &lt;allow&lt;
- *      &lt;create creator="new" javascript="validator" class="org.apache.struts.action2.validators.DWRValidator"/&lt;
+ *      &lt;create creator="new" javascript="validator" class="org.apache.struts2.validators.DWRValidator"/&lt;
  *      &lt;convert converter="bean" match="com.opensymphony.xwork.ValidationAwareSupport"/&lt;
  *    &lt;/allow&lt;
  * &lt;/dwr&lt;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/JspSupportServlet.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/JspSupportServlet.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/JspSupportServlet.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/JspSupportServlet.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views;
+package org.apache.struts2.views;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java Sat Jul  1 16:36:50 2006
@@ -15,14 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts2.views.freemarker;
 
 import com.opensymphony.util.FileManager;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.views.JspSupportServlet;
-import org.apache.struts.action2.views.freemarker.tags.StrutsModels;
-import org.apache.struts.action2.views.util.ContextUtil;
-import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts2.config.Configuration;
+import org.apache.struts2.views.JspSupportServlet;
+import org.apache.struts2.views.freemarker.tags.StrutsModels;
+import org.apache.struts2.views.util.ContextUtil;
+import org.apache.struts2.StrutsConstants;
 import com.opensymphony.xwork.ObjectFactory;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import freemarker.cache.FileTemplateLoader;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java Sat Jul  1 16:36:50 2006
@@ -15,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts2.views.freemarker;
 
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.dispatcher.StrutsResultSupport;
-import org.apache.struts.action2.views.util.ResourceUtil;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.dispatcher.StrutsResultSupport;
+import org.apache.struts2.views.util.ResourceUtil;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.LocaleProvider;
@@ -38,7 +38,7 @@
  * <!-- START SNIPPET: description -->
  *
  * Renders a view using the Freemarker template engine.  Alternatively, the
- * {@link org.apache.struts.action2.dispatcher.ServletDispatcherResult
+ * {@link org.apache.struts2.dispatcher.ServletDispatcherResult
  * dispatcher} result type can be used in conjunction Struts's {@link
  * FreemarkerServlet}.
  * <p>

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerServlet.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerServlet.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerServlet.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerServlet.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts2.views.freemarker;
 
-import org.apache.struts.action2.RequestUtils;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts2.RequestUtils;
+import org.apache.struts2.ServletActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import freemarker.template.*;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts2.views.freemarker;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -28,11 +28,11 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.dispatcher.StrutsResultSupport;
-import org.apache.struts.action2.portlet.PortletActionConstants;
-import org.apache.struts.action2.portlet.context.PortletActionContext;
-import org.apache.struts.action2.views.util.ResourceUtil;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.dispatcher.StrutsResultSupport;
+import org.apache.struts2.portlet.PortletActionConstants;
+import org.apache.struts2.portlet.context.PortletActionContext;
+import org.apache.struts2.views.util.ResourceUtil;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.util.OgnlValueStack;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts2.views.freemarker;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 import freemarker.template.ObjectWrapper;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts2.views.freemarker;
 
 import freemarker.core.CollectionAndSequence;
 import freemarker.ext.beans.BeansWrapper;
@@ -43,7 +43,7 @@
  */
 public class StrutsBeanWrapper extends BeansWrapper {
     private static final boolean altMapWrapper
-            = "true".equals(org.apache.struts.action2.config.Configuration.get("struts.freemarker.wrapper.altMap"));
+            = "true".equals(org.apache.struts2.config.Configuration.get("struts.freemarker.wrapper.altMap"));
 
     public TemplateModel wrap(Object object) throws TemplateModelException {
         if (object instanceof TemplateBooleanModel) {

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts2.views.freemarker;
 
 import com.opensymphony.util.ClassLoaderUtil;
 import freemarker.cache.URLTemplateLoader;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java Sat Jul  1 16:36:50 2006
@@ -15,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.ActionError;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.ActionError;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.ActionMessage;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.ActionMessage;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.ActionComponent;
-import org.apache.struts.action2.components.Component;
+import org.apache.struts2.components.ActionComponent;
+import org.apache.struts2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Anchor;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Anchor;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Bean;
-import org.apache.struts.action2.components.Component;
+import org.apache.struts2.components.Bean;
+import org.apache.struts2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CallbackWriter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CallbackWriter.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CallbackWriter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CallbackWriter.java Sat Jul  1 16:36:50 2006
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
+import org.apache.struts2.components.Component;
 import freemarker.template.TemplateModelException;
 import freemarker.template.TransformControl;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.CheckboxList;
-import org.apache.struts.action2.components.Component;
+import org.apache.struts2.components.CheckboxList;
+import org.apache.struts2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Checkbox;
-import org.apache.struts.action2.components.Component;
+import org.apache.struts2.components.Checkbox;
+import org.apache.struts2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.ComboBox;
-import org.apache.struts.action2.components.Component;
+import org.apache.struts2.components.ComboBox;
+import org.apache.struts2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.GenericUIBean;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.GenericUIBean;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java Sat Jul  1 16:36:50 2006
@@ -15,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Date;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Date;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DatePickerModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DatePickerModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DatePickerModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DatePickerModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.DatePicker;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.DatePicker;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Div;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Div;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.DoubleSelect;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.DoubleSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java Sat Jul  1 16:36:50 2006
@@ -15,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.FieldError;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.FieldError;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.File;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.File;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Form;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Form;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Head;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Head;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Hidden;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Hidden;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.I18n;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.I18n;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Include;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Include;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.IteratorComponent;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.IteratorComponent;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Label;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Label;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java Sat Jul  1 16:36:50 2006
@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.OptionTransferSelect;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.OptionTransferSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PanelModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PanelModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PanelModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PanelModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Panel;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Panel;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Param;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Param;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Password;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Password;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Property;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Property;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Push;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Push;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Radio;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Radio;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java Sat Jul  1 16:36:50 2006
@@ -15,17 +15,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Reset;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Reset;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * @see org.apache.struts.action2.components.Reset
+ * @see org.apache.struts2.components.Reset
  */
 public class ResetModel extends TagModel {
     public ResetModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/RichTextEditorModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/RichTextEditorModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/RichTextEditorModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/RichTextEditorModel.java Sat Jul  1 16:36:50 2006
@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.RichTextEditor;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.RichTextEditor;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Select;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Select;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Set;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Set;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Submit;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Submit;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.TabbedPanel;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TabbedPanel;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java Sat Jul  1 16:36:50 2006
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
+import org.apache.struts2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import freemarker.template.SimpleNumber;
 import freemarker.template.TemplateModelException;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.TextArea;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TextArea;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.TextField;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TextField;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Text;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Text;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Token;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Token;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Tree;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Tree;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java Sat Jul  1 16:36:50 2006
@@ -15,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.TreeNode;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TreeNode;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.URL;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.URL;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java Sat Jul  1 16:36:50 2006
@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.UpDownSelect;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.UpDownSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/WebTableModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/WebTableModel.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/WebTableModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/WebTableModel.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.freemarker.tags;
+package org.apache.struts2.views.freemarker.tags;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.table.WebTable;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts2.views.jsp;
 
-import org.apache.struts.action2.components.ActionComponent;
-import org.apache.struts.action2.components.Component;
+import org.apache.struts2.components.ActionComponent;
+import org.apache.struts2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts2.views.jsp;
 
-import org.apache.struts.action2.components.Bean;
-import org.apache.struts.action2.components.Component;
+import org.apache.struts2.components.Bean;
+import org.apache.struts2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java Sat Jul  1 16:36:50 2006
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts2.views.jsp;
 
-import org.apache.struts.action2.components.Component;
+import org.apache.struts2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java Sat Jul  1 16:36:50 2006
@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts2.views.jsp;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Date;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Date;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts2.views.jsp;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.ElseIf;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.ElseIf;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts2.views.jsp;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Else;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Else;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts2.views.jsp;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.I18n;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.I18n;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts2.views.jsp;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.If;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.If;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts2.views.jsp;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Include;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Include;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorStatus.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorStatus.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorStatus.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorStatus.java Sat Jul  1 16:36:50 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts2.views.jsp;
 
 
 /**

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java Sat Jul  1 16:36:50 2006
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts2.views.jsp;
 
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.IteratorComponent;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.IteratorComponent;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;