SWARM-856: main() clear up in examples repo (#114)

Motivation ---------- There are many usages of main() in our examples that don't require a main() as they can be configured through project-stages.yml. Modifications ------------- Removed all Shrinkwrap specific examples that can be achieved with a `war` project type and project-stages.yml. Modified remaining main() examples to use project-stages.yml instead. Result ------ No impact to product, simplified examples
thorntail · Dec 7, 2016 · ac61d71 · ac61d71
1 parent 865ab3d
commit ac61d71
Show file tree

Hide file tree

Showing 195 changed files with 203 additions and 4,207 deletions.
diff --git a/arjuna/arjuna-shrinkwrap/src/main/java/org/wildfly/swarm/examples/arjuna/Main.java b/arjuna/arjuna-shrinkwrap/src/main/java/org/wildfly/swarm/examples/arjuna/Main.java
diff --git a/arjuna/arjuna-shrinkwrap/README.md → arjuna/arjuna/README.md b/arjuna/arjuna-shrinkwrap/README.md → arjuna/arjuna/README.md
@@ -6,10 +6,6 @@ Note, these are not Java EE compliant APIs and classes we're going to use. But t
 
 ## Project `pom.xml`
 
-The project is a normal maven project with `jar` packaging, not `war`.
-
-    <packaging>jar</packaging>
-
 The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
 create the runnable `.jar`.
 
@@ -27,41 +23,22 @@ create the runnable `.jar`.
       </executions>
     </plugin>
 
-Additionally, the usual `maven-jar-plugin` is provided configuration
-to indicate which of our own classes should be used for the `main()`
-method.
-
-    <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-            <archive>
-                <manifest>
-                    <mainClass>org.wildfly.swarm.examples.transactions.Main</mainClass>
-                </manifest>
-            </archive>
-        </configuration>
-    </plugin>
-
 To define the needed parts of WildFly Swarm, a dependency is added
 
     <dependency>
         <groupId>org.wildfly.swarm</groupId>
         <artifactId>jaxrs</artifactId>
         <version>${version.wildfly-swarm}</version>
-        <scope>provided</scope>
     </dependency>
     <dependency>
         <groupId>org.wildfly.swarm</groupId>
         <artifactId>transactions</artifactId>
         <version>${version.wildfly-swarm}</version>
-        <scope>provided</scope>
     </dependency>
     <dependency>
         <groupId>org.wildfly.swarm</groupId>
         <artifactId>msc</artifactId>
         <version>${version.wildfly-swarm}</version>
-        <scope>provided</scope>
     </dependency>
 
 ## Build
@@ -105,4 +82,4 @@ To define the needed parts of WildFly Swarm, a dependency is added
 
     You should get something like the following in your browser ...
 
-    Nested transaction  BasicAction: 0:ffffac1c8001:-315e47ea:567ed60e:19 status: ActionStatus.RUNNING started!
+    Nested transaction  BasicAction: 0:ffffac1c8001:-315e47ea:567ed60e:19 status: ActionStatus.RUNNING started!
diff --git a/...una-shrinkwrap/etc/jbossts-properties.xml → arjuna/arjuna/etc/jbossts-properties.xml b/...una-shrinkwrap/etc/jbossts-properties.xml → arjuna/arjuna/etc/jbossts-properties.xml
diff --git a/arjuna/arjuna-shrinkwrap/pom.xml → arjuna/arjuna/pom.xml b/arjuna/arjuna-shrinkwrap/pom.xml → arjuna/arjuna/pom.xml
@@ -22,7 +22,7 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.wildfly.swarm.examples</groupId>
@@ -31,12 +31,12 @@
     <relativePath>../</relativePath>
   </parent>
 
-  <artifactId>example-arjuna-shrinkwrap</artifactId>
+  <artifactId>example-arjuna</artifactId>
 
-  <name>WildFly Swarm Examples: Arjuna ShrinkWrap</name>
-  <description>WildFly Swarm Examples: Arjuna ShrinkWrap</description>
+  <name>WildFly Swarm Examples: Arjuna</name>
+  <description>WildFly Swarm Examples: Arjuna</description>
 
-  <packaging>jar</packaging>
+  <packaging>war</packaging>
 
   <build>
     <plugins>
@@ -47,9 +47,6 @@
       <plugin>
         <groupId>org.wildfly.swarm</groupId>
         <artifactId>wildfly-swarm-plugin</artifactId>
-        <configuration>
-          <mainClass>org.wildfly.swarm.examples.arjuna.Main</mainClass>
-        </configuration>
         <executions>
           <execution>
             <id>package</id>

diff --git a/.../it/arjuna/TransactionsApplicationIT.java → .../it/arjuna/TransactionsApplicationIT.java b/.../it/arjuna/TransactionsApplicationIT.java → .../it/arjuna/TransactionsApplicationIT.java
diff --git a/...fly/swarm/examples/arjuna/MyResource.java → ...fly/swarm/examples/arjuna/MyResource.java b/...fly/swarm/examples/arjuna/MyResource.java → ...fly/swarm/examples/arjuna/MyResource.java
diff --git a/arjuna/pom.xml b/arjuna/pom.xml
@@ -23,7 +23,7 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>arjuna-shrinkwrap</module>
-    <module>stm-shrinkwrap</module>
+    <module>arjuna</module>
+    <module>stm</module>
   </modules>
 </project>
diff --git a/arjuna/stm-shrinkwrap/src/main/java/org/wildfly/swarm/examples/stm/Main.java b/arjuna/stm-shrinkwrap/src/main/java/org/wildfly/swarm/examples/stm/Main.java
diff --git a/arjuna/stm-shrinkwrap/README.md → arjuna/stm/README.md b/arjuna/stm-shrinkwrap/README.md → arjuna/stm/README.md
@@ -37,28 +37,22 @@ Additionally, the usual `maven-war-plugin` is provided.
         </configuration>
     </plugin>
 
-Currently we have to add javax.transactions into the pom.xml for building due to
-https://github.com/wildfly-swarm/wildfly-swarm/issues/27
-
 To define the needed parts of WildFly Swarm, a dependency is added
 
     <dependency>
         <groupId>org.wildfly.swarm</groupId>
         <artifactId>jaxrs</artifactId>
         <version>${version.wildfly-swarm}</version>
-        <scope>provided</scope>
     </dependency>
     <dependency>
         <groupId>org.wildfly.swarm</groupId>
         <artifactId>transactions</artifactId>
         <version>${version.wildfly-swarm}</version>
-        <scope>provided</scope>
     </dependency>
     <dependency>
         <groupId>org.wildfly.swarm</groupId>
         <artifactId>msc</artifactId>
         <version>${version.wildfly-swarm}</version>
-        <scope>provided</scope>
     </dependency>
 
 ## Build

diff --git a/...stm-shrinkwrap/etc/jbossts-properties.xml → arjuna/stm/etc/jbossts-properties.xml b/...stm-shrinkwrap/etc/jbossts-properties.xml → arjuna/stm/etc/jbossts-properties.xml
diff --git a/arjuna/stm-shrinkwrap/pom.xml → arjuna/stm/pom.xml b/arjuna/stm-shrinkwrap/pom.xml → arjuna/stm/pom.xml
@@ -22,7 +22,7 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.wildfly.swarm.examples</groupId>
@@ -31,12 +31,12 @@
     <relativePath>../</relativePath>
   </parent>
 
-  <artifactId>example-stm-shrinkwrap</artifactId>
+  <artifactId>example-stm</artifactId>
 
-  <name>WildFly Swarm Examples: STM ShrinkWrap</name>
-  <description>WildFly Swarm Examples: STM ShrinkWrap</description>
+  <name>WildFly Swarm Examples: STM</name>
+  <description>WildFly Swarm Examples: STM</description>
 
-  <packaging>jar</packaging>
+  <packaging>war</packaging>
 
   <build>
     <plugins>
@@ -45,21 +45,18 @@
         <artifactId>maven-surefire-plugin</artifactId>
       </plugin>
       <plugin>
-	<artifactId>maven-clean-plugin</artifactId>
-	<configuration>
-	  <filesets>
-	    <fileset>
-	      <directory>ObjectStore</directory>
-	    </fileset>
-	  </filesets>
-	</configuration>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>ObjectStore</directory>
+            </fileset>
+          </filesets>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.wildfly.swarm</groupId>
         <artifactId>wildfly-swarm-plugin</artifactId>
-        <configuration>
-          <mainClass>org.wildfly.swarm.examples.stm.Main</mainClass>
-        </configuration>
         <executions>
           <execution>
             <id>package</id>
@@ -81,9 +78,9 @@
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-	<groupId>org.jboss.narayana.stm</groupId>
-	<artifactId>stm</artifactId>
-	<version>5.2.12.Final</version>
+      <groupId>org.jboss.narayana.stm</groupId>
+      <artifactId>stm</artifactId>
+      <version>5.2.12.Final</version>
     </dependency>
     <dependency>
       <groupId>org.wildfly.swarm</groupId>

diff --git a/...arm/it/stm/TransactionsApplicationIT.java → ...arm/it/stm/TransactionsApplicationIT.java b/...arm/it/stm/TransactionsApplicationIT.java → ...arm/it/stm/TransactionsApplicationIT.java
diff --git a/...ildfly/swarm/examples/stm/MyResource.java → ...ildfly/swarm/examples/stm/MyResource.java b/...ildfly/swarm/examples/stm/MyResource.java → ...ildfly/swarm/examples/stm/MyResource.java
diff --git a/...rg/wildfly/swarm/examples/stm/Sample.java → ...rg/wildfly/swarm/examples/stm/Sample.java b/...rg/wildfly/swarm/examples/stm/Sample.java → ...rg/wildfly/swarm/examples/stm/Sample.java
diff --git a/...ly/swarm/examples/stm/SampleLockable.java → ...ly/swarm/examples/stm/SampleLockable.java b/...ly/swarm/examples/stm/SampleLockable.java → ...ly/swarm/examples/stm/SampleLockable.java
diff --git a/camel/camel-cxf-jaxrs/pom.xml b/camel/camel-cxf-jaxrs/pom.xml
@@ -33,6 +33,8 @@
 
   <artifactId>example-camel-cxf-jaxrs</artifactId>
 
+  <packaging>war</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm.examples</groupId>
@@ -49,9 +51,6 @@
       <plugin>
         <groupId>org.wildfly.swarm</groupId>
         <artifactId>wildfly-swarm-plugin</artifactId>
-        <configuration>
-          <mainClass>org.wildfly.swarm.examples.camel.cxf.jaxrs.Main</mainClass>
-        </configuration>
       </plugin>
     </plugins>
   </build>

diff --git a/camel/camel-cxf-jaxrs/src/main/java/org/wildfly/swarm/examples/camel/cxf/jaxrs/Main.java b/camel/camel-cxf-jaxrs/src/main/java/org/wildfly/swarm/examples/camel/cxf/jaxrs/Main.java
diff --git a/camel/camel-cxf-jaxws/pom.xml b/camel/camel-cxf-jaxws/pom.xml
@@ -33,6 +33,8 @@
 
   <artifactId>example-camel-cxf-jaxws</artifactId>
 
+  <packaging>war</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.wildfly.swarm.examples</groupId>
@@ -49,9 +51,6 @@
       <plugin>
         <groupId>org.wildfly.swarm</groupId>
         <artifactId>wildfly-swarm-plugin</artifactId>
-        <configuration>
-          <mainClass>org.wildfly.swarm.examples.camel.cxf.jaxws.Main</mainClass>
-        </configuration>
       </plugin>
     </plugins>
   </build>