Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 15:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finishing package changes

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/incubator/webwork2@388369 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald J. Brown
2006-03-24 04:54:56 +00:00
parent c94ad18aa3
commit 7b54a93676
255 changed files with 791 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+2 -2
View File
@@ -168,7 +168,7 @@
<jar basedir="${build.java}" jarfile="${build}/${name}-${version}.jar">
<manifest>
<attribute name="Main-Class" value="com.opensymphony.webwork.Main"/>
<attribute name="Main-Class" value="org.apache.struts.action2.Main"/>
<attribute name="Implementation-Title" value="${fullname}"/>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
@@ -185,7 +185,7 @@
<exclude name="com/opensymphony/webwork/static/**/*" />
</fileset>
<manifest>
<attribute name="Main-Class" value="com.opensymphony.webwork.Main"/>
<attribute name="Main-Class" value="org.apache.struts.action2.Main"/>
<attribute name="Implementation-Title" value="${fullname}"/>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
src/java/META-INF/taglib.tld
+55 -55
View File
@@ -15,7 +15,7 @@
<tag>
<name>head</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.HeadTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.HeadTag</tag-class>
<body-content>empty</body-content>
<description><![CDATA[Render a chunk of HEAD for your HTML file]]></description>
@@ -288,7 +288,7 @@
<tag>
<name>push</name>
<tag-class>com.opensymphony.webwork.views.jsp.PushTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.PushTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Push value on stack for simplified usage.]]></description>
@@ -313,7 +313,7 @@
<tag>
<name>table</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.table.WebTableTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.table.WebTableTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Instantiate a JavaBean and place it in the context.]]></description>
@@ -346,7 +346,7 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<description><![CDATA[Whether the table should be sortable. Requires that model implements com.opensymphony.webwork.components.table.SortableTableModel if set to true.]]></description>
<description><![CDATA[Whether the table should be sortable. Requires that model implements org.apache.struts.action2.components.table.SortableTableModel if set to true.]]></description>
</attribute>
<attribute>
@@ -602,7 +602,7 @@
<tag>
<name>component</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.ComponentTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.ComponentTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a custom ui widget]]></description>
@@ -859,7 +859,7 @@
<tag>
<name>token</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.TokenTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.TokenTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Stop double-submission of forms]]></description>
@@ -1116,7 +1116,7 @@
<tag>
<name>set</name>
<tag-class>com.opensymphony.webwork.views.jsp.SetTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.SetTag</tag-class>
<body-content>empty</body-content>
<description><![CDATA[Assigns a value to a variable in a specified scope]]></description>
@@ -1157,7 +1157,7 @@
<tag>
<name>i18n</name>
<tag-class>com.opensymphony.webwork.views.jsp.I18nTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.I18nTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Get a resource bundle and place it on the value stack]]></description>
@@ -1182,7 +1182,7 @@
<tag>
<name>merge</name>
<tag-class>com.opensymphony.webwork.views.jsp.iterator.MergeIteratorTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Merge the values of a list of iterators into one iterator]]></description>
@@ -1199,7 +1199,7 @@
<tag>
<name>password</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.PasswordTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.PasswordTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render an HTML input tag of type password]]></description>
@@ -1504,7 +1504,7 @@
<tag>
<name>submit</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.SubmitTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.SubmitTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a submit button]]></description>
@@ -1841,7 +1841,7 @@
<tag>
<name>form</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.FormTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.FormTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Renders an input form]]></description>
@@ -2178,7 +2178,7 @@
<tag>
<name>include</name>
<tag-class>com.opensymphony.webwork.views.jsp.IncludeTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.IncludeTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Include a servlet's output (result of servlet or a JSP page)]]></description>
@@ -2203,7 +2203,7 @@
<tag>
<name>div</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.DivTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.DivTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render HTML div providing content from remote call via AJAX]]></description>
@@ -2532,7 +2532,7 @@
<tag>
<name>label</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.LabelTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.LabelTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a label that displays read-only information]]></description>
@@ -2797,7 +2797,7 @@
<tag>
<name>action</name>
<tag-class>com.opensymphony.webwork.views.jsp.ActionTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ActionTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Execute an action from within a view]]></description>
@@ -2846,7 +2846,7 @@
<tag>
<name>bean</name>
<tag-class>com.opensymphony.webwork.views.jsp.BeanTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.BeanTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Instantiate a JavaBean and place it in the context.]]></description>
@@ -2871,7 +2871,7 @@
<tag>
<name>sort</name>
<tag-class>com.opensymphony.webwork.views.jsp.iterator.SortIteratorTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.iterator.SortIteratorTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Sort a List using a Comparator both passed in as the tag attribute.]]></description>
@@ -2904,7 +2904,7 @@
<tag>
<name>hidden</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.HiddenTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.HiddenTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a hidden input field]]></description>
@@ -3161,7 +3161,7 @@
<tag>
<name>iterator</name>
<tag-class>com.opensymphony.webwork.views.jsp.IteratorTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.IteratorTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Iterate over a iterable value]]></description>
@@ -3194,7 +3194,7 @@
<tag>
<name>actionerror</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.ActionErrorTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.ActionErrorTag</tag-class>
<body-content>empty</body-content>
<description><![CDATA[Render action errors if they exists]]></description>
@@ -3451,7 +3451,7 @@
<tag>
<name>if</name>
<tag-class>com.opensymphony.webwork.views.jsp.IfTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.IfTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[If tag]]></description>
@@ -3476,7 +3476,7 @@
<tag>
<name>select</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.SelectTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.SelectTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a select element]]></description>
@@ -3797,7 +3797,7 @@
<tag>
<name>reset</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.ResetTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.ResetTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a reset button]]></description>
@@ -4086,7 +4086,7 @@
<tag>
<name>append</name>
<tag-class>com.opensymphony.webwork.views.jsp.iterator.AppendIteratorTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Append the values of a list of iterators to one iterator]]></description>
@@ -4103,7 +4103,7 @@
<tag>
<name>updownselect</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.UpDownSelectTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.UpDownSelectTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a up down select element]]></description>
@@ -4472,7 +4472,7 @@
<tag>
<name>else</name>
<tag-class>com.opensymphony.webwork.views.jsp.ElseTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ElseTag</tag-class>
<description><![CDATA[Else tag]]></description>
<attribute>
@@ -4488,7 +4488,7 @@
<tag>
<name>debug</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.DebugTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.DebugTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render debug tag]]></description>
@@ -4745,7 +4745,7 @@
<tag>
<name>param</name>
<tag-class>com.opensymphony.webwork.views.jsp.ParamTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ParamTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Parametrize other tags]]></description>
@@ -4778,7 +4778,7 @@
<tag>
<name>optiontransferselect</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.OptionTransferSelectTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.OptionTransferSelectTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Renders an input form]]></description>
@@ -5451,7 +5451,7 @@
<tag>
<name>textfield</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.TextFieldTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.TextFieldTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render an HTML input field of type text]]></description>
@@ -5740,7 +5740,7 @@
<tag>
<name>doubleselect</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.DoubleSelectTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.DoubleSelectTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Renders two HTML select elements with second one changing displayed values depending on selected entry of first one.]]></description>
@@ -6301,7 +6301,7 @@
<tag>
<name>textarea</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.TextareaTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.TextareaTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render HTML textarea tag.]]></description>
@@ -6590,7 +6590,7 @@
<tag>
<name>generator</name>
<tag-class>com.opensymphony.webwork.views.jsp.iterator.IteratorGeneratorTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.iterator.IteratorGeneratorTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Generate an iterator for a iterable source.]]></description>
@@ -6639,7 +6639,7 @@
<tag>
<name>checkbox</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.CheckboxTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.CheckboxTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a checkbox input field]]></description>
@@ -6904,7 +6904,7 @@
<tag>
<name>date</name>
<tag-class>com.opensymphony.webwork.views.jsp.DateTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.DateTag</tag-class>
<body-content>empty</body-content>
<description><![CDATA[Render a formatted date.]]></description>
@@ -6945,7 +6945,7 @@
<tag>
<name>a</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.AnchorTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.AnchorTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a HTML href element that when clicked calls a URL via remote XMLHttpRequest]]></description>
@@ -7258,7 +7258,7 @@
<tag>
<name>file</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.FileTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.FileTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a file input field]]></description>
@@ -7531,7 +7531,7 @@
<tag>
<name>url</name>
<tag-class>com.opensymphony.webwork.views.jsp.URLTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.URLTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[This tag is used to create a URL]]></description>
@@ -7644,7 +7644,7 @@
<tag>
<name>radio</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.RadioTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.RadioTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Renders a radio button input field]]></description>
@@ -7925,7 +7925,7 @@
<tag>
<name>combobox</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.ComboBoxTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.ComboBoxTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Widget that fills a text box from a select]]></description>
@@ -8222,7 +8222,7 @@
<tag>
<name>checkboxlist</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.CheckboxListTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.CheckboxListTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a list of checkboxes]]></description>
@@ -8503,7 +8503,7 @@
<tag>
<name>panel</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.PanelTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.PanelTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a panel for tabbedPanel]]></description>
@@ -8856,7 +8856,7 @@
<tag>
<name>actionmessage</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.ActionMessageTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.ActionMessageTag</tag-class>
<body-content>empty</body-content>
<description><![CDATA[Render action messages if they exists]]></description>
@@ -9113,7 +9113,7 @@
<tag>
<name>tree</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.TreeTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.TreeTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a tree widget.]]></description>
@@ -9450,7 +9450,7 @@
<tag>
<name>property</name>
<tag-class>com.opensymphony.webwork.views.jsp.PropertyTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.PropertyTag</tag-class>
<body-content>empty</body-content>
<description><![CDATA[Print out expression which evaluates against the stack]]></description>
@@ -9491,7 +9491,7 @@
<tag>
<name>tabbedpane</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.TabbedPaneTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.TabbedPaneTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[This tag is deprecated. Use tabbed panel instead.]]></description>
@@ -9516,7 +9516,7 @@
<tag>
<name>tabbedPanel</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.TabbedPanelTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.TabbedPanelTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a tabbedPanel widget.]]></description>
@@ -9781,7 +9781,7 @@
<tag>
<name>treenode</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.TreeNodeTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.TreeNodeTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a tree node within a tree widget.]]></description>
@@ -10046,7 +10046,7 @@
<tag>
<name>fielderror</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.FieldErrorTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.FieldErrorTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render field error (all or partial depending on param tag nested)if they exists]]></description>
@@ -10303,7 +10303,7 @@
<tag>
<name>subset</name>
<tag-class>com.opensymphony.webwork.views.jsp.iterator.SubsetIteratorTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.iterator.SubsetIteratorTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Takes an iterator and outputs a subset of it]]></description>
@@ -10352,7 +10352,7 @@
<tag>
<name>elseif</name>
<tag-class>com.opensymphony.webwork.views.jsp.ElseIfTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ElseIfTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Elseif tag]]></description>
@@ -10377,7 +10377,7 @@
<tag>
<name>text</name>
<tag-class>com.opensymphony.webwork.views.jsp.TextTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.TextTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a I18n text message.]]></description>
@@ -10402,7 +10402,7 @@
<tag>
<name>datepicker</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.DatePickerTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.DatePickerTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render datepicker]]></description>
@@ -10723,7 +10723,7 @@
<tag>
<name>richtexteditor</name>
<tag-class>com.opensymphony.webwork.views.jsp.ui.RichTextEditorTag</tag-class>
<tag-class>org.apache.struts.action2.views.jsp.ui.RichTextEditorTag</tag-class>
<body-content>JSP</body-content>
<description><![CDATA[Render a rich text editor element]]></description>
src/java/config-browser.xml
+4 -4
View File
@@ -21,21 +21,21 @@
<result type="redirect-action">actionNames</result>
</action>
<action name="actionNames" class="com.opensymphony.webwork.config_browser.ActionNamesAction">
<action name="actionNames" class="org.apache.struts.action2.config_browser.ActionNamesAction">
<result type="freemarker" name="success">/config-browser/actionNames.ftl</result>
</action>
<action name="showConfig" class="com.opensymphony.webwork.config_browser.ShowConfigAction">
<action name="showConfig" class="org.apache.struts.action2.config_browser.ShowConfigAction">
<result type="freemarker" name="success">/config-browser/showConfig.ftl</result>
</action>
<action name="showValidators" class="com.opensymphony.webwork.config_browser.ListValidatorsAction">
<action name="showValidators" class="org.apache.struts.action2.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="com.opensymphony.webwork.config_browser.ShowValidatorAction">
<action name="validatorDetails" class="org.apache.struts.action2.config_browser.ShowValidatorAction">
<result type="freemarker" name="success">/config-browser/validatorDetails.ftl</result>
</action>
</package>
src/java/template/archive/simple/tabbedpane.vm
+1 -1
View File
@@ -16,7 +16,7 @@
--
*#
#bean ("com.opensymphony.webwork.util.Counter" $tabIndex)
#bean ("org.apache.struts.action2.util.Counter" $tabIndex)
#set ($tabIndex.first = 0)
#set ($tabIndex.last = $tag.content.size())
src/java/webwork-default.xml
+30 -30
View File
@@ -3,23 +3,23 @@
<package name="webwork-default">
<result-types>
<result-type name="chain" class="com.opensymphony.xwork.ActionChainResult"/>
<result-type name="dispatcher" class="com.opensymphony.webwork.dispatcher.ServletDispatcherResult" default="true"/>
<result-type name="freemarker" class="com.opensymphony.webwork.views.freemarker.FreemarkerResult"/>
<result-type name="httpheader" class="com.opensymphony.webwork.dispatcher.HttpHeaderResult"/>
<result-type name="jasper" class="com.opensymphony.webwork.views.jasperreports.JasperReportsResult"/>
<result-type name="redirect" class="com.opensymphony.webwork.dispatcher.ServletRedirectResult"/>
<result-type name="redirect-action" class="com.opensymphony.webwork.dispatcher.ServletActionRedirectResult"/>
<result-type name="stream" class="com.opensymphony.webwork.dispatcher.StreamResult"/>
<result-type name="tiles" class="com.opensymphony.webwork.views.tiles.TilesResult"/>
<result-type name="velocity" class="com.opensymphony.webwork.dispatcher.VelocityResult"/>
<result-type name="xslt" class="com.opensymphony.webwork.views.xslt.XSLTResult"/>
<result-type name="plaintext" class="com.opensymphony.webwork.dispatcher.PlainTextResult" />
<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="jasper" class="org.apache.struts.action2.views.jasperreports.JasperReportsResult"/>
<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" />
<!-- Results necessary when using 'browse server' and 'upload' feature of Richtexteditor -->
<result-type name="richtexteditorGetFolders" class="com.opensymphony.webwork.views.jsp.ui.RichtexteditorGetFoldersResult" />
<result-type name="richtexteditorGetFoldersAndFiles" class="com.opensymphony.webwork.views.jsp.ui.RichtexteditorGetFoldersAndFilesResult" />
<result-type name="richtexteditorCreateFolder" class="com.opensymphony.webwork.views.jsp.ui.RichtexteditorCreateFolderResult" />
<result-type name="richtexteditorFileUpload" class="com.opensymphony.webwork.views.jsp.ui.RichtexteditorFileUploadResult" />
<result-type name="richtexteditorGetFolders" class="org.apache.struts.action2.views.jsp.ui.RichtexteditorGetFoldersResult" />
<result-type name="richtexteditorGetFoldersAndFiles" class="org.apache.struts.action2.views.jsp.ui.RichtexteditorGetFoldersAndFilesResult" />
<result-type name="richtexteditorCreateFolder" class="org.apache.struts.action2.views.jsp.ui.RichtexteditorCreateFolderResult" />
<result-type name="richtexteditorFileUpload" class="org.apache.struts.action2.views.jsp.ui.RichtexteditorFileUploadResult" />
</result-types>
@@ -28,24 +28,24 @@
<interceptor name="autowiring" class="com.opensymphony.xwork.spring.interceptor.ActionAutowiringInterceptor"/>
<interceptor name="chain" class="com.opensymphony.xwork.interceptor.ChainingInterceptor"/>
<interceptor name="component" class="com.opensymphony.xwork.interceptor.component.ComponentInterceptor"/>
<interceptor name="conversionError" class="com.opensymphony.webwork.interceptor.WebWorkConversionErrorInterceptor"/>
<interceptor name="createSession" class="com.opensymphony.webwork.interceptor.CreateSessionInterceptor" />
<interceptor name="conversionError" class="org.apache.struts.action2.interceptor.WebWorkConversionErrorInterceptor"/>
<interceptor name="createSession" class="org.apache.struts.action2.interceptor.CreateSessionInterceptor" />
<interceptor name="external-ref" class="com.opensymphony.xwork.interceptor.ExternalReferencesInterceptor"/>
<interceptor name="execAndWait" class="com.opensymphony.webwork.interceptor.ExecuteAndWaitInterceptor"/>
<interceptor name="execAndWait" class="org.apache.struts.action2.interceptor.ExecuteAndWaitInterceptor"/>
<interceptor name="exception" class="com.opensymphony.xwork.interceptor.ExceptionMappingInterceptor"/>
<interceptor name="fileUpload" class="com.opensymphony.webwork.interceptor.FileUploadInterceptor"/>
<interceptor name="fileUpload" class="org.apache.struts.action2.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="com.opensymphony.webwork.interceptor.ScopeInterceptor"/>
<interceptor name="servlet-config" class="com.opensymphony.webwork.interceptor.ServletConfigInterceptor"/>
<interceptor name="sessionAutowiring" class="com.opensymphony.webwork.spring.interceptor.SessionContextAutowiringInterceptor"/>
<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="timer" class="com.opensymphony.xwork.interceptor.TimerInterceptor"/>
<interceptor name="token" class="com.opensymphony.webwork.interceptor.TokenInterceptor"/>
<interceptor name="token-session" class="com.opensymphony.webwork.interceptor.TokenSessionStoreInterceptor"/>
<interceptor name="token" class="org.apache.struts.action2.interceptor.TokenInterceptor"/>
<interceptor name="token-session" class="org.apache.struts.action2.interceptor.TokenSessionStoreInterceptor"/>
<interceptor name="validation" class="com.opensymphony.xwork.validator.ValidationInterceptor"/>
<interceptor name="workflow" class="com.opensymphony.xwork.interceptor.DefaultWorkflowInterceptor"/>
@@ -182,18 +182,18 @@
<package name="webwork-portlet-default" extends="webwork-default">
<result-types>
<result-type name="dispatcher" class="com.opensymphony.webwork.portlet.result.PortletResult" default="true"/>
<result-type name="freemarker" class="com.opensymphony.webwork.views.freemarker.PortletFreemarkerResult"/>
<result-type name="velocity" class="com.opensymphony.webwork.portlet.result.PortletVelocityResult"/>
<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-types>
<action name="renderDirect" class="com.opensymphony.webwork.portlet.dispatcher.DirectRenderFromEventAction">
<action name="renderDirect" class="org.apache.struts.action2.portlet.dispatcher.DirectRenderFromEventAction">
<result name="success">${location}</result>
</action>
<action name="freemarkerDirect" class="com.opensymphony.webwork.portlet.dispatcher.DirectRenderFromEventAction">
<action name="freemarkerDirect" class="org.apache.struts.action2.portlet.dispatcher.DirectRenderFromEventAction">
<result type="freemarker" name="success">${location}</result>
</action>
<action name="velocityDirect" class="com.opensymphony.webwork.portlet.dispatcher.DirectRenderFromEventAction">
<action name="velocityDirect" class="org.apache.struts.action2.portlet.dispatcher.DirectRenderFromEventAction">
<result type="velocity" name="success">${location}</result>
</action>
</package>
src/java/webwork.vm
+1 -1
View File
@@ -7,7 +7,7 @@
#end
#macro(url $name)
#set ($name = $webwork.bean("com.opensymphony.webwork.util.URLBean"))
#set ($name = $webwork.bean("org.apache.struts.action2.util.URLBean"))
$name.setRequest($req)
$name.setResponse($res)
#end
src/test/com/opensymphony/webwork/ExecutionCountTestAction.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork;
package org.apache.struts.action2;
import com.opensymphony.xwork.ActionSupport;
import org.apache.commons.logging.Log;
src/test/com/opensymphony/webwork/RequestUtilsTest.java
+1 -1
View File
@@ -3,7 +3,7 @@
* All rights reserved.
*/
package com.opensymphony.webwork;
package org.apache.struts.action2;
/**
* <code>RequestUtilsTest</code>
src/test/com/opensymphony/webwork/ServletActionContextTest.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork;
package org.apache.struts.action2;
import com.mockobjects.servlet.MockHttpServletRequest;
import com.mockobjects.servlet.MockHttpServletResponse;
src/test/com/opensymphony/webwork/TestAction.java
+2 -2
View File
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork;
package org.apache.struts.action2;
import com.opensymphony.webwork.views.jsp.ui.User;
import org.apache.struts.action2.views.jsp.ui.User;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
src/test/com/opensymphony/webwork/TestActionTagResult.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.opensymphony.webwork;
package org.apache.struts.action2;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.Result;
src/test/com/opensymphony/webwork/TestConfigurationProvider.java
+4 -4
View File
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork;
package org.apache.struts.action2;
import com.opensymphony.webwork.dispatcher.ServletDispatcherResult;
import com.opensymphony.webwork.interceptor.TokenInterceptor;
import com.opensymphony.webwork.interceptor.TokenSessionStoreInterceptor;
import org.apache.struts.action2.dispatcher.ServletDispatcherResult;
import org.apache.struts.action2.interceptor.TokenInterceptor;
import org.apache.struts.action2.interceptor.TokenSessionStoreInterceptor;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionChainResult;
import com.opensymphony.xwork.config.Configuration;
src/test/com/opensymphony/webwork/TestResult.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork;
package org.apache.struts.action2;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
src/test/com/opensymphony/webwork/components/AbstractRichtexteditorConnectorTest.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.components;
package org.apache.struts.action2.components;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
src/test/com/opensymphony/webwork/components/ComponentTest.java
+24 -24
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.components;
package org.apache.struts.action2.components;
import java.util.Iterator;
import java.util.Locale;
@@ -11,25 +11,25 @@ import java.util.Stack;
import javax.servlet.jsp.tagext.TagSupport;
import com.opensymphony.webwork.TestConfigurationProvider;
import com.opensymphony.webwork.views.jsp.AbstractTagTest;
import com.opensymphony.webwork.views.jsp.ActionTag;
import com.opensymphony.webwork.views.jsp.BeanTag;
import com.opensymphony.webwork.views.jsp.ElseIfTag;
import com.opensymphony.webwork.views.jsp.ElseTag;
import com.opensymphony.webwork.views.jsp.I18nTag;
import com.opensymphony.webwork.views.jsp.IfTag;
import com.opensymphony.webwork.views.jsp.IteratorTag;
import com.opensymphony.webwork.views.jsp.PropertyTag;
import com.opensymphony.webwork.views.jsp.PushTag;
import com.opensymphony.webwork.views.jsp.SetTag;
import com.opensymphony.webwork.views.jsp.TextTag;
import com.opensymphony.webwork.views.jsp.URLTag;
import com.opensymphony.webwork.views.jsp.iterator.AppendIteratorTag;
import com.opensymphony.webwork.views.jsp.iterator.MergeIteratorTag;
import com.opensymphony.webwork.views.jsp.ui.RichTextEditorTag;
import com.opensymphony.webwork.views.jsp.ui.TextFieldTag;
import com.opensymphony.webwork.views.jsp.ui.UpDownSelectTag;
import org.apache.struts.action2.TestConfigurationProvider;
import org.apache.struts.action2.views.jsp.AbstractTagTest;
import org.apache.struts.action2.views.jsp.ActionTag;
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 com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.config.ConfigurationManager;
import com.opensymphony.xwork.util.LocalizedTextUtil;
@@ -175,7 +175,7 @@ public class ComponentTest extends AbstractTagTest {
t.setName("textFieldName");
BeanTag tag = new BeanTag();
tag.setName("com.opensymphony.webwork.util.Counter");
tag.setName("org.apache.struts.action2.util.Counter");
tag.setPageContext(pageContext);
try {
@@ -427,11 +427,11 @@ public class ComponentTest extends AbstractTagTest {
t.setPageContext(pageContext);
t.setName("textFieldName");
ResourceBundle bundle = ResourceBundle.getBundle("com.opensymphony.webwork.components.tempo");
LocalizedTextUtil.addDefaultResourceBundle("com.opensymphony.webwork.components.temp");
ResourceBundle bundle = ResourceBundle.getBundle("org.apache.struts.action2.components.tempo");
LocalizedTextUtil.addDefaultResourceBundle("org.apache.struts.action2.components.temp");
I18nTag tag = new I18nTag();
tag.setName("com.opensymphony.webwork.components.tempo");
tag.setName("org.apache.struts.action2.components.tempo");
tag.setPageContext(pageContext);
try {
src/test/com/opensymphony/webwork/components/FormTest.java
+3 -3
View File
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.components;
package org.apache.struts.action2.components;
import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
import com.opensymphony.webwork.TestAction;
import org.apache.struts.action2.views.jsp.AbstractUITagTest;
import org.apache.struts.action2.TestAction;
import com.opensymphony.xwork.validator.validators.RequiredFieldValidator;
import java.util.List;
src/test/com/opensymphony/webwork/components/MockRichtexteditorConnector.java
+5 -5
View File
@@ -2,12 +2,12 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.components;
package org.apache.struts.action2.components;
import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.CreateFolderResult;
import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.FileUploadResult;
import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.Folder;
import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.FoldersAndFiles;
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;
/**
*
src/test/com/opensymphony/webwork/components/PropertyTest.java
+4 -4
View File
@@ -1,7 +1,7 @@
package com.opensymphony.webwork.components;
package org.apache.struts.action2.components;
import com.opensymphony.webwork.components.Property;
import com.opensymphony.webwork.util.WebWorkTypeConverter;
import org.apache.struts.action2.components.Property;
import org.apache.struts.action2.util.WebWorkTypeConverter;
import com.opensymphony.xwork.util.OgnlValueStack;
import com.opensymphony.xwork.util.XWorkConverter;
import junit.framework.TestCase;
@@ -121,7 +121,7 @@ public class PropertyTest extends TestCase {
private final class TestDefaultConverter extends XWorkConverter {
protected TestDefaultConverter() {
super();
registerConverter("com.opensymphony.webwork.components.PropertyTest$FooBar", new FooBarConverter());
registerConverter("org.apache.struts.action2.components.PropertyTest$FooBar", new FooBarConverter());
}
}
}
src/test/com/opensymphony/webwork/components/UIComponentTest.java
+23 -23
View File
@@ -2,35 +2,35 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.components;
package org.apache.struts.action2.components;
import java.util.Iterator;
import java.util.Stack;
import javax.servlet.jsp.tagext.TagSupport;
import com.opensymphony.webwork.TestConfigurationProvider;
import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
import com.opensymphony.webwork.views.jsp.ui.ActionErrorTag;
import com.opensymphony.webwork.views.jsp.ui.ActionMessageTag;
import com.opensymphony.webwork.views.jsp.ui.AnchorTag;
import com.opensymphony.webwork.views.jsp.ui.CheckboxTag;
import com.opensymphony.webwork.views.jsp.ui.ComboBoxTag;
import com.opensymphony.webwork.views.jsp.ui.DivTag;
import com.opensymphony.webwork.views.jsp.ui.DoubleSelectTag;
import com.opensymphony.webwork.views.jsp.ui.FieldErrorTag;
import com.opensymphony.webwork.views.jsp.ui.FileTag;
import com.opensymphony.webwork.views.jsp.ui.FormTag;
import com.opensymphony.webwork.views.jsp.ui.HiddenTag;
import com.opensymphony.webwork.views.jsp.ui.LabelTag;
import com.opensymphony.webwork.views.jsp.ui.OptionTransferSelectTag;
import com.opensymphony.webwork.views.jsp.ui.PasswordTag;
import com.opensymphony.webwork.views.jsp.ui.RadioTag;
import com.opensymphony.webwork.views.jsp.ui.SelectTag;
import com.opensymphony.webwork.views.jsp.ui.SubmitTag;
import com.opensymphony.webwork.views.jsp.ui.TextFieldTag;
import com.opensymphony.webwork.views.jsp.ui.TextareaTag;
import com.opensymphony.webwork.views.jsp.ui.TokenTag;
import org.apache.struts.action2.TestConfigurationProvider;
import org.apache.struts.action2.views.jsp.AbstractUITagTest;
import org.apache.struts.action2.views.jsp.ui.ActionErrorTag;
import org.apache.struts.action2.views.jsp.ui.ActionMessageTag;
import org.apache.struts.action2.views.jsp.ui.AnchorTag;
import org.apache.struts.action2.views.jsp.ui.CheckboxTag;
import org.apache.struts.action2.views.jsp.ui.ComboBoxTag;
import org.apache.struts.action2.views.jsp.ui.DivTag;
import org.apache.struts.action2.views.jsp.ui.DoubleSelectTag;
import org.apache.struts.action2.views.jsp.ui.FieldErrorTag;
import org.apache.struts.action2.views.jsp.ui.FileTag;
import org.apache.struts.action2.views.jsp.ui.FormTag;
import org.apache.struts.action2.views.jsp.ui.HiddenTag;
import org.apache.struts.action2.views.jsp.ui.LabelTag;
import org.apache.struts.action2.views.jsp.ui.OptionTransferSelectTag;
import org.apache.struts.action2.views.jsp.ui.PasswordTag;
import org.apache.struts.action2.views.jsp.ui.RadioTag;
import org.apache.struts.action2.views.jsp.ui.SelectTag;
import org.apache.struts.action2.views.jsp.ui.SubmitTag;
import org.apache.struts.action2.views.jsp.ui.TextFieldTag;
import org.apache.struts.action2.views.jsp.ui.TextareaTag;
import org.apache.struts.action2.views.jsp.ui.TokenTag;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.config.ConfigurationManager;
src/test/com/opensymphony/webwork/config/ConfigurationTest.java
+3 -3
View File
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.config;
package org.apache.struts.action2.config;
import com.opensymphony.webwork.WebWorkTestCase;
import com.opensymphony.webwork.WebWorkConstants;
import org.apache.struts.action2.WebWorkTestCase;
import org.apache.struts.action2.WebWorkConstants;
import com.opensymphony.xwork.util.LocalizedTextUtil;
import java.util.Iterator;
src/test/com/opensymphony/webwork/config/TestConfiguration.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.config;
package org.apache.struts.action2.config;
import java.util.ArrayList;
import java.util.Iterator;
src/test/com/opensymphony/webwork/dispatcher/AbstractServletDispatcherTestCase.java
+4 -4
View File
@@ -6,7 +6,7 @@
* Created on 2/10/2003
*
*/
package com.opensymphony.webwork.dispatcher;
package org.apache.struts.action2.dispatcher;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
@@ -14,9 +14,9 @@ import com.mockobjects.servlet.MockHttpServletResponse;
import com.mockobjects.servlet.MockHttpSession;
import com.mockobjects.servlet.MockServletConfig;
import com.mockobjects.servlet.MockServletOutputStream;
import com.opensymphony.webwork.WebWorkTestCase;
import com.opensymphony.webwork.views.jsp.WebWorkMockHttpServletRequest;
import com.opensymphony.webwork.views.jsp.WebWorkMockHttpServletResponse;
import org.apache.struts.action2.WebWorkTestCase;
import org.apache.struts.action2.views.jsp.WebWorkMockHttpServletRequest;
import org.apache.struts.action2.views.jsp.WebWorkMockHttpServletResponse;
import com.opensymphony.xwork.config.ConfigurationManager;
import com.opensymphony.xwork.config.providers.XmlConfigurationProvider;
src/test/com/opensymphony/webwork/dispatcher/ChartResultTest.java
+2 -2
View File
@@ -8,10 +8,10 @@
* To change the template for this generated file go to Window - Preferences -
* Java - Code Generation - Code and Comments
*/
package com.opensymphony.webwork.dispatcher;
package org.apache.struts.action2.dispatcher;
import com.mockobjects.dynamic.Mock;
import com.opensymphony.webwork.ServletActionContext;
import org.apache.struts.action2.ServletActionContext;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import junit.framework.TestCase;
src/test/com/opensymphony/webwork/dispatcher/DefautActionMapperTest.java
+6 -6
View File
@@ -6,14 +6,14 @@
* Created on 2/10/2003
*
*/
package com.opensymphony.webwork.dispatcher;
package org.apache.struts.action2.dispatcher;
import com.mockobjects.servlet.MockHttpServletRequest;
import com.opensymphony.webwork.WebWorkTestCase;
import com.opensymphony.webwork.WebWorkConstants;
import com.opensymphony.webwork.config.Configuration;
import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
import com.opensymphony.webwork.dispatcher.mapper.DefaultActionMapper;
import org.apache.struts.action2.WebWorkTestCase;
import org.apache.struts.action2.WebWorkConstants;
import org.apache.struts.action2.config.Configuration;
import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
import org.apache.struts.action2.dispatcher.mapper.DefaultActionMapper;
import java.util.HashMap;
src/test/com/opensymphony/webwork/dispatcher/DispatcherUtilsTest.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.dispatcher;
package org.apache.struts.action2.dispatcher;
import java.util.Locale;
src/test/com/opensymphony/webwork/dispatcher/FilterDispatcherTest.java
+8 -8
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.dispatcher;
package org.apache.struts.action2.dispatcher;
import java.util.HashMap;
import java.util.Map;
@@ -12,11 +12,11 @@ import javax.servlet.ServletContext;
import org.springframework.mock.web.MockFilterConfig;
import org.springframework.mock.web.MockServletContext;
import com.opensymphony.webwork.WebWorkConstants;
import com.opensymphony.webwork.config.Configuration;
import com.opensymphony.webwork.util.ObjectFactoryDestroyable;
import com.opensymphony.webwork.util.ObjectFactoryInitializable;
import com.opensymphony.webwork.util.ObjectFactoryLifecycle;
import org.apache.struts.action2.WebWorkConstants;
import org.apache.struts.action2.config.Configuration;
import org.apache.struts.action2.util.ObjectFactoryDestroyable;
import org.apache.struts.action2.util.ObjectFactoryInitializable;
import org.apache.struts.action2.util.ObjectFactoryLifecycle;
import com.opensymphony.xwork.ObjectFactory;
import junit.framework.TestCase;
@@ -76,7 +76,7 @@ public class FilterDispatcherTest extends TestCase {
DispatcherUtils.setInstance(null);
Map configMap = new HashMap();
configMap.put(WebWorkConstants.WEBWORK_OBJECTFACTORY, "com.opensymphony.webwork.dispatcher.FilterDispatcherTest$InnerInitializableObjectFactory");
configMap.put(WebWorkConstants.WEBWORK_OBJECTFACTORY, "org.apache.struts.action2.dispatcher.FilterDispatcherTest$InnerInitializableObjectFactory");
configMap.put(WebWorkConstants.WEBWORK_CONFIGURATION_XML_RELOAD, "false");
Configuration.setConfiguration(new InnerConfiguration(configMap));
@@ -96,7 +96,7 @@ public class FilterDispatcherTest extends TestCase {
DispatcherUtils.setInstance(null);
Map configMap = new HashMap();
configMap.put(WebWorkConstants.WEBWORK_OBJECTFACTORY, "com.opensymphony.webwork.dispatcher.FilterDispatcherTest$InnerInitailizableDestroyableObjectFactory");
configMap.put(WebWorkConstants.WEBWORK_OBJECTFACTORY, "org.apache.struts.action2.dispatcher.FilterDispatcherTest$InnerInitailizableDestroyableObjectFactory");
configMap.put(WebWorkConstants.WEBWORK_CONFIGURATION_XML_RELOAD, "false");
Configuration.setConfiguration(new InnerConfiguration(configMap));
src/test/com/opensymphony/webwork/dispatcher/HttpHeaderResultTest.java
+2 -2
View File
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.dispatcher;
package org.apache.struts.action2.dispatcher;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
import com.opensymphony.webwork.ServletActionContext;
import org.apache.struts.action2.ServletActionContext;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.XWorkTestCase;
src/test/com/opensymphony/webwork/dispatcher/NullActionMapper.java
+3 -3
View File
@@ -2,12 +2,12 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.dispatcher;
package org.apache.struts.action2.dispatcher;
import javax.servlet.http.HttpServletRequest;
import com.opensymphony.webwork.dispatcher.mapper.ActionMapper;
import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
import org.apache.struts.action2.dispatcher.mapper.ActionMapper;
import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
/**
* ActionMapper for testing FilterDispatcher (used in FilterDispaatcherTest)
src/test/com/opensymphony/webwork/dispatcher/PlainTextResultTest.java
+5 -5
View File
@@ -2,17 +2,17 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.dispatcher;
package org.apache.struts.action2.dispatcher;
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import com.opensymphony.util.ClassLoaderUtil;
import com.opensymphony.webwork.WebWorkStatics;
import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
import com.opensymphony.webwork.views.jsp.WebWorkMockHttpServletResponse;
import com.opensymphony.webwork.views.jsp.WebWorkMockServletContext;
import org.apache.struts.action2.WebWorkStatics;
import org.apache.struts.action2.views.jsp.AbstractUITagTest;
import org.apache.struts.action2.views.jsp.WebWorkMockHttpServletResponse;
import org.apache.struts.action2.views.jsp.WebWorkMockServletContext;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.mock.MockActionInvocation;
import com.opensymphony.xwork.util.OgnlValueStack;
src/test/com/opensymphony/webwork/dispatcher/ServletDispatchedTestAssertInterceptor.java
+2 -2
View File
@@ -6,9 +6,9 @@
* Created on 2/10/2003
*
*/
package com.opensymphony.webwork.dispatcher;
package org.apache.struts.action2.dispatcher;
import com.opensymphony.webwork.TestAction;
import org.apache.struts.action2.TestAction;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.interceptor.Interceptor;
import junit.framework.Assert;
src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherResultTest.java
+4 -4
View File
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.dispatcher;
package org.apache.struts.action2.dispatcher;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.WebWorkStatics;
import com.opensymphony.webwork.WebWorkTestCase;
import org.apache.struts.action2.ServletActionContext;
import org.apache.struts.action2.WebWorkStatics;
import org.apache.struts.action2.WebWorkTestCase;
import com.opensymphony.xwork.ActionContext;
import ognl.Ognl;
src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherTest-xwork.xml
+2 -2
View File
@@ -6,10 +6,10 @@
<package name="default" extends="webwork-default">
<interceptors>
<interceptor name="assert" class="com.opensymphony.webwork.dispatcher.ServletDispatchedTestAssertInterceptor"/>
<interceptor name="assert" class="org.apache.struts.action2.dispatcher.ServletDispatchedTestAssertInterceptor"/>
</interceptors>
<action name="Test" class="com.opensymphony.webwork.TestAction">
<action name="Test" class="org.apache.struts.action2.TestAction">
<interceptor-ref name="params"/>
<interceptor-ref name="assert"/>
</action>
src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherTest.java
+1 -1
View File
@@ -6,7 +6,7 @@
* Created on 2/10/2003
*
*/
package com.opensymphony.webwork.dispatcher;
package org.apache.struts.action2.dispatcher;
import java.util.HashMap;
import java.util.Map;
src/test/com/opensymphony/webwork/dispatcher/ServletRedirectResultTest.java
+4 -4
View File
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.dispatcher;
package org.apache.struts.action2.dispatcher;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.WebWorkStatics;
import com.opensymphony.webwork.WebWorkTestCase;
import org.apache.struts.action2.ServletActionContext;
import org.apache.struts.action2.WebWorkStatics;
import org.apache.struts.action2.WebWorkTestCase;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.mock.MockActionInvocation;
src/test/com/opensymphony/webwork/dispatcher/SessionMapTest.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.dispatcher;
package org.apache.struts.action2.dispatcher;
import com.mockobjects.constraint.Constraint;
import com.mockobjects.constraint.IsAnything;
src/test/com/opensymphony/webwork/dispatcher/StreamResultTest.java
+2 -2
View File
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.dispatcher;
package org.apache.struts.action2.dispatcher;
import com.opensymphony.util.ClassLoaderUtil;
import com.opensymphony.webwork.ServletActionContext;
import org.apache.struts.action2.ServletActionContext;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.mock.MockActionInvocation;
src/test/com/opensymphony/webwork/dispatcher/VelocityResultTest.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.dispatcher;
package org.apache.struts.action2.dispatcher;
import com.mockobjects.dynamic.Mock;
import com.opensymphony.xwork.ActionContext;
src/test/com/opensymphony/webwork/dispatcher/mapper/DefaultActionMapperTest.java
+3 -3
View File
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.dispatcher.mapper;
package org.apache.struts.action2.dispatcher.mapper;
import java.util.HashMap;
import java.util.Map;
import com.opensymphony.webwork.dispatcher.ServletRedirectResult;
import com.opensymphony.webwork.views.jsp.WebWorkMockHttpServletRequest;
import org.apache.struts.action2.dispatcher.ServletRedirectResult;
import org.apache.struts.action2.views.jsp.WebWorkMockHttpServletRequest;
import com.opensymphony.xwork.Result;
import junit.framework.TestCase;
src/test/com/opensymphony/webwork/dispatcher/mapper/RestfulActionMapperTest.java
+2 -2
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.dispatcher.mapper;
package org.apache.struts.action2.dispatcher.mapper;
import junit.framework.TestCase;
@@ -10,7 +10,7 @@ import java.util.Map;
import java.util.Collections;
import java.util.HashMap;
import com.opensymphony.webwork.views.jsp.WebWorkMockHttpServletRequest;
import org.apache.struts.action2.views.jsp.WebWorkMockHttpServletRequest;
/**
* Unit test for {@link RestfulActionMapper}.
src/test/com/opensymphony/webwork/interceptor/CreateSessionInterceptorTest.java
+3 -3
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.interceptor;
package org.apache.struts.action2.interceptor;
import javax.servlet.http.HttpServletRequest;
@@ -10,8 +10,8 @@ import org.jmock.Mock;
import org.jmock.core.constraint.IsEqual;
import org.jmock.core.matcher.InvokeOnceMatcher;
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.WebWorkTestCase;
import org.apache.struts.action2.ServletActionContext;
import org.apache.struts.action2.WebWorkTestCase;
import com.opensymphony.xwork.mock.MockActionInvocation;
/**
src/test/com/opensymphony/webwork/interceptor/ExecuteAndWaitDelayAction.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.interceptor;
package org.apache.struts.action2.interceptor;
import com.opensymphony.xwork.Action;
src/test/com/opensymphony/webwork/interceptor/ExecuteAndWaitInterceptorTest.java
+5 -5
View File
@@ -3,12 +3,12 @@
* All rights reserved.
*/
package com.opensymphony.webwork.interceptor;
package org.apache.struts.action2.interceptor;
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.WebWorkTestCase;
import com.opensymphony.webwork.views.jsp.WebWorkMockHttpServletRequest;
import com.opensymphony.webwork.views.jsp.WebWorkMockHttpSession;
import org.apache.struts.action2.ServletActionContext;
import org.apache.struts.action2.WebWorkTestCase;
import org.apache.struts.action2.views.jsp.WebWorkMockHttpServletRequest;
import org.apache.struts.action2.views.jsp.WebWorkMockHttpSession;
import com.opensymphony.xwork.*;
import com.opensymphony.xwork.mock.MockResult;
import com.opensymphony.xwork.config.Configuration;
src/test/com/opensymphony/webwork/interceptor/FileUploadInterceptorTest.java
+4 -4
View File
@@ -2,12 +2,12 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.interceptor;
package org.apache.struts.action2.interceptor;
import com.opensymphony.util.ClassLoaderUtil;
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.WebWorkTestCase;
import com.opensymphony.webwork.dispatcher.multipart.MultiPartRequestWrapper;
import org.apache.struts.action2.ServletActionContext;
import org.apache.struts.action2.WebWorkTestCase;
import org.apache.struts.action2.dispatcher.multipart.MultiPartRequestWrapper;
import com.opensymphony.xwork.*;
import com.opensymphony.xwork.mock.MockActionInvocation;
import org.springframework.mock.web.MockHttpServletRequest;
src/test/com/opensymphony/webwork/interceptor/ServletConfigInterceptorTest.java
+4 -4
View File
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.interceptor;
package org.apache.struts.action2.interceptor;
import com.opensymphony.webwork.WebWorkStatics;
import com.opensymphony.webwork.WebWorkTestCase;
import com.opensymphony.webwork.util.ServletContextAware;
import org.apache.struts.action2.WebWorkStatics;
import org.apache.struts.action2.WebWorkTestCase;
import org.apache.struts.action2.util.ServletContextAware;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.mock.MockActionInvocation;
src/test/com/opensymphony/webwork/interceptor/TokenInterceptorTest.java
+6 -6
View File
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.interceptor;
package org.apache.struts.action2.interceptor;
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.TestConfigurationProvider;
import com.opensymphony.webwork.util.TokenHelper;
import com.opensymphony.webwork.views.jsp.WebWorkMockHttpServletRequest;
import com.opensymphony.webwork.views.jsp.WebWorkMockHttpSession;
import org.apache.struts.action2.ServletActionContext;
import org.apache.struts.action2.TestConfigurationProvider;
import org.apache.struts.action2.util.TokenHelper;
import org.apache.struts.action2.views.jsp.WebWorkMockHttpServletRequest;
import org.apache.struts.action2.views.jsp.WebWorkMockHttpSession;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionProxy;
src/test/com/opensymphony/webwork/interceptor/TokenSessionStoreInterceptorTest.java
+2 -2
View File
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.interceptor;
package org.apache.struts.action2.interceptor;
import com.opensymphony.xwork.ActionProxy;
import com.opensymphony.xwork.Action;
import com.opensymphony.webwork.TestConfigurationProvider;
import org.apache.struts.action2.TestConfigurationProvider;
/**
* Unit test for {@link TokenSessionStoreInterceptor}.
src/test/com/opensymphony/webwork/interceptor/WebWorkConversionErrorInterceptorTest.java
+2 -2
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.interceptor;
package org.apache.struts.action2.interceptor;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
@@ -11,7 +11,7 @@ import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.ActionSupport;
import com.opensymphony.xwork.util.OgnlValueStack;
import com.opensymphony.webwork.WebWorkTestCase;
import org.apache.struts.action2.WebWorkTestCase;
import junit.framework.TestCase;
import java.util.HashMap;
src/test/com/opensymphony/webwork/portlet/PortletApplicationMapTest.java
+1 -1
View File
@@ -4,7 +4,7 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
package com.opensymphony.webwork.portlet;
package org.apache.struts.action2.portlet;
import java.util.ArrayList;
import java.util.Arrays;
src/test/com/opensymphony/webwork/portlet/PortletRequestMapTest.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.portlet;
package org.apache.struts.action2.portlet;
import java.util.ArrayList;
import java.util.Arrays;
src/test/com/opensymphony/webwork/portlet/PortletSessionMapTest.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.portlet;
package org.apache.struts.action2.portlet;
import java.util.ArrayList;
import java.util.Arrays;
src/test/com/opensymphony/webwork/portlet/context/PortletActionContextTest.java
+2 -2
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.portlet.context;
package org.apache.struts.action2.portlet.context;
import java.util.HashMap;
import java.util.Map;
@@ -18,7 +18,7 @@ import junit.textui.TestRunner;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
import com.opensymphony.webwork.portlet.PortletActionConstants;
import org.apache.struts.action2.portlet.PortletActionConstants;
import com.opensymphony.xwork.ActionContext;
/**
src/test/com/opensymphony/webwork/portlet/context/PreparatorServletTest.java
+2 -2
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.portlet.context;
package org.apache.struts.action2.portlet.context;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
@@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletResponse;
import org.easymock.MockControl;
import com.opensymphony.webwork.ServletActionContext;
import org.apache.struts.action2.ServletActionContext;
import com.opensymphony.xwork.ActionContext;
import junit.framework.TestCase;
src/test/com/opensymphony/webwork/portlet/context/ServletContextHolderListenerTest.java
+1 -1
View File
@@ -4,7 +4,7 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
package com.opensymphony.webwork.portlet.context;
package org.apache.struts.action2.portlet.context;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
src/test/com/opensymphony/webwork/portlet/dispatcher/Jsr168DispatcherTest.java
+3 -3
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.portlet.dispatcher;
package org.apache.struts.action2.portlet.dispatcher;
import java.util.Collections;
import java.util.HashMap;
@@ -29,8 +29,8 @@ import org.jmock.Mock;
import org.jmock.cglib.MockObjectTestCase;
import org.jmock.core.Constraint;
import com.opensymphony.webwork.portlet.PortletActionConstants;
import com.opensymphony.webwork.portlet.context.ServletContextHolderListener;
import org.apache.struts.action2.portlet.PortletActionConstants;
import org.apache.struts.action2.portlet.context.ServletContextHolderListener;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.ActionProxy;
src/test/com/opensymphony/webwork/portlet/result/PortletResultTest.java
+2 -2
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.portlet.result;
package org.apache.struts.action2.portlet.result;
import java.io.IOException;
import java.util.HashMap;
@@ -23,7 +23,7 @@ import org.jmock.Mock;
import org.jmock.cglib.MockObjectTestCase;
import org.jmock.core.Constraint;
import com.opensymphony.webwork.portlet.PortletActionConstants;
import org.apache.struts.action2.portlet.PortletActionConstants;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
src/test/com/opensymphony/webwork/portlet/util/PortletUrlHelperTest.java
+2 -2
View File
@@ -4,7 +4,7 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
package com.opensymphony.webwork.portlet.util;
package org.apache.struts.action2.portlet.util;
import java.util.HashMap;
import java.util.Map;
@@ -19,7 +19,7 @@ import junit.framework.TestCase;
import org.easymock.MockControl;
import com.opensymphony.webwork.portlet.context.PortletActionContext;
import org.apache.struts.action2.portlet.context.PortletActionContext;
import com.opensymphony.xwork.ActionContext;
/**
src/test/com/opensymphony/webwork/portlet/util/WebWorkUtilTest.java
+5 -5
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.portlet.util;
package org.apache.struts.action2.portlet.util;
import java.util.ArrayList;
import java.util.List;
@@ -15,9 +15,9 @@ import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockRequestDispatcher;
import com.opensymphony.webwork.TestAction;
import com.opensymphony.webwork.util.ListEntry;
import com.opensymphony.webwork.util.WebWorkUtil;
import org.apache.struts.action2.TestAction;
import org.apache.struts.action2.util.ListEntry;
import org.apache.struts.action2.util.WebWorkUtil;
import com.opensymphony.xwork.util.OgnlValueStack;
import junit.framework.TestCase;
@@ -36,7 +36,7 @@ public class WebWorkUtilTest extends TestCase {
protected WebWorkUtil webWorkUtil = null;
public void testBeanMethod() throws Exception {
Object o = webWorkUtil.bean("com.opensymphony.webwork.TestAction");
Object o = webWorkUtil.bean("org.apache.struts.action2.TestAction");
assertNotNull(o);
assertTrue(o instanceof TestAction);
}
src/test/com/opensymphony/webwork/sitegraph/SiteGraphTest.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.opensymphony.webwork.sitegraph;
package org.apache.struts.action2.sitegraph;
import com.opensymphony.util.FileUtils;
import com.opensymphony.webwork.WebWorkTestCase;
import org.apache.struts.action2.WebWorkTestCase;
import java.io.File;
import java.io.StringWriter;
src/test/com/opensymphony/webwork/sitegraph/xwork.xml
+2 -2
View File
@@ -13,7 +13,7 @@
<package name="tutorial" namespace="/tutorial" extends="webwork-default">
<result-types>
<result-type name="freemarker" default="true"
class="com.opensymphony.webwork.views.freemarker.FreemarkerResult"/>
class="org.apache.struts.action2.views.freemarker.FreemarkerResult"/>
</result-types>
<action name="test" class="com.opensymphony.xwork.ActionSupport">
@@ -24,7 +24,7 @@
<package name="sitegraph" namespace="/tutorial/sitegraph" extends="webwork-default">
<result-types>
<result-type name="freemarker" default="true"
class="com.opensymphony.webwork.views.freemarker.FreemarkerResult"/>
class="org.apache.struts.action2.views.freemarker.FreemarkerResult"/>
</result-types>
<action name="guess" class="com.opensymphony.xwork.ActionSupport">
src/test/com/opensymphony/webwork/spring/WebWorkSpringObjectFactoryTest.java
+3 -3
View File
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.spring;
package org.apache.struts.action2.spring;
import com.opensymphony.webwork.WebWorkConstants;
import com.opensymphony.webwork.config.Configuration;
import org.apache.struts.action2.WebWorkConstants;
import org.apache.struts.action2.config.Configuration;
import junit.framework.TestCase;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.mock.web.MockServletContext;
src/test/com/opensymphony/webwork/util/CounterTest.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.util;
package org.apache.struts.action2.util;
import junit.framework.TestCase;
src/test/com/opensymphony/webwork/util/InvocationSessionStoreTest.java
+4 -4
View File
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.util;
package org.apache.struts.action2.util;
import com.mockobjects.dynamic.Mock;
import com.opensymphony.webwork.WebWorkTestCase;
import org.apache.struts.action2.WebWorkTestCase;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.ActionProxy;
@@ -22,8 +22,8 @@ import java.util.Map;
*/
public class InvocationSessionStoreTest extends WebWorkTestCase {
private static final String INVOCATION_KEY = "com.opensymphony.webwork.util.InvocationSessionStoreTest.invocation";
private static final String TOKEN_VALUE = "com.opensymphony.webwork.util.InvocationSessionStoreTest.token";
private static final String INVOCATION_KEY = "org.apache.struts.action2.util.InvocationSessionStoreTest.invocation";
private static final String TOKEN_VALUE = "org.apache.struts.action2.util.InvocationSessionStoreTest.token";
private ActionInvocation invocation;
src/test/com/opensymphony/webwork/util/PrefixTrieTest.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.opensymphony.webwork.util;
package org.apache.struts.action2.util;
import junit.framework.TestCase;
src/test/com/opensymphony/webwork/util/TokenHelperTest.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.util;
package org.apache.struts.action2.util;
import java.util.HashMap;
import java.util.Map;
src/test/com/opensymphony/webwork/util/WebWorkTypeConverterTest.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.util;
package org.apache.struts.action2.util;
import java.util.Date;
import java.util.HashMap;
src/test/com/opensymphony/webwork/views/TemplateEngineManagerTest.java
+3 -3
View File
@@ -1,7 +1,7 @@
package com.opensymphony.webwork.views;
package org.apache.struts.action2.views;
import com.opensymphony.webwork.components.template.*;
import com.opensymphony.webwork.config.Configuration;
import org.apache.struts.action2.components.template.*;
import org.apache.struts.action2.config.Configuration;
import junit.framework.TestCase;
/**
src/test/com/opensymphony/webwork/views/freemarker/FreemarkerManagerTest.java
+4 -4
View File
@@ -2,12 +2,12 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.freemarker;
package org.apache.struts.action2.views.freemarker;
import com.mockobjects.servlet.MockServletContext;
import com.opensymphony.webwork.WebWorkConstants;
import com.opensymphony.webwork.config.Configuration;
import com.opensymphony.webwork.views.jsp.WebWorkMockServletContext;
import org.apache.struts.action2.WebWorkConstants;
import org.apache.struts.action2.config.Configuration;
import org.apache.struts.action2.views.jsp.WebWorkMockServletContext;
import junit.framework.TestCase;
src/test/com/opensymphony/webwork/views/freemarker/FreemarkerTest.java
+3 -3
View File
@@ -6,10 +6,10 @@
* Created on 1/10/2003
*
*/
package com.opensymphony.webwork.views.freemarker;
package org.apache.struts.action2.views.freemarker;
import com.opensymphony.webwork.util.ListEntry;
import com.opensymphony.webwork.util.WebWorkUtil;
import org.apache.struts.action2.util.ListEntry;
import org.apache.struts.action2.util.WebWorkUtil;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
import freemarker.ext.beans.CollectionModel;
src/test/com/opensymphony/webwork/views/freemarker/TestAction.java
+1 -1
View File
@@ -1,7 +1,7 @@
/* * Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.freemarker;
package org.apache.struts.action2.views.freemarker;
import com.opensymphony.xwork.ActionSupport;
src/test/com/opensymphony/webwork/views/freemarker/TestBean.java
+1 -1
View File
@@ -6,7 +6,7 @@
* Created on 1/10/2003
*
*/
package com.opensymphony.webwork.views.freemarker;
package org.apache.struts.action2.views.freemarker;
/**
src/test/com/opensymphony/webwork/views/jsp/AbstractTagTest.java
+9 -9
View File
@@ -2,16 +2,16 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.TestAction;
import com.opensymphony.webwork.WebWorkTestCase;
import com.opensymphony.webwork.config.Configuration;
import com.opensymphony.webwork.dispatcher.ApplicationMap;
import com.opensymphony.webwork.dispatcher.DispatcherUtils;
import com.opensymphony.webwork.dispatcher.RequestMap;
import com.opensymphony.webwork.dispatcher.SessionMap;
import org.apache.struts.action2.ServletActionContext;
import org.apache.struts.action2.TestAction;
import org.apache.struts.action2.WebWorkTestCase;
import org.apache.struts.action2.config.Configuration;
import org.apache.struts.action2.dispatcher.ApplicationMap;
import org.apache.struts.action2.dispatcher.DispatcherUtils;
import org.apache.struts.action2.dispatcher.RequestMap;
import org.apache.struts.action2.dispatcher.SessionMap;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
src/test/com/opensymphony/webwork/views/jsp/AbstractUITagTest.java
+6 -6
View File
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.views.jsp.ui.AbstractUITag;
import org.apache.struts.action2.ServletActionContext;
import org.apache.struts.action2.views.jsp.ui.AbstractUITag;
import com.opensymphony.xwork.ActionContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -132,11 +132,11 @@ public abstract class AbstractUITagTest extends AbstractTagTest {
/**
* Initialize a map of {@link PropertyHolder} for generic tag property testing. Will be used when calling {@link
* #verifyGenericProperties(com.opensymphony.webwork.views.jsp.ui.AbstractUITag, String, String[])} as properties to
* #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, String, String[])} as properties to
* verify.<p/> This implementation defines testdata for all common AbstractUITag properties and may be overridden in
* subclasses.
*
* @return A Map of PropertyHolders values bound to {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
* @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
* as key.
*/
protected Map initializedGenericTagTestProperties() {
@@ -171,7 +171,7 @@ public abstract class AbstractUITagTest extends AbstractTagTest {
/**
* Do a generic verification that setting certain properties on a tag causes expected output regarding this
* property. In most cases you would not call this directly, instead use {@link
* #verifyGenericProperties(com.opensymphony.webwork.views.jsp.ui.AbstractUITag, String, String[])}.
* #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, String, String[])}.
*
* @param tag The fresh created tag instance to test.
* @param theme The theme to use. If <tt>null</tt>, use configured default theme.
src/test/com/opensymphony/webwork/views/jsp/ActionTagTest.java
+6 -6
View File
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.TestAction;
import com.opensymphony.webwork.TestActionTagResult;
import com.opensymphony.webwork.TestConfigurationProvider;
import com.opensymphony.webwork.components.ActionComponent;
import org.apache.struts.action2.ServletActionContext;
import org.apache.struts.action2.TestAction;
import org.apache.struts.action2.TestActionTagResult;
import org.apache.struts.action2.TestConfigurationProvider;
import org.apache.struts.action2.components.ActionComponent;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionProxy;
src/test/com/opensymphony/webwork/views/jsp/AnchorTagTest.java
+3 -3
View File
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import com.opensymphony.webwork.views.jsp.ui.AnchorTag;
import com.opensymphony.webwork.views.jsp.ui.WebWorkBodyContent;
import org.apache.struts.action2.views.jsp.ui.AnchorTag;
import org.apache.struts.action2.views.jsp.ui.WebWorkBodyContent;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
src/test/com/opensymphony/webwork/views/jsp/AppendIteratorTagTest.java
+2 -2
View File
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import com.opensymphony.webwork.views.jsp.iterator.AppendIteratorTag;
import org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
src/test/com/opensymphony/webwork/views/jsp/BeanTagTest.java
+2 -2
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import javax.servlet.jsp.JspException;
@@ -18,7 +18,7 @@ public class BeanTagTest extends AbstractUITagTest {
public void testSimple() {
BeanTag tag = new BeanTag();
tag.setPageContext(pageContext);
tag.setName("com.opensymphony.webwork.TestAction");
tag.setName("org.apache.struts.action2.TestAction");
try {
tag.doStartTag();
src/test/com/opensymphony/webwork/views/jsp/ElseIfTagTest.java
+3 -3
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
@@ -11,8 +11,8 @@ import javax.servlet.jsp.tagext.TagSupport;
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.components.If;
import org.apache.struts.action2.ServletActionContext;
import org.apache.struts.action2.components.If;
import com.opensymphony.xwork.util.OgnlValueStack;
import junit.framework.TestCase;
src/test/com/opensymphony/webwork/views/jsp/ElseTagTest.java
+3 -3
View File
@@ -2,12 +2,12 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.components.If;
import org.apache.struts.action2.ServletActionContext;
import org.apache.struts.action2.components.If;
import com.opensymphony.xwork.util.OgnlValueStack;
import junit.framework.TestCase;
src/test/com/opensymphony/webwork/views/jsp/IfTagTest.java
+2 -2
View File
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
import com.opensymphony.webwork.ServletActionContext;
import org.apache.struts.action2.ServletActionContext;
import junit.framework.TestCase;
import javax.servlet.jsp.JspException;
src/test/com/opensymphony/webwork/views/jsp/IncludeTagTest.java
+2 -2
View File
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import com.mockobjects.servlet.MockRequestDispatcher;
import com.opensymphony.webwork.components.Include;
import org.apache.struts.action2.components.Include;
import org.easymock.MockControl;
import javax.servlet.RequestDispatcher;
src/test/com/opensymphony/webwork/views/jsp/IteratorGeneratorTagTest.java
+3 -3
View File
@@ -2,12 +2,12 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import java.util.Iterator;
import com.opensymphony.webwork.util.IteratorGenerator.Converter;
import com.opensymphony.webwork.views.jsp.iterator.IteratorGeneratorTag;
import org.apache.struts.action2.util.IteratorGenerator.Converter;
import org.apache.struts.action2.views.jsp.iterator.IteratorGeneratorTag;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
src/test/com/opensymphony/webwork/views/jsp/IteratorTagTest.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import com.mockobjects.servlet.MockBodyContent;
import com.mockobjects.servlet.MockJspWriter;
src/test/com/opensymphony/webwork/views/jsp/MergeIteratorTagTest.java
+2 -2
View File
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import com.opensymphony.webwork.views.jsp.iterator.MergeIteratorTag;
import org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
src/test/com/opensymphony/webwork/views/jsp/PortletUrlTagTest.java
+6 -6
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import java.lang.reflect.Field;
import java.util.Arrays;
@@ -41,11 +41,11 @@ import org.jmock.cglib.MockObjectTestCase;
import org.jmock.core.Constraint;
import com.mockobjects.servlet.MockJspWriter;
import com.opensymphony.webwork.components.URL;
import com.opensymphony.webwork.portlet.PortletActionConstants;
import com.opensymphony.webwork.portlet.util.PortletUrlHelper;
import com.opensymphony.webwork.views.jsp.ParamTag;
import com.opensymphony.webwork.dispatcher.DispatcherUtils;
import org.apache.struts.action2.components.URL;
import org.apache.struts.action2.portlet.PortletActionConstants;
import org.apache.struts.action2.portlet.util.PortletUrlHelper;
import org.apache.struts.action2.views.jsp.ParamTag;
import org.apache.struts.action2.dispatcher.DispatcherUtils;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
src/test/com/opensymphony/webwork/views/jsp/PropertyTagTest.java
+5 -5
View File
@@ -2,14 +2,14 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.WebWorkTestCase;
import com.opensymphony.webwork.WebWorkConstants;
import com.opensymphony.webwork.config.Configuration;
import org.apache.struts.action2.ServletActionContext;
import org.apache.struts.action2.WebWorkTestCase;
import org.apache.struts.action2.WebWorkConstants;
import org.apache.struts.action2.config.Configuration;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
src/test/com/opensymphony/webwork/views/jsp/PushTagTest.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import javax.servlet.jsp.JspException;
src/test/com/opensymphony/webwork/views/jsp/SetTagTest.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import javax.servlet.jsp.JspException;
src/test/com/opensymphony/webwork/views/jsp/SortIteratorTagTest.java
+2 -2
View File
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import com.opensymphony.webwork.views.jsp.iterator.SortIteratorTag;
import org.apache.struts.action2.views.jsp.iterator.SortIteratorTag;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
src/test/com/opensymphony/webwork/views/jsp/SubsetIteratorTagTest.java
+3 -3
View File
@@ -2,14 +2,14 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import com.opensymphony.webwork.util.SubsetIteratorFilter.Decider;
import com.opensymphony.webwork.views.jsp.iterator.SubsetIteratorTag;
import org.apache.struts.action2.util.SubsetIteratorFilter.Decider;
import org.apache.struts.action2.views.jsp.iterator.SubsetIteratorTag;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
src/test/com/opensymphony/webwork/views/jsp/TextTagTest.java
+7 -7
View File
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.TestAction;
import com.opensymphony.webwork.components.Text;
import com.opensymphony.webwork.views.jsp.ui.TestAction1;
import com.opensymphony.webwork.views.jsp.ui.WebWorkBodyContent;
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.WebWorkBodyContent;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -29,7 +29,7 @@ import java.util.Locale;
*/
public class TextTagTest extends AbstractTagTest {
private String fooValue = "com.opensymphony.webwork.views.jsp.TextTagTest.fooValue";
private String fooValue = "org.apache.struts.action2.views.jsp.TextTagTest.fooValue";
private TextTag tag;
src/test/com/opensymphony/webwork/views/jsp/URLTagTest.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
src/test/com/opensymphony/webwork/views/jsp/WebWorkMockBodyContent.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.BodyContent;
src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpServletRequest.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import com.mockobjects.servlet.MockHttpServletRequest;
import junit.framework.AssertionFailedError;
src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpServletResponse.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import com.mockobjects.servlet.MockHttpServletResponse;
src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpSession.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import com.mockobjects.servlet.MockHttpSession;
src/test/com/opensymphony/webwork/views/jsp/WebWorkMockJspWriter.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import com.mockobjects.servlet.MockJspWriter;
src/test/com/opensymphony/webwork/views/jsp/WebWorkMockPageContext.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import com.mockobjects.servlet.MockPageContext;
src/test/com/opensymphony/webwork/views/jsp/WebWorkMockServletContext.java
+1 -1
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp;
package org.apache.struts.action2.views.jsp;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
src/test/com/opensymphony/webwork/views/jsp/ui/AbstractRichtexteditorTest.java
+3 -3
View File
@@ -2,14 +2,14 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp.ui;
package org.apache.struts.action2.views.jsp.ui;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import com.mockobjects.servlet.MockHttpServletResponse;
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
import org.apache.struts.action2.ServletActionContext;
import org.apache.struts.action2.views.jsp.AbstractUITagTest;
import com.opensymphony.xwork.mock.MockActionInvocation;
import com.opensymphony.xwork.util.OgnlValueStack;
src/test/com/opensymphony/webwork/views/jsp/ui/ActionErrorTagTest.java
+3 -3
View File
@@ -2,15 +2,15 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
package com.opensymphony.webwork.views.jsp.ui;
package org.apache.struts.action2.views.jsp.ui;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
import com.opensymphony.webwork.views.jsp.ui.ActionErrorTag;
import org.apache.struts.action2.views.jsp.AbstractUITagTest;
import org.apache.struts.action2.views.jsp.ui.ActionErrorTag;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;

Some files were not shown because too many files have changed in this diff Show More