Update demos (description below).

* Upgrade several demos to EmbeddedWildFlyLauncher (SDM was broken in some demos with the JBossLauncher). * Fix bugs in jpa demos relating to new IoC. * Remove non-Wildfly app server profiles for several demos (don't have resources to maintain them). * Rename jboss7 profiles to wildfly. * Update README.md files to refer to Wildfly instead of JBoss AS 6/7. * Add .gitignore.
kie-ci · Apr 15, 2016 · 637ea8f · 637ea8f
1 parent d67f140
commit 637ea8f
Show file tree

Hide file tree

Showing 46 changed files with 378 additions and 800 deletions.
diff --git a/errai-demos/.gitignore b/errai-demos/.gitignore
@@ -0,0 +1 @@
+**/WEB-INF/lib/
diff --git a/errai-demos/errai-bus-demo-stock/pom.xml b/errai-demos/errai-bus-demo-stock/pom.xml
@@ -340,9 +340,9 @@
     </profile>
 
     <profile>
-      <id>jboss7</id>
+      <id>wildfly</id>
       <properties>
-        <webDescriptor>jboss7</webDescriptor>
+        <webDescriptor>wildfly</webDescriptor>
         <errai-jboss-as-support.scope>compile</errai-jboss-as-support.scope>
       </properties>
     </profile>

diff --git a/...emo-stock/src/jboss7/META-INF/MANIFEST.MF → ...mo-stock/src/wildfly/META-INF/MANIFEST.MF b/...emo-stock/src/jboss7/META-INF/MANIFEST.MF → ...mo-stock/src/wildfly/META-INF/MANIFEST.MF
diff --git a/...bus-demo-stock/src/jboss7/WEB-INF/web.xml → ...us-demo-stock/src/wildfly/WEB-INF/web.xml b/...bus-demo-stock/src/jboss7/WEB-INF/web.xml → ...us-demo-stock/src/wildfly/WEB-INF/web.xml
diff --git a/errai-demos/errai-bus-demo-stress-test/README.md b/errai-demos/errai-bus-demo-stress-test/README.md
@@ -13,7 +13,7 @@ execute the following command:
 
     mvn clean package -Pintegration-test -P<app-server-profile>
 
-Available app server profile names are jboss7, jboss6, jetty, and tomcat. Remember to clean every
+Available app server profile names are wildfly and tomcat. Remember to clean every
 time you build for a different app server.
 
 

diff --git a/errai-demos/errai-bus-demo-stress-test/pom.xml b/errai-demos/errai-bus-demo-stress-test/pom.xml
@@ -54,7 +54,7 @@
   <properties>
     <skipTests>true</skipTests>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <webDescriptor>jboss7</webDescriptor>
+    <webDescriptor>wildfly</webDescriptor>
     <!-- maven plugins versions -->
     <maven.war.plugin.version>2.1.1</maven.war.plugin.version>
     <maven.surefire.plugin.version>2.5</maven.surefire.plugin.version>
@@ -334,9 +334,9 @@
     </profile>
 
     <profile>
-      <id>jboss7</id>
+      <id>wildfly</id>
       <properties>
-        <webDescriptor>jboss7</webDescriptor>
+        <webDescriptor>wildfly</webDescriptor>
         <errai-jboss-as-support.scope>compile</errai-jboss-as-support.scope>
       </properties>
 

diff --git a/...mo-stress-test/src/jboss7/WEB-INF/web.xml → ...o-stress-test/src/wildfly/WEB-INF/web.xml b/...mo-stress-test/src/jboss7/WEB-INF/web.xml → ...o-stress-test/src/wildfly/WEB-INF/web.xml
diff --git a/errai-demos/errai-cdi-demo-mobile/README.md b/errai-demos/errai-cdi-demo-mobile/README.md
@@ -12,9 +12,9 @@ To try it in dev mode, ensure you have Maven 3 installed, then type the followin
 
     % mvn gwt:run
 
-To build a .war file that you can deploy to JBoss EAP 6, AS 7 or the OpenShift cloud:
+To build a .war file that you can deploy to Wildfly 8 or the OpenShift cloud:
 
-    % mvn clean package -Pjboss7
+    % mvn clean package -Pwildfly
 
 Then copy target/errai-cdi-demo-mobile.war to the appropriate location.
 
diff --git a/errai-demos/errai-cdi-demo-mobile/pom.xml b/errai-demos/errai-cdi-demo-mobile/pom.xml
@@ -53,7 +53,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <webDescriptor>jboss7</webDescriptor>
+    <webDescriptor>wildfly</webDescriptor>
     <skipTests>true</skipTests>
     <argLine></argLine>
     <!-- maven plugins versions -->
@@ -423,9 +423,9 @@
     </profile>
 
     <profile>
-      <id>jboss7</id>
+      <id>wildfly</id>
       <properties>
-        <webDescriptor>jboss7</webDescriptor>
+        <webDescriptor>wildfly</webDescriptor>
       </properties>
 
       <dependencies>

diff --git a/...mo-mobile/src/jboss7/META-INF/MANIFEST.MF → ...o-mobile/src/wildfly/META-INF/MANIFEST.MF b/...mo-mobile/src/jboss7/META-INF/MANIFEST.MF → ...o-mobile/src/wildfly/META-INF/MANIFEST.MF
diff --git a/...s7/WEB-INF/jboss-deployment-structure.xml → ...ly/WEB-INF/jboss-deployment-structure.xml b/...s7/WEB-INF/jboss-deployment-structure.xml → ...ly/WEB-INF/jboss-deployment-structure.xml
diff --git a/...di-demo-mobile/src/jboss7/WEB-INF/web.xml → ...i-demo-mobile/src/wildfly/WEB-INF/web.xml b/...di-demo-mobile/src/jboss7/WEB-INF/web.xml → ...i-demo-mobile/src/wildfly/WEB-INF/web.xml
diff --git a/errai-demos/errai-cdi-demo-tagcloud/pom.xml b/errai-demos/errai-cdi-demo-tagcloud/pom.xml
@@ -53,7 +53,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <webDescriptor>jboss7</webDescriptor>
+    <webDescriptor>wildfly</webDescriptor>
     <skipTests>true</skipTests>
     <argLine></argLine>
     <!-- maven plugins versions -->
@@ -349,9 +349,9 @@
     </profile>
 
     <profile>
-      <id>jboss7</id>
+      <id>wildfly</id>
       <properties>
-        <webDescriptor>jboss7</webDescriptor>
+        <webDescriptor>wildfly</webDescriptor>
       </properties>
 
       <dependencies>

diff --git a/...-tagcloud/src/jboss7/META-INF/MANIFEST.MF → ...tagcloud/src/wildfly/META-INF/MANIFEST.MF b/...-tagcloud/src/jboss7/META-INF/MANIFEST.MF → ...tagcloud/src/wildfly/META-INF/MANIFEST.MF
diff --git a/...s7/WEB-INF/jboss-deployment-structure.xml → ...ly/WEB-INF/jboss-deployment-structure.xml b/...s7/WEB-INF/jboss-deployment-structure.xml → ...ly/WEB-INF/jboss-deployment-structure.xml
diff --git a/...-demo-tagcloud/src/jboss7/WEB-INF/web.xml → ...demo-tagcloud/src/wildfly/WEB-INF/web.xml b/...-demo-tagcloud/src/jboss7/WEB-INF/web.xml → ...demo-tagcloud/src/wildfly/WEB-INF/web.xml
diff --git a/errai-demos/errai-jaxrs-demo-crud/README.md b/errai-demos/errai-jaxrs-demo-crud/README.md
@@ -16,9 +16,9 @@ To try it in dev mode, ensure you have Maven 3 installed, then type the followin
 
     % mvn gwt:run
 
-To build a .war file that you can deploy to JBoss EAP 6, AS 7 or the OpenShift cloud:
+To build a .war file that you can deploy to Wildfly 8 or the OpenShift cloud:
 
-    % mvn clean package -Pjboss7
+    % mvn clean package -Pwildfly
 
 Then copy target/errai-jaxrs-demo-crud.war to the appropriate location.
 
diff --git a/errai-demos/errai-jaxrs-demo-crud/pom.xml b/errai-demos/errai-jaxrs-demo-crud/pom.xml
@@ -52,7 +52,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <webDescriptor>jboss7</webDescriptor>
+    <webDescriptor>wildfly</webDescriptor>
     <skipTests>true</skipTests>
     <argLine></argLine>
     <maven.compiler.source>1.8</maven.compiler.source>
@@ -168,6 +168,12 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jaxrs</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javassist</groupId>
+          <artifactId>javassist</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -194,9 +200,9 @@
     </profile>
 
     <profile>
-      <id>jboss7</id>
+      <id>wildfly</id>
       <properties>
-        <webDescriptor>jboss7</webDescriptor>
+        <webDescriptor>wildfly</webDescriptor>
       </properties>
 
       <dependencies>

diff --git a/...axrs-demo-crud/src/jboss7/WEB-INF/web.xml → ...xrs-demo-crud/src/wildfly/WEB-INF/web.xml b/...axrs-demo-crud/src/jboss7/WEB-INF/web.xml → ...xrs-demo-crud/src/wildfly/WEB-INF/web.xml
diff --git a/errai-demos/errai-jpa-demo-basic/pom.xml b/errai-demos/errai-jpa-demo-basic/pom.xml
@@ -53,7 +53,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <webDescriptor>jboss7</webDescriptor>
+    <webDescriptor>wildfly</webDescriptor>
     <skipTests>true</skipTests>
     <weld.version>1.1.6.Final</weld.version>
     <argLine></argLine>
@@ -254,9 +254,9 @@
     </profile>
 
     <profile>
-      <id>jboss7</id>
+      <id>wildfly</id>
       <properties>
-        <webDescriptor>jboss7</webDescriptor>
+        <webDescriptor>wildfly</webDescriptor>
       </properties>
 
       <dependencies>

diff --git a/...emo-basic/src/jboss7/META-INF/MANIFEST.MF → ...mo-basic/src/wildfly/META-INF/MANIFEST.MF b/...emo-basic/src/jboss7/META-INF/MANIFEST.MF → ...mo-basic/src/wildfly/META-INF/MANIFEST.MF
diff --git a/...s7/WEB-INF/jboss-deployment-structure.xml → ...ly/WEB-INF/jboss-deployment-structure.xml b/...s7/WEB-INF/jboss-deployment-structure.xml → ...ly/WEB-INF/jboss-deployment-structure.xml
diff --git a/...jpa-demo-basic/src/jboss7/WEB-INF/web.xml → ...pa-demo-basic/src/wildfly/WEB-INF/web.xml b/...jpa-demo-basic/src/jboss7/WEB-INF/web.xml → ...pa-demo-basic/src/wildfly/WEB-INF/web.xml
diff --git a/errai-demos/errai-jpa-demo-grocery-list/README.md b/errai-demos/errai-jpa-demo-grocery-list/README.md
@@ -21,9 +21,9 @@ To try it in dev mode, ensure you have Maven 3 installed, then type the followin
 
     % mvn gwt:run
 
-To build a .war file that you can deploy to JBoss EAP 6, AS 7 or the OpenShift cloud:
+To build a .war file that you can deploy to Wildfly 8 or the OpenShift cloud:
 
-    % mvn clean package -Pjboss7
+    % mvn clean package -Pwildfly
 
 Then copy target/errai-jpa-demo-grocery-list.war to the appropriate location.