diff --git a/.gitignore b/.gitignore index 4a3cc1b..8a2196e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ -*/target/** -*/.settings/* -*/.project/* -.metadata -/.settings/ -/target/ -/.project +*.project +.settings/ +target/ \ No newline at end of file diff --git a/README.md b/README.md index 901784a..ff7e5fd 100644 --- a/README.md +++ b/README.md @@ -1,42 +1,56 @@ ci.maven.tools ============== -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. +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. -## Maven Target Pom's +##Projects -### liberty-target +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. -#### Usage: Add the following dependency to your application pom.xml to represent the Liberty and spec API libraries +### [Maven Target POM's](/docs/target-poms.md) - - net.wasdev.maven.tools - liberty-target - LATEST - pom - provided - - -### liberty-target-impl +Project containing convenience POMs that groups a set of WebSphere Liberty APIs/SPIs, java specifications and third-party dependencies provided by the runtime. -#### Usage: Add the following dependency to your application pom.xml to represent the Liberty 3rd Party implementation API libraries +Following are the provided modules for this project: - - net.wasdev.maven.tools - liberty-target-impl - LATEST - pom - provided - +* [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). +* [liberty-apis](/docs/target-poms.md#liberty-apis) - Creates a POM with Liberty API dependencies. +* [liberty-spis](/docs/target-poms.md#liberty-spis) - Creates a POM with Liberty SPI dependencies. +* [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. +* [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. -## Archetypes +### [Archetypes](/docs/archetypes.md) + +Project with Maven archetypes for creating new Java EE and OSGi projects targeting WebSphere Liberty within the WDT Eclipse IDE. + +#### Java EE archetypes + +Archetype | Project type +----------------------- | ------------ +ejb-jee5-liberty | EJB 3.0 project +ejb-jee6-liberty | EJB 3.1 project +ejb-jee7-liberty | EJB 3.2 project +webapp-jee5-liberty | Web 2.5 project +webapp-jee6-liberty | Web 3.0 project +webapp-jee7-liberty | Web 3.1 project + +#### OSGi Enterprise archetypes + +Archetype | Project type +----------------------- | ------------ +osgi-liberty | OSGi project +osgi-web25-liberty | OSGi Web 2.5 project +osgi-web30-liberty | OSGi Web 3.0 project +osgi-web31-liberty | OSGi Web 3.1 project + +##How to build + +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. + +* `mvn install`: installs the archetypes and target POMs into your local Maven repository. +* `mvn install -DskipTests`: installs the archetypes and target POMs into your local Maven repository without executing testing. -### liberty-ejb31-archetype - Creates EJB 3.1 Module Project targeting Liberty profile -### liberty-ejb32-archetype - Creates EJB 3.2 Module Project targeting Liberty profile -### liberty-osgi-ejb30-archetype - Creates OSGi with EJB 3.0 Bundle Project targeting Liberty profile -### liberty-osgi-ejb31-archetype - Creates OSGi with EJB 3.1 Bundle Project targeting Liberty profile -### liberty-osgi-web30-archetype - Creates OSGi with Servlet 3.0 Web Application Bundle Project targeting Liberty profile -### liberty-osgi-web31-archetype - Creates OSGi with Servlet 3.1 Web Application Bundle Project targeting Liberty profile -### liberty-web30-archetype - Creates Servlet 3.0 Web Application Module Project targeting Liberty profile -### liberty-web31-archetype - Creates Servlet 3.1 Web Application Module Project targeting Liberty profile +Notice: +* Require of Apache Maven 2.x or later. +* 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 \ No newline at end of file diff --git a/archetypes/ejb-jee5-liberty/pom.xml b/archetypes/ejb-jee5-liberty/pom.xml new file mode 100644 index 0000000..807c034 --- /dev/null +++ b/archetypes/ejb-jee5-liberty/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + archetypes-parent + 1.0 + + + net.wasdev.maven.tools.archetypes + ejb-jee5-liberty + 1.0 + maven-archetype + + EJB 3.0 project archetype + EJB 3.0 project targeting WebSphere Liberty + \ No newline at end of file diff --git a/archetypes/ejb-jee5-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/ejb-jee5-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml new file mode 100644 index 0000000..81afeab --- /dev/null +++ b/archetypes/ejb-jee5-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -0,0 +1,26 @@ + + + + + + RELEASE + + + + + + src/main/resources + + **/*.* + + + + src/main/java + + + + \ No newline at end of file diff --git a/archetypes/liberty-ejb32-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/ejb-jee5-liberty/src/main/resources/archetype-resources/pom.xml similarity index 84% rename from archetypes/liberty-ejb32-archetype/src/main/resources/archetype-resources/pom.xml rename to archetypes/ejb-jee5-liberty/src/main/resources/archetype-resources/pom.xml index 7550304..df3fdf3 100644 --- a/archetypes/liberty-ejb32-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/ejb-jee5-liberty/src/main/resources/archetype-resources/pom.xml @@ -23,15 +23,14 @@ - net.wasdev.maven.tools + net.wasdev.maven.tools.targets liberty-target - LATEST + ${libertyVersion} pom provided - @@ -39,8 +38,8 @@ maven-compiler-plugin 2.0.2 - 1.6 - 1.6 + 1.5 + 1.5 @@ -48,10 +47,9 @@ maven-ejb-plugin 2.1 - 3.2 + 3.0 - \ No newline at end of file diff --git a/archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/archetype.properties b/archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/archetype.properties new file mode 100644 index 0000000..99dd783 --- /dev/null +++ b/archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/archetype.properties @@ -0,0 +1,8 @@ +#Simple test that verifies creation and packaging of a new Maven EJB project +#with ejb-jee5-liberty archetype + +groupId=net.wasdev.maven.tools.archetypes.tests +artifactId=ejb-jee5-liberty-test +version=1.0-SNAPSHOT +package=net.wasdev.tests +libertyVersion=RELEASE \ No newline at end of file diff --git a/archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/goal.txt b/archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/goal.txt new file mode 100644 index 0000000..597acc7 --- /dev/null +++ b/archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/goal.txt @@ -0,0 +1 @@ +package \ No newline at end of file diff --git a/archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml b/archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml new file mode 100644 index 0000000..0d98774 --- /dev/null +++ b/archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml @@ -0,0 +1,55 @@ + + + + + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + + + 4.0.0 + + net.wasdev.maven.tools.archetypes.tests + ejb-jee5-liberty-test + ejb + 1.0-SNAPSHOT + + ejb-jee5-liberty-test + http://maven.apache.org + + + + net.wasdev.maven.tools.targets + liberty-target + RELEASE + pom + provided + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.5 + 1.5 + + + + org.apache.maven.plugins + maven-ejb-plugin + 2.1 + + 3.0 + + + + + \ No newline at end of file diff --git a/archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore b/archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore new file mode 100644 index 0000000..a3a0c8b --- /dev/null +++ b/archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/reference/src/main/resources/.gitignore b/archetypes/ejb-jee5-liberty/src/test/resources/projects/project-generation-test/reference/src/main/resources/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/archetypes/ejb-jee6-liberty/pom.xml b/archetypes/ejb-jee6-liberty/pom.xml new file mode 100644 index 0000000..efdba81 --- /dev/null +++ b/archetypes/ejb-jee6-liberty/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + archetypes-parent + 1.0 + + + net.wasdev.maven.tools.archetypes + ejb-jee6-liberty + 1.0 + maven-archetype + + EJB 3.1 project archetype + EJB 3.1 project targeting WebSphere Liberty + \ No newline at end of file diff --git a/archetypes/ejb-jee6-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/ejb-jee6-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml new file mode 100644 index 0000000..e8e22f9 --- /dev/null +++ b/archetypes/ejb-jee6-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -0,0 +1,26 @@ + + + + + + RELEASE + + + + + + src/main/resources + + **/*.* + + + + src/main/java + + + + \ No newline at end of file diff --git a/archetypes/liberty-ejb31-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/ejb-jee6-liberty/src/main/resources/archetype-resources/pom.xml similarity index 90% rename from archetypes/liberty-ejb31-archetype/src/main/resources/archetype-resources/pom.xml rename to archetypes/ejb-jee6-liberty/src/main/resources/archetype-resources/pom.xml index 6870479..5539408 100644 --- a/archetypes/liberty-ejb31-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/ejb-jee6-liberty/src/main/resources/archetype-resources/pom.xml @@ -23,15 +23,14 @@ - net.wasdev.maven.tools + net.wasdev.maven.tools.targets liberty-target - LATEST + ${libertyVersion} pom provided - @@ -51,7 +50,6 @@ 3.1 - \ No newline at end of file diff --git a/archetypes/ejb-jee6-liberty/src/test/resources/projects/project-generation-test/archetype.properties b/archetypes/ejb-jee6-liberty/src/test/resources/projects/project-generation-test/archetype.properties new file mode 100644 index 0000000..33009e9 --- /dev/null +++ b/archetypes/ejb-jee6-liberty/src/test/resources/projects/project-generation-test/archetype.properties @@ -0,0 +1,8 @@ +#Simple test that verifies creation and packaging of a new Maven EJB project +#with ejb-jee6-liberty archetype + +groupId=net.wasdev.maven.tools.archetypes.tests +artifactId=ejb-jee6-liberty-test +version=1.0-SNAPSHOT +package=net.wasdev.tests +libertyVersion=RELEASE \ No newline at end of file diff --git a/archetypes/ejb-jee6-liberty/src/test/resources/projects/project-generation-test/goal.txt b/archetypes/ejb-jee6-liberty/src/test/resources/projects/project-generation-test/goal.txt new file mode 100644 index 0000000..597acc7 --- /dev/null +++ b/archetypes/ejb-jee6-liberty/src/test/resources/projects/project-generation-test/goal.txt @@ -0,0 +1 @@ +package \ No newline at end of file diff --git a/archetypes/ejb-jee6-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml b/archetypes/ejb-jee6-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml new file mode 100644 index 0000000..91705b6 --- /dev/null +++ b/archetypes/ejb-jee6-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml @@ -0,0 +1,55 @@ + + + + + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + + + 4.0.0 + + net.wasdev.maven.tools.archetypes.tests + ejb-jee6-liberty-test + ejb + 1.0-SNAPSHOT + + ejb-jee6-liberty-test + http://maven.apache.org + + + + net.wasdev.maven.tools.targets + liberty-target + RELEASE + pom + provided + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-ejb-plugin + 2.1 + + 3.1 + + + + + \ No newline at end of file diff --git a/archetypes/ejb-jee6-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore b/archetypes/ejb-jee6-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore new file mode 100644 index 0000000..8a2196e --- /dev/null +++ b/archetypes/ejb-jee6-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore @@ -0,0 +1,3 @@ +*.project +.settings/ +target/ \ No newline at end of file diff --git a/archetypes/ejb-jee6-liberty/src/test/resources/projects/project-generation-test/reference/src/main/resources/.gitignore b/archetypes/ejb-jee6-liberty/src/test/resources/projects/project-generation-test/reference/src/main/resources/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/archetypes/ejb-jee7-liberty/pom.xml b/archetypes/ejb-jee7-liberty/pom.xml new file mode 100644 index 0000000..f0643a0 --- /dev/null +++ b/archetypes/ejb-jee7-liberty/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + archetypes-parent + 1.0 + + + net.wasdev.maven.tools.archetypes + ejb-jee7-liberty + 1.0 + maven-archetype + + EJB 3.2 project archetype + EJB 3.2 project targeting WebSphere Liberty + \ No newline at end of file diff --git a/archetypes/ejb-jee7-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/ejb-jee7-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml new file mode 100644 index 0000000..9a0dba1 --- /dev/null +++ b/archetypes/ejb-jee7-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -0,0 +1,26 @@ + + + + + + RELEASE + + + + + + src/main/resources + + **/*.* + + + + src/main/java + + + + \ No newline at end of file diff --git a/archetypes/ejb-jee7-liberty/src/main/resources/archetype-resources/pom.xml b/archetypes/ejb-jee7-liberty/src/main/resources/archetype-resources/pom.xml new file mode 100644 index 0000000..e991a39 --- /dev/null +++ b/archetypes/ejb-jee7-liberty/src/main/resources/archetype-resources/pom.xml @@ -0,0 +1,55 @@ + + + + + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + + + 4.0.0 + + ${groupId} + ${artifactId} + ejb + ${version} + + ${artifactId} + http://maven.apache.org + + + + net.wasdev.maven.tools.targets + liberty-target + ${libertyVersion} + pom + provided + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-ejb-plugin + 2.1 + + 3.2 + + + + + \ No newline at end of file diff --git a/archetypes/ejb-jee7-liberty/src/test/resources/projects/project-generation-test/archetype.properties b/archetypes/ejb-jee7-liberty/src/test/resources/projects/project-generation-test/archetype.properties new file mode 100644 index 0000000..0502162 --- /dev/null +++ b/archetypes/ejb-jee7-liberty/src/test/resources/projects/project-generation-test/archetype.properties @@ -0,0 +1,8 @@ +#Simple test that verifies creation and packaging of a new Maven EJB project +#with ejb-jee7-liberty archetype + +groupId=net.wasdev.maven.tools.archetypes.tests +artifactId=ejb-jee7-liberty-test +version=1.0-SNAPSHOT +package=net.wasdev.tests +libertyVersion=RELEASE \ No newline at end of file diff --git a/archetypes/ejb-jee7-liberty/src/test/resources/projects/project-generation-test/goal.txt b/archetypes/ejb-jee7-liberty/src/test/resources/projects/project-generation-test/goal.txt new file mode 100644 index 0000000..597acc7 --- /dev/null +++ b/archetypes/ejb-jee7-liberty/src/test/resources/projects/project-generation-test/goal.txt @@ -0,0 +1 @@ +package \ No newline at end of file diff --git a/archetypes/ejb-jee7-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml b/archetypes/ejb-jee7-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml new file mode 100644 index 0000000..83649b1 --- /dev/null +++ b/archetypes/ejb-jee7-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml @@ -0,0 +1,55 @@ + + + + + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + + + 4.0.0 + + net.wasdev.maven.tools.archetypes.tests + ejb-jee7-liberty-test + ejb + 1.0-SNAPSHOT + + ejb-jee7-liberty-test + http://maven.apache.org + + + + net.wasdev.maven.tools.targets + liberty-target + RELEASE + pom + provided + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-ejb-plugin + 2.1 + + 3.2 + + + + + \ No newline at end of file diff --git a/archetypes/ejb-jee7-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore b/archetypes/ejb-jee7-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore new file mode 100644 index 0000000..8a2196e --- /dev/null +++ b/archetypes/ejb-jee7-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore @@ -0,0 +1,3 @@ +*.project +.settings/ +target/ \ No newline at end of file diff --git a/archetypes/ejb-jee7-liberty/src/test/resources/projects/project-generation-test/reference/src/main/resources/.gitignore b/archetypes/ejb-jee7-liberty/src/test/resources/projects/project-generation-test/reference/src/main/resources/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/archetypes/liberty-ejb31-archetype/.gitignore b/archetypes/liberty-ejb31-archetype/.gitignore deleted file mode 100644 index 8eb1c44..0000000 --- a/archetypes/liberty-ejb31-archetype/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/.settings/ -/target/ -/.project diff --git a/archetypes/liberty-ejb31-archetype/pom.xml b/archetypes/liberty-ejb31-archetype/pom.xml deleted file mode 100644 index 09f657c..0000000 --- a/archetypes/liberty-ejb31-archetype/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 4.0.0 - net.wasdev.maven.tools - liberty-ejb31-archetype - 1.0 - maven-archetype - - - - The Apache Software License, Version 2.0 - https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE - repo - - - - - - - org.apache.maven.archetype - archetype-packaging - 2.2 - true - - - - - \ No newline at end of file diff --git a/archetypes/liberty-ejb31-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/liberty-ejb31-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index 0879547..0000000 --- a/archetypes/liberty-ejb31-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/archetypes/liberty-ejb32-archetype/.gitignore b/archetypes/liberty-ejb32-archetype/.gitignore deleted file mode 100644 index 8eb1c44..0000000 --- a/archetypes/liberty-ejb32-archetype/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/.settings/ -/target/ -/.project diff --git a/archetypes/liberty-ejb32-archetype/pom.xml b/archetypes/liberty-ejb32-archetype/pom.xml deleted file mode 100644 index 06e06a2..0000000 --- a/archetypes/liberty-ejb32-archetype/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 4.0.0 - net.wasdev.maven.tools - liberty-ejb32-archetype - 1.0 - maven-archetype - - - - The Apache Software License, Version 2.0 - https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE - repo - - - - - - - org.apache.maven.archetype - archetype-packaging - 2.2 - true - - - - - \ No newline at end of file diff --git a/archetypes/liberty-osgi-ejb30-archetype/.gitignore b/archetypes/liberty-osgi-ejb30-archetype/.gitignore deleted file mode 100644 index 8eb1c44..0000000 --- a/archetypes/liberty-osgi-ejb30-archetype/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/.settings/ -/target/ -/.project diff --git a/archetypes/liberty-osgi-ejb30-archetype/pom.xml b/archetypes/liberty-osgi-ejb30-archetype/pom.xml deleted file mode 100644 index b3de4e4..0000000 --- a/archetypes/liberty-osgi-ejb30-archetype/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 4.0.0 - net.wasdev.maven.tools - liberty-osgi-ejb30-archetype - 1.0 - maven-archetype - - - - The Apache Software License, Version 2.0 - https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE - repo - - - - - - - org.apache.maven.archetype - archetype-packaging - 2.2 - true - - - - - \ No newline at end of file diff --git a/archetypes/liberty-osgi-ejb31-archetype/.gitignore b/archetypes/liberty-osgi-ejb31-archetype/.gitignore deleted file mode 100644 index 8eb1c44..0000000 --- a/archetypes/liberty-osgi-ejb31-archetype/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/.settings/ -/target/ -/.project diff --git a/archetypes/liberty-osgi-ejb31-archetype/pom.xml b/archetypes/liberty-osgi-ejb31-archetype/pom.xml deleted file mode 100644 index 6f6190b..0000000 --- a/archetypes/liberty-osgi-ejb31-archetype/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 4.0.0 - net.wasdev.maven.tools - liberty-osgi-ejb31-archetype - 1.0 - maven-archetype - - - - The Apache Software License, Version 2.0 - https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE - repo - - - - - - - org.apache.maven.archetype - archetype-packaging - 2.2 - true - - - - - \ No newline at end of file diff --git a/archetypes/liberty-osgi-web30-archetype/.gitignore b/archetypes/liberty-osgi-web30-archetype/.gitignore deleted file mode 100644 index 8eb1c44..0000000 --- a/archetypes/liberty-osgi-web30-archetype/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/.settings/ -/target/ -/.project diff --git a/archetypes/liberty-osgi-web30-archetype/pom.xml b/archetypes/liberty-osgi-web30-archetype/pom.xml deleted file mode 100644 index c7d56cf..0000000 --- a/archetypes/liberty-osgi-web30-archetype/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 4.0.0 - net.wasdev.maven.tools - liberty-osgi-web30-archetype - 1.0 - maven-archetype - - - - The Apache Software License, Version 2.0 - https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE - repo - - - - - - - org.apache.maven.archetype - archetype-packaging - 2.2 - true - - - - - \ No newline at end of file diff --git a/archetypes/liberty-osgi-web30-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/liberty-osgi-web30-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index 9968600..0000000 --- a/archetypes/liberty-osgi-web30-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/archetypes/liberty-osgi-web31-archetype/.gitignore b/archetypes/liberty-osgi-web31-archetype/.gitignore deleted file mode 100644 index 8eb1c44..0000000 --- a/archetypes/liberty-osgi-web31-archetype/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/.settings/ -/target/ -/.project diff --git a/archetypes/liberty-osgi-web31-archetype/pom.xml b/archetypes/liberty-osgi-web31-archetype/pom.xml deleted file mode 100644 index c5d7701..0000000 --- a/archetypes/liberty-osgi-web31-archetype/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 4.0.0 - net.wasdev.maven.tools - liberty-osgi-web31-archetype - 1.0 - maven-archetype - - - - The Apache Software License, Version 2.0 - https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE - repo - - - - - - - org.apache.maven.archetype - archetype-packaging - 2.2 - true - - - - - \ No newline at end of file diff --git a/archetypes/liberty-osgi-web31-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/liberty-osgi-web31-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index ca89803..0000000 --- a/archetypes/liberty-osgi-web31-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/archetypes/liberty-web30-archetype/.gitignore b/archetypes/liberty-web30-archetype/.gitignore deleted file mode 100644 index 8eb1c44..0000000 --- a/archetypes/liberty-web30-archetype/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/.settings/ -/target/ -/.project diff --git a/archetypes/liberty-web30-archetype/pom.xml b/archetypes/liberty-web30-archetype/pom.xml deleted file mode 100644 index 0d4a4fb..0000000 --- a/archetypes/liberty-web30-archetype/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 4.0.0 - net.wasdev.maven.tools - liberty-web30-archetype - 1.0 - maven-archetype - - - - The Apache Software License, Version 2.0 - https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE - repo - - - - - - - org.apache.maven.archetype - archetype-packaging - 2.2 - true - - - - - \ No newline at end of file diff --git a/archetypes/liberty-web30-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/liberty-web30-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index 8c48c55..0000000 --- a/archetypes/liberty-web30-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/archetypes/liberty-web31-archetype/.gitignore b/archetypes/liberty-web31-archetype/.gitignore deleted file mode 100644 index 8eb1c44..0000000 --- a/archetypes/liberty-web31-archetype/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/.settings/ -/target/ -/.project diff --git a/archetypes/liberty-web31-archetype/pom.xml b/archetypes/liberty-web31-archetype/pom.xml deleted file mode 100644 index 700b58b..0000000 --- a/archetypes/liberty-web31-archetype/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 4.0.0 - net.wasdev.maven.tools - liberty-web31-archetype - 1.0 - maven-archetype - - - - The Apache Software License, Version 2.0 - https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE - repo - - - - - - - org.apache.maven.archetype - archetype-packaging - 2.2 - true - - - - - \ No newline at end of file diff --git a/archetypes/liberty-web31-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/liberty-web31-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index 49441cd..0000000 --- a/archetypes/liberty-web31-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/archetypes/osgi-liberty/pom.xml b/archetypes/osgi-liberty/pom.xml new file mode 100644 index 0000000..8394a3d --- /dev/null +++ b/archetypes/osgi-liberty/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + archetypes-parent + 1.0 + + + net.wasdev.maven.tools.archetypes + osgi-liberty + 1.0 + maven-archetype + + OSGi project archetype + OSGi project targeting WebSphere Liberty + \ No newline at end of file diff --git a/archetypes/liberty-osgi-ejb31-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/osgi-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml similarity index 54% rename from archetypes/liberty-osgi-ejb31-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml rename to archetypes/osgi-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml index 9968600..377c40c 100644 --- a/archetypes/liberty-osgi-ejb31-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/osgi-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -3,6 +3,15 @@ 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" - partial="false" name="WebSphere Liberty OSGi EJB31 Archetype"> + partial="false" name="OSGi project targeting WebSphere Liberty"> + + + + RELEASE + + + 1.7 + + \ No newline at end of file diff --git a/archetypes/liberty-osgi-ejb30-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/osgi-liberty/src/main/resources/archetype-resources/pom.xml similarity index 63% rename from archetypes/liberty-osgi-ejb30-archetype/src/main/resources/archetype-resources/pom.xml rename to archetypes/osgi-liberty/src/main/resources/archetype-resources/pom.xml index 229413a..f13054c 100644 --- a/archetypes/liberty-osgi-ejb30-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/osgi-liberty/src/main/resources/archetype-resources/pom.xml @@ -4,12 +4,12 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - The Apache Software License, Version 2.0 - https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE - repo - - + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + 4.0.0 @@ -22,12 +22,12 @@ - net.wasdev.maven.tools - liberty-target - LATEST - pom - provided - + net.wasdev.maven.tools.targets + liberty-target + ${libertyVersion} + pom + provided + @@ -36,8 +36,8 @@ maven-compiler-plugin 3.0 - 1.6 - 1.6 + ${javaVersion} + ${javaVersion} @@ -62,8 +62,11 @@ src/main/resources/META-INF true - J2SE-1.6 - <<EMPTY>> + #if ($javaVersion == "1.5") + J2SE-1.5 + #else + JavaSE-${javaVersion} + #end diff --git a/archetypes/osgi-liberty/src/test/resources/projects/project-generation-test/archetype.properties b/archetypes/osgi-liberty/src/test/resources/projects/project-generation-test/archetype.properties new file mode 100644 index 0000000..9d8982f --- /dev/null +++ b/archetypes/osgi-liberty/src/test/resources/projects/project-generation-test/archetype.properties @@ -0,0 +1,9 @@ +#Simple test that verifies creation and packaging of a new Maven OSGi project +#with osgi-liberty archetype + +groupId=net.wasdev.maven.tools.archetypes.tests +artifactId=osgi-liberty-test +version=1.0-SNAPSHOT +package=net.wasdev.tests +libertyVersion=RELEASE +javaVersion=1.7 \ No newline at end of file diff --git a/archetypes/osgi-liberty/src/test/resources/projects/project-generation-test/goal.txt b/archetypes/osgi-liberty/src/test/resources/projects/project-generation-test/goal.txt new file mode 100644 index 0000000..597acc7 --- /dev/null +++ b/archetypes/osgi-liberty/src/test/resources/projects/project-generation-test/goal.txt @@ -0,0 +1 @@ +package \ No newline at end of file diff --git a/archetypes/liberty-osgi-web30-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/osgi-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml similarity index 58% rename from archetypes/liberty-osgi-web30-archetype/src/main/resources/archetype-resources/pom.xml rename to archetypes/osgi-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml index 229413a..8891eec 100644 --- a/archetypes/liberty-osgi-web30-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/osgi-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml @@ -4,30 +4,30 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - The Apache Software License, Version 2.0 - https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE - repo - - + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + 4.0.0 - ${groupId} - ${artifactId} - ${version} + net.wasdev.maven.tools.archetypes.tests + osgi-liberty-test + 1.0-SNAPSHOT bundle - ${artifactId} + osgi-liberty-test - net.wasdev.maven.tools - liberty-target - LATEST - pom - provided - + net.wasdev.maven.tools.targets + liberty-target + RELEASE + pom + provided + @@ -36,8 +36,8 @@ maven-compiler-plugin 3.0 - 1.6 - 1.6 + 1.7 + 1.7 @@ -62,9 +62,8 @@ src/main/resources/META-INF true - J2SE-1.6 - <<EMPTY>> - + JavaSE-1.7 + diff --git a/archetypes/osgi-web25-liberty/pom.xml b/archetypes/osgi-web25-liberty/pom.xml new file mode 100644 index 0000000..0356bd9 --- /dev/null +++ b/archetypes/osgi-web25-liberty/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + archetypes-parent + 1.0 + + + net.wasdev.maven.tools.archetypes + osgi-web25-liberty + 1.0 + maven-archetype + + OSGi Web 2.5 project archetype + OSGi Web 2.5 project targeting WebSphere Liberty + \ No newline at end of file diff --git a/archetypes/osgi-web25-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/osgi-web25-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml new file mode 100644 index 0000000..e9faea3 --- /dev/null +++ b/archetypes/osgi-web25-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -0,0 +1,22 @@ + + + + + + RELEASE + + + + + + src/main/webapp + + **/*.* + + + + \ No newline at end of file diff --git a/archetypes/liberty-osgi-web31-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/osgi-web25-liberty/src/main/resources/archetype-resources/pom.xml similarity index 57% rename from archetypes/liberty-osgi-web31-archetype/src/main/resources/archetype-resources/pom.xml rename to archetypes/osgi-web25-liberty/src/main/resources/archetype-resources/pom.xml index 229413a..854ebf4 100644 --- a/archetypes/liberty-osgi-web31-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/osgi-web25-liberty/src/main/resources/archetype-resources/pom.xml @@ -4,12 +4,12 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - The Apache Software License, Version 2.0 - https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE - repo - - + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + 4.0.0 @@ -22,22 +22,23 @@ - net.wasdev.maven.tools - liberty-target - LATEST - pom - provided - + net.wasdev.maven.tools.targets + liberty-target + ${libertyVersion} + pom + provided + + src/main/webapp/WEB-INF/classes maven-compiler-plugin 3.0 - 1.6 - 1.6 + 1.5 + 1.5 @@ -59,11 +60,14 @@ - src/main/resources/META-INF + src/main/webapp/META-INF true + src/main/webapp - J2SE-1.6 - <<EMPTY>> + WEB-INF/classes + J2SE-1.5 + src/main/webapp + /${artifactId} diff --git a/archetypes/osgi-web25-liberty/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/archetypes/osgi-web25-liberty/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..3657b68 --- /dev/null +++ b/archetypes/osgi-web25-liberty/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,12 @@ + + + ${artifactId} + + 30 + + + index.jsp + + diff --git a/archetypes/liberty-osgi-web30-archetype/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/archetypes/osgi-web25-liberty/src/main/resources/archetype-resources/src/main/webapp/index.jsp similarity index 100% rename from archetypes/liberty-osgi-web30-archetype/src/main/resources/archetype-resources/src/main/webapp/index.jsp rename to archetypes/osgi-web25-liberty/src/main/resources/archetype-resources/src/main/webapp/index.jsp diff --git a/archetypes/osgi-web25-liberty/src/test/resources/projects/project-generation-test/archetype.properties b/archetypes/osgi-web25-liberty/src/test/resources/projects/project-generation-test/archetype.properties new file mode 100644 index 0000000..97f1d46 --- /dev/null +++ b/archetypes/osgi-web25-liberty/src/test/resources/projects/project-generation-test/archetype.properties @@ -0,0 +1,8 @@ +#Simple test that verifies creation and packaging of a new Maven OSGi Web +#project with osgi-web25-liberty archetype + +groupId=net.wasdev.maven.tools.archetypes.tests +artifactId=osgi-web25-liberty-test +version=1.0-SNAPSHOT +package=net.wasdev.tests +libertyVersion=RELEASE \ No newline at end of file diff --git a/archetypes/osgi-web25-liberty/src/test/resources/projects/project-generation-test/goal.txt b/archetypes/osgi-web25-liberty/src/test/resources/projects/project-generation-test/goal.txt new file mode 100644 index 0000000..597acc7 --- /dev/null +++ b/archetypes/osgi-web25-liberty/src/test/resources/projects/project-generation-test/goal.txt @@ -0,0 +1 @@ +package \ No newline at end of file diff --git a/archetypes/osgi-web25-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml b/archetypes/osgi-web25-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml new file mode 100644 index 0000000..95c03b7 --- /dev/null +++ b/archetypes/osgi-web25-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml @@ -0,0 +1,77 @@ + + + + + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + + + 4.0.0 + + net.wasdev.maven.tools.archetypes.tests + osgi-web25-liberty-test + 1.0-SNAPSHOT + bundle + + osgi-web25-liberty-test + + + + net.wasdev.maven.tools.targets + liberty-target + RELEASE + pom + provided + + + + + src/main/webapp/WEB-INF/classes + + + maven-compiler-plugin + 3.0 + + 1.5 + 1.5 + + + + org.apache.felix + maven-bundle-plugin + 2.3.7 + true + + + set_failok + + manifest + + + + <_failok>true + + + + + + src/main/webapp/META-INF + true + src/main/webapp + + WEB-INF/classes + J2SE-1.5 + src/main/webapp + /osgi-web25-liberty-test + + + + + + + diff --git a/archetypes/osgi-web25-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/WEB-INF/web.xml b/archetypes/osgi-web25-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..9fcb1cf --- /dev/null +++ b/archetypes/osgi-web25-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,12 @@ + + + osgi-web25-liberty-test + + 30 + + + index.jsp + + diff --git a/archetypes/liberty-osgi-web31-archetype/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/archetypes/osgi-web25-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/index.jsp similarity index 100% rename from archetypes/liberty-osgi-web31-archetype/src/main/resources/archetype-resources/src/main/webapp/index.jsp rename to archetypes/osgi-web25-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/index.jsp diff --git a/archetypes/osgi-web30-liberty/pom.xml b/archetypes/osgi-web30-liberty/pom.xml new file mode 100644 index 0000000..96bf172 --- /dev/null +++ b/archetypes/osgi-web30-liberty/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + archetypes-parent + 1.0 + + + net.wasdev.maven.tools.archetypes + osgi-web30-liberty + 1.0 + maven-archetype + + OSGi Web 3.0 project archetype + OSGi Web 3.0 project targeting WebSphere Liberty + \ No newline at end of file diff --git a/archetypes/liberty-ejb32-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/osgi-web30-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml similarity index 62% rename from archetypes/liberty-ejb32-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml rename to archetypes/osgi-web30-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml index 51d36be..e41ccd5 100644 --- a/archetypes/liberty-ejb32-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/osgi-web30-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -3,6 +3,12 @@ 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" - partial="false" name="WebSphere Liberty EJB32 Archetype"> + partial="false" name="OSGi Web 3.0 project targeting WebSphere Liberty"> + + + + RELEASE + + \ No newline at end of file diff --git a/archetypes/liberty-osgi-ejb31-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/osgi-web30-liberty/src/main/resources/archetype-resources/pom.xml similarity index 58% rename from archetypes/liberty-osgi-ejb31-archetype/src/main/resources/archetype-resources/pom.xml rename to archetypes/osgi-web30-liberty/src/main/resources/archetype-resources/pom.xml index 229413a..d90e765 100644 --- a/archetypes/liberty-osgi-ejb31-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/osgi-web30-liberty/src/main/resources/archetype-resources/pom.xml @@ -4,12 +4,12 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - The Apache Software License, Version 2.0 - https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE - repo - - + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + 4.0.0 @@ -22,15 +22,16 @@ - net.wasdev.maven.tools - liberty-target - LATEST - pom - provided - + net.wasdev.maven.tools.targets + liberty-target + ${libertyVersion} + pom + provided + + src/main/webapp/WEB-INF/classes maven-compiler-plugin @@ -59,11 +60,14 @@ - src/main/resources/META-INF + src/main/webapp/META-INF true + src/main/webapp - J2SE-1.6 - <<EMPTY>> + WEB-INF/classes + JavaSE-1.6 + src/main/webapp + /${artifactId} diff --git a/archetypes/liberty-osgi-web30-archetype/src/main/resources/archetype-resources/src/main/webapp/web.xml b/archetypes/osgi-web30-liberty/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from archetypes/liberty-osgi-web30-archetype/src/main/resources/archetype-resources/src/main/webapp/web.xml rename to archetypes/osgi-web30-liberty/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml diff --git a/archetypes/liberty-web30-archetype/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/archetypes/osgi-web30-liberty/src/main/resources/archetype-resources/src/main/webapp/index.jsp similarity index 100% rename from archetypes/liberty-web30-archetype/src/main/resources/archetype-resources/src/main/webapp/index.jsp rename to archetypes/osgi-web30-liberty/src/main/resources/archetype-resources/src/main/webapp/index.jsp diff --git a/archetypes/osgi-web30-liberty/src/test/resources/projects/project-generation-test/archetype.properties b/archetypes/osgi-web30-liberty/src/test/resources/projects/project-generation-test/archetype.properties new file mode 100644 index 0000000..f1af1a7 --- /dev/null +++ b/archetypes/osgi-web30-liberty/src/test/resources/projects/project-generation-test/archetype.properties @@ -0,0 +1,8 @@ +#Simple test that verifies creation and packaging of a new Maven OSGi Web +#project with osgi-web30-liberty archetype + +groupId=net.wasdev.maven.tools.archetypes.tests +artifactId=osgi-web30-liberty-test +version=1.0-SNAPSHOT +package=net.wasdev.tests +libertyVersion=RELEASE \ No newline at end of file diff --git a/archetypes/osgi-web30-liberty/src/test/resources/projects/project-generation-test/goal.txt b/archetypes/osgi-web30-liberty/src/test/resources/projects/project-generation-test/goal.txt new file mode 100644 index 0000000..597acc7 --- /dev/null +++ b/archetypes/osgi-web30-liberty/src/test/resources/projects/project-generation-test/goal.txt @@ -0,0 +1 @@ +package \ No newline at end of file diff --git a/archetypes/osgi-web30-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml b/archetypes/osgi-web30-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml new file mode 100644 index 0000000..3f7be53 --- /dev/null +++ b/archetypes/osgi-web30-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml @@ -0,0 +1,77 @@ + + + + + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + + + 4.0.0 + + net.wasdev.maven.tools.archetypes.tests + osgi-web30-liberty-test + 1.0-SNAPSHOT + bundle + + osgi-web30-liberty-test + + + + net.wasdev.maven.tools.targets + liberty-target + RELEASE + pom + provided + + + + + src/main/webapp/WEB-INF/classes + + + maven-compiler-plugin + 3.0 + + 1.6 + 1.6 + + + + org.apache.felix + maven-bundle-plugin + 2.3.7 + true + + + set_failok + + manifest + + + + <_failok>true + + + + + + src/main/webapp/META-INF + true + src/main/webapp + + WEB-INF/classes + JavaSE-1.6 + src/main/webapp + /osgi-web30-liberty-test + + + + + + + diff --git a/archetypes/osgi-web31-liberty/pom.xml b/archetypes/osgi-web31-liberty/pom.xml new file mode 100644 index 0000000..fd5f088 --- /dev/null +++ b/archetypes/osgi-web31-liberty/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + archetypes-parent + 1.0 + + + net.wasdev.maven.tools.archetypes + osgi-web31-liberty + 1.0 + maven-archetype + + OSGi Web 3.1 project archetype + OSGi Web 3.1 project targeting WebSphere Liberty + \ No newline at end of file diff --git a/archetypes/liberty-osgi-ejb30-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/osgi-web31-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml similarity index 62% rename from archetypes/liberty-osgi-ejb30-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml rename to archetypes/osgi-web31-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml index 561c950..e349abb 100644 --- a/archetypes/liberty-osgi-ejb30-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/osgi-web31-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -3,6 +3,12 @@ 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" - partial="false" name="WebSphere Liberty OSGi EJB30 Archetype"> + partial="false" name="OSGi Web 3.1 project targeting WebSphere Liberty"> + + + + RELEASE + + \ No newline at end of file diff --git a/archetypes/osgi-web31-liberty/src/main/resources/archetype-resources/pom.xml b/archetypes/osgi-web31-liberty/src/main/resources/archetype-resources/pom.xml new file mode 100644 index 0000000..aa6c5ae --- /dev/null +++ b/archetypes/osgi-web31-liberty/src/main/resources/archetype-resources/pom.xml @@ -0,0 +1,77 @@ + + + + + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + + + 4.0.0 + + ${groupId} + ${artifactId} + ${version} + bundle + + ${artifactId} + + + + net.wasdev.maven.tools.targets + liberty-target + ${libertyVersion} + pom + provided + + + + + src/main/webapp/WEB-INF/classes + + + maven-compiler-plugin + 3.0 + + 1.7 + 1.7 + + + + org.apache.felix + maven-bundle-plugin + 2.3.7 + true + + + set_failok + + manifest + + + + <_failok>true + + + + + + src/main/webapp/META-INF + true + src/main/webapp + + WEB-INF/classes + JavaSE-1.7 + src/main/webapp + /${artifactId} + + + + + + + diff --git a/archetypes/liberty-osgi-web31-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/archetypes/osgi-web31-liberty/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from archetypes/liberty-osgi-web31-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml rename to archetypes/osgi-web31-liberty/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml diff --git a/archetypes/liberty-web31-archetype/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/archetypes/osgi-web31-liberty/src/main/resources/archetype-resources/src/main/webapp/index.jsp similarity index 100% rename from archetypes/liberty-web31-archetype/src/main/resources/archetype-resources/src/main/webapp/index.jsp rename to archetypes/osgi-web31-liberty/src/main/resources/archetype-resources/src/main/webapp/index.jsp diff --git a/archetypes/osgi-web31-liberty/src/test/resources/projects/project-generation-test/archetype.properties b/archetypes/osgi-web31-liberty/src/test/resources/projects/project-generation-test/archetype.properties new file mode 100644 index 0000000..5c2aa8f --- /dev/null +++ b/archetypes/osgi-web31-liberty/src/test/resources/projects/project-generation-test/archetype.properties @@ -0,0 +1,8 @@ +#Simple test that verifies creation and packaging of a new Maven OSGi Web +#project with osgi-web31-liberty archetype + +groupId=net.wasdev.maven.tools.archetypes.tests +artifactId=osgi-web31-liberty-test +version=1.0-SNAPSHOT +package=net.wasdev.tests +libertyVersion=RELEASE \ No newline at end of file diff --git a/archetypes/osgi-web31-liberty/src/test/resources/projects/project-generation-test/goal.txt b/archetypes/osgi-web31-liberty/src/test/resources/projects/project-generation-test/goal.txt new file mode 100644 index 0000000..597acc7 --- /dev/null +++ b/archetypes/osgi-web31-liberty/src/test/resources/projects/project-generation-test/goal.txt @@ -0,0 +1 @@ +package \ No newline at end of file diff --git a/archetypes/osgi-web31-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml b/archetypes/osgi-web31-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml new file mode 100644 index 0000000..7acb3b7 --- /dev/null +++ b/archetypes/osgi-web31-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml @@ -0,0 +1,77 @@ + + + + + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + + + 4.0.0 + + net.wasdev.maven.tools.archetypes.tests + osgi-web31-liberty-test + 1.0-SNAPSHOT + bundle + + osgi-web31-liberty-test + + + + net.wasdev.maven.tools.targets + liberty-target + RELEASE + pom + provided + + + + + src/main/webapp/WEB-INF/classes + + + maven-compiler-plugin + 3.0 + + 1.7 + 1.7 + + + + org.apache.felix + maven-bundle-plugin + 2.3.7 + true + + + set_failok + + manifest + + + + <_failok>true + + + + + + src/main/webapp/META-INF + true + src/main/webapp + + WEB-INF/classes + JavaSE-1.7 + src/main/webapp + /osgi-web31-liberty-test + + + + + + + diff --git a/archetypes/pom.xml b/archetypes/pom.xml new file mode 100644 index 0000000..b2c191d --- /dev/null +++ b/archetypes/pom.xml @@ -0,0 +1,40 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + main-parent + 1.0 + + + archetypes-parent + 1.0 + pom + + WDT archetypes parent POM + Parent POM for building all WebSphere Developer Tools archetypes + + + ejb-jee5-liberty + ejb-jee6-liberty + ejb-jee7-liberty + osgi-liberty + osgi-web25-liberty + osgi-web30-liberty + osgi-web31-liberty + webapp-jee5-liberty + webapp-jee6-liberty + webapp-jee7-liberty + + + + + + org.apache.maven.archetype + archetype-packaging + 2.4 + + + + diff --git a/archetypes/webapp-jee5-liberty/pom.xml b/archetypes/webapp-jee5-liberty/pom.xml new file mode 100644 index 0000000..334e522 --- /dev/null +++ b/archetypes/webapp-jee5-liberty/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + archetypes-parent + 1.0 + + + net.wasdev.maven.tools.archetypes + webapp-jee5-liberty + 1.0 + maven-archetype + + Web 2.5 project archetype + Web 2.5 project targeting WebSphere Liberty + \ No newline at end of file diff --git a/archetypes/webapp-jee5-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/webapp-jee5-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml new file mode 100644 index 0000000..675d6ae --- /dev/null +++ b/archetypes/webapp-jee5-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -0,0 +1,26 @@ + + + + + + RELEASE + + + + + + src/main/webapp + + **/*.* + + + + src/main/java + + + + \ No newline at end of file diff --git a/archetypes/webapp-jee5-liberty/src/main/resources/archetype-resources/pom.xml b/archetypes/webapp-jee5-liberty/src/main/resources/archetype-resources/pom.xml new file mode 100644 index 0000000..325164b --- /dev/null +++ b/archetypes/webapp-jee5-liberty/src/main/resources/archetype-resources/pom.xml @@ -0,0 +1,48 @@ + + + + + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + + + 4.0.0 + + ${groupId} + ${artifactId} + war + ${version} + + ${artifactId} + http://maven.apache.org + + + + net.wasdev.maven.tools.targets + liberty-target + ${libertyVersion} + pom + provided + + + + + ${project.name} + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.5 + 1.5 + + + + + diff --git a/archetypes/webapp-jee5-liberty/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/archetypes/webapp-jee5-liberty/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..dd9ccba --- /dev/null +++ b/archetypes/webapp-jee5-liberty/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,12 @@ + + + ${artifactId} + + + 30 + + + + index.jsp + + diff --git a/archetypes/webapp-jee5-liberty/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/archetypes/webapp-jee5-liberty/src/main/resources/archetype-resources/src/main/webapp/index.jsp new file mode 100644 index 0000000..0604526 --- /dev/null +++ b/archetypes/webapp-jee5-liberty/src/main/resources/archetype-resources/src/main/webapp/index.jsp @@ -0,0 +1,13 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> + + + + + + JSP Page + + +

