This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git
The following commit(s) were added to refs/heads/master by this push:
new 310cfea WW-5283 Fixes outstanding imports
310cfea is described below
commit 310cfea5a127e1036e616a031d2973a2ca52822e
Author: Lukasz Lenart <[email protected]>
AuthorDate: Fri Feb 24 08:41:57 2023 +0100
WW-5283 Fixes outstanding imports
---
.../archetype-resources/src/test/java/example/ConfigTest.java | 1 +
.../archetype-resources/src/main/java/DateConverter.java | 2 +-
.../archetype-resources/src/main/java/HelloWorldAction.java | 9 ++++-----
.../archetype-resources/src/main/webapp/WEB-INF/web.xml | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
b/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
index a222597..f7a4f52 100644
---
a/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
+++
b/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
@@ -22,6 +22,7 @@ import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.config.RuntimeConfiguration;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
import org.apache.struts2.config.StrutsXmlConfigurationProvider;
import org.apache.struts2.junit.StrutsTestCase;
diff --git
a/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
b/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
index a0c0902..ac1f4f1 100644
---
a/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
+++
b/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
@@ -16,12 +16,12 @@
package ${package};
import org.apache.struts2.util.StrutsTypeConverter;
+import org.apache.struts2.conversion.TypeConversionException;
import java.text.SimpleDateFormat;
import java.text.ParseException;
import java.util.Map;
import java.util.Date;
-import com.opensymphony.xwork2.conversion.TypeConversionException;
public class DateConverter extends StrutsTypeConverter {
public Object convertFromString(Map context, String[] values, Class
toClass) {
diff --git
a/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java
b/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java
index 6874e63..68014ac 100644
---
a/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java
+++
b/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java
@@ -17,7 +17,6 @@ package ${package};
import java.util.Date;
import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.validator.annotations.Validation;
import com.opensymphony.xwork2.validator.annotations.RequiredStringValidator;
import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator;
import com.opensymphony.xwork2.conversion.annotations.Conversion;
@@ -25,19 +24,19 @@ import
com.opensymphony.xwork2.conversion.annotations.TypeConversion;
@Conversion()
public class HelloWorldAction extends ActionSupport {
-
+
private Date now;
private String name;
-
+
@TypeConversion(converter = "${package}.DateConverter")
@RequiredFieldValidator(message = "Please enter the date")
public void setDateNow(Date now) { this.now = now; }
public Date getDateNow() { return now; }
-
+
@RequiredStringValidator(message = "Please enter a name", trim = true)
public void setName(String name) { this.name = name; }
public String getName() { return this.name; }
-
+
public String execute() throws Exception {
return SUCCESS;
}
diff --git
a/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
b/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index f9273ce..81897fe 100644
---
a/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++
b/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -47,7 +47,7 @@
<!-- Servlets -->
<servlet>
<servlet-name>dwr</servlet-name>
- <servlet-class>uk.ltd.getahead.dwr.DWRServlet</servlet-class>
+ <servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
<init-param>
<param-name>debug</param-name>
<param-value>true</param-value>
