Author: hboutemy
Date: Sun Feb 18 19:37:23 2018
New Revision: 1824692
URL: http://svn.apache.org/viewvc?rev=1824692&view=rev
Log:
[MARCHETYPES-53] switch from Archetype 1 to Archetype NG
Modified:
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/META-INF/maven/archetype-metadata.xml
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/goal.txt
Modified:
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1824692&r1=1824691&r2=1824692&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/META-INF/maven/archetype-metadata.xml
(original)
+++
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/META-INF/maven/archetype-metadata.xml
Sun Feb 18 19:37:23 2018
@@ -17,21 +17,74 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<archetype
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0
http://maven.apache.org/xsd/archetype-1.0.0.xsd";>
- <id>j2ee</id>
+<archetype-descriptor
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0
http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd";
+ name="j2ee">
- <resources>
- <resource>pom.xml</resource>
- <resource>ear/pom.xml</resource>
- <resource>ejbs/src/main/resources/META-INF/ejb-jar.xml</resource>
- <resource>ejbs/pom.xml</resource>
- <resource>primary-source/pom.xml</resource>
- <resource>projects/logging/pom.xml</resource>
- <resource>projects/pom.xml</resource>
- <resource>servlets/pom.xml</resource>
- <resource>servlets/servlet/pom.xml</resource>
- <resource>servlets/servlet/src/main/webapp/index.jsp</resource>
- <resource>servlets/servlet/src/main/webapp/WEB-INF/web.xml</resource>
- </resources>
-</archetype>
+ <modules>
+ <module id="ear" dir="ear" name="ear">
+ <fileSets>
+ <fileSet>
+ <directory>src/main/java</directory>
+ </fileSet>
+ <fileSet>
+ <directory>src/test/java</directory>
+ </fileSet>
+ </fileSets>
+ </module>
+ <module id="ejbs" dir="ejbs" name="ejbs">
+ <fileSets>
+ <fileSet>
+ <directory>src/main/java</directory>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ </fileSet>
+ <fileSet>
+ <directory>src/test/java</directory>
+ </fileSet>
+ </fileSets>
+ </module>
+ <module id="primary-source" dir="primary-source" name="primary-source">
+ <fileSets>
+ <fileSet>
+ <directory>src/main/java</directory>
+ </fileSet>
+ <fileSet>
+ <directory>src/test/java</directory>
+ </fileSet>
+ </fileSets>
+ </module>
+ <module id="projects" dir="projects" name="projects">
+ <modules>
+ <module id="logging" dir="logging" name="logging">
+ <fileSets>
+ <fileSet>
+ <directory>src/main/java</directory>
+ </fileSet>
+ <fileSet>
+ <directory>src/test/java</directory>
+ </fileSet>
+ </fileSets>
+ </module>
+ </modules>
+ </module>
+ <module id="servlets" dir="servlets" name="servlets">
+ <modules>
+ <module id="servlet" dir="servlet" name="servlet">
+ <fileSets>
+ <fileSet>
+ <directory>src/main/java</directory>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/webapp</directory>
+ </fileSet>
+ <fileSet>
+ <directory>src/test/java</directory>
+ </fileSet>
+ </fileSets>
+ </module>
+ </modules>
+ </module>
+ </modules>
+</archetype-descriptor>
Modified:
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml?rev=1824692&r1=1824691&r2=1824692&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
(original)
+++
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
Sun Feb 18 19:37:23 2018
@@ -5,35 +5,33 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>root</groupId>
- <artifactId>project</artifactId>
- <version>1.0</version>
+ <groupId>${groupId}</groupId>
+ <artifactId>${rootArtifactId}</artifactId>
+ <version>${version}</version>
</parent>
- <groupId>root.project</groupId>
<artifactId>ear</artifactId>
- <version>1.0</version>
<packaging>ear</packaging>
<name>ear assembly</name>
<dependencies>
<dependency>
- <groupId>root.project</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>ejbs</artifactId>
<type>ejb</type>
</dependency>
<dependency>
- <groupId>root.project.servlets</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>servlet</artifactId>
<type>war</type>
</dependency>
<dependency>
- <groupId>root.project</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>primary-source</artifactId>
</dependency>
<dependency>
- <groupId>root.project.projects</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>logging</artifactId>
</dependency>
</dependencies>
Modified:
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml?rev=1824692&r1=1824691&r2=1824692&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml
(original)
+++
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml
Sun Feb 18 19:37:23 2018
@@ -5,25 +5,23 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>root</groupId>
- <artifactId>project</artifactId>
- <version>1.0</version>
+ <groupId>${groupId}</groupId>
+ <artifactId>${rootArtifactId}</artifactId>
+ <version>${version}</version>
</parent>
- <groupId>root.project</groupId>
<artifactId>ejbs</artifactId>
- <version>1.0</version>
<packaging>ejb</packaging>
<name>enterprise java beans</name>
<dependencies>
<dependency>
- <groupId>root.project</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>primary-source</artifactId>
</dependency>
<dependency>
- <groupId>root.project.projects</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>logging</artifactId>
</dependency>
</dependencies>
Modified:
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml?rev=1824692&r1=1824691&r2=1824692&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml
(original)
+++
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml
Sun Feb 18 19:37:23 2018
@@ -4,12 +4,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>root</groupId>
- <artifactId>project</artifactId>
- <version>1.0</version>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <version>${version}</version>
<packaging>pom</packaging>
- <name>project</name>
+ <name>${artifactId}</name>
<modules>
<module>projects</module>
@@ -34,25 +34,25 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>root.project.projects</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>logging</artifactId>
- <version>1.0</version>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>root.project</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>primary-source</artifactId>
- <version>1.0</version>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>root.project.servlets</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>servlet</artifactId>
- <version>1.0</version>
+ <version>${version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>root.project</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>ejbs</artifactId>
- <version>1.0</version>
+ <version>${version}</version>
<type>ejb</type>
</dependency>
</dependencies>
Modified:
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml?rev=1824692&r1=1824691&r2=1824692&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml
(original)
+++
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml
Sun Feb 18 19:37:23 2018
@@ -5,12 +5,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>root</groupId>
- <artifactId>project</artifactId>
- <version>1.0</version>
+ <groupId>${groupId}</groupId>
+ <artifactId>${rootArtifactId}</artifactId>
+ <version>${version}</version>
</parent>
- <groupId>root.project</groupId>
<artifactId>primary-source</artifactId>
<packaging>jar</packaging>
@@ -18,7 +17,7 @@
<dependencies>
<dependency>
- <groupId>root.project.projects</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>logging</artifactId>
</dependency>
</dependencies>
Modified:
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml?rev=1824692&r1=1824691&r2=1824692&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml
(original)
+++
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml
Sun Feb 18 19:37:23 2018
@@ -5,14 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>root.project</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>projects</artifactId>
- <version>1.0</version>
+ <version>${version}</version>
</parent>
- <groupId>root.project.projects</groupId>
<artifactId>logging</artifactId>
- <packaging>jar</packaging>
<name>logging</name>
</project>
Modified:
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml?rev=1824692&r1=1824691&r2=1824692&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml
(original)
+++
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml
Sun Feb 18 19:37:23 2018
@@ -5,14 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>root</groupId>
- <artifactId>project</artifactId>
- <version>1.0</version>
+ <groupId>${groupId}</groupId>
+ <artifactId>${rootArtifactId}</artifactId>
+ <version>${version}</version>
</parent>
- <groupId>root.project</groupId>
<artifactId>projects</artifactId>
- <version>1.0</version>
<packaging>pom</packaging>
<name>sub projects</name>
Modified:
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml?rev=1824692&r1=1824691&r2=1824692&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml
(original)
+++
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml
Sun Feb 18 19:37:23 2018
@@ -5,14 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>root</groupId>
- <artifactId>project</artifactId>
- <version>1.0</version>
+ <groupId>${groupId}</groupId>
+ <artifactId>${rootArtifactId}</artifactId>
+ <version>${version}</version>
</parent>
- <groupId>root.project</groupId>
<artifactId>servlets</artifactId>
- <version>1.0</version>
<packaging>pom</packaging>
<name>servlets</name>
Modified:
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml?rev=1824692&r1=1824691&r2=1824692&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml
(original)
+++
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml
Sun Feb 18 19:37:23 2018
@@ -1,16 +1,15 @@
-<<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>root.project</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>servlets</artifactId>
- <version>1.0</version>
+ <version>${version}</version>
</parent>
- <groupId>root.project.servlets</groupId>
<artifactId>servlet</artifactId>
<packaging>war</packaging>
@@ -18,7 +17,7 @@ project xmlns="http://maven.apache.org/P
<dependencies>
<dependency>
- <groupId>root.project</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>primary-source</artifactId>
<scope>provided</scope>
</dependency>
Modified:
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/goal.txt
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/goal.txt?rev=1824692&r1=1824691&r2=1824692&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/goal.txt
(original)
+++
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/goal.txt
Sun Feb 18 19:37:23 2018
@@ -0,0 +1 @@
+verify
\ No newline at end of file
