Skip to content

Commit

Permalink
THORN-2055 Reflect project rename and migration in examples
Browse files Browse the repository at this point in the history
- changed occurences in readme and doc
- changed artifact in pom.xml files
- detect and corrected problems with maven plugin (THORN-2082)
  • Loading branch information
antoinesd committed Jun 11, 2018
1 parent c5a2e31 commit 6379814
Show file tree
Hide file tree
Showing 165 changed files with 953 additions and 953 deletions.
10 changes: 5 additions & 5 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
> Please raise any issues found with the examples in our JIRA:
> https://issues.jboss.org/browse/SWARM

== WildFly Swarm
== Thorntail

This repository contains examples for the http://wildfly-swarm.io[WildFly Swarm] project.
This repository contains examples for the http://wildfly-swarm.io[Thorntail] project.

It is currently listed as *alpha* release software, subject to massive, possibly-breaking,
changes as we determine exactly how it should all hang together.
Expand All @@ -16,12 +16,12 @@ These examples demonstrate utilizing and combining different parts of WildFly to
a self-contained executable jar. They provide small, specific, working examples that can be used
as a reference for your own project.

By default, this repository uses `SNAPSHOT` versions of WildFly Swarm. They are used to test
particular aspects of the WildFly Swarm project in addition to being useful examples of what
By default, this repository uses `SNAPSHOT` versions of Thorntail. They are used to test
particular aspects of the Thorntail project in addition to being useful examples of what
you can do and how you can do it.

Since these examples are `SNAPSHOT`-centric, our *snapshot* repository is added to the
root `pom.xml`. If you were to build https://github.com/wildfly-swarm/wildfly-swarm[WildFly Swarm]
root `pom.xml`. If you were to build https://github.com/wildfly-swarm/wildfly-swarm[Thorntail]
directly, that would of course take precedence.

If you want to build these examples as they stand (using the snapshot) then you should start by either
Expand Down
12 changes: 6 additions & 6 deletions arjuna/arjuna/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ Note, these are not Java EE compliant APIs and classes we're going to use. But t

## Project `pom.xml`

The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
create the runnable `.jar`.

<plugin>
<groupId>org.wildfly.swarm</groupId>
<artifactId>wildfly-swarm-plugin</artifactId>
<groupid>io.thorntail</groupId>
<artifactId>thorntail-maven-plugin</artifactId>
<version>${version.wildfly-swarm}</version>
<executions>
<execution>
Expand All @@ -23,15 +23,15 @@ create the runnable `.jar`.
</executions>
</plugin>

To define the needed parts of WildFly Swarm, a dependency is added
To define the needed parts of Thorntail, a dependency is added

<dependency>
<groupId>org.wildfly.swarm</groupId>
<groupid>io.thorntail</groupId>
<artifactId>jaxrs</artifactId>
<version>${version.wildfly-swarm}</version>
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<groupid>io.thorntail</groupId>
<artifactId>transactions</artifactId>
<version>${version.wildfly-swarm}</version>
</dependency>
Expand Down
18 changes: 9 additions & 9 deletions arjuna/arjuna/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.wildfly.swarm.examples</groupId>
<groupId>io.thorntail.examples</groupId>
<artifactId>examples-arjuna</artifactId>
<version>2018.6.0-SNAPSHOT</version>
<version>2.0.0.Final-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<artifactId>example-arjuna</artifactId>

<name>WildFly Swarm Examples: Arjuna</name>
<description>WildFly Swarm Examples: Arjuna</description>
<name>Thorntail Examples: Arjuna</name>
<description>Thorntail Examples: Arjuna</description>

<packaging>war</packaging>

Expand All @@ -45,8 +45,8 @@
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.wildfly.swarm</groupId>
<artifactId>wildfly-swarm-plugin</artifactId>
<groupId>io.thorntail</groupId>
<artifactId>thorntail-maven-plugin</artifactId>
<executions>
<execution>
<id>package</id>
Expand All @@ -64,15 +64,15 @@

