You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2011/12/01 08:27:13 UTC
svn commit: r1208981 [5/24] - in /struts/struts2/branches/STRUTS_3_X:
apps/blank/src/main/java/example/ apps/blank/src/test/java/example/
apps/jboss-blank/src/main/java/example/
apps/jboss-blank/src/test/java/example/ apps/mailreader/src/main/java/mail...
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Include;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Include
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java Thu Dec 1 07:18:07 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.views.freemarker.tags;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.IteratorComponent;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see IteratorComponent
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Label;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Label
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.OptGroup;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* Freemarker's TransformModel for OptGroup component.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.OptionTransferSelect;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see OptionTransferSelect
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Param;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Param
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Password;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Password
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Property;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Property
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Push;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Push
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Radio;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Radio
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Reset;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see org.apache.struts2.components.Reset
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Select;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Select
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Set;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Set
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java Thu Dec 1 07:18:07 2011
@@ -24,7 +24,7 @@ package org.apache.struts2.views.freemar
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* Provides @s.tag access for various tags.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Submit;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Submit
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java Thu Dec 1 07:18:07 2011
@@ -21,11 +21,11 @@
package org.apache.struts2.views.freemarker.tags;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.inject.Container;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import freemarker.ext.beans.BeansWrapper;
import freemarker.template.SimpleNumber;
import freemarker.template.SimpleSequence;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TextArea;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see TextArea
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TextField;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see TextField
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Text;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Text
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Token;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Token
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.URL;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see URL
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.UpDownSelect;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see UpDownSelect
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java Thu Dec 1 07:18:07 2011
@@ -28,8 +28,8 @@ import javax.servlet.jsp.JspException;
import org.apache.struts2.components.Component;
import org.apache.struts2.dispatcher.Dispatcher;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.inject.Container;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
*/
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java Thu Dec 1 07:18:07 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.views.jsp;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Date;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.ElseIf;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see ElseIf
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Else;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.I18n;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.If;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Include;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java Thu Dec 1 07:18:07 2011
@@ -28,7 +28,7 @@ import javax.servlet.jsp.JspException;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.IteratorComponent;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see IteratorComponent
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Param;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Param
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Property;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Push;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Set;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java Thu Dec 1 07:18:07 2011
@@ -28,8 +28,8 @@ import javax.servlet.jsp.tagext.BodyTagS
import org.apache.struts2.components.Component;
import org.apache.struts2.util.FastByteArrayOutputStream;
-import com.opensymphony.xwork2.util.TextParseUtil;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.TextParseUtil;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java Thu Dec 1 07:18:07 2011
@@ -37,11 +37,11 @@ import org.apache.struts2.dispatcher.map
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.apache.struts2.util.AttributeMap;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.config.ConfigurationException;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStackFactory;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Text;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.URL;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java Thu Dec 1 07:18:07 2011
@@ -29,8 +29,8 @@ import org.apache.struts2.views.annotati
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.views.jsp.StrutsBodyTagSupport;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java Thu Dec 1 07:18:07 2011
@@ -28,7 +28,7 @@ import org.apache.struts2.components.Com
import org.apache.struts2.components.MergeIterator;
import org.apache.struts2.views.jsp.ContextBeanTag;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java Thu Dec 1 07:18:07 2011
@@ -29,8 +29,8 @@ import org.apache.struts2.views.annotati
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.views.jsp.StrutsBodyTagSupport;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.CheckboxList;
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Checkbox;
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.ComboBox;
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see ComboBox
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.GenericUIBean;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see GenericUIBean
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Debug;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
public class DebugTag extends AbstractUITag {
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Div;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
public class DivTag extends AbstractClosingTag {
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.DoubleSelect;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see DoubleSelect
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.FieldError;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* FieldError Tag.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.File;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Form;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Head;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Head
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Hidden;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTag.java Thu Dec 1 07:18:07 2011
@@ -23,7 +23,7 @@ package org.apache.struts2.views.jsp.ui;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.InputTransferSelect;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Label;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/OgnlTool.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/OgnlTool.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/OgnlTool.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/OgnlTool.java Thu Dec 1 07:18:07 2011
@@ -24,8 +24,8 @@ package org.apache.struts2.views.jsp.ui;
import ognl.Ognl;
import ognl.OgnlException;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.ognl.OgnlUtil;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.ognl.OgnlUtil;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java Thu Dec 1 07:18:07 2011
@@ -28,7 +28,7 @@ import org.apache.struts2.components.Com
import org.apache.struts2.components.OptGroup;
import org.apache.struts2.views.jsp.ComponentTagSupport;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
*
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.OptionTransferSelect;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* OptionTransferSelect jsp tag.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Password;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Radio;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java Thu Dec 1 07:18:07 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.views.jsp.ui;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Reset;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Select;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Submit;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Submit
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TextField;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see TextField
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TextArea;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Token;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.UpDownSelect;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see UpDownSelect
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java Thu Dec 1 07:18:07 2011
@@ -31,12 +31,10 @@ import org.apache.struts2.StrutsConstant
import org.apache.struts2.util.StrutsUtil;
import org.apache.struts2.views.jsp.ui.OgnlTool;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.inject.Container;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* Value Stack's Context related Utilities.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java Thu Dec 1 07:18:07 2011
@@ -21,12 +21,12 @@
package org.apache.struts2.views.util;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.TextParseUtil;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.inject.Container;
+import org.apache.struts2.xwork2.util.TextParseUtil;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
@@ -253,7 +253,7 @@ public class UrlHelper {
}
/**
- * Translates any script expressions using {@link com.opensymphony.xwork2.util.TextParseUtil#translateVariables} and
+ * Translates any script expressions using {@link org.apache.struts2.xwork2.util.TextParseUtil#translateVariables} and
* encodes the URL using {@link java.net.URLEncoder#encode} with the encoding specified in the configuration.
*
* @param input
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java Thu Dec 1 07:18:07 2011
@@ -23,7 +23,7 @@ package org.apache.struts2.views.velocit
import org.apache.velocity.VelocityContext;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java Thu Dec 1 07:18:07 2011
@@ -21,12 +21,12 @@
package org.apache.struts2.views.velocity;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.inject.Container;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Checkbox;
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Checkbox
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.CheckboxList;
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see CheckboxList
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.ComboBox;
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see ComboBox
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.GenericUIBean;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see GenericUIBean
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Date;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* <code>DateDirective</code>
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Div;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Div
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.DoubleSelect;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see DoubleSelect
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.FieldError;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see FieldError
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.File;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see File
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Form;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Form
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Head;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Head
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Hidden;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Hidden
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.I18n;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see I18n
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Include;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Include
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java Thu Dec 1 07:18:07 2011
@@ -23,7 +23,7 @@ package org.apache.struts2.views.velocit
import org.apache.struts2.components.Component;
import org.apache.struts2.components.InputTransferSelect;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Label;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Label
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.OptGroup;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.OptionTransferSelect;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see OptionTransferSelect
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Param;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Param
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Password;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Password
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java Thu Dec 1 07:18:07 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Property;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
*/