Skip to content

Commit 8001638

Browse files
author
Alexis Resendiz A.
committed
Changes over archetypes project
* Added new archetypes * Defined new POM to agreggate all archetypes modules * Added missing tests to verify project creation with artifacts * Modified archetypes groupId * Updated all archetypes to use target POMs
1 parent 49c3efa commit 8001638

120 files changed

Lines changed: 1887 additions & 321 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎archetypes/ejb-jee5-liberty/pom.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>net.wasdev.maven.tools.parents</groupId>
7+
<artifactId>archetypes-parent</artifactId>
8+
<version>1.0</version>
9+
</parent>
10+
11+
<groupId>net.wasdev.maven.tools.archetypes</groupId>
12+
<artifactId>ejb-jee5-liberty</artifactId>
13+
<version>1.0</version>
14+
<packaging>maven-archetype</packaging>
15+
16+
<name>EJB 3.0 project archetype</name>
17+
<description>EJB 3.0 project targeting WebSphere Liberty</description>
18+
</project>

‎archetypes/ejb-jee5-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<archetype-descriptor
3+
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
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"
6+
partial="false" name="EJB 3.0 project targeting WebSphere Liberty">
7+
8+
<requiredProperties>
9+
<requiredProperty key="libertyVersion">
10+
<defaultValue>RELEASE</defaultValue>
11+
</requiredProperty>
12+
</requiredProperties>
13+
14+
<fileSets>
15+
<fileSet filtered="true" packaged="false">
16+
<directory>src/main/resources</directory>
17+
<includes>
18+
<include>**/*.*</include>
19+
</includes>
20+
</fileSet>
21+
<fileSet filtered="true" packaged="true">
22+
<directory>src/main/java</directory>
23+
</fileSet>
24+
</fileSets>
25+
26+
</archetype-descriptor>

archetypes/liberty-ejb32-archetype/src/main/resources/archetype-resources/pom.xml renamed to archetypes/ejb-jee5-liberty/src/main/resources/archetype-resources/pom.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,33 @@
2323

2424
<dependencies>
2525
<dependency>
26-
<groupId>net.wasdev.maven.tools</groupId>
26+
<groupId>net.wasdev.maven.tools.targets</groupId>
2727
<artifactId>liberty-target</artifactId>
28-
<version>LATEST</version>
28+
<version>${libertyVersion}</version>
2929
<type>pom</type>
3030
<scope>provided</scope>
3131
</dependency>
3232
</dependencies>
3333

34-
3534
<build>
3635
<plugins>
3736
<plugin>
3837
<groupId>org.apache.maven.plugins</groupId>
3938
<artifactId>maven-compiler-plugin</artifactId>
4039
<version>2.0.2</version>
4140
<configuration>
42-
<source>1.6</source>
43-
<target>1.6</target>
41+
<source>1.5</source>
42+
<target>1.5</target>
4443
</configuration>
4544
</plugin>
4645
<plugin>
4746
<groupId>org.apache.maven.plugins</groupId>
4847
<artifactId>maven-ejb-plugin</artifactId>
4948
<version>2.1</version>
5049
<configuration>
51-
<ejbVersion>3.2</ejbVersion>
50+
<ejbVersion>3.0</ejbVersion>
5251
</configuration>
5352
</plugin>
54-
5553
</plugins>
5654
</build>
5755
</project>

‎archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/archetype.properties‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#Simple test that verifies creation and packaging of a new Maven EJB project
2+
#with ejb-jee5-liberty archetype
3+
4+
groupId=net.wasdev.maven.tools.archetypes.tests
5+
artifactId=ejb-jee5-liberty-test
6+
version=1.0-SNAPSHOT
7+
package=net.wasdev.tests
8+
libertyVersion=RELEASE

‎archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/goal.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package

‎archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5+
6+
<licenses>
7+
<license>
8+
<name>The Apache Software License, Version 2.0</name>
9+
<url>https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE</url>
10+
<distribution>repo</distribution>
11+
</license>
12+
</licenses>
13+
14+
<modelVersion>4.0.0</modelVersion>
15+
16+
<groupId>net.wasdev.maven.tools.archetypes.tests</groupId>
17+
<artifactId>ejb-jee5-liberty-test</artifactId>
18+
<packaging>ejb</packaging>
19+
<version>1.0-SNAPSHOT</version>
20+
21+
<name>ejb-jee5-liberty-test</name>
22+
<url>http://maven.apache.org</url>
23+
24+
<dependencies>
25+
<dependency>
26+
<groupId>net.wasdev.maven.tools.targets</groupId>
27+
<artifactId>liberty-target</artifactId>
28+
<version>RELEASE</version>
29+
<type>pom</type>
30+
<scope>provided</scope>
31+
</dependency>
32+
</dependencies>
33+
34+
<build>
35+
<plugins>
36+
<plugin>
37+
<groupId>org.apache.maven.plugins</groupId>
38+
<artifactId>maven-compiler-plugin</artifactId>
39+
<version>2.0.2</version>
40+
<configuration>
41+
<source>1.5</source>
42+
<target>1.5</target>
43+
</configuration>
44+
</plugin>
45+
<plugin>
46+
<groupId>org.apache.maven.plugins</groupId>
47+
<artifactId>maven-ejb-plugin</artifactId>
48+
<version>2.1</version>
49+
<configuration>
50+
<ejbVersion>3.0</ejbVersion>
51+
</configuration>
52+
</plugin>
53+
</plugins>
54+
</build>
55+
</project>

‎archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

‎archetypes/ejb-jee6-liberty/pom.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>net.wasdev.maven.tools.parents</groupId>
7+
<artifactId>archetypes-parent</artifactId>
8+
<version>1.0</version>
9+
</parent>
10+
11+
<groupId>net.wasdev.maven.tools.archetypes</groupId>
12+
<artifactId>ejb-jee6-liberty</artifactId>
13+
<version>1.0</version>
14+
<packaging>maven-archetype</packaging>
15+
16+
<name>EJB 3.1 project archetype</name>
17+
<description>EJB 3.1 project targeting WebSphere Liberty</description>
18+
</project>

‎archetypes/ejb-jee6-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<archetype-descriptor
3+
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
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"
6+
partial="false" name="EJB 3.1 project targeting WebSphere Liberty">
7+
8+
<requiredProperties>
9+
<requiredProperty key="libertyVersion">
10+
<defaultValue>RELEASE</defaultValue>
11+
</requiredProperty>
12+
</requiredProperties>
13+
14+
<fileSets>
15+
<fileSet filtered="true" packaged="false">
16+
<directory>src/main/resources</directory>
17+
<includes>
18+
<include>**/*.*</include>
19+
</includes>
20+
</fileSet>
21+
<fileSet filtered="true" packaged="true">
22+
<directory>src/main/java</directory>
23+
</fileSet>
24+
</fileSets>
25+
26+
</archetype-descriptor>

archetypes/liberty-ejb31-archetype/src/main/resources/archetype-resources/pom.xml renamed to archetypes/ejb-jee6-liberty/src/main/resources/archetype-resources/pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,14 @@
2323

2424
<dependencies>
2525
<dependency>
26-
<groupId>net.wasdev.maven.tools</groupId>
26+
<groupId>net.wasdev.maven.tools.targets</groupId>
2727
<artifactId>liberty-target</artifactId>
28-
<version>LATEST</version>
28+
<version>${libertyVersion}</version>
2929
<type>pom</type>
3030
<scope>provided</scope>
3131
</dependency>
3232
</dependencies>
3333

34-
3534
<build>
3635
<plugins>
3736
<plugin>
@@ -51,7 +50,6 @@
5150
<ejbVersion>3.1</ejbVersion>
5251
</configuration>
5352
</plugin>
54-
5553
</plugins>
5654
</build>
5755
</project>

0 commit comments

Comments
 (0)