<dependencies>
<dependency>
<groupId>org.wildfly.swarm.examples</groupId>
<groupId>io.thorntail.examples</groupId>
<artifactId>examples-base</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<groupId>io.thorntail</groupId>
<artifactId>jaxrs</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<groupId>io.thorntail</groupId>
<artifactId>transactions</artifactId>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions arjuna/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.wildfly.swarm.examples</groupId>
<groupId>io.thorntail.examples</groupId>
<artifactId>examples-parent</artifactId>
<version>2018.6.0-SNAPSHOT</version>
<version>2.0.0.Final-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<artifactId>examples-arjuna</artifactId>

<name>WildFly Swarm Examples: Arjuna parent</name>
<description>WildFly Swarm Examples: Arjuna parent</description>
<name>Thorntail Examples: Arjuna parent</name>
<description>Thorntail Examples: Arjuna parent</description>

<packaging>pom</packaging>

Expand Down
16 changes: 8 additions & 8 deletions arjuna/stm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ The project is a normal maven project with `war` packaging, not `jar`.

<packaging>war</packaging>

The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
create the `.war`.

<plugin>
<groupId>org.wildfly.swarm</groupId>
<artifactId>wildfly-swarm-plugin</artifactId>
<groupid>io.thorntail</groupId>
<artifactId>thorntail-maven-plugin</artifactId>
<version>${version.wildfly-swarm}</version>
<executions>
<execution>
Expand All @@ -37,15 +37,15 @@ Additionally, the usual `maven-war-plugin` is provided.
</configuration>
</plugin>

To define the needed parts of WildFly Swarm, a dependency is added
To define the needed parts of Thorntail, a dependency is added

<dependency>
<groupId>org.wildfly.swarm</groupId>
<groupid>io.thorntail</groupId>
<artifactId>jaxrs</artifactId>
<version>${version.wildfly-swarm}</version>
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<groupid>io.thorntail</groupId>
<artifactId>transactions</artifactId>
<version>${version.wildfly-swarm}</version>
</dependency>
Expand All @@ -56,7 +56,7 @@ To define the needed parts of WildFly Swarm, a dependency is added

## Run

mvn wildfly-swarm:run
mvn thorntail:run

## Use

Expand All @@ -79,7 +79,7 @@ Transactional object value incremented to 18
Transactional object value incremented to 19
Transactional object value incremented to 20

What's happening is that we've created a recoverable STM-managed object (an integer state) within WildFly Swarm and given it an initial value
What's happening is that we've created a recoverable STM-managed object (an integer state) within Thorntail and given it an initial value
of 10; then we increment it by another 10, printing out each time we do.

If you repeat the operation you will see a new instance created and the end state will always be 20.
Expand Down
18 changes: 9 additions & 9 deletions arjuna/stm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.wildfly.swarm.examples</groupId>
<groupId>io.thorntail.examples</groupId>
<artifactId>examples-arjuna</artifactId>
<version>2018.6.0-SNAPSHOT</version>
<version>2.0.0.Final-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<artifactId>example-stm</artifactId>

<name>WildFly Swarm Examples: STM</name>
<description>WildFly Swarm Examples: STM</description>
<name>Thorntail Examples: STM</name>
<description>Thorntail Examples: STM</description>

<packaging>war</packaging>

Expand All @@ -55,8 +55,8 @@
</configuration>
</plugin>
<plugin>
<groupId>org.wildfly.swarm</groupId>
<artifactId>wildfly-swarm-plugin</artifactId>
<groupId>io.thorntail</groupId>
<artifactId>thorntail-maven-plugin</artifactId>
<executions>
<execution>
<id>package</id>
Expand All @@ -74,7 +74,7 @@

<dependencies>
<dependency>
<groupId>org.wildfly.swarm.examples</groupId>
<groupId>io.thorntail.examples</groupId>
<artifactId>examples-base</artifactId>
</dependency>
<dependency>
Expand All @@ -83,11 +83,11 @@
<version>5.2.12.Final</version>
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<groupId>io.thorntail</groupId>
<artifactId>jaxrs</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<groupId>io.thorntail</groupId>
<artifactId>transactions</artifactId>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.wildfly.swarm.examples</groupId>
<groupId>io.thorntail.examples</groupId>
<artifactId>examples-parent</artifactId>
<version>2018.6.0-SNAPSHOT</version>
<version>2.0.0.Final-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<artifactId>examples-base</artifactId>