Hello World!

+ + diff --git a/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/archetype.properties b/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/archetype.properties new file mode 100644 index 0000000..e8d6f30 --- /dev/null +++ b/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/archetype.properties @@ -0,0 +1,8 @@ +#Simple test that verifies creation and packaging of a new Maven Web project +#with webapp-jee5-liberty archetype + +groupId=net.wasdev.maven.tools.archetypes.tests +artifactId=webapp-jee5-liberty-test +version=1.0-SNAPSHOT +package=net.wasdev.tests +libertyVersion=RELEASE \ No newline at end of file diff --git a/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/goal.txt b/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/goal.txt new file mode 100644 index 0000000..597acc7 --- /dev/null +++ b/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/goal.txt @@ -0,0 +1 @@ +package \ No newline at end of file diff --git a/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml b/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml new file mode 100644 index 0000000..9117992 --- /dev/null +++ b/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml @@ -0,0 +1,48 @@ + + + + + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + + + 4.0.0 + + net.wasdev.maven.tools.archetypes.tests + webapp-jee5-liberty-test + war + 1.0-SNAPSHOT + + webapp-jee5-liberty-test + http://maven.apache.org + + + + net.wasdev.maven.tools.targets + liberty-target + RELEASE + pom + provided + + + + + ${project.name} + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.5 + 1.5 + + + + + diff --git a/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore b/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore new file mode 100644 index 0000000..8a2196e --- /dev/null +++ b/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore @@ -0,0 +1,3 @@ +*.project +.settings/ +target/ \ No newline at end of file diff --git a/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/WEB-INF/web.xml b/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..6c9c744 --- /dev/null +++ b/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,12 @@ + + + webapp-jee5-liberty-test + + + 30 + + + + index.jsp + + diff --git a/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/index.jsp b/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/index.jsp new file mode 100644 index 0000000..0604526 --- /dev/null +++ b/archetypes/webapp-jee5-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/index.jsp @@ -0,0 +1,13 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> + + + + + + JSP Page + + +

