You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2006/07/02 01:37:11 UTC
svn commit: r418521 [7/9] - in /struts/struts2/trunk/core: ./
src/main/java/org/apache/struts/action2/ src/main/java/org/apache/struts2/
src/main/java/org/apache/struts2/components/
src/main/java/org/apache/struts2/components/table/ src/main/java/org/a...
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.GenericUIBean;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.GenericUIBean;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Date;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Date;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.DatePicker;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.DatePicker;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Div;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Div;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.DoubleSelect;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.DoubleSelect;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.FieldError;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.FieldError;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.File;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.File;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Form;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Form;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Head;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Head;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Hidden;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Hidden;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.I18n;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.I18n;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Include;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Include;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Label;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Label;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java Sat Jul 1 16:36:50 2006
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.OptionTransferSelect;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.OptionTransferSelect;
import com.opensymphony.xwork.util.OgnlValueStack;
/**
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PanelDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PanelDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PanelDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PanelDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Panel;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Panel;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Param;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Param;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Password;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Password;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Property;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Property;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Push;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Push;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Radio;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Radio;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java Sat Jul 1 16:36:50 2006
@@ -15,17 +15,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Reset;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Reset;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
- * @see org.apache.struts.action2.components.Reset
+ * @see org.apache.struts2.components.Reset
*/
public class ResetDirective extends AbstractDirective {
public String getBeanName() {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/RichTextEditorDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/RichTextEditorDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/RichTextEditorDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/RichTextEditorDirective.java Sat Jul 1 16:36:50 2006
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.RichTextEditor;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.RichTextEditor;
import com.opensymphony.xwork.util.OgnlValueStack;
/**
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Select;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Select;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Set;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Set;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Submit;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Submit;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.TabbedPanel;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TabbedPanel;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.TextArea;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TextArea;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Text;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Text;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.TextField;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TextField;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Token;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Token;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.Tree;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Tree;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.TreeNode;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.TreeNode;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.URL;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.URL;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java Sat Jul 1 16:36:50 2006
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.UpDownSelect;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.UpDownSelect;
import com.opensymphony.xwork.util.OgnlValueStack;
/**
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/WebTableDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/WebTableDirective.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/WebTableDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/WebTableDirective.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.velocity.components;
+package org.apache.struts2.views.velocity.components;
-import org.apache.struts.action2.components.Component;
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.table.WebTable;
import com.opensymphony.xwork.util.OgnlValueStack;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterNode.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterNode.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterNode.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterNode.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.xslt;
+package org.apache.struts2.views.xslt;
import org.w3c.dom.Node;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.xslt;
+package org.apache.struts2.views.xslt;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.xslt;
+package org.apache.struts2.views.xslt;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.xslt;
+package org.apache.struts2.views.xslt;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/CollectionNodeList.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/CollectionNodeList.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/CollectionNodeList.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/CollectionNodeList.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.xslt;
+package org.apache.struts2.views.xslt;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/DOMAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/DOMAdapter.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/DOMAdapter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/DOMAdapter.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.xslt;
+package org.apache.struts2.views.xslt;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/DefaultAdapterNode.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/DefaultAdapterNode.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/DefaultAdapterNode.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/DefaultAdapterNode.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.xslt;
+package org.apache.struts2.views.xslt;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.*;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/DefaultElementAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/DefaultElementAdapter.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/DefaultElementAdapter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/DefaultElementAdapter.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.xslt;
+package org.apache.struts2.views.xslt;
import org.w3c.dom.*;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/DocumentAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/DocumentAdapter.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/DocumentAdapter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/DocumentAdapter.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.xslt;
+package org.apache.struts2.views.xslt;
import org.w3c.dom.*;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.xslt;
+package org.apache.struts2.views.xslt;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleTextNode.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleTextNode.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleTextNode.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleTextNode.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.xslt;
+package org.apache.struts2.views.xslt;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ToStringAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ToStringAdapter.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ToStringAdapter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ToStringAdapter.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.xslt;
+package org.apache.struts2.views.xslt;
import org.w3c.dom.*;
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java Sat Jul 1 16:36:50 2006
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.xslt;
+package org.apache.struts2.views.xslt;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.StrutsConstants;
-import org.apache.struts.action2.config.Configuration;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.config.Configuration;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.Result;
Modified: struts/struts2/trunk/core/src/main/resources/config-browser.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/config-browser.xml?rev=418521&r1=418520&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/config-browser.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/config-browser.xml Sat Jul 1 16:36:50 2006
@@ -21,21 +21,21 @@
<result type="redirect-action">actionNames</result>
</action>
- <action name="actionNames" class="org.apache.struts.action2.config_browser.ActionNamesAction">
+ <action name="actionNames" class="org.apache.struts2.config_browser.ActionNamesAction">
<result type="freemarker" name="success">/config-browser/actionNames.ftl</result>
</action>
- <action name="showConfig" class="org.apache.struts.action2.config_browser.ShowConfigAction">
+ <action name="showConfig" class="org.apache.struts2.config_browser.ShowConfigAction">
<result type="freemarker" name="success">/config-browser/showConfig.ftl</result>
</action>
- <action name="showValidators" class="org.apache.struts.action2.config_browser.ListValidatorsAction">
+ <action name="showValidators" class="org.apache.struts2.config_browser.ListValidatorsAction">
<result name="error" type="freemarker">/config-browser/simple-error.ftl</result>
<result name="input" type="freemarker">/config-browser/simple-error.ftl</result>
<result type="freemarker" name="success">/config-browser/showValidators.ftl</result>
</action>
- <action name="validatorDetails" class="org.apache.struts.action2.config_browser.ShowValidatorAction">
+ <action name="validatorDetails" class="org.apache.struts2.config_browser.ShowValidatorAction">
<result type="freemarker" name="success">/config-browser/validatorDetails.ftl</result>
</action>
</package>
Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties (original)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties Sat Jul 1 16:36:50 2006
@@ -5,9 +5,9 @@
###
### Specifies the Configuration used to configure Struts Action 2.0
-### one could extend org.apache.struts.action2.config.Configuration
+### one could extend org.apache.struts2.config.Configuration
### to build one's customize way of getting the configurations parameters into Struts Action 2.0
-# struts.configuration=org.apache.struts.action2.config.DefaultConfiguration
+# struts.configuration=org.apache.struts2.config.DefaultConfiguration
### This can be used to set your default locale and encoding scheme
# struts.locale=en_US
@@ -48,7 +48,7 @@
# struts.custom.properties=application,com/webwork/extension/custom
### How request URLs are mapped to and from actions
-struts.mapper.class=org.apache.struts.action2.dispatcher.mapper.DefaultActionMapper
+struts.mapper.class=org.apache.struts2.dispatcher.mapper.DefaultActionMapper
### Used by the DefaultActionMapper
### You may provide a comma separated list, e.g. struts.action.extension=action,jnlp,do
@@ -121,8 +121,8 @@
### configure the Freemarker Manager class to be used
### Allows user to plug-in customised Freemarker Manager if necessary
-### MUST extends off org.apache.struts.action2.views.freemarker.FreemarkerManager
-#struts.freemarker.manager.classname=org.apache.struts.action2.views.freemarker.FreemarkerManager
+### MUST extends off org.apache.struts2.views.freemarker.FreemarkerManager
+#struts.freemarker.manager.classname=org.apache.struts2.views.freemarker.FreemarkerManager
### See the StrutsBeanWrapper javadocs for more information
struts.freemarker.wrapper.altMap=true
Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-default.xml?rev=418521&r1=418520&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Sat Jul 1 16:36:50 2006
@@ -3,44 +3,44 @@
<package name="struts-default">
<result-types>
<result-type name="chain" class="com.opensymphony.xwork.ActionChainResult"/>
- <result-type name="dispatcher" class="org.apache.struts.action2.dispatcher.ServletDispatcherResult" default="true"/>
- <result-type name="freemarker" class="org.apache.struts.action2.views.freemarker.FreemarkerResult"/>
- <result-type name="httpheader" class="org.apache.struts.action2.dispatcher.HttpHeaderResult"/>
- <result-type name="redirect" class="org.apache.struts.action2.dispatcher.ServletRedirectResult"/>
- <result-type name="redirect-action" class="org.apache.struts.action2.dispatcher.ServletActionRedirectResult"/>
- <result-type name="stream" class="org.apache.struts.action2.dispatcher.StreamResult"/>
- <result-type name="tiles" class="org.apache.struts.action2.views.tiles.TilesResult"/>
- <result-type name="velocity" class="org.apache.struts.action2.dispatcher.VelocityResult"/>
- <result-type name="xslt" class="org.apache.struts.action2.views.xslt.XSLTResult"/>
- <result-type name="plaintext" class="org.apache.struts.action2.dispatcher.PlainTextResult" />
+ <result-type name="dispatcher" class="org.apache.struts2.dispatcher.ServletDispatcherResult" default="true"/>
+ <result-type name="freemarker" class="org.apache.struts2.views.freemarker.FreemarkerResult"/>
+ <result-type name="httpheader" class="org.apache.struts2.dispatcher.HttpHeaderResult"/>
+ <result-type name="redirect" class="org.apache.struts2.dispatcher.ServletRedirectResult"/>
+ <result-type name="redirect-action" class="org.apache.struts2.dispatcher.ServletActionRedirectResult"/>
+ <result-type name="stream" class="org.apache.struts2.dispatcher.StreamResult"/>
+ <result-type name="tiles" class="org.apache.struts2.views.tiles.TilesResult"/>
+ <result-type name="velocity" class="org.apache.struts2.dispatcher.VelocityResult"/>
+ <result-type name="xslt" class="org.apache.struts2.views.xslt.XSLTResult"/>
+ <result-type name="plaintext" class="org.apache.struts2.dispatcher.PlainTextResult" />
<!-- third party integration -->
- <result-type name="jasper" class="org.apache.struts.action2.views.jasperreports.JasperReportsResult"/>
+ <result-type name="jasper" class="org.apache.struts2.views.jasperreports.JasperReportsResult"/>
</result-types>
<interceptors>
<interceptor name="alias" class="com.opensymphony.xwork.interceptor.AliasInterceptor"/>
<interceptor name="autowiring" class="com.opensymphony.xwork.spring.interceptor.ActionAutowiringInterceptor"/>
<interceptor name="chain" class="com.opensymphony.xwork.interceptor.ChainingInterceptor"/>
- <interceptor name="conversionError" class="org.apache.struts.action2.interceptor.StrutsConversionErrorInterceptor"/>
- <interceptor name="createSession" class="org.apache.struts.action2.interceptor.CreateSessionInterceptor" />
- <interceptor name="debugging" class="org.apache.struts.action2.interceptor.debugging.DebuggingInterceptor" />
+ <interceptor name="conversionError" class="org.apache.struts2.interceptor.StrutsConversionErrorInterceptor"/>
+ <interceptor name="createSession" class="org.apache.struts2.interceptor.CreateSessionInterceptor" />
+ <interceptor name="debugging" class="org.apache.struts2.interceptor.debugging.DebuggingInterceptor" />
<interceptor name="external-ref" class="com.opensymphony.xwork.interceptor.ExternalReferencesInterceptor"/>
- <interceptor name="execAndWait" class="org.apache.struts.action2.interceptor.ExecuteAndWaitInterceptor"/>
+ <interceptor name="execAndWait" class="org.apache.struts2.interceptor.ExecuteAndWaitInterceptor"/>
<interceptor name="exception" class="com.opensymphony.xwork.interceptor.ExceptionMappingInterceptor"/>
- <interceptor name="fileUpload" class="org.apache.struts.action2.interceptor.FileUploadInterceptor"/>
+ <interceptor name="fileUpload" class="org.apache.struts2.interceptor.FileUploadInterceptor"/>
<interceptor name="i18n" class="com.opensymphony.xwork.interceptor.I18nInterceptor"/>
<interceptor name="logger" class="com.opensymphony.xwork.interceptor.LoggingInterceptor"/>
<interceptor name="model-driven" class="com.opensymphony.xwork.interceptor.ModelDrivenInterceptor"/>
<interceptor name="params" class="com.opensymphony.xwork.interceptor.ParametersInterceptor"/>
<interceptor name="prepare" class="com.opensymphony.xwork.interceptor.PrepareInterceptor"/>
<interceptor name="static-params" class="com.opensymphony.xwork.interceptor.StaticParametersInterceptor"/>
- <interceptor name="scope" class="org.apache.struts.action2.interceptor.ScopeInterceptor"/>
- <interceptor name="servlet-config" class="org.apache.struts.action2.interceptor.ServletConfigInterceptor"/>
- <interceptor name="sessionAutowiring" class="org.apache.struts.action2.spring.interceptor.SessionContextAutowiringInterceptor"/>
+ <interceptor name="scope" class="org.apache.struts2.interceptor.ScopeInterceptor"/>
+ <interceptor name="servlet-config" class="org.apache.struts2.interceptor.ServletConfigInterceptor"/>
+ <interceptor name="sessionAutowiring" class="org.apache.struts2.spring.interceptor.SessionContextAutowiringInterceptor"/>
<interceptor name="timer" class="com.opensymphony.xwork.interceptor.TimerInterceptor"/>
- <interceptor name="token" class="org.apache.struts.action2.interceptor.TokenInterceptor"/>
- <interceptor name="token-session" class="org.apache.struts.action2.interceptor.TokenSessionStoreInterceptor"/>
+ <interceptor name="token" class="org.apache.struts2.interceptor.TokenInterceptor"/>
+ <interceptor name="token-session" class="org.apache.struts2.interceptor.TokenSessionStoreInterceptor"/>
<interceptor name="validation" class="com.opensymphony.xwork.validator.ValidationInterceptor"/>
<interceptor name="workflow" class="com.opensymphony.xwork.interceptor.DefaultWorkflowInterceptor"/>
Modified: struts/struts2/trunk/core/src/main/resources/struts-jsf.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-jsf.xml?rev=418521&r1=418520&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-jsf.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-jsf.xml Sat Jul 1 16:36:50 2006
@@ -2,17 +2,17 @@
<xwork>
<package name="struts-jsf">
<result-types>
- <result-type name="jsf" class="org.apache.struts.action2.jsf.FacesResult" />
+ <result-type name="jsf" class="org.apache.struts2.jsf.FacesResult" />
</result-types>
<interceptors>
<!-- JSF interceptors, one per lifecycle phase -->
- <interceptor class="org.apache.struts.action2.jsf.FacesSetupInterceptor" name="jsfSetup" />
- <interceptor class="org.apache.struts.action2.jsf.RestoreViewInterceptor" name="jsfRestore" />
- <interceptor class="org.apache.struts.action2.jsf.ApplyRequestValuesInterceptor" name="jsfApply" />
- <interceptor class="org.apache.struts.action2.jsf.ProcessValidationsInterceptor" name="jsfValidate" />
- <interceptor class="org.apache.struts.action2.jsf.UpdateModelValuesInterceptor" name="jsfUpdate" />
- <interceptor class="org.apache.struts.action2.jsf.InvokeApplicationInterceptor" name="jsfInvoke" />
+ <interceptor class="org.apache.struts2.jsf.FacesSetupInterceptor" name="jsfSetup" />
+ <interceptor class="org.apache.struts2.jsf.RestoreViewInterceptor" name="jsfRestore" />
+ <interceptor class="org.apache.struts2.jsf.ApplyRequestValuesInterceptor" name="jsfApply" />
+ <interceptor class="org.apache.struts2.jsf.ProcessValidationsInterceptor" name="jsfValidate" />
+ <interceptor class="org.apache.struts2.jsf.UpdateModelValuesInterceptor" name="jsfUpdate" />
+ <interceptor class="org.apache.struts2.jsf.InvokeApplicationInterceptor" name="jsfInvoke" />
<!-- Sample JSF stack, can be combined with other stacks easily -->
<interceptor-stack name="jsfStack">
Modified: struts/struts2/trunk/core/src/main/resources/struts-portlet-default.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-portlet-default.xml?rev=418521&r1=418520&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-portlet-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-portlet-default.xml Sat Jul 1 16:36:50 2006
@@ -5,18 +5,18 @@
<package name="struts-portlet-default" extends="struts-default">
<result-types>
- <result-type name="dispatcher" class="org.apache.struts.action2.portlet.result.PortletResult" default="true"/>
- <result-type name="freemarker" class="org.apache.struts.action2.views.freemarker.PortletFreemarkerResult"/>
- <result-type name="velocity" class="org.apache.struts.action2.portlet.result.PortletVelocityResult"/>
+ <result-type name="dispatcher" class="org.apache.struts2.portlet.result.PortletResult" default="true"/>
+ <result-type name="freemarker" class="org.apache.struts2.views.freemarker.PortletFreemarkerResult"/>
+ <result-type name="velocity" class="org.apache.struts2.portlet.result.PortletVelocityResult"/>
</result-types>
- <action name="renderDirect" class="org.apache.struts.action2.portlet.dispatcher.DirectRenderFromEventAction">
+ <action name="renderDirect" class="org.apache.struts2.portlet.dispatcher.DirectRenderFromEventAction">
<result name="success">${location}</result>
</action>
- <action name="freemarkerDirect" class="org.apache.struts.action2.portlet.dispatcher.DirectRenderFromEventAction">
+ <action name="freemarkerDirect" class="org.apache.struts2.portlet.dispatcher.DirectRenderFromEventAction">
<result type="freemarker" name="success">${location}</result>
</action>
- <action name="velocityDirect" class="org.apache.struts.action2.portlet.dispatcher.DirectRenderFromEventAction">
+ <action name="velocityDirect" class="org.apache.struts2.portlet.dispatcher.DirectRenderFromEventAction">
<result type="velocity" name="success">${location}</result>
</action>
</package>
Copied: struts/struts2/trunk/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java (from r418519, struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/ExecutionCountTestAction.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java?p2=struts/struts2/trunk/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java&p1=struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/ExecutionCountTestAction.java&r1=418519&r2=418521&rev=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/ExecutionCountTestAction.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2;
+package org.apache.struts2;
import com.opensymphony.xwork.ActionSupport;
import org.apache.commons.logging.Log;
Copied: struts/struts2/trunk/core/src/test/java/org/apache/struts2/RequestUtilsTest.java (from r418519, struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/RequestUtilsTest.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/RequestUtilsTest.java?p2=struts/struts2/trunk/core/src/test/java/org/apache/struts2/RequestUtilsTest.java&p1=struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/RequestUtilsTest.java&r1=418519&r2=418521&rev=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/RequestUtilsTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/RequestUtilsTest.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2;
+package org.apache.struts2;
/**
* <code>RequestUtilsTest</code>
Copied: struts/struts2/trunk/core/src/test/java/org/apache/struts2/ServletActionContextTest.java (from r418519, struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/ServletActionContextTest.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/ServletActionContextTest.java?p2=struts/struts2/trunk/core/src/test/java/org/apache/struts2/ServletActionContextTest.java&p1=struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/ServletActionContextTest.java&r1=418519&r2=418521&rev=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/ServletActionContextTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/ServletActionContextTest.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2;
+package org.apache.struts2;
import com.mockobjects.servlet.MockHttpServletRequest;
import com.mockobjects.servlet.MockHttpServletResponse;
Copied: struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java (from r418519, struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/TestAction.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java?p2=struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java&p1=struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/TestAction.java&r1=418519&r2=418521&rev=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/TestAction.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java Sat Jul 1 16:36:50 2006
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2;
+package org.apache.struts2;
-import org.apache.struts.action2.views.jsp.ui.User;
+import org.apache.struts2.views.jsp.ui.User;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
Copied: struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestActionTagResult.java (from r418519, struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/TestActionTagResult.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestActionTagResult.java?p2=struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestActionTagResult.java&p1=struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/TestActionTagResult.java&r1=418519&r2=418521&rev=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/TestActionTagResult.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestActionTagResult.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2;
+package org.apache.struts2;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.Result;
Copied: struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java (from r418519, struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/TestConfigurationProvider.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java?p2=struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java&p1=struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/TestConfigurationProvider.java&r1=418519&r2=418521&rev=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/TestConfigurationProvider.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java Sat Jul 1 16:36:50 2006
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2;
+package org.apache.struts2;
-import org.apache.struts.action2.dispatcher.ServletDispatcherResult;
-import org.apache.struts.action2.interceptor.TokenInterceptor;
-import org.apache.struts.action2.interceptor.TokenSessionStoreInterceptor;
+import org.apache.struts2.dispatcher.ServletDispatcherResult;
+import org.apache.struts2.interceptor.TokenInterceptor;
+import org.apache.struts2.interceptor.TokenSessionStoreInterceptor;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionChainResult;
import com.opensymphony.xwork.config.Configuration;
Copied: struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestResult.java (from r418519, struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/TestResult.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestResult.java?p2=struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestResult.java&p1=struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/TestResult.java&r1=418519&r2=418521&rev=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts/action2/TestResult.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestResult.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2;
+package org.apache.struts2;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/AbstractRichtexteditorConnectorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/AbstractRichtexteditorConnectorTest.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/AbstractRichtexteditorConnectorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/AbstractRichtexteditorConnectorTest.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java Sat Jul 1 16:36:50 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
import java.util.Iterator;
import java.util.Locale;
@@ -24,23 +24,23 @@
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.struts.action2.views.jsp.AbstractTagTest;
-import org.apache.struts.action2.views.jsp.BeanTag;
-import org.apache.struts.action2.views.jsp.ElseIfTag;
-import org.apache.struts.action2.views.jsp.ElseTag;
-import org.apache.struts.action2.views.jsp.I18nTag;
-import org.apache.struts.action2.views.jsp.IfTag;
-import org.apache.struts.action2.views.jsp.IteratorTag;
-import org.apache.struts.action2.views.jsp.PropertyTag;
-import org.apache.struts.action2.views.jsp.PushTag;
-import org.apache.struts.action2.views.jsp.SetTag;
-import org.apache.struts.action2.views.jsp.TextTag;
-import org.apache.struts.action2.views.jsp.URLTag;
-import org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag;
-import org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag;
-import org.apache.struts.action2.views.jsp.ui.RichTextEditorTag;
-import org.apache.struts.action2.views.jsp.ui.TextFieldTag;
-import org.apache.struts.action2.views.jsp.ui.UpDownSelectTag;
+import org.apache.struts2.views.jsp.AbstractTagTest;
+import org.apache.struts2.views.jsp.BeanTag;
+import org.apache.struts2.views.jsp.ElseIfTag;
+import org.apache.struts2.views.jsp.ElseTag;
+import org.apache.struts2.views.jsp.I18nTag;
+import org.apache.struts2.views.jsp.IfTag;
+import org.apache.struts2.views.jsp.IteratorTag;
+import org.apache.struts2.views.jsp.PropertyTag;
+import org.apache.struts2.views.jsp.PushTag;
+import org.apache.struts2.views.jsp.SetTag;
+import org.apache.struts2.views.jsp.TextTag;
+import org.apache.struts2.views.jsp.URLTag;
+import org.apache.struts2.views.jsp.iterator.AppendIteratorTag;
+import org.apache.struts2.views.jsp.iterator.MergeIteratorTag;
+import org.apache.struts2.views.jsp.ui.RichTextEditorTag;
+import org.apache.struts2.views.jsp.ui.TextFieldTag;
+import org.apache.struts2.views.jsp.ui.UpDownSelectTag;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.LocalizedTextUtil;
@@ -184,7 +184,7 @@
t.setName("textFieldName");
BeanTag tag = new BeanTag();
- tag.setName("org.apache.struts.action2.util.Counter");
+ tag.setName("org.apache.struts2.util.Counter");
tag.setPageContext(pageContext);
try {
@@ -436,11 +436,11 @@
t.setPageContext(pageContext);
t.setName("textFieldName");
- ResourceBundle bundle = ResourceBundle.getBundle("org.apache.struts.action2.components.tempo");
- LocalizedTextUtil.addDefaultResourceBundle("org.apache.struts.action2.components.temp");
+ ResourceBundle bundle = ResourceBundle.getBundle("org.apache.struts2.components.tempo");
+ LocalizedTextUtil.addDefaultResourceBundle("org.apache.struts2.components.temp");
I18nTag tag = new I18nTag();
- tag.setName("org.apache.struts.action2.components.tempo");
+ tag.setName("org.apache.struts2.components.tempo");
tag.setPageContext(pageContext);
try {
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormTest.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormTest.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
-import org.apache.struts.action2.TestAction;
+import org.apache.struts2.views.jsp.AbstractUITagTest;
+import org.apache.struts2.TestAction;
import com.opensymphony.xwork.validator.validators.RequiredFieldValidator;
import java.util.List;
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/MockRichtexteditorConnector.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/MockRichtexteditorConnector.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/MockRichtexteditorConnector.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/MockRichtexteditorConnector.java Sat Jul 1 16:36:50 2006
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
-import org.apache.struts.action2.components.AbstractRichtexteditorConnector.CreateFolderResult;
-import org.apache.struts.action2.components.AbstractRichtexteditorConnector.FileUploadResult;
-import org.apache.struts.action2.components.AbstractRichtexteditorConnector.Folder;
-import org.apache.struts.action2.components.AbstractRichtexteditorConnector.FoldersAndFiles;
+import org.apache.struts2.components.AbstractRichtexteditorConnector.CreateFolderResult;
+import org.apache.struts2.components.AbstractRichtexteditorConnector.FileUploadResult;
+import org.apache.struts2.components.AbstractRichtexteditorConnector.Folder;
+import org.apache.struts2.components.AbstractRichtexteditorConnector.FoldersAndFiles;
/**
*
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
-import org.apache.struts.action2.components.Property;
-import org.apache.struts.action2.util.StrutsTypeConverter;
+import org.apache.struts2.components.Property;
+import org.apache.struts2.util.StrutsTypeConverter;
import com.opensymphony.xwork.util.OgnlValueStack;
import com.opensymphony.xwork.util.XWorkConverter;
import junit.framework.TestCase;
@@ -135,7 +135,7 @@
private final class TestDefaultConverter extends XWorkConverter {
protected TestDefaultConverter() {
super();
- registerConverter("org.apache.struts.action2.components.PropertyTest$FooBar", new FooBarConverter());
+ registerConverter("org.apache.struts2.components.PropertyTest$FooBar", new FooBarConverter());
}
}
}
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java Sat Jul 1 16:36:50 2006
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.XWorkStatic;
-import org.apache.struts.action2.TestConfigurationProvider;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
-import org.apache.struts.action2.views.jsp.ui.*;
+import org.apache.struts2.TestConfigurationProvider;
+import org.apache.struts2.views.jsp.AbstractUITagTest;
+import org.apache.struts2.views.jsp.ui.*;
/**
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ConfigurationTest.java?rev=418521&r1=418519&r2=418521&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ConfigurationTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ConfigurationTest.java Sat Jul 1 16:36:50 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.config;
+package org.apache.struts2.config;
-import org.apache.struts.action2.StrutsTestCase;
-import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.StrutsConstants;
import com.opensymphony.xwork.util.LocalizedTextUtil;
import java.util.Iterator;
@@ -35,7 +35,7 @@
assertEquals("12345", Configuration.getString(StrutsConstants.STRUTS_MULTIPART_MAXSIZE));
assertEquals("\temp", Configuration.getString(StrutsConstants.STRUTS_MULTIPART_SAVEDIR));
- assertEquals("test,org/apache/struts/action2/othertest", Configuration.getString( StrutsConstants.STRUTS_CUSTOM_PROPERTIES));
+ assertEquals("test,org/apache/struts2/othertest", Configuration.getString( StrutsConstants.STRUTS_CUSTOM_PROPERTIES));
assertEquals("testvalue", Configuration.getString("testkey"));
assertEquals("othertestvalue", Configuration.getString("othertestkey"));
@@ -56,7 +56,7 @@
Locale.setDefault(Locale.US); // force to US locale as we also have _de and _da properties
LocalizedTextUtil.clearDefaultResourceBundles();
- LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts/action2/struts-messages");
+ LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts2/struts-messages");
assertEquals("The form has already been processed or no token was supplied, please try again.", LocalizedTextUtil.findDefaultText("struts.messages.invalid.token", Locale.getDefault()));
Configuration.reset();