<name>WildFly Swarm Examples: Base</name>
<description>WildFly Swarm Examples: Base</description>
<name>Thorntail Examples: Base</name>
<description>Thorntail Examples: Base</description>

<packaging>jar</packaging>

Expand Down
18 changes: 9 additions & 9 deletions camel/camel-activemq/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,31 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.wildfly.swarm.examples</groupId>
<groupId>io.thorntail.examples</groupId>
<artifactId>examples-camel</artifactId>
<version>2018.6.0-SNAPSHOT</version>
<version>2.0.0.Final-SNAPSHOT</version>
</parent>

<name>WildFly Swarm Examples: Camel ActiveMQ</name>
<name>Thorntail Examples: Camel ActiveMQ</name>

<artifactId>example-camel-activemq</artifactId>
<packaging>war</packaging>

<dependencies>
<dependency>
<groupId>org.wildfly.swarm.examples</groupId>
<groupId>io.thorntail.examples</groupId>
<artifactId>examples-base</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<groupId>io.thorntail</groupId>
<artifactId>camel-cdi</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<groupId>io.thorntail</groupId>
<artifactId>camel-activemq</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<groupId>io.thorntail</groupId>
<artifactId>jaxrs</artifactId>
</dependency>
</dependencies>
Expand All @@ -64,8 +64,8 @@
</configuration>
</plugin>
<plugin>
<groupId>org.wildfly.swarm</groupId>
<artifactId>wildfly-swarm-plugin</artifactId>
<groupId>io.thorntail</groupId>
<artifactId>thorntail-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Expand Down
12 changes: 6 additions & 6 deletions camel/camel-cdi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ This example uses camel-cdi for enabling CDI beans to participate in a Camel rou

## Project `pom.xml`

The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
create the runnable `.jar`.

<plugin>
<groupId>org.wildfly.swarm</groupId>
<artifactId>wildfly-swarm-plugin</artifactId>
<groupid>io.thorntail</groupId>
<artifactId>thorntail-maven-plugin</artifactId>
</plugin>

To define the needed parts of WildFly Swarm, the following dependencies are added
To define the needed parts of Thorntail, the following dependencies are added

<dependency>
<groupId>org.wildfly.swarm</groupId>
<groupid>io.thorntail</groupId>
<artifactId>camel-cdi</artifactId>
</dependency>

Expand All @@ -27,7 +27,7 @@ project does *not* need to specify those.
You can run it many ways:

* mvn package && java -jar ./target/example-camel-cdi-swarm.jar
* mvn wildfly-swarm:run
* mvn thorntail:run
* In your IDE run the `org.wildfly.swarm.Swarm` class

## Use
Expand Down
18 changes: 9 additions & 9 deletions camel/camel-cdi/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
#%L
Wildfly Swarm :: Camel Core Runtime
Thorntail :: Camel Core Runtime
%%
Copyright (C) 2016 RedHat
%%
Expand All @@ -24,35 +24,35 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.wildfly.swarm.examples</groupId>
<groupId>io.thorntail.examples</groupId>
<artifactId>examples-camel</artifactId>
<version>2018.6.0-SNAPSHOT</version>
<version>2.0.0.Final-SNAPSHOT</version>
</parent>

<name>WildFly Swarm Examples: Camel CDI</name>
<name>Thorntail Examples: Camel CDI</name>
<artifactId>example-camel-cdi</artifactId>
<packaging>war</packaging>

<dependencies>
<dependency>
<groupId>org.wildfly.swarm.examples</groupId>
<groupId>io.thorntail.examples</groupId>
<artifactId>examples-base</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<groupId>io.thorntail</groupId>
<artifactId>camel-cdi</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.swarm</groupId>
<groupId>io.thorntail</groupId>
<artifactId>camel-undertow</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.wildfly.swarm</groupId>
<artifactId>wildfly-swarm-plugin</artifactId>
<groupId>io.thorntail</groupId>
<artifactId>thorntail-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
Expand Down
Loading

0 comments on commit 6379814

Please sign in to comment.