Return-Path: Delivered-To: apmail-struts-commits-archive@locus.apache.org Received: (qmail 94573 invoked from network); 1 Jul 2006 23:40:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Jul 2006 23:40:20 -0000 Received: (qmail 19525 invoked by uid 500); 1 Jul 2006 23:39:35 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 19483 invoked by uid 500); 1 Jul 2006 23:39:35 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 19472 invoked by uid 99); 1 Jul 2006 23:39:35 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Jul 2006 16:39:35 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Jul 2006 16:39:29 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id D1FEA1A9863; Sat, 1 Jul 2006 16:38:44 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r418521 [9/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... Date: Sat, 01 Jul 2006 23:37:11 -0000 To: commits@struts.apache.org From: mrdon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060701233844.D1FEA1A9863@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java Sat Jul 1 16:36:50 2006 @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.components.Text; -import org.apache.struts.action2.views.jsp.ui.TestAction1; -import org.apache.struts.action2.views.jsp.ui.StrutsBodyContent; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.TestAction; +import org.apache.struts2.components.Text; +import org.apache.struts2.views.jsp.ui.TestAction1; +import org.apache.struts2.views.jsp.ui.StrutsBodyContent; import com.mockobjects.servlet.MockBodyContent; import com.mockobjects.servlet.MockJspWriter; @@ -47,7 +47,7 @@ */ public class TextTagTest extends AbstractTagTest { - private String fooValue = "org.apache.struts.action2.views.jsp.TextTagTest.fooValue"; + private String fooValue = "org.apache.struts2.views.jsp.TextTagTest.fooValue"; private TextTag tag; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java Sat Jul 1 16:36:50 2006 @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import java.util.HashMap; import java.util.Map; import javax.servlet.jsp.JspWriter; -import org.apache.struts.action2.components.URL; +import org.apache.struts2.components.URL; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorTest.java Sat Jul 1 16:36:50 2006 @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import java.io.ByteArrayOutputStream; import java.io.InputStream; import com.mockobjects.servlet.MockHttpServletResponse; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.views.jsp.AbstractUITagTest; import com.opensymphony.xwork.mock.MockActionInvocation; import com.opensymphony.xwork.util.OgnlValueStack; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java Sat Jul 1 16:36:50 2006 @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; -import org.apache.struts.action2.views.jsp.ui.ActionErrorTag; +import org.apache.struts2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.ui.ActionErrorTag; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionSupport; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java Sat Jul 1 16:36:50 2006 @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.AbstractUITagTest; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionSupport; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/Category.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/Category.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/Category.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/Category.java Sat Jul 1 16:36:50 2006 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import java.util.ArrayList; import java.util.HashMap; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.ArrayList; import java.util.Collection; @@ -32,11 +32,11 @@ public class CheckboxListTest extends AbstractUITagTest { /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag - * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.Map; @@ -31,11 +31,11 @@ } /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag - * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ComboBoxTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ComboBoxTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ComboBoxTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ComboBoxTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.ArrayList; import java.util.LinkedHashMap; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ComponentTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ComponentTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ComponentTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ComponentTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java Sat Jul 1 16:36:50 2006 @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.AbstractUITagTest; import com.opensymphony.xwork.ActionContext; import java.util.Locale; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.views.jsp.AbstractTagTest; -import org.apache.struts.action2.views.jsp.DateTag; +import org.apache.struts2.views.jsp.AbstractTagTest; +import org.apache.struts2.views.jsp.DateTag; import com.opensymphony.xwork.ActionContext; import java.text.DateFormat; @@ -27,7 +27,7 @@ import java.util.Date; /** - * Unit test for {@link org.apache.struts.action2.components.Date}. + * Unit test for {@link org.apache.struts2.components.Date}. * */ public class DateTagTest extends AbstractTagTest { @@ -74,7 +74,7 @@ tag.doStartTag(); // component test must be done between start and end tag - org.apache.struts.action2.components.Date component = (org.apache.struts.action2.components.Date) tag.getComponent(); + org.apache.struts2.components.Date component = (org.apache.struts2.components.Date) tag.getComponent(); assertEquals("myDate", component.getName()); assertEquals(format, component.getFormat()); assertEquals(false, component.isNice()); Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.ArrayList; import java.util.Collection; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java Sat Jul 1 16:36:50 2006 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import java.util.ArrayList; import java.util.Collections; @@ -23,8 +23,8 @@ import java.util.List; import java.util.Map; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; -import org.apache.struts.action2.views.jsp.ParamTag; +import org.apache.struts2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.ParamTag; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionSupport; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.Map; @@ -51,11 +51,11 @@ } /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag - * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java Sat Jul 1 16:36:50 2006 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.ActionSupport; @@ -25,13 +25,13 @@ import com.opensymphony.xwork.config.entities.ActionConfig; import com.opensymphony.xwork.config.entities.InterceptorMapping; import com.opensymphony.xwork.validator.ValidationInterceptor; -import org.apache.struts.action2.StrutsConstants; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.TestConfigurationProvider; -import org.apache.struts.action2.config.Configuration; -import org.apache.struts.action2.dispatcher.mapper.DefaultActionMapper; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; -import org.apache.struts.action2.views.jsp.ActionTag; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.TestAction; +import org.apache.struts2.TestConfigurationProvider; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.dispatcher.mapper.DefaultActionMapper; +import org.apache.struts2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.ActionTag; import java.util.ArrayList; import java.util.List; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; -import org.apache.struts.action2.components.Head; +import org.apache.struts2.views.jsp.AbstractUITagTest; +import org.apache.struts2.components.Head; /** * Unit test for {@link HeadTag}. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.Map; import java.util.HashMap; @@ -45,11 +45,11 @@ } /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag - * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.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.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import com.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.Map; import java.util.HashMap; @@ -63,11 +63,11 @@ } /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag - * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java Sat Jul 1 16:36:50 2006 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import javax.servlet.jsp.tagext.BodyTagSupport; import java.util.Calendar; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java Sat Jul 1 16:36:50 2006 @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import java.util.ArrayList; import java.util.List; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** * Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/PasswordTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/PasswordTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/PasswordTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/PasswordTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.HashMap; import java.util.LinkedHashMap; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.HashMap; import java.util.Map; @@ -97,11 +97,11 @@ } /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag * property testing. Will be used when calling {@link #verifyGenericProperties(AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RichTextEditorTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RichTextEditorTagTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RichTextEditorTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RichTextEditorTagTest.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.jsp.ui; +package org.apache.struts2.views.jsp.ui; import java.util.Locale; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.AbstractUITagTest; import com.opensymphony.xwork.ActionContext; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.math.BigDecimal; import java.util.ArrayList; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java Sat Jul 1 16:36:50 2006 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.tagext.BodyContent; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.Map; import java.util.HashMap; @@ -211,11 +211,11 @@ } /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag - * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java Sat Jul 1 16:36:50 2006 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import com.opensymphony.xwork.ActionSupport; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.Map; @@ -54,11 +54,11 @@ } /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag - * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.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.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.freemarker.tags.TextFieldModel; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.freemarker.tags.TextFieldModel; +import org.apache.struts2.views.jsp.AbstractUITagTest; import freemarker.template.TransformControl; import java.util.HashMap; @@ -31,11 +31,11 @@ public class TextfieldTest extends AbstractUITagTest { /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag - * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java Sat Jul 1 16:36:50 2006 @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.util.TokenHelper; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.util.TokenHelper; +import org.apache.struts2.views.jsp.AbstractUITagTest; import javax.servlet.jsp.JspException; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java Sat Jul 1 16:36:50 2006 @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import com.mockobjects.servlet.MockJspWriter; 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.ParamTag; -import org.apache.struts.action2.views.jsp.StrutsMockBodyContent; +import org.apache.struts2.TestConfigurationProvider; +import org.apache.struts2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.ParamTag; +import org.apache.struts2.views.jsp.StrutsMockBodyContent; /** * UI components Tooltip test case. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java Sat Jul 1 16:36:50 2006 @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.AbstractUITagTest; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionSupport; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java Sat Jul 1 16:36:50 2006 @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.AbstractUITagTest; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionSupport; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/User.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/User.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/User.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/User.java Sat Jul 1 16:36:50 2006 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.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.util; +package org.apache.struts2.views.util; -import org.apache.struts.action2.config.Configuration; -import org.apache.struts.action2.StrutsConstants; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.StrutsConstants; import com.opensymphony.xwork.util.OgnlValueStack; import junit.framework.TestCase; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.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.util; +package org.apache.struts2.views.util; /** * ResourceUtilTest * Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/TextUtilTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/TextUtilTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/TextUtilTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/TextUtilTest.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.util; +package org.apache.struts2.views.util; import junit.framework.TestCase; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.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.views.util; +package org.apache.struts2.views.util; import com.mockobjects.dynamic.Mock; -import org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.StrutsConstants; -import org.apache.struts.action2.config.Configuration; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.config.Configuration; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.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.xslt; +package org.apache.struts2.views.xslt; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.StrutsTestCase; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.StrutsTestCase; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.mock.MockActionInvocation; Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/dispatcher/ServletDispatcherTest-xwork.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/dispatcher/ServletDispatcherTest-xwork.xml?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/dispatcher/ServletDispatcherTest-xwork.xml (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/dispatcher/ServletDispatcherTest-xwork.xml Sat Jul 1 16:36:50 2006 @@ -6,10 +6,10 @@ - + - + Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/xwork.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/xwork.xml?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/xwork.xml (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/xwork.xml Sat Jul 1 16:36:50 2006 @@ -13,7 +13,7 @@ + class="org.apache.struts2.views.freemarker.FreemarkerResult"/> @@ -24,7 +24,7 @@ + class="org.apache.struts2.views.freemarker.FreemarkerResult"/> Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-param.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-param.txt?rev=418521&r1=418519&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-param.txt (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-param.txt Sat Jul 1 16:36:50 2006 @@ -1,7 +1,7 @@ param hello = world param argle = bargle param glip = glop -param obj.Class = class org.apache.struts.action2.views.jsp.ui.ComponentTag +param obj.Class = class org.apache.struts2.views.jsp.ui.ComponentTag param array[0] = a param array[1] = b Modified: struts/struts2/trunk/core/src/test/resources/struts.properties URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/struts.properties?rev=418521&r1=418520&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/struts.properties (original) +++ struts/struts2/trunk/core/src/test/resources/struts.properties Sat Jul 1 16:36:50 2006 @@ -4,10 +4,10 @@ struts.multipart.maxSize=12345 ### Load custom property files (does not override struts.properties!) -struts.custom.properties=test,org/apache/struts/action2/othertest +struts.custom.properties=test,org/apache/struts2/othertest # added the MockTag to the path of Tags that the TagDirective will search through -struts.velocity.tag.path = org.apache.struts.action2.views.velocity.ui, org.displaytag.tags +struts.velocity.tag.path = org.apache.struts2.views.velocity.ui, org.displaytag.tags struts.ui.templateDir = template Modified: struts/struts2/trunk/core/src/test/resources/xwork.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/xwork.xml?rev=418521&r1=418520&r2=418521&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/xwork.xml (original) +++ struts/struts2/trunk/core/src/test/resources/xwork.xml Sat Jul 1 16:36:50 2006 @@ -13,7 +13,7 @@ + class="org.apache.struts2.views.freemarker.FreemarkerResult"/> @@ -24,7 +24,7 @@ + class="org.apache.struts2.views.freemarker.FreemarkerResult"/>