Hello World!

+ + diff --git a/archetypes/webapp-jee6-liberty/pom.xml b/archetypes/webapp-jee6-liberty/pom.xml new file mode 100644 index 0000000..691d218 --- /dev/null +++ b/archetypes/webapp-jee6-liberty/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + archetypes-parent + 1.0 + + + net.wasdev.maven.tools.archetypes + webapp-jee6-liberty + 1.0 + maven-archetype + + Web 3.0 project archetype + Web 3.0 project targeting WebSphere Liberty + \ No newline at end of file diff --git a/archetypes/webapp-jee6-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/webapp-jee6-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml new file mode 100644 index 0000000..71c76be --- /dev/null +++ b/archetypes/webapp-jee6-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -0,0 +1,26 @@ + + + + + + RELEASE + + + + + + src/main/webapp + + **/*.* + + + + src/main/java + + + + \ No newline at end of file diff --git a/archetypes/liberty-web30-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/webapp-jee6-liberty/src/main/resources/archetype-resources/pom.xml similarity index 90% rename from archetypes/liberty-web30-archetype/src/main/resources/archetype-resources/pom.xml rename to archetypes/webapp-jee6-liberty/src/main/resources/archetype-resources/pom.xml index b08a8fe..f9ed520 100644 --- a/archetypes/liberty-web30-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/webapp-jee6-liberty/src/main/resources/archetype-resources/pom.xml @@ -23,9 +23,9 @@ - net.wasdev.maven.tools + net.wasdev.maven.tools.targets liberty-target - LATEST + ${libertyVersion} pom provided diff --git a/archetypes/liberty-web30-archetype/src/main/resources/archetype-resources/src/main/webapp/web.xml b/archetypes/webapp-jee6-liberty/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from archetypes/liberty-web30-archetype/src/main/resources/archetype-resources/src/main/webapp/web.xml rename to archetypes/webapp-jee6-liberty/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml diff --git a/archetypes/webapp-jee6-liberty/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/archetypes/webapp-jee6-liberty/src/main/resources/archetype-resources/src/main/webapp/index.jsp new file mode 100644 index 0000000..0604526 --- /dev/null +++ b/archetypes/webapp-jee6-liberty/src/main/resources/archetype-resources/src/main/webapp/index.jsp @@ -0,0 +1,13 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> + + + + + + JSP Page + + +

Hello World!

+ + diff --git a/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/archetype.properties b/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/archetype.properties new file mode 100644 index 0000000..a73a35d --- /dev/null +++ b/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/archetype.properties @@ -0,0 +1,8 @@ +#Simple test that verifies creation and packaging of a new Maven Web project +#with webapp-jee-6-liberty archetype + +groupId=net.wasdev.maven.tools.archetypes.tests +artifactId=webapp-jee6-liberty-test +version=1.0-SNAPSHOT +package=net.wasdev.tests +libertyVersion=RELEASE \ No newline at end of file diff --git a/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/goal.txt b/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/goal.txt new file mode 100644 index 0000000..597acc7 --- /dev/null +++ b/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/goal.txt @@ -0,0 +1 @@ +package \ No newline at end of file diff --git a/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml b/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml new file mode 100644 index 0000000..b0d54be --- /dev/null +++ b/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml @@ -0,0 +1,55 @@ + + + + + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + + + 4.0.0 + + net.wasdev.maven.tools.archetypes.tests + webapp-jee6-liberty-test + war + 1.0-SNAPSHOT + + webapp-jee6-liberty-test + http://maven.apache.org + + + + net.wasdev.maven.tools.targets + liberty-target + RELEASE + pom + provided + + + + + ${project.name} + + + maven-war-plugin + 2.1.1 + + false + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.6 + 1.6 + + + + + diff --git a/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore b/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore new file mode 100644 index 0000000..8a2196e --- /dev/null +++ b/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore @@ -0,0 +1,3 @@ +*.project +.settings/ +target/ \ No newline at end of file diff --git a/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/WEB-INF/web.xml b/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..6d422e8 --- /dev/null +++ b/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,12 @@ + + + webapp-jee6-liberty-test + + index.html + index.htm + index.jsp + default.html + default.htm + default.jsp + + diff --git a/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/index.jsp b/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/index.jsp new file mode 100644 index 0000000..0604526 --- /dev/null +++ b/archetypes/webapp-jee6-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/index.jsp @@ -0,0 +1,13 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> + + + + + + JSP Page + + +

Hello World!

+ + diff --git a/archetypes/webapp-jee7-liberty/pom.xml b/archetypes/webapp-jee7-liberty/pom.xml new file mode 100644 index 0000000..512c4a3 --- /dev/null +++ b/archetypes/webapp-jee7-liberty/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + archetypes-parent + 1.0 + + + net.wasdev.maven.tools.archetypes + webapp-jee7-liberty + 1.0 + maven-archetype + + Web 3.1 project archetype + Web 3.1 project targeting WebSphere Liberty + \ No newline at end of file diff --git a/archetypes/webapp-jee7-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/webapp-jee7-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml new file mode 100644 index 0000000..7334380 --- /dev/null +++ b/archetypes/webapp-jee7-liberty/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -0,0 +1,26 @@ + + + + + + RELEASE + + + + + + src/main/webapp + + **/*.* + + + + src/main/java + + + + diff --git a/archetypes/liberty-web31-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/webapp-jee7-liberty/src/main/resources/archetype-resources/pom.xml similarity index 90% rename from archetypes/liberty-web31-archetype/src/main/resources/archetype-resources/pom.xml rename to archetypes/webapp-jee7-liberty/src/main/resources/archetype-resources/pom.xml index edae1e3..1409220 100644 --- a/archetypes/liberty-web31-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/webapp-jee7-liberty/src/main/resources/archetype-resources/pom.xml @@ -23,9 +23,9 @@ - net.wasdev.maven.tools + net.wasdev.maven.tools.targets liberty-target - LATEST + ${libertyVersion} pom provided diff --git a/archetypes/liberty-web31-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/archetypes/webapp-jee7-liberty/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from archetypes/liberty-web31-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml rename to archetypes/webapp-jee7-liberty/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml diff --git a/archetypes/webapp-jee7-liberty/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/archetypes/webapp-jee7-liberty/src/main/resources/archetype-resources/src/main/webapp/index.jsp new file mode 100644 index 0000000..0604526 --- /dev/null +++ b/archetypes/webapp-jee7-liberty/src/main/resources/archetype-resources/src/main/webapp/index.jsp @@ -0,0 +1,13 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> + + + + + + JSP Page + + +

