Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions action-chaining/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
<parent>
<artifactId>struts-examples</artifactId>
<groupId>org.apache.struts</groupId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>action-chaining</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>Action chaining</name>

Expand Down
4 changes: 1 addition & 3 deletions annotations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>annotations</artifactId>

<name>Annotations with Convention Plugin</name>

<description>Annotations example application for the Struts 2 getting started tutorials</description>
<packaging>war</packaging>

Expand Down
3 changes: 2 additions & 1 deletion basic-struts/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>basic-struts</artifactId>
<name>Basic Struts2 Example</name>
<description>Basic Struts 2 example application</description>
Expand Down
4 changes: 2 additions & 2 deletions bean-validation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>
<artifactId>bean-validation</artifactId>

<artifactId>bean-validation</artifactId>
<name>Bean Validation</name>
<description>bean (JSR 303) validation example application for the Struts 2 getting started tutorials</description>

Expand Down
2 changes: 1 addition & 1 deletion blank/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>blank</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion coding-actions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>coding-actions</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions control-tags/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>
<artifactId>control-tags</artifactId>

<artifactId>control-tags</artifactId>
<name>Control Tags</name>

<description>Control tags example application for the Struts 2 getting started tutorials</description>

<packaging>war</packaging>

<build>
Expand Down
3 changes: 1 addition & 2 deletions crud/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>crud</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>CRUD Example</name>

Expand Down
6 changes: 3 additions & 3 deletions debugging-struts/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>debugging-struts</artifactId>

<name>Debugging Struts</name>

<description>Exception handling example application for the Struts 2 getting started tutorials</description>

<packaging>war</packaging>

<dependencies>
<dependency>
<groupId>org.apache.struts</groupId>
Expand Down
5 changes: 2 additions & 3 deletions exception-handling/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>exception-handling</artifactId>

<name>Exception handling</name>

<description>Exception handling example application for the Struts 2 getting started tutorials</description>

<packaging>war</packaging>

<build>
Expand Down
3 changes: 2 additions & 1 deletion exclude-parameters/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>exclude-parameters</artifactId>
<name>Exclude Parameters</name>
<description>Struts 2 example application for the exclude parameters getting started tutorial</description>

<packaging>war</packaging>

<build>
Expand Down
4 changes: 2 additions & 2 deletions file-upload/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<parent>
<artifactId>struts-examples</artifactId>
<groupId>org.apache.struts</groupId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>file-upload</artifactId>

<name>File upload</name>
<description>Simple file upload example</description>

<packaging>war</packaging>

<properties>
Expand Down
5 changes: 2 additions & 3 deletions form-processing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>
<artifactId>form-processing</artifactId>

<artifactId>form-processing</artifactId>
<name>Form Processing</name>

<description>Form processing example application for the Struts 2 getting started tutorials</description>

<packaging>war</packaging>
Expand Down
4 changes: 1 addition & 3 deletions form-tags/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>form-tags</artifactId>

<name>Form Tags</name>

<description>Form tags example application for the Struts 2 getting started tutorials</description>

<packaging>war</packaging>
Expand Down
4 changes: 1 addition & 3 deletions form-validation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>form-validation</artifactId>

<name>Form validation</name>

<description>Form validation example application for the Struts 2 getting started tutorials</description>

<packaging>war</packaging>
Expand Down
5 changes: 2 additions & 3 deletions form-xml-validation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>form-xml-validation</artifactId>

<name>XML based form validation</name>

<description>Form XML validation example application for the Struts 2 getting started tutorials</description>

<packaging>war</packaging>

<build>
Expand Down
7 changes: 3 additions & 4 deletions helloworld/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>helloworld</artifactId>
<packaging>war</packaging>

<name>Hello World Struts 2 Example Application</name>

<description>Hello world example application for the Struts 2 Getting Started tutorials</description>

<packaging>war</packaging>

<build>
<finalName>hello-world</finalName>
<plugins>
Expand Down
3 changes: 2 additions & 1 deletion http-session/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>http-session</artifactId>
<name>Http Session</name>
<description>Struts 2 example application for the HTTP Session getting started tutorial</description>

<packaging>war</packaging>

<build>
Expand Down
4 changes: 1 addition & 3 deletions interceptors/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>interceptors</artifactId>

<name>Struts 2 Interceptors</name>

<description>Form XML validation example application for the Struts 2 getting started tutorials</description>

<packaging>war</packaging>
Expand Down
7 changes: 3 additions & 4 deletions json-customize/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
<parent>
<artifactId>struts-examples</artifactId>
<groupId>org.apache.struts</groupId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<groupId>org.demo</groupId>
<artifactId>json-customize</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>Customized JSON produce</name>

<packaging>war</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down
7 changes: 3 additions & 4 deletions json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
<parent>
<artifactId>struts-examples</artifactId>
<groupId>org.apache.struts</groupId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<groupId>org.demo</groupId>
<artifactId>json</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>JSON produce/consume</name>

<packaging>war</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down
3 changes: 0 additions & 3 deletions mailreader/src/main/webapp/META-INF/context.xml

This file was deleted.

File renamed without changes.
33 changes: 15 additions & 18 deletions mailreader/pom.xml → mailreader2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,40 +25,37 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-examples</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</parent>

<artifactId>mailreader</artifactId>
<packaging>war</packaging>
<artifactId>mailreader2</artifactId>
<name>Struts 2 Mail Reader Webapp</name>

<packaging>war</packaging>

<dependencies>

<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-config-browser-plugin</artifactId>
</dependency>

<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>2.1</version>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-mailreader-dao</artifactId>
<version>1.3.5</version>
</dependency>

</dependencies>

<build>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
Expand Down
Loading