Skip to content

Commit e300d7f

Browse files
author
Alexis Resendiz Andrade
committed
Merge pull request #7 from WASdev/Development
Development
2 parents 38607b6 + a3d19f2 commit e300d7f

126 files changed

Lines changed: 2744 additions & 1071 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.

‎.gitignore‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
*/target/**
2-
*/.settings/*
3-
*/.project/*
4-
.metadata
5-
/.settings/
6-
/target/
7-
/.project
1+
*.project
2+
.settings/
3+
target/

‎README.md‎

Lines changed: 44 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,56 @@
11
ci.maven.tools
22
==============
33

4-
Collection of Maven archetypes and target pom's for developing Java EE and OSGi applications targetting the WebSphere Application Server Liberty Profile within the WDT Eclipse IDE.
4+
ci.maven.tools is a collection of Maven archetypes and target POMs for developing Java EE and OSGi applications targeting WebSphere Application Server Liberty within the WDT Eclipse IDE.
55

6-
## Maven Target Pom's
6+
##Projects
77

8-
### liberty-target
8+
There are provided two different projects to be used in Maven environments: [Maven Target POMs](#maven-target-poms), a set of convenience POMs that groups WebSphere Liberty dependencies; and [Maven archetypes](#archetypes), to create new Maven projects with recommended configurations and dependencies targeting WebSphere Liberty.
99

10-
#### Usage: Add the following dependency to your application pom.xml to represent the Liberty and spec API libraries
10+
### [Maven Target POM's](/docs/target-poms.md)
1111

12-
<dependency>
13-
<groupId>net.wasdev.maven.tools</groupId>
14-
<artifactId>liberty-target</artifactId>
15-
<version>LATEST</version>
16-
<type>pom</type>
17-
<scope>provided</scope>
18-
</dependency>
19-
20-
### liberty-target-impl
12+
Project containing convenience POMs that groups a set of WebSphere Liberty APIs/SPIs, java specifications and third-party dependencies provided by the runtime.
2113

22-
#### Usage: Add the following dependency to your application pom.xml to represent the Liberty 3rd Party implementation API libraries
14+
Following are the provided modules for this project:
2315

24-
<dependency>
25-
<groupId>net.wasdev.maven.tools</groupId>
26-
<artifactId>liberty-target-impl</artifactId>
27-
<version>LATEST</version>
28-
<type>pom</type>
29-
<scope>provided</scope>
30-
</dependency>
16+
* [liberty-target](/docs/target-poms.md#liberty-target) - Creates a POM that provides references to all modules (APIs/SPIs, java specifications and third-party implementations).
17+
* [liberty-apis](/docs/target-poms.md#liberty-apis) - Creates a POM with Liberty API dependencies.
18+
* [liberty-spis](/docs/target-poms.md#liberty-spis) - Creates a POM with Liberty SPI dependencies.
19+
* [java-specs](/docs/target-poms.md#java-specs) - Creates a POM with Java specification dependencies that a Liberty installation provides in the `dev/api/spec` and `/dev/spi/spec` folders.
20+
* [third-party](/docs/target-poms.md#third-party) - Creates a POM with third-party dependencies that a Liberty installation provides in the `dev/api/third-party` and `/dev/spi/third-party` folders.
3121

32-
## Archetypes
22+
### [Archetypes](/docs/archetypes.md)
23+
24+
Project with Maven archetypes for creating new Java EE and OSGi projects targeting WebSphere Liberty within the WDT Eclipse IDE.
25+
26+
#### Java EE archetypes
27+
28+
Archetype | Project type
29+
----------------------- | ------------
30+
ejb-jee5-liberty | EJB 3.0 project
31+
ejb-jee6-liberty | EJB 3.1 project
32+
ejb-jee7-liberty | EJB 3.2 project
33+
webapp-jee5-liberty | Web 2.5 project
34+
webapp-jee6-liberty | Web 3.0 project
35+
webapp-jee7-liberty | Web 3.1 project
36+
37+
#### OSGi Enterprise archetypes
38+
39+
Archetype | Project type
40+
----------------------- | ------------
41+
osgi-liberty | OSGi project
42+
osgi-web25-liberty | OSGi Web 2.5 project
43+
osgi-web30-liberty | OSGi Web 3.0 project
44+
osgi-web31-liberty | OSGi Web 3.1 project
45+
46+
##How to build
47+
48+
To build and install the whole project in your local Maven repository, locate in the root folder and then execute one of the following commands in a Maven terminal.
49+
50+
* `mvn install`: installs the archetypes and target POMs into your local Maven repository.
51+
* `mvn install -DskipTests`: installs the archetypes and target POMs into your local Maven repository without executing testing.
3352

34-
### liberty-ejb31-archetype - Creates EJB 3.1 Module Project targeting Liberty profile
35-
### liberty-ejb32-archetype - Creates EJB 3.2 Module Project targeting Liberty profile
36-
### liberty-osgi-ejb30-archetype - Creates OSGi with EJB 3.0 Bundle Project targeting Liberty profile
37-
### liberty-osgi-ejb31-archetype - Creates OSGi with EJB 3.1 Bundle Project targeting Liberty profile
38-
### liberty-osgi-web30-archetype - Creates OSGi with Servlet 3.0 Web Application Bundle Project targeting Liberty profile
39-
### liberty-osgi-web31-archetype - Creates OSGi with Servlet 3.1 Web Application Bundle Project targeting Liberty profile
40-
### liberty-web30-archetype - Creates Servlet 3.0 Web Application Module Project targeting Liberty profile
41-
### liberty-web31-archetype - Creates Servlet 3.1 Web Application Module Project targeting Liberty profile
53+
Notice:
4254

55+
* Require of Apache Maven 2.x or later.
56+
* There's an Apache Maven issue related to archetype testing in Maven 3.3.x versions. You can workaround this, by creating a copy of "mvn.cmd" named "mvn.bat" in MAVEN_HOME/bin. For more details, see: https://issues.apache.org/jira/browse/ARCHETYPE-488

‎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-jee5-liberty/src/test/resources/projects/project-generation-test/reference/src/main/resources/.gitignore‎

Whitespace-only changes.

0 commit comments

Comments
 (0)