Hello World!

+ + diff --git a/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/archetype.properties b/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/archetype.properties new file mode 100644 index 0000000..0e893f1 --- /dev/null +++ b/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/archetype.properties @@ -0,0 +1,8 @@ +#Simple test that verifies creation and packaging of a new Maven Web project +#with webapp-jee6-liberty archetype + +groupId=net.wasdev.maven.tools.archetypes.tests +artifactId=webapp-jee7-liberty-test +version=1.0-SNAPSHOT +package=net.wasdev.tests +libertyVersion=RELEASE \ No newline at end of file diff --git a/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/goal.txt b/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/goal.txt new file mode 100644 index 0000000..597acc7 --- /dev/null +++ b/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/goal.txt @@ -0,0 +1 @@ +package \ No newline at end of file diff --git a/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml b/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml new file mode 100644 index 0000000..be2a386 --- /dev/null +++ b/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/reference/pom.xml @@ -0,0 +1,55 @@ + + + + + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + + + 4.0.0 + + net.wasdev.maven.tools.archetypes.tests + webapp-jee7-liberty-test + war + 1.0-SNAPSHOT + + webapp-jee7-liberty-test + http://maven.apache.org + + + + net.wasdev.maven.tools.targets + liberty-target + RELEASE + pom + provided + + + + + ${project.name} + + + maven-war-plugin + 2.1.1 + + false + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.7 + 1.7 + + + + + diff --git a/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore b/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore new file mode 100644 index 0000000..8a2196e --- /dev/null +++ b/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/reference/src/main/java/net/wasdev/tests/.gitignore @@ -0,0 +1,3 @@ +*.project +.settings/ +target/ \ No newline at end of file diff --git a/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/WEB-INF/web.xml b/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..a54e00d --- /dev/null +++ b/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,12 @@ + + + webapp-jee7-liberty-test + + index.html + index.htm + index.jsp + default.html + default.htm + default.jsp + + diff --git a/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/index.jsp b/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/index.jsp new file mode 100644 index 0000000..0604526 --- /dev/null +++ b/archetypes/webapp-jee7-liberty/src/test/resources/projects/project-generation-test/reference/src/main/webapp/index.jsp @@ -0,0 +1,13 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> + + + + + + JSP Page + + +

