Skip to content

Commit 310cfea

Browse files
committed
WW-5283 Fixes outstanding imports
1 parent 511e4ae commit 310cfea

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.opensymphony.xwork2.config.RuntimeConfiguration;
2323
import com.opensymphony.xwork2.config.entities.ActionConfig;
2424
import com.opensymphony.xwork2.config.entities.ResultConfig;
25+
import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
2526
import org.apache.struts2.config.StrutsXmlConfigurationProvider;
2627
import org.apache.struts2.junit.StrutsTestCase;
2728

struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
package ${package};
1717

1818
import org.apache.struts2.util.StrutsTypeConverter;
19+
import org.apache.struts2.conversion.TypeConversionException;
1920

2021
import java.text.SimpleDateFormat;
2122
import java.text.ParseException;
2223
import java.util.Map;
2324
import java.util.Date;
24-
import com.opensymphony.xwork2.conversion.TypeConversionException;
2525

2626
public class DateConverter extends StrutsTypeConverter {
2727
public Object convertFromString(Map context, String[] values, Class toClass) {

struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,26 @@
1717

1818
import java.util.Date;
1919
import com.opensymphony.xwork2.ActionSupport;
20-
import com.opensymphony.xwork2.validator.annotations.Validation;
2120
import com.opensymphony.xwork2.validator.annotations.RequiredStringValidator;
2221
import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator;
2322
import com.opensymphony.xwork2.conversion.annotations.Conversion;
2423
import com.opensymphony.xwork2.conversion.annotations.TypeConversion;
2524

2625
@Conversion()
2726
public class HelloWorldAction extends ActionSupport {
28-
27+
2928
private Date now;
3029
private String name;
31-
30+
3231
@TypeConversion(converter = "${package}.DateConverter")
3332
@RequiredFieldValidator(message = "Please enter the date")
3433
public void setDateNow(Date now) { this.now = now; }
3534
public Date getDateNow() { return now; }
36-
35+
3736
@RequiredStringValidator(message = "Please enter a name", trim = true)
3837
public void setName(String name) { this.name = name; }
3938
public String getName() { return this.name; }
40-
39+
4140
public String execute() throws Exception {
4241
return SUCCESS;
4342
}

struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<!-- Servlets -->
4848
<servlet>
4949
<servlet-name>dwr</servlet-name>
50-
<servlet-class>uk.ltd.getahead.dwr.DWRServlet</servlet-class>
50+
<servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
5151
<init-param>
5252
<param-name>debug</param-name>
5353
<param-value>true</param-value>

0 commit comments

Comments
 (0)