This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch cleanup
in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git
commit 2174235750d93d4cba3fe1cfebeb1c4cbed05bbc
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Sun Nov 3 16:04:20 2019 +0100
Performs various cleanups and updates to adjust archetypes
---
pom.xml | 35 +++++++++----
struts2-archetype-angularjs/README.txt | 11 ++---
struts2-archetype-angularjs/pom.xml | 57 ++--------------------
.../main/resources/archetype-resources/NOTICE.txt | 2 +-
struts2-archetype-blank/README.txt | 11 ++---
struts2-archetype-blank/pom.xml | 54 ++------------------
.../main/resources/META-INF/maven/archetype.xml | 31 ------------
.../main/resources/archetype-resources/NOTICE.txt | 2 +-
.../main/resources/archetype-resources/README.txt | 2 +-
struts2-archetype-convention/README.txt | 7 ++-
struts2-archetype-convention/pom.xml | 54 ++------------------
.../main/resources/archetype-resources/NOTICE.txt | 2 +-
.../main/resources/archetype-resources/README.txt | 2 +-
struts2-archetype-dbportlet/README.txt | 9 ++--
struts2-archetype-dbportlet/pom.xml | 57 +++-------------------
struts2-archetype-plugin/pom.xml | 56 ++-------------------
struts2-archetype-portlet/README.txt | 25 +++++-----
struts2-archetype-portlet/pom.xml | 52 +++-----------------
struts2-archetype-starter/README.txt | 15 +++---
struts2-archetype-starter/pom.xml | 57 +++-------------------
20 files changed, 99 insertions(+), 442 deletions(-)
diff --git a/pom.xml b/pom.xml
index acbbb67..3c7a3d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,13 +26,14 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-master</artifactId>
- <version>10</version>
+ <version>13</version>
</parent>
<artifactId>struts-archetypes</artifactId>
<version>2.5.21-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2 Maven Archetypes</name>
+ <description>Collection of Apache Struts Maven Archetypes</description>
<scm>
<connection>scm:git:https://gitbox.apache.org/struts-archetypes.git</connection>
@@ -91,14 +92,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- <skipDeploy>true</skipDeploy>
- <generateReports>false</generateReports>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -106,7 +99,31 @@
<target>1.7</target>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <escapeString>\</escapeString>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>3.1.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
diff --git a/struts2-archetype-angularjs/README.txt
b/struts2-archetype-angularjs/README.txt
index 3151a95..50cb76a 100644
--- a/struts2-archetype-angularjs/README.txt
+++ b/struts2-archetype-angularjs/README.txt
@@ -1,6 +1,6 @@
INFORMATION
===========
-- This is Struts 2's "HTML5 AngularJS" Maven Archetype
+This is Struts 2's "HTML5 AngularJS" Maven Archetype
USAGE
=====
@@ -15,19 +15,16 @@ USAGE
- the webapp war name -> myWebApp
-
-mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
+ mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
-DartifactId=myWebApp \
-DarchetypeGroupId=org.apache.struts \
-DarchetypeArtifactId=struts2-archetype-angularjs \
-DarchetypeVersion=<CURRENT_STRUTS_VERSION> \
-DremoteRepositories=http://struts.apache.org
+For more details about the Struts2 archetypes, please take a look at our page.
-For more details about the Struts2 archetypes, please take a look at our Wiki
page.
-
--> https://cwiki.apache.org/confluence/display/WW/Struts+2+Maven+Archetypes
-
+-> https://struts.apache.org/maven-archetypes/
IMPORTANT:
==========
diff --git a/struts2-archetype-angularjs/pom.xml
b/struts2-archetype-angularjs/pom.xml
index 6e5d6f0..a9532d0 100644
--- a/struts2-archetype-angularjs/pom.xml
+++ b/struts2-archetype-angularjs/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-archetypes</artifactId>
@@ -7,8 +8,9 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-angularjs</artifactId>
- <packaging>jar</packaging>
+ <packaging>maven-archetype</packaging>
<name>Struts 2 Archetypes - Angular JS</name>
+ <description>This is Struts 2's "HTML5 AngularJS" Maven
Archetype</description>
<properties>
<maven.test.skip>true</maven.test.skip>
@@ -24,63 +26,14 @@
<include>**/*.*</include>
</includes>
</resource>
- <resource>
-
<directory>src/main/resources/archetype-resources/src</directory>
- <filtering>false</filtering>
- <includes>
- <include>**/*.*</include>
- </includes>
- </resource>
</resources>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0</version>
+ <version>3.1.2</version>
</extension>
</extensions>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <escapeString>\</escapeString>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
-
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git
a/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt
b/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt
index 0f2aa9e..c88ffc5 100644
---
a/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt
+++
b/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt
@@ -1,6 +1,6 @@
Apache Struts
-Copyright 2006-2011 The Apache Software Foundation
+Copyright 2006-2019 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/
diff --git a/struts2-archetype-blank/README.txt
b/struts2-archetype-blank/README.txt
index 3fd80bb..94f2796 100644
--- a/struts2-archetype-blank/README.txt
+++ b/struts2-archetype-blank/README.txt
@@ -1,6 +1,6 @@
INFORMATION
===========
-- This is Struts 2's "Blank" Maven Archetype
+This is Struts 2's "Blank" Maven Archetype
USAGE
=====
@@ -15,19 +15,16 @@ USAGE
- the webapp war name -> myWebApp
-
-mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
+ mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
-DartifactId=myWebApp \
-DarchetypeGroupId=org.apache.struts \
-DarchetypeArtifactId=struts2-archetype-blank \
-DarchetypeVersion=<CURRENT_STRUTS_VERSION> \
-DremoteRepositories=http://struts.apache.org
+For more details about the Struts2 archetypes, please take a look at our page.
-For more details about the Struts2 archetypes, please take a look at our Wiki
page.
-
--> https://cwiki.apache.org/confluence/display/WW/Struts+2+Maven+Archetypes
-
+-> https://struts.apache.org/maven-archetypes/
IMPORTANT:
==========
diff --git a/struts2-archetype-blank/pom.xml b/struts2-archetype-blank/pom.xml
index 1fe0d34..58777c8 100644
--- a/struts2-archetype-blank/pom.xml
+++ b/struts2-archetype-blank/pom.xml
@@ -8,8 +8,9 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-blank</artifactId>
- <packaging>jar</packaging>
+ <packaging>maven-archetype</packaging>
<name>Struts 2 Archetypes - Blank</name>
+ <description>This is Struts 2's "Blank" Maven Archetype</description>
<properties>
<maven.test.skip>true</maven.test.skip>
@@ -25,63 +26,14 @@
<include>**/*.*</include>
</includes>
</resource>
- <resource>
-
<directory>src/main/resources/archetype-resources/src</directory>
- <filtering>false</filtering>
- <includes>
- <include>**/*.*</include>
- </includes>
- </resource>
</resources>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0</version>
+ <version>3.1.2</version>
</extension>
</extensions>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <escapeString>\</escapeString>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
-
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git
a/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype.xml
b/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype.xml
index 2fd544f..8867f43 100644
--- a/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype.xml
+++ b/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype.xml
@@ -5,35 +5,4 @@
>
<id>struts2-archetype-blank</id>
-<!--
- <sources>
- <source>src/main/java/example/ExampleSupport.java</source>
- <source>src/main/java/example/HelloWorld.java</source>
- <source>src/main/java/example/Login.java</source>
- </sources>
-
- <resources>
- <resource>src/main/resources/example/Login-validation.xml</resource>
- <resource
filtered="false">src/main/resources/example/package.properties</resource>
- <resource
filtered="false">src/main/resources/example/package_es.properties</resource>
-
- <resource>src/main/resources/example.xml</resource>
- <resource>src/main/resources/struts.xml</resource>
-
- <resource>src/main/webapp/index.html</resource>
- <resource>src/main/webapp/example/HelloWorld.jsp</resource>
- <resource>src/main/webapp/example/Login.jsp</resource>
- <resource>src/main/webapp/example/Menu.jsp</resource>
- <resource>src/main/webapp/example/Missing.jsp</resource>
- <resource>src/main/webapp/example/Register.jsp</resource>
- <resource>src/main/webapp/example/Welcome.jsp</resource>
- <resource>src/main/webapp/WEB-INF/web.xml</resource>
- </resources>
-
- <testSources>
- <source>src/test/java/example/ConfigTest.java</source>
- <source>src/test/java/example/HelloWorldTest.java</source>
- <source>src/test/java/example/LoginTest.java</source>
- </testSources>
--->
</archetype>
diff --git
a/struts2-archetype-blank/src/main/resources/archetype-resources/NOTICE.txt
b/struts2-archetype-blank/src/main/resources/archetype-resources/NOTICE.txt
index 0f2aa9e..c88ffc5 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/NOTICE.txt
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/NOTICE.txt
@@ -1,6 +1,6 @@
Apache Struts
-Copyright 2006-2011 The Apache Software Foundation
+Copyright 2006-2019 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/
diff --git
a/struts2-archetype-blank/src/main/resources/archetype-resources/README.txt
b/struts2-archetype-blank/src/main/resources/archetype-resources/README.txt
index 6608909..7d649e6 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/README.txt
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/README.txt
@@ -5,6 +5,6 @@ application.
For more on getting started with Struts, see
-* http://cwiki.apache.org/WW/home.html
+* https://struts.apache.org/
----------------------------------------------------------------------------
\ No newline at end of file
diff --git a/struts2-archetype-convention/README.txt
b/struts2-archetype-convention/README.txt
index 7948324..0189897 100644
--- a/struts2-archetype-convention/README.txt
+++ b/struts2-archetype-convention/README.txt
@@ -1,6 +1,6 @@
INFORMATION
===========
-- This is Struts 2's "Blank Convention" Maven Archetype
+This is Struts 2's "Blank Convention" Maven Archetype
USAGE
=====
@@ -15,7 +15,6 @@ USAGE
- the webapp war name -> myWebApp
-
mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
-DartifactId=myWebApp \
-DarchetypeGroupId=org.apache.struts \
@@ -23,9 +22,9 @@ USAGE
-DarchetypeVersion=<CURRENT_STRUTS_VERSION> \
-DremoteRepositories=http://struts.apache.org
-For more details about the Struts2 archetypes, please take a look at our Wiki
page.
+For more details about the Struts2 archetypes, please take a look at our page.
--> https://cwiki.apache.org/confluence/display/WW/Struts+2+Maven+Archetypes
+-> https://struts.apache.org/maven-archetypes/
IMPORTANT:
==========
diff --git a/struts2-archetype-convention/pom.xml
b/struts2-archetype-convention/pom.xml
index 66d730b..eb71500 100644
--- a/struts2-archetype-convention/pom.xml
+++ b/struts2-archetype-convention/pom.xml
@@ -7,8 +7,9 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-convention</artifactId>
- <packaging>jar</packaging>
+ <packaging>maven-archetype</packaging>
<name>Struts 2 Archetypes - Blank Convention</name>
+ <description>This is Struts 2's "Blank Convention" Maven
Archetype</description>
<properties>
<maven.test.skip>true</maven.test.skip>
@@ -24,63 +25,14 @@
<include>**/*.*</include>
</includes>
</resource>
- <resource>
-
<directory>src/main/resources/archetype-resources/src</directory>
- <filtering>false</filtering>
- <includes>
- <include>**/*.*</include>
- </includes>
- </resource>
</resources>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0</version>
+ <version>3.1.2</version>
</extension>
</extensions>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <escapeString>\</escapeString>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
-
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git
a/struts2-archetype-convention/src/main/resources/archetype-resources/NOTICE.txt
b/struts2-archetype-convention/src/main/resources/archetype-resources/NOTICE.txt
index 0f2aa9e..c88ffc5 100644
---
a/struts2-archetype-convention/src/main/resources/archetype-resources/NOTICE.txt
+++
b/struts2-archetype-convention/src/main/resources/archetype-resources/NOTICE.txt
@@ -1,6 +1,6 @@
Apache Struts
-Copyright 2006-2011 The Apache Software Foundation
+Copyright 2006-2019 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/
diff --git
a/struts2-archetype-convention/src/main/resources/archetype-resources/README.txt
b/struts2-archetype-convention/src/main/resources/archetype-resources/README.txt
index 3925551..e5aad64 100644
---
a/struts2-archetype-convention/src/main/resources/archetype-resources/README.txt
+++
b/struts2-archetype-convention/src/main/resources/archetype-resources/README.txt
@@ -5,6 +5,6 @@ application.
For more on getting started with Struts, see
-* http://cwiki.apache.org/WW/home.html
+* https://struts.apache.org/
----------------------------------------------------------------------------
\ No newline at end of file
diff --git a/struts2-archetype-dbportlet/README.txt
b/struts2-archetype-dbportlet/README.txt
index 3cfbcab..d89749f 100644
--- a/struts2-archetype-dbportlet/README.txt
+++ b/struts2-archetype-dbportlet/README.txt
@@ -1,8 +1,7 @@
INFORMATION
===========
-- This is Struts 2's "Database Portlet" Maven Archetype
-- To be used to create a simple portlet that displays information in a
database and can be deployed as a webapp or JSR168 portlet.
-
+This is Struts 2's "Database Portlet" Maven Archetype, to be used to create a
simple portlet that displays
+information in a database and can be deployed as a webapp or JSR168 portlet.
USAGE
=====
@@ -25,9 +24,9 @@ mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
-DarchetypeVersion=<CURRENT_STRUTS_VERSION> \
-DremoteRepositories=http://struts.apache.org
-For more details about the Struts2 archetypes, please take a look at our Wiki
page.
+For more details about the Struts2 archetypes, please take a look at our page.
--> https://cwiki.apache.org/confluence/display/WW/Struts+2+Maven+Archetypes
+-> https://struts.apache.org/maven-archetypes/
- to compile, execute
diff --git a/struts2-archetype-dbportlet/pom.xml
b/struts2-archetype-dbportlet/pom.xml
index 4694daf..a88793c 100644
--- a/struts2-archetype-dbportlet/pom.xml
+++ b/struts2-archetype-dbportlet/pom.xml
@@ -7,8 +7,12 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-dbportlet</artifactId>
- <packaging>jar</packaging>
+ <packaging>maven-archetype</packaging>
<name>Struts 2 Archetypes - Database Portlet</name>
+ <description>
+ This is Struts 2's "Database Portlet" Maven Archetype, to be used to
create a simple portlet that displays
+ information in a database and can be deployed as a webapp or JSR168
portlet.
+ </description>
<properties>
<maven.test.skip>true</maven.test.skip>
@@ -24,63 +28,14 @@
<include>**/*.*</include>
</includes>
</resource>
- <resource>
-
<directory>src/main/resources/archetype-resources/src</directory>
- <filtering>false</filtering>
- <includes>
- <include>**/*.*</include>
- </includes>
- </resource>
</resources>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0</version>
+ <version>3.1.2</version>
</extension>
</extensions>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <escapeString>\</escapeString>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
-
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/struts2-archetype-plugin/pom.xml b/struts2-archetype-plugin/pom.xml
index 97574ba..6d08aca 100644
--- a/struts2-archetype-plugin/pom.xml
+++ b/struts2-archetype-plugin/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-archetypes</artifactId>
@@ -7,8 +8,9 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-plugin</artifactId>
- <packaging>jar</packaging>
+ <packaging>maven-archetype</packaging>
<name>Struts 2 Archetypes - Plugin</name>
+ <description>This is Struts 2's "Plugin" Maven Archetype</description>
<properties>
<maven.test.skip>true</maven.test.skip>
@@ -24,62 +26,14 @@
<include>**/*.*</include>
</includes>
</resource>
- <resource>
-
<directory>src/main/resources/archetype-resources/src</directory>
- <filtering>false</filtering>
- <includes>
- <include>**/*.*</include>
- </includes>
- </resource>
</resources>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0</version>
+ <version>3.1.2</version>
</extension>
</extensions>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <escapeString>\</escapeString>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
-
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/struts2-archetype-portlet/README.txt
b/struts2-archetype-portlet/README.txt
index 7708134..8dbc66f 100644
--- a/struts2-archetype-portlet/README.txt
+++ b/struts2-archetype-portlet/README.txt
@@ -1,47 +1,44 @@
INFORMATION
===========
-- This is Struts 2's "Portlet" Maven Archetype
-- To be used to create a simple portlet that can be deployed as JSR286 portlet.
-- There is a maven profile in order to test this portlet on Pluto Portal.
-
+This is Struts 2's "Portlet" Maven Archetype, to be used to create a simple
portlet that
+can be deployed as JSR286 portlet. There is a maven profile in order to test
this portlet on Pluto Portal.
USAGE
=====
-1- Generate your archetype
-mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
+1 Generate your archetype
+ mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
-DartifactId=myWebApp \
-DarchetypeGroupId=org.apache.struts \
-DarchetypeArtifactId=struts2-archetype-portlet \
-DarchetypeVersion=<CURRENT_STRUTS_VERSION> \
-DremoteRepositories=http://struts.apache.org
-2- Build your portlet project for Pluto Portal
+2 Build your portlet project for Pluto Portal
- cd struts2-portlet-helloworld
- mvn clean package -Ppluto-embedded
-3- Download and install Pluto Portal
+3 Download and install Pluto Portal
- cd ..
- curl -v -H "Accept-Encoding: gzip"
"http://apache.opensourcemirror.com/portals/pluto/pluto-2.0.3-bundle.zip"; >
pluto-2.0.3.zip
- unzip pluto-2.0.3.zip -d .
-4- Deploy your portlet app
+4 Deploy your portlet app
- cp
struts2-portlet-helloworld/target/struts2-portlet-helloworld-1.0.0-SNAPSHOT.war
pluto-2.0.3/webapps
-5- Start Pluto Portal and create a page for your portlet
+5 Start Pluto Portal and create a page for your portlet
- ./pluto-2.0.3/bin/startup.sh
- Go to http://localhost:8080/pluto/portal (login: pluto / pwd: pluto)
- Click on "Pluto Admin" (http://localhost:8080/pluto/portal/Pluto%20Admin)
- On "Portal Pages" section : Add page "Struts2"
- On "Portlet Applications" section : select "/struts2-portlet-helloworld" and
"HelloPortlet" then click "Add Portlet"
-6- Test your portlet app
+6 Test your portlet app
- Go to your Struts2 page http://localhost:8080/pluto/portal/Struts2 and play
with your portlet !!
+For more details about the Struts2 archetypes, please take a look at our page.
-For more details about the Struts2 archetypes, please take a look at our Wiki
page.
-
--> https://cwiki.apache.org/confluence/display/WW/Struts+2+Maven+Archetypes
+-> https://struts.apache.org/maven-archetypes/
I18N:
=====
diff --git a/struts2-archetype-portlet/pom.xml
b/struts2-archetype-portlet/pom.xml
index 85b7af7..a9a935c 100644
--- a/struts2-archetype-portlet/pom.xml
+++ b/struts2-archetype-portlet/pom.xml
@@ -7,8 +7,12 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-portlet</artifactId>
- <packaging>jar</packaging>
+ <packaging>maven-archetype</packaging>
<name>Struts 2 Archetypes - Portlet</name>
+ <description>
+ This is Struts 2's "Portlet" Maven Archetype, to be used to create a
simple portlet that
+ can be deployed as JSR286 portlet. There is a maven profile in order
to test this portlet on Pluto Portal.
+ </description>
<properties>
<maven.test.skip>true</maven.test.skip>
@@ -19,7 +23,7 @@
<resources>
<resource>
<directory>src/main/resources</directory>
- <filtering>false</filtering>
+ <filtering>true</filtering>
<includes>
<include>**/*.*</include>
</includes>
@@ -30,50 +34,8 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0</version>
+ <version>3.1.2</version>
</extension>
</extensions>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <escapeString>\</escapeString>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
-
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/struts2-archetype-starter/README.txt
b/struts2-archetype-starter/README.txt
index 9f80801..2d8c76d 100644
--- a/struts2-archetype-starter/README.txt
+++ b/struts2-archetype-starter/README.txt
@@ -1,8 +1,9 @@
INFORMATION
===========
-- This is Struts 2's "Starter" Maven Archetype
-- To be used to create a simple webapp template that one could alter to meet
his/her needs.
-- The created template contains
+This is Struts 2's "Starter" Maven Archetype, to be used to create a simple
webapp template that one could alter
+to meet their needs.
+
+The created template contains
- sitemesh integration
- a simple Struts action
- a simple Struts action level validation
@@ -26,18 +27,16 @@ USAGE
- the webapp war name -> myWebApp
-
-mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
+ mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
-DartifactId=myWebApp \
-DarchetypeGroupId=org.apache.struts \
-DarchetypeArtifactId=struts2-archetype-starter \
-DarchetypeVersion=<CURRENT_STRUTS_VERSION> \
-DremoteRepositories=http://struts.apache.org
-For more details about the Struts2 archetypes, please take a look at our Wiki
page.
-
--> https://cwiki.apache.org/confluence/display/WW/Struts+2+Maven+Archetypes
+For more details about the Struts2 archetypes, please take a look at our page.
+-> https://struts.apache.org/maven-archetypes/
COMMON TASKS
==========
diff --git a/struts2-archetype-starter/pom.xml
b/struts2-archetype-starter/pom.xml
index 5369000..b696b03 100644
--- a/struts2-archetype-starter/pom.xml
+++ b/struts2-archetype-starter/pom.xml
@@ -9,8 +9,12 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-starter</artifactId>
- <packaging>jar</packaging>
+ <packaging>maven-archetype</packaging>
<name>Struts 2 Archetypes - Starter</name>
+ <description>
+ This is Struts 2's "Starter" Maven Archetype, to be used to create a
simple webapp template that one could alter
+ to meet their needs.
+ </description>
<properties>
<maven.test.skip>true</maven.test.skip>
@@ -26,63 +30,14 @@
<include>**/*.*</include>
</includes>
</resource>
- <resource>
-
<directory>src/main/resources/archetype-resources/src</directory>
- <filtering>false</filtering>
- <includes>
- <include>**/*.*</include>
- </includes>
- </resource>
</resources>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0</version>
+ <version>3.1.2</version>
</extension>
</extensions>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <escapeString>\</escapeString>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
-
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