Hello World!

+ + diff --git a/docs/archetypes.md b/docs/archetypes.md new file mode 100644 index 0000000..e106314 --- /dev/null +++ b/docs/archetypes.md @@ -0,0 +1,86 @@ +Archetypes +========== + +This multi-module project contains archetypes to develop new Maven Java EE and OSGi projects with recommended configurations and dependencies targeting WebSphere Liberty. + +*Note: Usage of following archetypes is recommended with WAS Developer Tools (WDT) for Eclipse IDE.* + +##Project structure + + archetypes/ - Parent POM to build all archetypes + pom.xml + ejb-jee5-liberty/ - EJB 3.0 archetype module + pom.xml + ejb-jee6-liberty/ - EJB 3.1 archetype module + pom.xml + ejb-jee7-liberty/ - EJB 3.2 archetype module + pom.xml + osgi-liberty/ - OSGI archetype module + pom.xml + osgi-web25-liberty/ - OSGi Web 2.5 archetype + pom.xml + osgi-web30-liberty/ - OSGi Web 3.0 archetype + pom.xml + osgi-web31-liberty/ - OSGi Web 3.1 archetype + pom.xml + webapp-jee5-liberty/ - Web 2.5 archetype + pom.xml + webapp-jee6-liberty/ - Web 3.0 archetype + pom.xml + webapp-jee7-liberty/ - Web 3.1 archetype + pom.xml + +##Archetypes list + +Following is the list of provided archetypes. The Archetypes groupId is `net.wasdev.maven.tools.archetypes` + +### Java EE archetypes + +Archetype artifactId | Project type +----------------------- | ------------ +ejb-jee5-liberty | EJB 3.0 project +ejb-jee6-liberty | EJB 3.1 project +ejb-jee7-liberty | EJB 3.2 project +webapp-jee5-liberty | Web 2.5 project +webapp-jee6-liberty | Web 3.0 project +webapp-jee7-liberty | Web 3.1 project + +### OSGi Enterprise archetypes + +Archetype artifactId | Project type +----------------------- | ------------ +osgi-liberty | OSGi project +osgi-web25-liberty | OSGi Web 2.5 project +osgi-web30-liberty | OSGi Web 3.0 project +osgi-web31-liberty | OSGi Web 3.1 project + +##Usage information + +You can use the provided archetypes by using WDT for Eclipse IDE and by CLI. + +###Usage with WDT for Eclipse IDE + +1. Open the New Project Wizard by selecting **File/New/Other...** menu. +2. In the Filter textbox type **Maven Project** and press **Next** button. +3. Press again **Next** button and then ensure the **All Catalogs** option is selected in the **Catalog** combo box. +4. In the **Filter** textbox type **net.wasdev.maven.tools.archetypes**. +5. Select one of the provided archetypes and then follow the Wizard. +6. Once completed, wait until all processes conclude and WDT for Eclipse IDE will install project facets and configure your Maven project in base of the archetype you chose at step 5. + +###Usage by CLI + +Open a Maven terminal and then execute following command to generate a new Maven project: + +`mvn archetype:generate -DarchetypeArtifactId= -DarchetypeGroupId=net.wasdev.maven.tools.archetypes` + +After executing the command the interactive mode will be asked for some values like your artifactId, groupId and version for your project before finishing. + +##How to build + +*Before building this project in your machine, ensure you have installed the [target POMs project](../docs/target-poms.md) as archetypes use net.wasdev.maven.tools.targets:liberty-target:RELEASE dependency*. + +To build the whole archetypes project locate in the `archetypes/` folder and execute following command in a Maven terminal: + +`mvn install`: builds and install all archetypes in the local repository. + +If you need to build one of the modules, just locate in the module folder you want and execute the previous command. \ No newline at end of file diff --git a/docs/target-poms.md b/docs/target-poms.md new file mode 100644 index 0000000..7528573 --- /dev/null +++ b/docs/target-poms.md @@ -0,0 +1,112 @@ +Maven target POMs +================= + +This project contains all convenience POMs that list WebSphere Liberty dependencies aligned to the latest release of Liberty to develop Java EE and OSGi applications. + +Dependencies are grouped in following modules: + +* liberty-target - All WebSphere Liberty dependencies (APIs/SPIs, java specifications and third-party implementations) +* liberty-apis - WebSphere Liberty APIs dependencies +* liberty-spis - WebSphere Liberty SPIs dependencies +* java-specs - Java specifications dependencies +* third-party - Third-party implementations + +## Project structure + + targets/ - Parent to build all modules + pom.xml + java-specs/ - Java specifications module + pom.xml + liberty-apis/ - WebSphere Liberty APIs module + pom.xml + liberty-spis/ - WebSphere Liberty SPIs module + pom.xml + liberty-target/ - Aggregator of all modules + pom.xml + third-party/ - Third-party dependencies module + pom.xml + +##Usage information + +Following modules add WebSphere Liberty dependencies to your project. Add the dependency snippet to your Maven project to reference all dependencies automatically. + +It's important to notice that the version of the `liberty-target`, `liberty-apis` and `liberty-spis` are aligned to the release of WebSphere Liberty, so you can use older versions by changing the version of those artifacts. + +###liberty-target + +This project aggregates all other modules that references WebSphere Liberty APIs/SPIs, java specifications and third-party implementations dependencies to compile your project. + +Dependency snippet: + + + net.wasdev.maven.tools.targets + liberty-target + RELEASE + pom + provided + + +###liberty-apis + +WebSphere Liberty API's dependencies. This POM satisfies all APIs libraries that a Liberty installation provides in the `dev/api/ibm` folder. + +Dependency snippet: + + + net.wasdev.maven.tools.targets + liberty-apis + RELEASE + pom + provided + + +###liberty-spis + +WebSphere Liberty SPI's dependencies. This POM satisfies all SPIs libraries that a Liberty installation provides in the `dev/spi/ibm` folder. + +Dependency snippet: + + + net.wasdev.maven.tools.targets + liberty-spis + RELEASE + pom + provided + + +###java-specs + +Java specification dependencies. This POM satisfies all Java specification libraries that a Liberty installation provides in the `dev/api/spec` and `dev/spi/spec` folders. + +Dependency snippet: + + + net.wasdev.maven.tools.targets + java-specs + RELEASE + pom + provided + + + +###third-party + +Third-party implementation dependencies. This POM satisfies all third-party libraries that a Liberty installation provides in the `dev/api/third-party` and `dev/spi/third-party` folders. + +Dependency snippet: + + + net.wasdev.maven.tools.targets + third-party + RELEASE + pom + provided + + +##How to build + +To build the whole target POMs project locate in the `targets/` folder and execute following command in a Maven terminal: + +`mvn install`: builds and install all target POMs in the local repository. + +If you need to build one of the modules, just locate in the module folder you want and execute the previous command. \ No newline at end of file diff --git a/pom.xml b/pom.xml index e6dcac6..9dec6e7 100644 --- a/pom.xml +++ b/pom.xml @@ -1,60 +1,185 @@ - - - 4.0.0 - - - net.wasdev.maven.parent - default-parent - 1.2 - - - net.wasdev.maven.tools - wdt-maven - 1.0-SNAPSHOT - pom - WebSphere Developer Tools for Maven - - Parent pom for WDT Maven tools supporting Eclipse development for - WebSphere Application Server Liberty Profile - - https://wasdev.github.io - - - - The Apache Software License, Version 2.0 - https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE - repo - - - - - scm:git:git@github.com:WASdev/ci.maven.tools.git - scm:git:git@github.com:WASdev/ci.maven.tools.git - git@github.com:WASdev/ci.maven.tools.git - - - - - cbridgha - Chuck Bridgham - chuck.bridgham@gmail.com - - - - - runtime_targets/liberty-target - runtime_targets/liberty-target-impl - - - archetypes/liberty-osgi-ejb30-archetype - archetypes/liberty-osgi-ejb31-archetype - archetypes/liberty-osgi-web30-archetype - archetypes/liberty-osgi-web31-archetype - archetypes/liberty-ejb31-archetype - archetypes/liberty-ejb32-archetype - archetypes/liberty-web30-archetype - archetypes/liberty-web31-archetype - - - + + 4.0.0 + + net.wasdev.maven.tools.parents + main-parent + 1.0 + pom + + Parent POM for all projects + Parent POM for building WDT Maven tools supporting Eclipse development for WebSphere Application Server Liberty Profile + https://wasdev.github.io/ + + + The Apache Software License, Version 2.0 + https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE + repo + + + + + + cbridgha + Chuck Bridgham + chuck.bridgham@gmail.com + + + rea-al + Alexis Resendiz A. + alexisra@mx1.ibm.com + https://github.com/rea-al + IBM + http://www.ibm.com/ + + + + + targets + archetypes + + + + scm:git:git@github.com:WASdev/ci.maven.tools.git + scm:git:git@github.com:WASdev/ci.maven.tools.git + https://github.com/WASdev/ci.maven.tools + + + + + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.4 + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.3 + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + false + sonatype-oss-release + deploy + + + + org.apache.maven.archetype + archetype-packaging + 2.4 + true + + + org.apache.maven.plugins + maven-archetype-plugin + 2.4 + + + org.apache.maven.plugins + maven-resources-plugin + 2.7 + + true + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + true + true + true + + + + + + + + + sonatype-oss-release + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + skip-test + + + skipTests + + + + + + + org.apache.maven.plugins + maven-archetype-plugin + + true + + + + + + + + \ No newline at end of file diff --git a/runtime_targets/liberty-target-impl/.gitignore b/runtime_targets/liberty-target-impl/.gitignore deleted file mode 100644 index 0c2b833..0000000 --- a/runtime_targets/liberty-target-impl/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/.settings/ -/.project diff --git a/runtime_targets/liberty-target-impl/pom.xml b/runtime_targets/liberty-target-impl/pom.xml deleted file mode 100644 index eae22be..0000000 --- a/runtime_targets/liberty-target-impl/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - 4.0.0 - com.ibm.tools.target - was-liberty-impl - Liberty Target v 8.5 Implementation - pom - 8.5.x.2 - - WebSphere Liberty v 8.5 3rd party implementations used with IBM Rational, IBM WebSphere IDE - - - - - IBM International License Agreement for Non-Warranted Programs - http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/maven/licenses/L-JTHS-8SZMHX/HTML/ - repo - Additional notices http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/maven/licenses/L-JTHS-8SZMHX/HTML/notices.html - - - - - - org.apache.wink - wink-jackson-provider - 1.1.1-incubating - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-jaxrs - - - org.codehaus.jackson - jackson-xc - - - - - org.codehaus.jackson - jackson-jaxrs - 1.6.2 - - - org.codehaus.jackson - jackson-core-asl - 1.6.2 - - - org.codehaus.jackson - jackson-mapper-asl - 1.6.2 - - - org.codehaus.jackson - jackson-xc - 1.6.2 - - - org.apache.openjpa - openjpa - 2.2.0 - - - org.apache.ws.security - wss4j - 1.6.7 - - - org.apache.aries.blueprint - org.apache.aries.blueprint.core - 1.3.0 - - - org.apache.aries.proxy - org.apache.aries.proxy - 1.0.0 - - - org.apache.aries - org.apache.aries.util - 1.0.0 - - - org.apache.santuario - xmlsec - 1.5.2 - - - org.apache.wink - wink-client - 1.1.1-incubating - - - org.apache.wink - wink-server - 1.1.1-incubating - - - - \ No newline at end of file diff --git a/runtime_targets/liberty-target/.gitignore b/runtime_targets/liberty-target/.gitignore deleted file mode 100644 index 0c2b833..0000000 --- a/runtime_targets/liberty-target/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/.settings/ -/.project diff --git a/runtime_targets/liberty-target/pom.xml b/runtime_targets/liberty-target/pom.xml deleted file mode 100644 index 7ab581d..0000000 --- a/runtime_targets/liberty-target/pom.xml +++ /dev/null @@ -1,484 +0,0 @@ - - 4.0.0 - net.wasdev.maven.tools - liberty-target - 1.0 - pom - - - - The Apache Software License, Version 2.0 - https://raw.github.com/WASdev/ci.maven.tools/master/LICENSE - repo - - - - - WebSphere Liberty Profile Target used with IBM WebSphere Eclipse IDE Tools - - - - - wasdev-maven-repo - wasdev-maven-repo - http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/maven/repository/ - - - - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.basics - 1.1.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.clusterMember - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.collectiveController - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.connectionpool - 1.0.1 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.distributedMap - 2.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.dynamicRouting - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.endpoint - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.hpel - 2.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.jaxrs - 1.0.3 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.json - 1.0.1 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.kernel.service - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.messaging - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.monitor - 1.1.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.oauth - 1.1 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.restConnector - 1.1.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.scalingMember - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.scriptMetric - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.security - 1.0.1 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.security.authorization.saf - 1.0.2 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.security.registry.saf - 1.0.1 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.servlet - 1.0.1 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.sessionstats - 1.0.1 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.transaction - 1.1.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.webCache - 1.1.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.webcontainer.security.app - 1.1.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.api.zosLocalAdapters - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.anno - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.application - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.artifact - 1.1.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.classloading - 1.1.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.collectiveMember - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.containerServices - 1.1.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.globalhandler - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.httptransport - 1.1.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.javaeedd - 1.1.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.jsp - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.kernel.embeddable - 1.1.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.kernel.filemonitor - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.kernel.metatype - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.kernel.service - 1.1.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.logging - 1.1.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.restHandler - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.servlet - 1.0.2 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.ssl - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.threading - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.timedOperations - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.webCache - 1.0.0 - jar - - - com.ibm.websphere.appserver.api - com.ibm.websphere.appserver.spi.zosConnect - 1.0.0 - jar - - - org.apache.geronimo.specs - geronimo-jsp_2.2_spec - 1.2 - - - org.apache.geronimo.specs - geronimo-saaj_1.3_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-annotation_1.1_spec - 1.0.1 - - - org.apache.geronimo.specs - geronimo-el_2.2_spec - 1.0.4 - - - org.apache.geronimo.specs - geronimo-jaxrs_1.1_spec - 1.0 - - - org.apache.geronimo.bundles - jstl - 1.2_1 - - - org.apache.geronimo.specs - geronimo-jpa_2.0_spec - 1.1 - - - javax.enterprise.concurrent - javax.enterprise.concurrent-api - 1.0 - - - javax.servlet - javax.servlet-api - 3.1.0 - - - javax.faces - javax.faces-api - 2.0 - - - javax.websocket - javax.websocket-api - 1.0 - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.1.1 - - - org.apache.geronimo.specs - geronimo-jcdi_1.0_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-validation_1.0_spec - 1.1 - - - org.osgi - org.osgi.core - 4.3.1 - - - org.osgi - org.osgi.compendium - 4.2.0 - - - org.apache.geronimo.specs - geronimo-ejb_3.1_spec - 1.0.2 - - - org.apache.geronimo.specs - geronimo-interceptor_1.1_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-atinject_1.0_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-ccpp_1.0_spec - 1.0-beta - - - org.apache.geronimo.specs - geronimo-j2ee-management_1.1_spec - 1.0.1 - - - org.apache.geronimo.specs - geronimo-jacc_1.4_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-jaspic_1.0_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-javaee-deployment_1.1MR3_spec - 1.0.1 - - - org.apache.geronimo.specs - geronimo-jaxr_1.0_spec - 2.1 - - - org.apache.geronimo.specs - geronimo-jaxrpc_1.1_spec - 2.1 - - - org.apache.geronimo.specs - geronimo-stax-api_1.2_spec - 1.1 - - - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - 1.1.3 - - - org.apache.geronimo.specs - geronimo-j2ee-connector_1.6_spec - 1.0 - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - 1.1.1 - - - org.apache.geronimo.specs - geronimo-jaxws_2.2_spec - 1.2 - - - org.apache.geronimo.specs - geronimo-jaxb_2.2_spec - 1.0.1 - - - javax.json - javax.json-api - 1.0 - - - \ No newline at end of file diff --git a/targets/java-specs/pom.xml b/targets/java-specs/pom.xml new file mode 100644 index 0000000..18b5489 --- /dev/null +++ b/targets/java-specs/pom.xml @@ -0,0 +1,181 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + 8.5.5.8 + targets-parent + + + net.wasdev.maven.tools.targets + java-specs + 1.0 + pom + + Java Specification Libraries + POM targeting Java Specification libraries for WebSphere Liberty + + + + javax.annotation + javax.annotation-api + 1.2 + + + javax.batch + javax.batch-api + 1.0 + + + javax.enterprise + cdi-api + 1.2 + + + javax.inject + javax.inject + 1 + + + javax.enterprise.concurrent + javax.enterprise.concurrent-api + 1.0 + + + javax.resource + javax.resource-api + 1.7 + + + javax.ejb + javax.ejb-api + 3.2 + + + javax.el + javax.el-api + 3.0.0 + + + javax.interceptor + javax.interceptor-api + 1.2 + + + javax.security.jacc + javax.security.jacc-api + 1.5 + + + javax.security.auth.message + javax.security.auth.message-api + 1.1 + + + javax.xml.bind + jaxb-api + 2.2 + + + javax.ws.rs + javax.ws.rs-api + 2.0 + + + javax.xml.ws + jaxws-api + 2.2 + + + javax.jms + javax.jms-api + 2.0 + + + javax.faces + javax.faces-api + 2.2-m12 + + + javax.json + javax.json-api + 1.0 + + + javax.servlet.jsp + javax.servlet.jsp-api + 2.3.0 + + + taglibs + standard + 1.0 + + + javax.servlet + jstl + 1.2 + + + javax.mail + javax.mail-api + 1.5.0 + + + javax.management.j2ee + javax.management.j2ee-api + 1.1.1 + + + org.eclipse.persistence + javax.persistence + 2.1.0 + + + javax.servlet + javax.servlet-api + 3.1.0 + + + javax.transaction + javax.transaction-api + 1.2 + + + javax.validation + validation-api + 1.1.0.Final + + + javax.websocket + javax.websocket-api + 1.1 + + + wsdl4j + wsdl4j + 1.6.3 + + + org.osgi + org.osgi.compendium + 4.2.0 + + + org.osgi + org.osgi.core + 4.2.0 + + + org.osgi + org.osgi.service.http + 1.2.1 + + + org.osgi + org.osgi.service.http.whiteboard + 1.0.0 + + + \ No newline at end of file diff --git a/targets/liberty-apis/pom.xml b/targets/liberty-apis/pom.xml new file mode 100644 index 0000000..1bc05c9 --- /dev/null +++ b/targets/liberty-apis/pom.xml @@ -0,0 +1,252 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + 8.5.5.8 + targets-parent + + + net.wasdev.maven.tools.targets + liberty-apis + pom + + WebSphere Liberty API libraries + POM targeting WebSphere Liberty API libraries + + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.basics + 1.2.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.clusterMember + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.collectiveController + 1.3.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.config + 1.2.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.connectionpool + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.constrainedDelegation + 1.0.11 + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.distributedMap + 2.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.dynamicRouting + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.ejbcontainer + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.endpoint + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.hpel + 2.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.j2eemanagement + 1.1.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.jaxrs + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.jaxrs20 + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.json + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.kernel.service + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.mediaServerControl.1.0 + 1.0.11 + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.messaging + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.monitor + 1.1.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.oauth + 1.1.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.persistence + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.restConnector + 1.1.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.saml20 + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.scalingController + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.scalingMember + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.scriptMetric + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.security + 1.2.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.security.authorization.saf + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.security.registry.saf + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.securityClient + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.servlet + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.sessionstats + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.sipServlet.1.1 + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.sipServletSecurity.1.0 + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.transaction + 1.1.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.webCache + 1.1.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.webcontainer.security.app + 1.1.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.wsoc + 1.0.11 + jar + + + com.ibm.websphere.appserver.api + com.ibm.websphere.appserver.api.zosLocalAdapters + 1.0.11 + jar + + + \ No newline at end of file diff --git a/targets/liberty-spis/pom.xml b/targets/liberty-spis/pom.xml new file mode 100644 index 0000000..02173e8 --- /dev/null +++ b/targets/liberty-spis/pom.xml @@ -0,0 +1,164 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + 8.5.5.8 + targets-parent + + + net.wasdev.maven.tools.targets + liberty-spis + pom + + WebSphere Liberty SPI libraries + POM targeting WebSphere Liberty SPI libraries + + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.anno + 1.0.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.application + 1.0.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.artifact + 1.2.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.classloading + 1.2.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.collectiveMember + 1.1.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.containerServices + 1.2.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.globalhandler + 1.0.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.httptransport + 1.1.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.javaeedd + 1.1.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.jsp + 1.0.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.kernel.embeddable + 1.1.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.kernel.filemonitor + 1.0.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.kernel.metatype + 1.0.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.kernel.service + 1.4.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.logging + 1.1.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.restHandler + 1.3.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.saml20 + 1.0.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.servlet + 1.1.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.ssl + 1.0.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.threading + 1.1.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.timedOperations + 1.0.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.transaction + 1.1.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.webCache + 1.0.11 + jar + + + com.ibm.websphere.appserver.spi + com.ibm.websphere.appserver.spi.zosConnect + 1.0.11 + jar + + + \ No newline at end of file diff --git a/targets/liberty-target/pom.xml b/targets/liberty-target/pom.xml new file mode 100644 index 0000000..da15bde --- /dev/null +++ b/targets/liberty-target/pom.xml @@ -0,0 +1,44 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + 8.5.5.8 + targets-parent + + + net.wasdev.maven.tools.targets + liberty-target + pom + + Full WebSphere Liberty libraries + POM targeting WebSphere Liberty APIs, SPIs, Java specifications and third-party libraries. + + + + ${project.groupId} + liberty-spis + ${project.version} + pom + + + ${project.groupId} + liberty-apis + ${project.version} + pom + + + ${project.groupId} + java-specs + ${jspecs.libs.version} + pom + + + ${project.groupId} + third-party + ${thirdparty.libs.version} + pom + + + \ No newline at end of file diff --git a/targets/pom.xml b/targets/pom.xml new file mode 100644 index 0000000..2b58d1e --- /dev/null +++ b/targets/pom.xml @@ -0,0 +1,31 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + main-parent + 1.0 + + + targets-parent + 8.5.5.8 + pom + + WebSphere Liberty dependencies parent POM + Parent POM for building all WebSphere Liberty dependency POMs + + + liberty-target + liberty-spis + liberty-apis + java-specs + third-party + + + + + 1.0 + 1.0 + + diff --git a/targets/third-party/pom.xml b/targets/third-party/pom.xml new file mode 100644 index 0000000..069c736 --- /dev/null +++ b/targets/third-party/pom.xml @@ -0,0 +1,139 @@ + + 4.0.0 + + + net.wasdev.maven.tools.parents + 8.5.5.8 + targets-parent + + + net.wasdev.maven.tools.targets + third-party + 1.0 + pom + + Third-party libraries + POM targeting third-party libraries for WebSphere Liberty + + + + org.apache.aries.blueprint + org.apache.aries.blueprint.core + 1.3.0 + + + org.apache.aries.proxy + org.apache.aries.proxy + 1.0.0 + + + org.apache.aries + org.apache.aries.util + 1.0.0 + + + org.osgi + org.osgi.service.component + 1.3.0 + + + org.jboss.weld + weld-osgi-bundle + 2.2.15.Final + + + org.apache.aries.jndi + org.apache.aries.jndi.api + 1.0.0 + + + org.apache.aries.transaction + org.apache.aries.transaction.blueprint + 1.0.0 + + + org.eclipse.persistence + eclipselink + 2.6.0 + + + org.apache.wink + wink-jackson-provider + 1.1.1-incubating + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + + + org.codehaus.jackson + jackson-jaxrs + 1.6.2 + + + org.codehaus.jackson + jackson-core-asl + 1.6.2 + + + org.codehaus.jackson + jackson-mapper-asl + 1.6.2 + + + org.codehaus.jackson + jackson-xc + 1.6.2 + + + org.apache.wink + wink-client + 1.1.1-incubating + + + org.apache.wink + wink-server + 1.1.1-incubating + + + org.apache.openjpa + openjpa + 2.2.0 + + + io.swagger + swagger-annotations + 1.5.3 + + + org.apache.httpcomponents + httpclient + 4.3 + + + org.apache.httpcomponents + httpcore + 4.3 + + + org.slf4j + slf4j-api + 1.7.7 + + + \ No newline at end of file