You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by tm...@apache.org on 2006/04/03 17:30:10 UTC
svn commit: r391069 [5/9] - in /incubator/webwork2/src:
java/org/apache/struts/action2/ java/org/apache/struts/action2/components/
java/org/apache/struts/action2/components/table/
java/org/apache/struts/action2/components/table/renderer/ java/org/apach...
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/IteratorGenerator.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/IteratorGenerator.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/IteratorGenerator.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/IteratorGenerator.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import com.opensymphony.xwork.Action;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/ListEntry.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/ListEntry.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/ListEntry.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/ListEntry.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
/**
* Entry in a list.
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/MakeIterator.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/MakeIterator.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/MakeIterator.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/MakeIterator.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import java.lang.reflect.Array;
import java.util.*;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/MergeIteratorFilter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/MergeIteratorFilter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/MergeIteratorFilter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/MergeIteratorFilter.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import com.opensymphony.xwork.Action;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/ObjectFactoryDestroyable.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/ObjectFactoryDestroyable.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/ObjectFactoryDestroyable.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/ObjectFactoryDestroyable.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
/**
* An interface to be implemented by any ObjectFactory implementation
@@ -12,8 +12,8 @@
* @author tm_jee
* @version $Date: 2006/03/16 14:44:01 $ $Id: ObjectFactoryDestroyable.java,v 1.1 2006/03/16 14:44:01 tmjee Exp $
*
- * @see org.apache.struts.webwork.dispatcher.FilterDispatcher
- * @see org.apache.struts.webwork.dispatcher.DispatcherUtils
+ * @see org.apache.struts.action2.dispatcher.FilterDispatcher
+ * @see org.apache.struts.action2.dispatcher.DispatcherUtils
*/
public interface ObjectFactoryDestroyable {
void destroy();
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/ObjectFactoryInitializable.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/ObjectFactoryInitializable.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/ObjectFactoryInitializable.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/ObjectFactoryInitializable.java Mon Apr 3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import javax.servlet.ServletContext;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/ObjectFactoryLifecycle.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/ObjectFactoryLifecycle.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/ObjectFactoryLifecycle.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/ObjectFactoryLifecycle.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
/**
* An interface indicating the lifecycle of an ObjectFactory implementation.
@@ -12,8 +12,8 @@
*
* @see ObjectFactoryLifecycle
* @see com.opensymphony.xwork.ObjectFactory
- * @see org.apache.struts.webwork.util.ObjectFactoryInitializable
- * @see org.apache.struts.webwork.util.ObjectFactoryDestroyable
+ * @see org.apache.struts.action2.util.ObjectFactoryInitializable
+ * @see org.apache.struts.action2.util.ObjectFactoryDestroyable
*/
public interface ObjectFactoryLifecycle extends ObjectFactoryInitializable, ObjectFactoryDestroyable {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/PrefixTrie.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/PrefixTrie.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/PrefixTrie.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/PrefixTrie.java Mon Apr 3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
/**
* Quickly matches a prefix to an object.
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/ResolverSetupServletContextListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/ResolverSetupServletContextListener.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/ResolverSetupServletContextListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/ResolverSetupServletContextListener.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import com.opensymphony.xwork.config.Configuration;
import com.opensymphony.xwork.config.ConfigurationManager;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/ServletContextAware.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/ServletContextAware.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/ServletContextAware.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/ServletContextAware.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import javax.servlet.ServletContext;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/SortIteratorFilter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/SortIteratorFilter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/SortIteratorFilter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/SortIteratorFilter.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import com.opensymphony.xwork.Action;
import org.apache.commons.logging.LogFactory;
@@ -15,9 +15,9 @@
* utilizing the comparator. It is being used in SortIteratorTag.
*
* @author Rickard �berg (rickard@middleware-company.com)
- * @author tm_jee ( tm_jee(at)yahoo.co.uk )
+ * @author tm_jee
* @version $Revision: 1.9 $
- * @see org.apache.struts.webwork.views.jsp.iterator.SortIteratorTag
+ * @see org.apache.struts.action2.views.jsp.iterator.SortIteratorTag
*/
public class SortIteratorFilter extends IteratorFilterSupport implements Iterator, Action {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/Sorter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/Sorter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/Sorter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/Sorter.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -14,7 +14,7 @@
*
* @author Rickard �berg (rickard@middleware-company.com)
* @version $Revision: 1.9 $
- * @see org.apache.struts.webwork.views.jsp.iterator.SortIteratorTag
+ * @see org.apache.struts.action2.views.jsp.iterator.SortIteratorTag
* @see SortIteratorFilter
*/
public class Sorter {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/StrutsTypeConverter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/StrutsTypeConverter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/StrutsTypeConverter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/StrutsTypeConverter.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import ognl.DefaultTypeConverter;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/StrutsUtil.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/StrutsUtil.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/StrutsUtil.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/StrutsUtil.java Mon Apr 3 08:28:51 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import com.opensymphony.util.TextUtils;
-import org.apache.struts.webwork.views.jsp.ui.OgnlTool;
-import org.apache.struts.webwork.views.util.UrlHelper;
+import org.apache.struts.action2.views.jsp.ui.OgnlTool;
+import org.apache.struts.action2.views.util.UrlHelper;
import com.opensymphony.xwork.ObjectFactory;
import com.opensymphony.xwork.util.OgnlValueStack;
import org.apache.commons.logging.Log;
@@ -26,7 +26,7 @@
/**
- * WebWork base utility class, for use in Velocity and Freemarker templates
+ * Struts base utility class, for use in Velocity and Freemarker templates
*
* @author Rickard Ãâberg (rickard@dreambean.com)
* @author Cameron Braid
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/SubsetIteratorFilter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/SubsetIteratorFilter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/SubsetIteratorFilter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/SubsetIteratorFilter.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import com.opensymphony.xwork.Action;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/TabbedPane.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/TabbedPane.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/TabbedPane.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/TabbedPane.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import java.util.Vector;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/Timer.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/Timer.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/Timer.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/Timer.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/TokenHelper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/TokenHelper.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/TokenHelper.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/TokenHelper.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import com.opensymphony.util.GUID;
import com.opensymphony.xwork.ActionContext;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/URLBean.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/URLBean.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/URLBean.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/URLBean.java Mon Apr 3 08:28:51 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
-import org.apache.struts.webwork.views.util.UrlHelper;
+import org.apache.struts.action2.views.util.UrlHelper;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/VelocityStrutsUtil.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/VelocityStrutsUtil.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/VelocityStrutsUtil.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/VelocityStrutsUtil.java Mon Apr 3 08:28:51 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
-import org.apache.struts.webwork.views.velocity.VelocityManager;
+import org.apache.struts.action2.views.velocity.VelocityManager;
import com.opensymphony.xwork.util.OgnlValueStack;
import org.apache.velocity.context.Context;
import org.apache.velocity.exception.MethodInvocationException;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/CompilingClassLoader.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/CompilingClassLoader.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/CompilingClassLoader.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/CompilingClassLoader.java Mon Apr 3 08:28:51 2006
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader;
+package org.apache.struts.action2.util.classloader;
-import org.apache.struts.webwork.util.classloader.compilers.JavaCompiler;
-import org.apache.struts.webwork.util.classloader.compilers.eclipse.EclipseJavaCompiler;
-import org.apache.struts.webwork.util.classloader.listeners.CompilingListener;
-import org.apache.struts.webwork.util.classloader.monitor.FilesystemAlterationMonitor;
-import org.apache.struts.webwork.util.classloader.stores.MemoryResourceStore;
-import org.apache.struts.webwork.util.classloader.stores.TransactionalResourceStore;
+import org.apache.struts.action2.util.classloader.compilers.JavaCompiler;
+import org.apache.struts.action2.util.classloader.compilers.eclipse.EclipseJavaCompiler;
+import org.apache.struts.action2.util.classloader.listeners.CompilingListener;
+import org.apache.struts.action2.util.classloader.monitor.FilesystemAlterationMonitor;
+import org.apache.struts.action2.util.classloader.stores.MemoryResourceStore;
+import org.apache.struts.action2.util.classloader.stores.TransactionalResourceStore;
import com.uwyn.rife.continuations.ClassByteAware;
import java.io.File;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoader.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoader.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoader.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoader.java Mon Apr 3 08:28:51 2006
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader;
+package org.apache.struts.action2.util.classloader;
-import org.apache.struts.webwork.util.classloader.listeners.ReloadingListener;
-import org.apache.struts.webwork.util.classloader.listeners.CompilingListener;
-import org.apache.struts.webwork.util.classloader.monitor.FilesystemAlterationMonitor;
-import org.apache.struts.webwork.util.classloader.readers.FileResourceReader;
-import org.apache.struts.webwork.util.classloader.readers.ResourceReader;
-import org.apache.struts.webwork.util.classloader.stores.MemoryResourceStore;
-import org.apache.struts.webwork.util.classloader.stores.ResourceStore;
-import org.apache.struts.webwork.util.classloader.stores.ResourceStoreClassLoader;
+import org.apache.struts.action2.util.classloader.listeners.ReloadingListener;
+import org.apache.struts.action2.util.classloader.listeners.CompilingListener;
+import org.apache.struts.action2.util.classloader.monitor.FilesystemAlterationMonitor;
+import org.apache.struts.action2.util.classloader.readers.FileResourceReader;
+import org.apache.struts.action2.util.classloader.readers.ResourceReader;
+import org.apache.struts.action2.util.classloader.stores.MemoryResourceStore;
+import org.apache.struts.action2.util.classloader.stores.ResourceStore;
+import org.apache.struts.action2.util.classloader.stores.ResourceStoreClassLoader;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoaderListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoaderListener.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoaderListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoaderListener.java Mon Apr 3 08:28:51 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader;
+package org.apache.struts.action2.util.classloader;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompiler.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompiler.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompiler.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompiler.java Mon Apr 3 08:28:51 2006
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.compilers;
+package org.apache.struts.action2.util.classloader.compilers;
-import org.apache.struts.webwork.util.classloader.problems.CompilationProblemHandler;
-import org.apache.struts.webwork.util.classloader.readers.ResourceReader;
-import org.apache.struts.webwork.util.classloader.stores.ResourceStore;
+import org.apache.struts.action2.util.classloader.problems.CompilationProblemHandler;
+import org.apache.struts.action2.util.classloader.readers.ResourceReader;
+import org.apache.struts.action2.util.classloader.stores.ResourceStore;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerFactory.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerFactory.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerFactory.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerFactory.java Mon Apr 3 08:28:51 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.compilers;
+package org.apache.struts.action2.util.classloader.compilers;
public interface JavaCompilerFactory {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerSettings.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerSettings.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerSettings.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerSettings.java Mon Apr 3 08:28:51 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.compilers;
+package org.apache.struts.action2.util.classloader.compilers;
public interface JavaCompilerSettings {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseCompilationProblem.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseCompilationProblem.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseCompilationProblem.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseCompilationProblem.java Mon Apr 3 08:28:51 2006
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.compilers.eclipse;
+package org.apache.struts.action2.util.classloader.compilers.eclipse;
-import org.apache.struts.webwork.util.classloader.problems.CompilationProblem;
+import org.apache.struts.action2.util.classloader.problems.CompilationProblem;
import org.eclipse.jdt.core.compiler.IProblem;
public class EclipseCompilationProblem implements CompilationProblem {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java Mon Apr 3 08:28:51 2006
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.compilers.eclipse;
+package org.apache.struts.action2.util.classloader.compilers.eclipse;
-import org.apache.struts.webwork.util.classloader.compilers.JavaCompiler;
-import org.apache.struts.webwork.util.classloader.problems.CompilationProblemHandler;
-import org.apache.struts.webwork.util.classloader.readers.ResourceReader;
-import org.apache.struts.webwork.util.classloader.stores.ResourceStore;
+import org.apache.struts.action2.util.classloader.compilers.JavaCompiler;
+import org.apache.struts.action2.util.classloader.problems.CompilationProblemHandler;
+import org.apache.struts.action2.util.classloader.readers.ResourceReader;
+import org.apache.struts.action2.util.classloader.stores.ResourceStore;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java Mon Apr 3 08:28:51 2006
@@ -1,6 +1,6 @@
-package org.apache.struts.webwork.util.classloader.compilers.eclipse;
+package org.apache.struts.action2.util.classloader.compilers.eclipse;
-import org.apache.struts.webwork.util.classloader.compilers.JavaCompilerSettings;
+import org.apache.struts.action2.util.classloader.compilers.JavaCompilerSettings;
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
import java.util.HashMap;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/listeners/CompilingListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/listeners/CompilingListener.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/listeners/CompilingListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/listeners/CompilingListener.java Mon Apr 3 08:28:51 2006
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.listeners;
+package org.apache.struts.action2.util.classloader.listeners;
-import org.apache.struts.webwork.util.classloader.ReloadingClassLoader;
-import org.apache.struts.webwork.util.classloader.compilers.JavaCompiler;
-import org.apache.struts.webwork.util.classloader.monitor.FilesystemAlterationListener;
-import org.apache.struts.webwork.util.classloader.problems.CompilationProblem;
-import org.apache.struts.webwork.util.classloader.problems.DefaultCompilationProblemHandler;
-import org.apache.struts.webwork.util.classloader.problems.ConsoleCompilationProblemHandler;
-import org.apache.struts.webwork.util.classloader.readers.ResourceReader;
-import org.apache.struts.webwork.util.classloader.stores.TransactionalResourceStore;
+import org.apache.struts.action2.util.classloader.ReloadingClassLoader;
+import org.apache.struts.action2.util.classloader.compilers.JavaCompiler;
+import org.apache.struts.action2.util.classloader.monitor.FilesystemAlterationListener;
+import org.apache.struts.action2.util.classloader.problems.CompilationProblem;
+import org.apache.struts.action2.util.classloader.problems.DefaultCompilationProblemHandler;
+import org.apache.struts.action2.util.classloader.problems.ConsoleCompilationProblemHandler;
+import org.apache.struts.action2.util.classloader.readers.ResourceReader;
+import org.apache.struts.action2.util.classloader.stores.TransactionalResourceStore;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/listeners/ReloadingListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/listeners/ReloadingListener.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/listeners/ReloadingListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/listeners/ReloadingListener.java Mon Apr 3 08:28:51 2006
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.listeners;
+package org.apache.struts.action2.util.classloader.listeners;
-import org.apache.struts.webwork.util.classloader.monitor.FilesystemAlterationListener;
-import org.apache.struts.webwork.util.classloader.stores.ResourceStore;
+import org.apache.struts.action2.util.classloader.monitor.FilesystemAlterationListener;
+import org.apache.struts.action2.util.classloader.stores.ResourceStore;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -58,7 +58,7 @@
if (deleted.size() > 0) {
for (Iterator it = deleted.iterator(); it.hasNext();) {
final File file = (File) it.next();
- store.remove(org.apache.struts.webwork.util.classloader.ReloadingClassLoader.clazzName(pRepository, file));
+ store.remove(org.apache.struts.action2.util.classloader.ReloadingClassLoader.clazzName(pRepository, file));
}
reload = true;
}
@@ -68,7 +68,7 @@
final File file = (File) it.next();
try {
final byte[] bytes = IOUtils.toByteArray(new FileReader(file));
- store.write(org.apache.struts.webwork.util.classloader.ReloadingClassLoader.clazzName(pRepository, file), bytes);
+ store.write(org.apache.struts.action2.util.classloader.ReloadingClassLoader.clazzName(pRepository, file), bytes);
} catch (final Exception e) {
log.error("could not load " + file, e);
}
@@ -80,7 +80,7 @@
final File file = (File) it.next();
try {
final byte[] bytes = IOUtils.toByteArray(new FileReader(file));
- store.write(org.apache.struts.webwork.util.classloader.ReloadingClassLoader.clazzName(pRepository, file), bytes);
+ store.write(org.apache.struts.action2.util.classloader.ReloadingClassLoader.clazzName(pRepository, file), bytes);
} catch (final Exception e) {
log.error("could not load " + file, e);
}
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationListener.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationListener.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationListener.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationListener.java Mon Apr 3 08:28:51 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.monitor;
+package org.apache.struts.action2.util.classloader.monitor;
import java.io.File;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationMonitor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationMonitor.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationMonitor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationMonitor.java Mon Apr 3 08:28:51 2006
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.monitor;
+package org.apache.struts.action2.util.classloader.monitor;
-import org.apache.struts.webwork.util.classloader.utils.ThreadUtils;
+import org.apache.struts.action2.util.classloader.utils.ThreadUtils;
import org.apache.commons.collections.MultiHashMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblem.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblem.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblem.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblem.java Mon Apr 3 08:28:51 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.problems;
+package org.apache.struts.action2.util.classloader.problems;
public interface CompilationProblem {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblemHandler.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblemHandler.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblemHandler.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblemHandler.java Mon Apr 3 08:28:51 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.problems;
+package org.apache.struts.action2.util.classloader.problems;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/ConsoleCompilationProblemHandler.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/ConsoleCompilationProblemHandler.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/ConsoleCompilationProblemHandler.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/ConsoleCompilationProblemHandler.java Mon Apr 3 08:28:51 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.problems;
+package org.apache.struts.action2.util.classloader.problems;
/**
* @author tcurdt
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/DefaultCompilationProblemHandler.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/DefaultCompilationProblemHandler.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/DefaultCompilationProblemHandler.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/DefaultCompilationProblemHandler.java Mon Apr 3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.util.classloader.problems;
+package org.apache.struts.action2.util.classloader.problems;
import java.util.ArrayList;
import java.util.Collection;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/LogCompilationProblemHandler.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/LogCompilationProblemHandler.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/LogCompilationProblemHandler.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/problems/LogCompilationProblemHandler.java Mon Apr 3 08:28:51 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.problems;
+package org.apache.struts.action2.util.classloader.problems;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/readers/FileResourceReader.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/readers/FileResourceReader.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/readers/FileResourceReader.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/readers/FileResourceReader.java Mon Apr 3 08:28:51 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.readers;
+package org.apache.struts.action2.util.classloader.readers;
import org.apache.commons.io.FileUtils;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/readers/ResourceReader.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/readers/ResourceReader.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/readers/ResourceReader.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/readers/ResourceReader.java Mon Apr 3 08:28:51 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.readers;
+package org.apache.struts.action2.util.classloader.readers;
/**
* @author tcurdt
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/FileResourceStore.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/FileResourceStore.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/FileResourceStore.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/FileResourceStore.java Mon Apr 3 08:28:51 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.stores;
+package org.apache.struts.action2.util.classloader.stores;
import org.apache.commons.io.IOUtils;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/MemoryResourceStore.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/MemoryResourceStore.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/MemoryResourceStore.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/MemoryResourceStore.java Mon Apr 3 08:28:51 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.stores;
+package org.apache.struts.action2.util.classloader.stores;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStore.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStore.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStore.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStore.java Mon Apr 3 08:28:51 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.stores;
+package org.apache.struts.action2.util.classloader.stores;
/**
* @author tcurdt
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStoreClassLoader.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStoreClassLoader.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStoreClassLoader.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStoreClassLoader.java Mon Apr 3 08:28:51 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.stores;
+package org.apache.struts.action2.util.classloader.stores;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/TransactionalResourceStore.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/TransactionalResourceStore.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/TransactionalResourceStore.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/stores/TransactionalResourceStore.java Mon Apr 3 08:28:51 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.webwork.util.classloader.stores;
+package org.apache.struts.action2.util.classloader.stores;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/utils/ThreadUtils.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/utils/ThreadUtils.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/utils/ThreadUtils.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/util/classloader/utils/ThreadUtils.java Mon Apr 3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.util.classloader.utils;
+package org.apache.struts.action2.util.classloader.utils;
public final class ThreadUtils {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/validators/DWRValidator.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/validators/DWRValidator.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/validators/DWRValidator.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/validators/DWRValidator.java Mon Apr 3 08:28:51 2006
@@ -1,12 +1,12 @@
/*
* Copyright (c) 2005 Opensymphony. All Rights Reserved.
*/
-package org.apache.struts.webwork.validators;
+package org.apache.struts.action2.validators;
-import org.apache.struts.webwork.dispatcher.ApplicationMap;
-import org.apache.struts.webwork.dispatcher.DispatcherUtils;
-import org.apache.struts.webwork.dispatcher.RequestMap;
-import org.apache.struts.webwork.dispatcher.SessionMap;
+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 com.opensymphony.xwork.*;
import com.opensymphony.xwork.config.entities.ActionConfig;
import org.apache.commons.logging.Log;
@@ -26,7 +26,7 @@
* <p/>
* <dwr>
* <allow>
- * <create creator="new" javascript="validator" class="org.apache.struts.webwork.validators.DWRValidator"/>
+ * <create creator="new" javascript="validator" class="org.apache.struts.action2.validators.DWRValidator"/>
* <convert converter="bean" match="com.opensymphony.xwork.ValidationAwareSupport"/>
* </allow>
* </dwr>
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/JspSupportServlet.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/JspSupportServlet.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/JspSupportServlet.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/JspSupportServlet.java Mon Apr 3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.views;
+package org.apache.struts.action2.views;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java Mon Apr 3 08:28:51 2006
@@ -2,14 +2,14 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
import com.opensymphony.util.FileManager;
-import org.apache.struts.webwork.config.Configuration;
-import org.apache.struts.webwork.views.JspSupportServlet;
-import org.apache.struts.webwork.views.freemarker.tags.StrutsModels;
-import org.apache.struts.webwork.views.util.ContextUtil;
-import org.apache.struts.webwork.StrutsConstants;
+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 com.opensymphony.xwork.ObjectFactory;
import com.opensymphony.xwork.util.OgnlValueStack;
import freemarker.cache.FileTemplateLoader;
@@ -65,7 +65,7 @@
/**
* To allow for custom configuration of freemarker, sublcass this class "ConfigManager" and
- * set the webwork configuration property
+ * set the Struts configuration property
* <b>struts.freemarker.configmanager.classname</b> to the fully qualified classname.
* <p/>
* This allows you to override the protected methods in the ConfigMangaer
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java Mon Apr 3 08:28:51 2006
@@ -5,11 +5,11 @@
/*
* Created on 15/04/2004
*/
-package org.apache.struts.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.dispatcher.StrutsResultSupport;
-import org.apache.struts.webwork.views.util.ResourceUtil;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.dispatcher.StrutsResultSupport;
+import org.apache.struts.action2.views.util.ResourceUtil;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.LocaleProvider;
@@ -28,8 +28,8 @@
* <!-- START SNIPPET: description -->
*
* Renders a view using the Freemarker template engine. Alternatively, the
- * {@link org.apache.struts.webwork.dispatcher.ServletDispatcherResult
- * dispatcher} result type can be used in conjunction Webwork's {@link
+ * {@link org.apache.struts.action2.dispatcher.ServletDispatcherResult
+ * dispatcher} result type can be used in conjunction Struts's {@link
* FreemarkerServlet}.
* <p>
* The FreemarkarManager class configures the template loaders so that the
@@ -80,7 +80,7 @@
protected ObjectWrapper wrapper;
/*
- * webwork results are constructed for each result execeution
+ * Struts results are constructed for each result execeution
*
* the current context is availible to subclasses via these protected fields
*/
@@ -187,7 +187,7 @@
* <li>ognl - the instance of the OgnlTool
* <li>action - the action itself
* <li>exception - optional : the JSP or Servlet exception as per the servlet spec (for JSP Exception pages)
- * <li>webwork - instance of the StrutsUtil class
+ * <li>struts - instance of the StrutsUtil class
* </ul>
*/
protected TemplateModel createModel() throws TemplateModelException {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java Mon Apr 3 08:28:51 2006
@@ -6,10 +6,10 @@
* Created on 27/08/2003
*
*/
-package org.apache.struts.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
-import org.apache.struts.webwork.RequestUtils;
-import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.action2.RequestUtils;
+import org.apache.struts.action2.ServletActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
import freemarker.template.*;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
import java.io.IOException;
import java.io.Writer;
@@ -15,11 +15,11 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.dispatcher.StrutsResultSupport;
-import org.apache.struts.webwork.portlet.PortletActionConstants;
-import org.apache.struts.webwork.portlet.context.PortletActionContext;
-import org.apache.struts.webwork.views.util.ResourceUtil;
+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 com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -46,7 +46,7 @@
protected ObjectWrapper wrapper;
/*
- * webwork results are constructed for each result execeution
+ * Struts results are constructed for each result execeution
*
* the current context is availible to subclasses via these protected fields
*/
@@ -194,7 +194,7 @@
* <li>action - the action itself
* <li>exception - optional : the JSP or Servlet exception as per the
* servlet spec (for JSP Exception pages)
- * <li>webwork - instance of the StrutsUtil class
+ * <li>struts - instance of the StrutsUtil class
* </ul>
*/
protected TemplateModel createModel() throws TemplateModelException {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/ScopesHashModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/ScopesHashModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/ScopesHashModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/ScopesHashModel.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
import com.opensymphony.xwork.util.OgnlValueStack;
import freemarker.template.ObjectWrapper;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/StrutsBeanWrapper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/StrutsBeanWrapper.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/StrutsBeanWrapper.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/StrutsBeanWrapper.java Mon Apr 3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
import freemarker.core.CollectionAndSequence;
import freemarker.ext.beans.BeansWrapper;
@@ -26,7 +26,7 @@
*/
public class StrutsBeanWrapper extends BeansWrapper {
private static final boolean altMapWrapper
- = "true".equals(org.apache.struts.webwork.config.Configuration.get("struts.freemarker.wrapper.altMap"));
+ = "true".equals(org.apache.struts.action2.config.Configuration.get("struts.freemarker.wrapper.altMap"));
public TemplateModel wrap(Object object) throws TemplateModelException {
if (object instanceof TemplateBooleanModel) {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/StrutsClassTemplateLoader.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/StrutsClassTemplateLoader.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/StrutsClassTemplateLoader.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/StrutsClassTemplateLoader.java Mon Apr 3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
import com.opensymphony.util.ClassLoaderUtil;
import freemarker.cache.URLTemplateLoader;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ActionErrorModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ActionErrorModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ActionErrorModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ActionErrorModel.java Mon Apr 3 08:28:51 2006
@@ -1,8 +1,8 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.ActionError;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.ActionError;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ActionMessageModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ActionMessageModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ActionMessageModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ActionMessageModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.ActionMessage;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.ActionMessage;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ActionModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ActionModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ActionModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ActionModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.ActionComponent;
-import org.apache.struts.webwork.components.Component;
+import org.apache.struts.action2.components.ActionComponent;
+import org.apache.struts.action2.components.Component;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/AnchorModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/AnchorModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/AnchorModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/AnchorModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.Anchor;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Anchor;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/BeanModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/BeanModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/BeanModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/BeanModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Bean;
-import org.apache.struts.webwork.components.Component;
+import org.apache.struts.action2.components.Bean;
+import org.apache.struts.action2.components.Component;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/CallbackWriter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/CallbackWriter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/CallbackWriter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/CallbackWriter.java Mon Apr 3 08:28:51 2006
@@ -1,6 +1,6 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Component;
+import org.apache.struts.action2.components.Component;
import freemarker.template.TemplateModelException;
import freemarker.template.TransformControl;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxListModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxListModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxListModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxListModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.CheckboxList;
-import org.apache.struts.webwork.components.Component;
+import org.apache.struts.action2.components.CheckboxList;
+import org.apache.struts.action2.components.Component;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Checkbox;
-import org.apache.struts.webwork.components.Component;
+import org.apache.struts.action2.components.Checkbox;
+import org.apache.struts.action2.components.Component;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ComboBoxModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ComboBoxModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ComboBoxModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ComboBoxModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.ComboBox;
-import org.apache.struts.webwork.components.Component;
+import org.apache.struts.action2.components.ComboBox;
+import org.apache.struts.action2.components.Component;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ComponentModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ComponentModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ComponentModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/ComponentModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.GenericUIBean;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.GenericUIBean;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DateModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DateModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DateModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DateModel.java Mon Apr 3 08:28:51 2006
@@ -1,8 +1,8 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.Date;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Date;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DatePickerModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DatePickerModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DatePickerModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DatePickerModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.DatePicker;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.DatePicker;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DebugModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DebugModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DebugModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DebugModel.java Mon Apr 3 08:28:51 2006
@@ -1,11 +1,11 @@
/*
* Copyright (c) 2005 Opensymphony. All Rights Reserved.
*/
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.Debug;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Debug;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DivModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DivModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DivModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DivModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.Div;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Div;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DoubleSelectModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DoubleSelectModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DoubleSelectModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/DoubleSelectModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.DoubleSelect;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.DoubleSelect;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/FieldErrorModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/FieldErrorModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/FieldErrorModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/FieldErrorModel.java Mon Apr 3 08:28:51 2006
@@ -1,8 +1,8 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.FieldError;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.FieldError;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/FileModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/FileModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/FileModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/FileModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.File;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.File;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/FormModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/FormModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/FormModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/FormModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.Form;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Form;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/HeadModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/HeadModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/HeadModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/HeadModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.Head;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Head;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/HiddenModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/HiddenModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/HiddenModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/HiddenModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.Hidden;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Hidden;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/I18nModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/I18nModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/I18nModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/I18nModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.I18n;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.I18n;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/IncludeModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/IncludeModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/IncludeModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/IncludeModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.Include;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Include;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/IteratorModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/IteratorModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/IteratorModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/IteratorModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.IteratorComponent;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.IteratorComponent;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/LabelModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/LabelModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/LabelModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/LabelModel.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.Label;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Label;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/OptionTransferSelectModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/OptionTransferSelectModel.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/OptionTransferSelectModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/OptionTransferSelectModel.java Mon Apr 3 08:28:51 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.webwork.components.Component;
-import org.apache.struts.webwork.components.OptionTransferSelect;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.OptionTransferSelect;
import com.opensymphony.xwork.util.OgnlValueStack;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org