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/02 18:27:55 UTC
svn commit: r390846 [2/7] - in
/incubator/webwork2/src/java/org/apache/struts: action2/
action2/components/ action2/config/ action2/config_browser/
action2/dispatcher/ action2/interceptor/ action2/lifecycle/ action2/pico/
action2/plexus/ action2/portle...
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/GenericUIBean.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/GenericUIBean.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/GenericUIBean.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/GenericUIBean.java Sun Apr 2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.action2.util.ContainUtil;
+import org.apache.struts.webwork.util.ContainUtil;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -54,7 +54,7 @@
* @version $Revision: 1.5 $
* @since 2.2
*
- * @a2.tag name="component" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ComponentTag"
+ * @a2.tag name="component" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.ComponentTag"
* description="Render a custom ui widget"
*/
public class GenericUIBean extends UIBean {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Head.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Head.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Head.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Head.java Sun Apr 2 09:27:22 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.webwork.StrutsConstants;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -60,7 +60,7 @@
* @author Patrick Lightbody
* @author Rainer Hermanns
* @author Rene Gielen
- * @a2.tag name="head" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.ui.HeadTag"
+ * @a2.tag name="head" tld-body-content="empty" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.HeadTag"
* description="Render a chunk of HEAD for your HTML file"
* @since 2.2
*/
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Hidden.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Hidden.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Hidden.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Hidden.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -31,7 +31,7 @@
* @version $Revision: 1.5 $
* @since 2.2
*
- * @a2.tag name="hidden" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.HiddenTag"
+ * @a2.tag name="hidden" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.HiddenTag"
* description="Render a hidden input field"
*/
public class Hidden extends UIBean {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/I18n.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/I18n.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/I18n.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/I18n.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.LocaleProvider;
@@ -63,7 +63,7 @@
* @version $Revision: 1.13 $
* @since 2.2
*
- * @a2.tag name="i18n" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.I18nTag"
+ * @a2.tag name="i18n" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.I18nTag"
* description="Get a resource bundle and place it on the value stack"
*/
public class I18n extends Component {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/If.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/If.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/If.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/If.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -43,7 +43,7 @@
* @see Else
* @see ElseIf
*
- * @a2.tag name="if" tld-body-content="JSP" description="If tag" tld-tag-class="org.apache.struts.action2.views.jsp.IfTag"
+ * @a2.tag name="if" tld-body-content="JSP" description="If tag" tld-tag-class="org.apache.struts.webwork.views.jsp.IfTag"
*/
public class If extends Component {
public static final String ANSWER = "struts.if.answer";
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Include.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Include.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Include.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Include.java Sun Apr 2 09:27:22 2006
@@ -1,9 +1,9 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.util.FastByteArrayOutputStream;
-import org.apache.struts.action2.RequestUtils;
-import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.webwork.util.FastByteArrayOutputStream;
+import org.apache.struts.webwork.RequestUtils;
+import org.apache.struts.webwork.StrutsConstants;
import com.opensymphony.xwork.util.OgnlValueStack;
import org.apache.commons.logging.Log;
@@ -69,7 +69,7 @@
* @version $Revision: 1.20 $
* @since 2.2
*
- * @a2.tag name="include" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.IncludeTag"
+ * @a2.tag name="include" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.IncludeTag"
* description="Include a servlet's output (result of servlet or a JSP page)"
*/
public class Include extends Component {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/IteratorComponent.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/IteratorComponent.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/IteratorComponent.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/IteratorComponent.java Sun Apr 2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
-import org.apache.struts.action2.util.MakeIterator;
-import org.apache.struts.action2.views.jsp.IteratorStatus;
+import org.apache.struts.webwork.util.MakeIterator;
+import org.apache.struts.webwork.views.jsp.IteratorStatus;
import com.opensymphony.xwork.util.OgnlValueStack;
import java.io.Writer;
@@ -58,7 +58,7 @@
* <pre>
* <!-- START SNIPPET: example2code -->
*
- * <a:bean name="org.apache.struts.action2.example.IteratorExample" id="it">
+ * <a:bean name="org.apache.struts.webwork.example.IteratorExample" id="it">
* <a:param name="day" value="'foo'"/>
* <a:param name="day" value="'bar'"/>
* </a:bean>
@@ -140,7 +140,7 @@
* @author Rick Salsa (rsal@mb.sympatico.ca)
* @author tm_jee ( tm_jee(at)yahoo.co.uk )
* @version $Revision: 1.11 $
- * @a2.tag name="iterator" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.IteratorTag"
+ * @a2.tag name="iterator" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.IteratorTag"
* description="Iterate over a iterable value"
*/
public class IteratorComponent extends Component {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Label.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Label.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Label.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Label.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -29,7 +29,7 @@
* @version $Revision: 1.11 $
* @since 2.2
*
- * @a2.tag name="label" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.LabelTag"
+ * @a2.tag name="label" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.LabelTag"
* description="Render a label that displays read-only information"
*/
public class Label extends UIBean {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/ListUIBean.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/ListUIBean.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/ListUIBean.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/ListUIBean.java Sun Apr 2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
-import org.apache.struts.action2.util.ContainUtil;
-import org.apache.struts.action2.util.MakeIterator;
+import org.apache.struts.webwork.util.ContainUtil;
+import org.apache.struts.webwork.util.MakeIterator;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/MergeIterator.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/MergeIterator.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/MergeIterator.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/MergeIterator.java Sun Apr 2 09:27:22 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import java.io.Writer;
import java.util.ArrayList;
@@ -12,9 +12,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action2.components.Param.UnnamedParametric;
-import org.apache.struts.action2.util.MakeIterator;
-import org.apache.struts.action2.util.MergeIteratorFilter;
+import org.apache.struts.webwork.components.Param.UnnamedParametric;
+import org.apache.struts.webwork.util.MakeIterator;
+import org.apache.struts.webwork.util.MergeIteratorFilter;
import com.opensymphony.xwork.util.OgnlValueStack;
/**
@@ -108,10 +108,10 @@
*
* @author tm_jee (tm_jee (at) yahoo.co.uk)
* @version $Date: 2006/03/18 16:14:40 $ $Id: MergeIterator.java,v 1.10 2006/03/18 16:14:40 rgielen Exp $
- * @see org.apache.struts.action2.util.MergeIteratorFilter
- * @see org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag
+ * @see org.apache.struts.webwork.util.MergeIteratorFilter
+ * @see org.apache.struts.webwork.views.jsp.iterator.MergeIteratorTag
*
- * @a2.tag name="merge" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag"
+ * @a2.tag name="merge" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.iterator.MergeIteratorTag"
* description="Merge the values of a list of iterators into one iterator"
*/
public class MergeIterator extends Component implements UnnamedParametric {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/OptionTransferSelect.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/OptionTransferSelect.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/OptionTransferSelect.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/OptionTransferSelect.java Sun Apr 2 09:27:22 2006
@@ -2,11 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
-import java.util.ArrayList;
import java.util.LinkedHashMap;
-import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -78,7 +76,7 @@
*
* @author tm_jee
* @version $Date: 2006/03/18 16:14:42 $ $Id: OptionTransferSelect.java,v 1.9 2006/03/18 16:14:42 rgielen Exp $
- * @a2.tag name="optiontransferselect" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.OptionTransferSelectTag"
+ * @a2.tag name="optiontransferselect" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.OptionTransferSelectTag"
* description="Renders an input form"
*/
public class OptionTransferSelect extends DoubleListUIBean {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Panel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Panel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Panel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Panel.java Sun Apr 2 09:27:22 2006
@@ -1,8 +1,6 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -25,11 +23,10 @@
*
* @see TabbedPanel
*
- * @a2.tag name="panel" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.PanelTag"
+ * @a2.tag name="panel" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.PanelTag"
* description="Render a panel for tabbedPanel"
*/
public class Panel extends Div {
- private static final Log LOG = LogFactory.getLog(Panel.class);
public static final String TEMPLATE = "tab";
public static final String TEMPLATE_CLOSE = "tab-close";
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Param.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Param.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Param.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Param.java Sun Apr 2 09:27:22 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -74,7 +74,7 @@
* @see Bean
* @see Text
*
- * @a2.tag name="param" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ParamTag"
+ * @a2.tag name="param" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ParamTag"
* description="Parametrize other tags"
*/
public class Param extends Component {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Password.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Password.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Password.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Password.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -27,7 +27,7 @@
* @version $Revision: 1.8 $
* @since 2.2
*
- * @a2.tag name="password" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.PasswordTag"
+ * @a2.tag name="password" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.PasswordTag"
* description="Render an HTML input tag of type password"
*/
public class Password extends TextField {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Property.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Property.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Property.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Property.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
import com.opensymphony.util.TextUtils;
@@ -71,7 +71,7 @@
* @author Rene Gielen
* @version $Revision: 1.4 $
*
- * @a2.tag name="property" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.PropertyTag"
+ * @a2.tag name="property" tld-body-content="empty" tld-tag-class="org.apache.struts.webwork.views.jsp.PropertyTag"
* description="Print out expression which evaluates against the stack"
*/
public class Property extends Component {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Push.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Push.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Push.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Push.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -92,7 +92,7 @@
* @version $Revision: 1.15 $
* @since 2.2
*
- * @a2.tag name="push" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.PushTag"
+ * @a2.tag name="push" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.PushTag"
* description="Push value on stack for simplified usage."
*/
public class Push extends Component {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Radio.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Radio.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Radio.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Radio.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -32,7 +32,7 @@
* @version $Revision: 1.6 $
* @since 2.2
*
- * @a2.tag name="radio" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.RadioTag"
+ * @a2.tag name="radio" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.RadioTag"
* description="Renders a radio button input field"
*/
public class Radio extends ListUIBean {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/RemoteCallUIBean.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/RemoteCallUIBean.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/RemoteCallUIBean.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/RemoteCallUIBean.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Reset.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Reset.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Reset.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Reset.java Sun Apr 2 09:27:22 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -40,7 +40,7 @@
* @version $Revision: 1.4 $
* @since 2.2.2
*
- * @a2.tag name="reset" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ResetTag"
+ * @a2.tag name="reset" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.ResetTag"
* description="Render a reset button"
*/
public class Reset extends FormButton {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/RichTextEditor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/RichTextEditor.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/RichTextEditor.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/RichTextEditor.java Sun Apr 2 09:27:22 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -47,7 +47,7 @@
* <package name="richtexteditor-browse" extends="webwork-default"
* namespace="/webwork/richtexteditor/editor/filemanager/browser/default/connectors/jsp">
* <action name="connector"
- * class="org.apache.struts.action2.components.DefaultRichtexteditorConnector"
+ * class="org.apache.struts.webwork.components.DefaultRichtexteditorConnector"
* method="browse">
* <result name="getFolders" type="richtexteditorGetFolders" />
* <result name="getFoldersAndFiles" type="richtexteditorGetFoldersAndFiles" />
@@ -108,7 +108,7 @@
* <package name="richtexteditor-upload" extends="webwork-default"
* namespace="/webwork/richtexteditor/editor/filemanager/upload">
* <action name="uploader"
- * class="org.apache.struts.action2.components.DefaultRichtexteditorConnector"
+ * class="org.apache.struts.webwork.components.DefaultRichtexteditorConnector"
* method="upload">
* <result name="richtexteditorFileUpload" />
* </action>
@@ -180,7 +180,7 @@
* @version $Date: 2006/03/18 15:45:33 $ $Id: RichTextEditor.java,v 1.9 2006/03/18 15:45:33 rgielen Exp $
* @see AbstractRichtexteditorConnector
*
- * @a2.tag name="richtexteditor" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.RichTextEditorTag"
+ * @a2.tag name="richtexteditor" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.RichTextEditorTag"
* description="Render a rich text editor element"
*/
public class RichTextEditor extends UIBean {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Select.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Select.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Select.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Select.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -59,7 +59,7 @@
* @version $Revision: 1.9 $
* @since 2.2
*
- * @a2.tag name="select" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.SelectTag"
+ * @a2.tag name="select" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.SelectTag"
* description="Render a select element"
*/
public class Select extends ListUIBean {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Set.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Set.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Set.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Set.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -44,7 +44,7 @@
* @version $Revision: 1.12 $
* @since 2.2
*
- * @a2.tag name="set" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.SetTag"
+ * @a2.tag name="set" tld-body-content="empty" tld-tag-class="org.apache.struts.webwork.views.jsp.SetTag"
* description="Assigns a value to a variable in a specified scope"
*/
public class Set extends Component {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Submit.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Submit.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Submit.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Submit.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -145,7 +145,7 @@
* @version $Revision: 1.16 $
* @since 2.2
*
- * @a2.tag name="submit" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.SubmitTag"
+ * @a2.tag name="submit" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.SubmitTag"
* description="Render a submit button"
*/
public class Submit extends FormButton {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/TabbedPanel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/TabbedPanel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/TabbedPanel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/TabbedPanel.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -76,7 +76,7 @@
*
* @see Panel
*
- * @a2.tag name="tabbedPanel" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TabbedPanelTag"
+ * @a2.tag name="tabbedPanel" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.TabbedPanelTag"
* description="Render a tabbedPanel widget."
*/
public class TabbedPanel extends ClosingUIBean {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Text.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Text.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Text.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Text.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import java.io.IOException;
import java.io.Writer;
@@ -87,7 +87,7 @@
*
* @see Param
*
- * @a2.tag name="text" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.TextTag"
+ * @a2.tag name="text" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.TextTag"
* description="Render a I18n text message."
*/
public class Text extends Component implements Param.UnnamedParametric {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/TextArea.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/TextArea.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/TextArea.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/TextArea.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -25,7 +25,7 @@
*
* @see TabbedPanel
*
- * @a2.tag name="textarea" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TextareaTag"
+ * @a2.tag name="textarea" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.TextareaTag"
* description="Render HTML textarea tag."
*/
public class TextArea extends UIBean {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/TextField.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/TextField.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/TextField.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/TextField.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -27,7 +27,7 @@
* @version $Revision: 1.10 $
* @since 2.2
*
- * @a2.tag name="textfield" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TextFieldTag"
+ * @a2.tag name="textfield" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.TextFieldTag"
* description="Render an HTML input field of type text"
*/
public class TextField extends UIBean {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Token.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Token.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Token.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Token.java Sun Apr 2 09:27:22 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
-import org.apache.struts.action2.util.TokenHelper;
+import org.apache.struts.webwork.util.TokenHelper;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
@@ -34,10 +34,10 @@
* @version $Date: 2006/03/18 16:24:46 $ $Id: Token.java,v 1.8 2006/03/18 16:24:46 rgielen Exp $
* @since 2.2
*
- * @see org.apache.struts.action2.interceptor.TokenInterceptor
- * @see org.apache.struts.action2.interceptor.TokenSessionStoreInterceptor
+ * @see org.apache.struts.webwork.interceptor.TokenInterceptor
+ * @see org.apache.struts.webwork.interceptor.TokenSessionStoreInterceptor
*
- * @a2.tag name="token" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TokenTag"
+ * @a2.tag name="token" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.TokenTag"
* description="Stop double-submission of forms"
*/
public class Token extends UIBean {
@@ -53,7 +53,7 @@
}
/**
- * First looks for the token in the PageContext using the supplied name (or {@link org.apache.struts.action2.util.TokenHelper#DEFAULT_TOKEN_NAME}
+ * First looks for the token in the PageContext using the supplied name (or {@link org.apache.struts.webwork.util.TokenHelper#DEFAULT_TOKEN_NAME}
* if no name is provided) so that the same token can be re-used for the scope of a request for the same name. If
* the token is not in the PageContext, a new Token is created and set into the Session and the PageContext with
* the name.
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/Tree.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/Tree.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/Tree.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/Tree.java Sun Apr 2 09:27:22 2006
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2005 ePlus Corporation. All Rights Reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -28,7 +28,7 @@
*
* @author Jason Carreira <jc...@eplus.com>
*
- * @a2.tag name="tree" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TreeTag"
+ * @a2.tag name="tree" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.TreeTag"
* description="Render a tree widget."
*/
public class Tree extends ClosingUIBean {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/TreeNode.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/TreeNode.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/TreeNode.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/TreeNode.java Sun Apr 2 09:27:22 2006
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2005 Opensymphony. All Rights Reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -27,7 +27,7 @@
*
* @author Jason Carreira <jc...@eplus.com>
*
- * @a2.tag name="treenode" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TreeNodeTag"
+ * @a2.tag name="treenode" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.TreeNodeTag"
* description="Render a tree node within a tree widget."
*/
public class TreeNode extends ClosingUIBean {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/UIBean.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/UIBean.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/UIBean.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/UIBean.java Sun Apr 2 09:27:22 2006
@@ -2,15 +2,15 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
-import org.apache.struts.action2.StrutsConstants;
-import org.apache.struts.action2.components.template.Template;
-import org.apache.struts.action2.components.template.TemplateEngine;
-import org.apache.struts.action2.components.template.TemplateEngineManager;
-import org.apache.struts.action2.components.template.TemplateRenderingContext;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.views.util.ContextUtil;
+import org.apache.struts.webwork.StrutsConstants;
+import org.apache.struts.webwork.components.template.Template;
+import org.apache.struts.webwork.components.template.TemplateEngine;
+import org.apache.struts.webwork.components.template.TemplateEngineManager;
+import org.apache.struts.webwork.components.template.TemplateRenderingContext;
+import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.webwork.views.util.ContextUtil;
import com.opensymphony.xwork.config.ConfigurationException;
import com.opensymphony.xwork.util.OgnlValueStack;
import org.apache.commons.logging.Log;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/URL.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/URL.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/URL.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/URL.java Sun Apr 2 09:27:22 2006
@@ -3,12 +3,12 @@
* All rights reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
-import org.apache.struts.action2.portlet.context.PortletActionContext;
-import org.apache.struts.action2.portlet.util.PortletUrlHelper;
-import org.apache.struts.action2.views.util.UrlHelper;
-import org.apache.struts.action2.dispatcher.DispatcherUtils;
+import org.apache.struts.webwork.portlet.context.PortletActionContext;
+import org.apache.struts.webwork.portlet.util.PortletUrlHelper;
+import org.apache.struts.webwork.views.util.UrlHelper;
+import org.apache.struts.webwork.dispatcher.DispatcherUtils;
import com.opensymphony.xwork.util.OgnlValueStack;
import com.opensymphony.xwork.util.XWorkContinuationConfig;
import com.opensymphony.xwork.ActionContext;
@@ -93,7 +93,7 @@
*
* @see Param
*
- * @a2.tag name="url" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.URLTag"
+ * @a2.tag name="url" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.URLTag"
* description="This tag is used to create a URL"
*/
public class URL extends Component {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/UpDownSelect.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/UpDownSelect.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/UpDownSelect.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/UpDownSelect.java Sun Apr 2 09:27:22 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -58,7 +58,7 @@
* @author tm_jee
* @version $Date: 2006/03/18 15:50:12 $ $Id: UpDownSelect.java,v 1.7 2006/03/18 15:50:12 rgielen Exp $
*
- * @a2.tag name="updownselect" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.UpDownSelectTag"
+ * @a2.tag name="updownselect" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.UpDownSelectTag"
* description="Render a up down select element"
*/
public class UpDownSelect extends Select {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/table/AbstractFilterModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/table/AbstractFilterModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/table/AbstractFilterModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/table/AbstractFilterModel.java Sun Apr 2 09:27:22 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.table;
+package org.apache.struts.webwork.components.table;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableModel;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/table/RenderFilterModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/table/RenderFilterModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/table/RenderFilterModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/table/RenderFilterModel.java Sun Apr 2 09:27:22 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.table;
+package org.apache.struts.webwork.components.table;
import javax.swing.table.TableModel;
@@ -13,7 +13,9 @@
*/
public class RenderFilterModel extends AbstractFilterModel {
- private boolean rendered;
+ private static final long serialVersionUID = -2501708467650344057L;
+
+ private boolean rendered;
public RenderFilterModel(TableModel tm) {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/table/SortFilterModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/table/SortFilterModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/table/SortFilterModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/table/SortFilterModel.java Sun Apr 2 09:27:22 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.table;
+package org.apache.struts.webwork.components.table;
import javax.swing.*;
import javax.swing.event.TableModelEvent;
@@ -20,7 +20,9 @@
*/
public class SortFilterModel extends AbstractFilterModel implements TableModelListener, SortableTableModel {
- private ArrayList rows = new ArrayList();
+ private static final long serialVersionUID = 2214225803442793597L;
+
+ private ArrayList rows = new ArrayList();
/**
* These are just here to implement the interface
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/table/SortableTableModel.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/table/SortableTableModel.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/table/SortableTableModel.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/table/SortableTableModel.java Sun Apr 2 09:27:22 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.table;
+package org.apache.struts.webwork.components.table;
import javax.swing.table.TableModel;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/table/WebTable.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/table/WebTable.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/table/WebTable.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/table/WebTable.java Sun Apr 2 09:27:22 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.components.table;
+package org.apache.struts.webwork.components.table;
-import org.apache.struts.action2.components.GenericUIBean;
-import org.apache.struts.action2.components.table.renderer.CellRenderer;
+import org.apache.struts.webwork.components.GenericUIBean;
+import org.apache.struts.webwork.components.table.renderer.CellRenderer;
import com.opensymphony.xwork.util.OgnlValueStack;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -15,7 +15,7 @@
import java.util.NoSuchElementException;
/**
- * @a2.tag name="table" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.table.WebTableTag"
+ * @a2.tag name="table" tld-body-content="JSP" tld-tag-class="org.apache.struts.webwork.views.jsp.ui.table.WebTableTag"
* description="Instantiate a JavaBean and place it in the context."
*/
public class WebTable extends GenericUIBean {
@@ -274,7 +274,7 @@
}
/**
- * Whether the table should be sortable. Requires that model implements org.apache.struts.action2.components.table.SortableTableModel if set to true.
+ * Whether the table should be sortable. Requires that model implements org.apache.struts.webwork.components.table.SortableTableModel if set to true.
* @a2.tagattribute required="false" type="Boolean" default="false"
*/
public void setSortable(boolean sortable) {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/table/WebTableColumn.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/table/WebTableColumn.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/table/WebTableColumn.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/table/WebTableColumn.java Sun Apr 2 09:27:22 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.table;
+package org.apache.struts.webwork.components.table;
-import org.apache.struts.action2.components.table.renderer.CellRenderer;
-import org.apache.struts.action2.components.table.renderer.DefaultCellRenderer;
+import org.apache.struts.webwork.components.table.renderer.CellRenderer;
+import org.apache.struts.webwork.components.table.renderer.DefaultCellRenderer;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/AbstractCellRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/AbstractCellRenderer.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/AbstractCellRenderer.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/AbstractCellRenderer.java Sun Apr 2 09:27:22 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.table.renderer;
+package org.apache.struts.webwork.components.table.renderer;
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts.webwork.components.table.WebTable;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/BooleanCellRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/BooleanCellRenderer.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/BooleanCellRenderer.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/BooleanCellRenderer.java Sun Apr 2 09:27:22 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.table.renderer;
+package org.apache.struts.webwork.components.table.renderer;
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts.webwork.components.table.WebTable;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/CellRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/CellRenderer.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/CellRenderer.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/CellRenderer.java Sun Apr 2 09:27:22 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.table.renderer;
+package org.apache.struts.webwork.components.table.renderer;
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts.webwork.components.table.WebTable;
/**
* @author $author$
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/DateCellRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/DateCellRenderer.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/DateCellRenderer.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/DateCellRenderer.java Sun Apr 2 09:27:22 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.table.renderer;
+package org.apache.struts.webwork.components.table.renderer;
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts.webwork.components.table.WebTable;
import java.text.SimpleDateFormat;
@@ -31,7 +31,6 @@
public String getCellValue(WebTable table, Object data, int row, int col) {
- java.util.Date cellValue = null;
if (data == null) {
return "";
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/DefaultCellRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/DefaultCellRenderer.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/DefaultCellRenderer.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/DefaultCellRenderer.java Sun Apr 2 09:27:22 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.table.renderer;
+package org.apache.struts.webwork.components.table.renderer;
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts.webwork.components.table.WebTable;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/FixedTextCellRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/FixedTextCellRenderer.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/FixedTextCellRenderer.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/FixedTextCellRenderer.java Sun Apr 2 09:27:22 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.table.renderer;
+package org.apache.struts.webwork.components.table.renderer;
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts.webwork.components.table.WebTable;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/LinkCellRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/LinkCellRenderer.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/LinkCellRenderer.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/LinkCellRenderer.java Sun Apr 2 09:27:22 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.table.renderer;
+package org.apache.struts.webwork.components.table.renderer;
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts.webwork.components.table.WebTable;
/**
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/NumericCellRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/NumericCellRenderer.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/NumericCellRenderer.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/table/renderer/NumericCellRenderer.java Sun Apr 2 09:27:22 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.table.renderer;
+package org.apache.struts.webwork.components.table.renderer;
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts.webwork.components.table.WebTable;
import java.text.DecimalFormat;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/template/BaseTemplateEngine.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/template/BaseTemplateEngine.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/template/BaseTemplateEngine.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/template/BaseTemplateEngine.java Sun Apr 2 09:27:22 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.template;
+package org.apache.struts.webwork.components.template;
import com.opensymphony.util.ClassLoaderUtil;
import org.apache.commons.logging.Log;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/template/FreemarkerTemplateEngine.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/template/FreemarkerTemplateEngine.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/template/FreemarkerTemplateEngine.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/template/FreemarkerTemplateEngine.java Sun Apr 2 09:27:22 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.template;
+package org.apache.struts.webwork.components.template;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.views.freemarker.FreemarkerManager;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.views.freemarker.FreemarkerManager;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.util.OgnlValueStack;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/template/JspTemplateEngine.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/template/JspTemplateEngine.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/template/JspTemplateEngine.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/template/JspTemplateEngine.java Sun Apr 2 09:27:22 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.template;
+package org.apache.struts.webwork.components.template;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.components.Include;
-import org.apache.struts.action2.components.UIBean;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.components.Include;
+import org.apache.struts.webwork.components.UIBean;
import com.opensymphony.xwork.util.OgnlValueStack;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/template/Template.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/template/Template.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/template/Template.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/template/Template.java Sun Apr 2 09:27:22 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.template;
+package org.apache.struts.webwork.components.template;
import java.util.ArrayList;
import java.util.List;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/template/TemplateEngine.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/template/TemplateEngine.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/template/TemplateEngine.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/template/TemplateEngine.java Sun Apr 2 09:27:22 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.template;
+package org.apache.struts.webwork.components.template;
import java.util.Map;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/template/TemplateEngineManager.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/template/TemplateEngineManager.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/template/TemplateEngineManager.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/template/TemplateEngineManager.java Sun Apr 2 09:27:22 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.template;
+package org.apache.struts.webwork.components.template;
-import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.webwork.config.Configuration;
import java.util.HashMap;
import java.util.Map;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/template/TemplateRenderingContext.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/template/TemplateRenderingContext.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/template/TemplateRenderingContext.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/template/TemplateRenderingContext.java Sun Apr 2 09:27:22 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.template;
+package org.apache.struts.webwork.components.template;
-import org.apache.struts.action2.components.UIBean;
+import org.apache.struts.webwork.components.UIBean;
import com.opensymphony.xwork.util.OgnlValueStack;
import java.io.Writer;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/components/template/VelocityTemplateEngine.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/components/template/VelocityTemplateEngine.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/components/template/VelocityTemplateEngine.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/components/template/VelocityTemplateEngine.java Sun Apr 2 09:27:22 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components.template;
+package org.apache.struts.webwork.components.template;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.views.velocity.VelocityManager;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.views.velocity.VelocityManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.velocity.app.VelocityEngine;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/config/Configuration.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/config/Configuration.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/config/Configuration.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/config/Configuration.java Sun Apr 2 09:27:22 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.config;
+package org.apache.struts.webwork.config;
import com.opensymphony.xwork.ObjectFactory;
-import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.webwork.StrutsConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/config/DefaultConfiguration.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/config/DefaultConfiguration.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/config/DefaultConfiguration.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/config/DefaultConfiguration.java Sun Apr 2 09:27:22 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.config;
+package org.apache.struts.webwork.config;
import com.opensymphony.xwork.util.LocalizedTextUtil;
-import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.webwork.StrutsConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -45,9 +45,9 @@
}
try {
- list.add(new PropertiesConfiguration("org/apache/struts/action2/default"));
+ list.add(new PropertiesConfiguration("org/apache/struts/webwork/default"));
} catch (Exception e) {
- log.error("Could not find org/apache/struts/action2/default.properties", e);
+ log.error("Could not find org/apache/struts/webwork/default.properties", e);
}
Configuration[] configList = new Configuration[list.size()];
@@ -75,7 +75,7 @@
// Add addtional list of i18n global resource bundles
try {
- LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts/action2/struts-messages");
+ LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts/webwork/struts-messages");
StringTokenizer bundleFiles = new StringTokenizer((String) config.getImpl(StrutsConstants.STRUTS_CUSTOM_I18N_RESOURCES), ", ");
while (bundleFiles.hasMoreTokens()) {
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/config/DelegatingConfiguration.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/config/DelegatingConfiguration.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/config/DelegatingConfiguration.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/config/DelegatingConfiguration.java Sun Apr 2 09:27:22 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.config;
+package org.apache.struts.webwork.config;
import java.util.HashSet;
import java.util.Iterator;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/config/PropertiesConfiguration.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/config/PropertiesConfiguration.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/config/PropertiesConfiguration.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/config/PropertiesConfiguration.java Sun Apr 2 09:27:22 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.config;
+package org.apache.struts.webwork.config;
import java.io.IOException;
import java.net.URL;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/config/ServletContextSingleton.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/config/ServletContextSingleton.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/config/ServletContextSingleton.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/config/ServletContextSingleton.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.config;
+package org.apache.struts.webwork.config;
import javax.servlet.ServletContext;
@@ -10,9 +10,9 @@
* from the web session object.
* <p/>
* This class is created to bet that this singleton can be set by
- * {@link org.apache.struts.action2.dispatcher.FilterDispatcherCompatWeblogic61}
+ * {@link org.apache.struts.webwork.dispatcher.FilterDispatcherCompatWeblogic61}
* before the servlet context is needed by
- * {@link org.apache.struts.action2.lifecycle.SessionLifecycleListener}
+ * {@link org.apache.struts.webwork.lifecycle.SessionLifecycleListener}
* which will use this object to get it.
*
* @author Scott N. Smith scottnelsonsmith@yahoo.com
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ActionNamesAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ActionNamesAction.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ActionNamesAction.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ActionNamesAction.java Sun Apr 2 09:27:22 2006
@@ -1,11 +1,9 @@
-package org.apache.struts.action2.config_browser;
+package org.apache.struts.webwork.config_browser;
import com.opensymphony.xwork.ActionSupport;
import com.opensymphony.xwork.config.entities.ActionConfig;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.StrutsConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.webwork.StrutsConstants;
import java.util.Set;
import java.util.TreeSet;
@@ -17,11 +15,13 @@
* @author Rainer Hermanns
*/
public class ActionNamesAction extends ActionSupport {
- private Set actionNames;
+
+ private static final long serialVersionUID = -5389385242431387840L;
+
+ private Set actionNames;
private String namespace = "";
private Set namespaces;
private String extension;
- private static Log log = LogFactory.getLog(ActionNamesAction.class);
public Set getActionNames() {
return actionNames;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ConfigurationHelper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ConfigurationHelper.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ConfigurationHelper.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ConfigurationHelper.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.config_browser;
+package org.apache.struts.webwork.config_browser;
import com.opensymphony.xwork.config.ConfigurationManager;
import com.opensymphony.xwork.config.entities.ActionConfig;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ListValidatorsAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ListValidatorsAction.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ListValidatorsAction.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ListValidatorsAction.java Sun Apr 2 09:27:22 2006
@@ -1,9 +1,9 @@
-package org.apache.struts.action2.config_browser;
+package org.apache.struts.webwork.config_browser;
import com.opensymphony.xwork.ActionSupport;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.validator.ActionValidatorManagerFactory;
-import org.apache.struts.action2.util.ClassLoaderUtils;
+import org.apache.struts.webwork.util.ClassLoaderUtils;
import java.util.Collections;
import java.util.List;
@@ -16,7 +16,10 @@
* Date: May 31, 2004 5:06:16 PM
*/
public class ListValidatorsAction extends ActionSupport {
- private String clazz;
+
+ private static final long serialVersionUID = 1L;
+
+ private String clazz;
private String context;
List validators = Collections.EMPTY_LIST;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ShowConfigAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ShowConfigAction.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ShowConfigAction.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ShowConfigAction.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.config_browser;
+package org.apache.struts.webwork.config_browser;
import com.opensymphony.xwork.ObjectFactory;
import com.opensymphony.xwork.config.entities.ActionConfig;
@@ -16,7 +16,10 @@
* @author Jason Carreira Created Aug 11, 2003 9:42:12 PM
*/
public class ShowConfigAction extends ActionNamesAction {
- private static final PropertyDescriptor[] PDSAT = new PropertyDescriptor[0];
+
+ private static final long serialVersionUID = -1630527489407671652L;
+
+ private static final PropertyDescriptor[] PDSAT = new PropertyDescriptor[0];
private String namespace;
private String actionName;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ShowValidatorAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ShowValidatorAction.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ShowValidatorAction.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/config_browser/ShowValidatorAction.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.config_browser;
+package org.apache.struts.webwork.config_browser;
import com.opensymphony.xwork.util.OgnlUtil;
import com.opensymphony.xwork.validator.Validator;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ActionContextCleanUp.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ActionContextCleanUp.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ActionContextCleanUp.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ActionContextCleanUp.java Sun Apr 2 09:27:22 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.interceptor.component.ComponentManager;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ApplicationMap.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ApplicationMap.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ApplicationMap.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ApplicationMap.java Sun Apr 2 09:27:22 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import javax.servlet.ServletContext;
import java.io.Serializable;
@@ -20,7 +20,9 @@
*/
public class ApplicationMap extends AbstractMap implements Serializable {
- ServletContext context;
+ private static final long serialVersionUID = 9136809763083228202L;
+
+ ServletContext context;
Set entries;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ChartResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ChartResult.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ChartResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/ChartResult.java Sun Apr 2 09:27:22 2006
@@ -8,9 +8,9 @@
* To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.webwork.ServletActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.Result;
import org.jfree.chart.ChartUtilities;
@@ -29,7 +29,9 @@
*/
public class ChartResult implements Result {
- JFreeChart chart;
+ private static final long serialVersionUID = -6484761870055986612L;
+
+ JFreeChart chart;
boolean chartSet = false;
private int height;
private int width;
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/DefaultActionSupport.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/DefaultActionSupport.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/DefaultActionSupport.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/DefaultActionSupport.java Sun Apr 2 09:27:22 2006
@@ -1,12 +1,9 @@
-/**
- *
- */
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import javax.servlet.http.HttpServletRequest;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.webwork.ServletActionContext;
import com.opensymphony.xwork.ActionSupport;
/**
@@ -17,12 +14,11 @@
*/
public class DefaultActionSupport extends ActionSupport {
+ private static final long serialVersionUID = -2426166391283746095L;
+
String successResultValue;
- /**
- *
- */
public DefaultActionSupport() {
super();
}
Modified: incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/DispatcherUtils.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/DispatcherUtils.java?rev=390846&r1=390822&r2=390846&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/DispatcherUtils.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/webwork/dispatcher/DispatcherUtils.java Sun Apr 2 09:27:22 2006
@@ -2,20 +2,20 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import com.opensymphony.util.ClassLoaderUtil;
import com.opensymphony.util.FileManager;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.StrutsStatics;
-import org.apache.struts.action2.StrutsConstants;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
-import org.apache.struts.action2.dispatcher.multipart.MultiPartRequest;
-import org.apache.struts.action2.dispatcher.multipart.MultiPartRequestWrapper;
-import org.apache.struts.action2.util.AttributeMap;
-import org.apache.struts.action2.util.ObjectFactoryDestroyable;
-import org.apache.struts.action2.util.ObjectFactoryInitializable;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.StrutsStatics;
+import org.apache.struts.webwork.StrutsConstants;
+import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.webwork.dispatcher.mapper.ActionMapping;
+import org.apache.struts.webwork.dispatcher.multipart.MultiPartRequest;
+import org.apache.struts.webwork.dispatcher.multipart.MultiPartRequestWrapper;
+import org.apache.struts.webwork.util.AttributeMap;
+import org.apache.struts.webwork.util.ObjectFactoryDestroyable;
+import org.apache.struts.webwork.util.ObjectFactoryInitializable;
import com.opensymphony.xwork.*;
import com.opensymphony.xwork.config.ConfigurationException;
import com.opensymphony.xwork.interceptor.component.ComponentInterceptor;
@@ -45,7 +45,7 @@
* @author tm_jee
* @version $Date: 2006/03/20 20:36:40 $ $Id: DispatcherUtils.java,v 1.48 2006/03/20 20:36:40 rainerh Exp $
*
- * @see org.apache.struts.action2.dispatcher.FilterDispatcher
+ * @see org.apache.struts.webwork.dispatcher.FilterDispatcher
*/
public class DispatcherUtils {
private static final Log LOG = LogFactory.getLog(DispatcherUtils.class);
@@ -104,11 +104,11 @@
if (className.equals("spring")) {
// note: this class name needs to be in string form so we don't put hard
// dependencies on spring, since it isn't technically required.
- className = "org.apache.struts.action2.spring.StrutsSpringObjectFactory";
+ className = "org.apache.struts.webwork.spring.StrutsSpringObjectFactory";
} else if (className.equals("plexus")) {
// note: this class name needs to be in string form so we don't put hard
// dependencies on spring, since it isn't technically required.
- className = "org.apache.struts.action2.plexus.PlexusObjectFactory";
+ className = "org.apache.struts.webwork.plexus.PlexusObjectFactory";
}
try {
@@ -415,12 +415,12 @@
/**
* Wraps and returns the given response or returns the original response object. This is used to transparently
* handle multipart data as a wrapped class around the given request. Override this method to handle multipart
- * requests in a special way or to handle other types of requests. Note, {@link org.apache.struts.action2.dispatcher.multipart.MultiPartRequestWrapper} is
+ * requests in a special way or to handle other types of requests. Note, {@link org.apache.struts.webwork.dispatcher.multipart.MultiPartRequestWrapper} is
* flexible - you should look to that first before overriding this method to handle multipart data.
*
* @param request the HttpServletRequest object.
* @return a wrapped request or original request.
- * @see org.apache.struts.action2.dispatcher.multipart.MultiPartRequestWrapper
+ * @see org.apache.struts.webwork.dispatcher.multipart.MultiPartRequestWrapper
*/
public HttpServletRequest wrapRequest(HttpServletRequest request, ServletContext servletContext) throws IOException {
// don't wrap more than once
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org