Merge remote-tracking branch 'upstream/master'

arjantijms · arjantijms · commit a4bcb6450acc · 2014-10-05T01:03:12.000+02:00
diff --git a/README.md b/README.md
@@ -71,6 +71,10 @@ When developing and runing them from IDE, remember to activate the profile befor
 
 To learn more about Arquillian please refer to the [Arquillian Guides](http://arquillian.org/guides/)
 
+### Importing in Eclipse ###
+
+To import the samples in an Eclipse workspace, please install the [Groovy plugins for your Eclipse version](http://groovy.codehaus.org/Eclipse+Plugin) first, then import the sample projects you want using File>Import>Existing Maven Projects. 
+
 ## How to contribute ##
 
 With your help we can improve this set of samples, learn from each other and grow the community full of passionate people who care about the technology, innovation and code quality. Every contribution matters!
diff --git a/jaxrs/angularjs/src/test/java/org/javaee7/jaxrs/angularjs/NoteResourceImplTest.java b/jaxrs/angularjs/src/test/java/org/javaee7/jaxrs/angularjs/NoteResourceImplTest.java
@@ -17,6 +17,7 @@
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.GenericArchive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.importer.ExplodedImporter;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
@@ -49,6 +50,8 @@ public static Archive createDeployment()
         return ShrinkWrap.create(WebArchive.class, NoteResourceImplTest.class.getSimpleName() + ".war")
             .addClasses(Note.class, NoteApp.class, NoteResource.class, NoteResourceImpl.class)
             .addAsResource("META-INF/persistence.xml")
+            .addAsWebInfResource("enforce-beans.xml", "jboss-all.xml")
+            .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
             .addAsLibraries(seleniumApi)
             .merge(webResources);
     }
diff --git a/jaxrs/angularjs/src/test/resources/enforce-beans.xml b/jaxrs/angularjs/src/test/resources/enforce-beans.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss xmlns="urn:jboss:1.0">
+  <weld xmlns="urn:jboss:weld:1.0" require-bean-descriptor="true"/>
+</jboss>
diff --git a/jaxrs/async-client/src/test/java/org/javaee7/jaxrs/asyncclient/MyResourceTest.java b/jaxrs/async-client/src/test/java/org/javaee7/jaxrs/asyncclient/MyResourceTest.java
@@ -44,7 +44,7 @@ public class MyResourceTest {
     
     /**
      * Since +JAX-RS+ webservices are, well, web related and require a
-     * web contex, they are required to be deployed within a +web archive+.
+     * web context, they are required to be deployed within a +web archive+.
      * By default, +JAX-RS+ will perform autodiscovery of our services.
      * That means there is no need to add a +web.xml+ in this scenario.
      * 
@@ -83,7 +83,7 @@ public void setUpClass() throws MalformedURLException {
      * 
      * include::MyResourceTest#setUpClass[]
      *
-     * Now we're free to invoke our deployed service by using the +JAX-RS+
+     * Now we are free to invoke our deployed service by using the +JAX-RS+
      * client library.
      * 
      * The asynchronous client library comes with multiple option on how
diff --git a/jms/jms-xa/src/main/java/org/javaee7/jms/xa/JMSMailman.java b/jms/jms-xa/src/main/java/org/javaee7/jms/xa/JMSMailman.java
@@ -6,7 +6,6 @@
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageListener;
-import javax.jms.TextMessage;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -24,8 +23,8 @@ public class JMSMailman implements MessageListener {
     public void onMessage(Message message)
     {
         try {
-            TextMessage tm = (TextMessage) message;
-            logger.info("Message received (async): " + tm.getText());
+            String text = message.getBody(String.class);
+            logger.info("Message received (async): " + text);
             deliveryStats.messageDelivered();
         } catch (JMSException ex) {
             logger.log(Level.SEVERE, null, ex);
diff --git a/jms/jms-xa/src/main/java/org/javaee7/jms/xa/Mailman.java b/jms/jms-xa/src/main/java/org/javaee7/jms/xa/Mailman.java
@@ -3,14 +3,10 @@
 import javax.annotation.Resource;
 import javax.ejb.Singleton;
 import javax.inject.Inject;
-import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
+import javax.jms.JMSContext;
 import javax.jms.JMSDestinationDefinition;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
 import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
 
 @JMSDestinationDefinition(
     name = Mailman.CLASSIC_QUEUE,
@@ -32,24 +28,8 @@ public class Mailman {
 
     public void sendMessage(String payload)
     {
-        Connection connection = null;
-        try {
-            connection = connectionFactory.createConnection();
-            connection.start();
-            Session session = connection.createSession(false, Session.SESSION_TRANSACTED);
-            MessageProducer messageProducer = session.createProducer(demoQueue);
-            TextMessage textMessage = session.createTextMessage(payload);
-            messageProducer.send(textMessage);
-        } catch (JMSException ex) {
-            ex.printStackTrace();
-        } finally {
-            if (connection != null) {
-                try {
-                    connection.close();
-                } catch (JMSException ex) {
-                    ex.printStackTrace();
-                }
-            }
+        try (JMSContext context = connectionFactory.createContext()) {
+            context.createProducer().send(demoQueue,payload);
         }
     }
 }
diff --git a/jms/jms-xa/src/test/resources/arquillian.xml b/jms/jms-xa/src/test/resources/arquillian.xml
@@ -8,4 +8,10 @@
         <property name="deploymentExportPath">target/deployment</property>
     </engine>
 
+    <container qualifier="wildfly">
+        <configuration>
+            <property name="serverConfig">standalone-full.xml</property>
+        </configuration>
+    </container>
+
 </arquillian>
diff --git a/pom.xml b/pom.xml
@@ -272,6 +272,12 @@
                     </dependency>
                 </dependencies>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-eclipse-compiler</artifactId>
+                <version>2.8.0-01</version>
+                <extensions>true</extensions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -306,6 +312,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.17</version>
+                <configuration>
+                    <aggregate>true</aggregate>
+                    <linkXRef>true</linkXRef>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
@@ -354,8 +369,12 @@
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
+          <artifactId>maven-surefire-report-plugin</artifactId>
           <version>2.17</version>
+          <configuration>
+            <aggregate>true</aggregate>
+            <linkXRef>true</linkXRef>
+          </configuration>
         </plugin>
       </plugins>
     </reporting>
@@ -446,6 +465,7 @@
                         <configuration>
                             <systemPropertyVariables>
                                 <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                                <arquillian.launch>wildfly</arquillian.launch>
                             </systemPropertyVariables>
                             <environmentVariables>
                                 <JBOSS_HOME>${project.build.directory}/wildfly-${org.wildfly}</JBOSS_HOME>
@@ -540,6 +560,9 @@
                             <environmentVariables>
                                 <JBOSS_HOME>${project.build.directory}/wildfly-${org.wildfly}</JBOSS_HOME>
                             </environmentVariables>
+                            <systemPropertyVariables>
+                                <arquillian.launch>wildfly</arquillian.launch>
+                            </systemPropertyVariables>
                         </configuration>
                     </plugin>
                 </plugins>

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public class MyResourceTest {`
`44`	`44`
`45`	`45`	`/**`
`46`	`46`	`* Since +JAX-RS+ webservices are, well, web related and require a`
`47`		`- * web contex, they are required to be deployed within a +web archive+.`
	`47`	`+ * web context, they are required to be deployed within a +web archive+.`
`48`	`48`	`* By default, +JAX-RS+ will perform autodiscovery of our services.`
`49`	`49`	`* That means there is no need to add a +web.xml+ in this scenario.`
`50`	`50`	`*`
`@@ -83,7 +83,7 @@ public void setUpClass() throws MalformedURLException {`
`83`	`83`	`*`
`84`	`84`	`* include::MyResourceTest#setUpClass[]`
`85`	`85`	`*`
`86`		`- * Now we're free to invoke our deployed service by using the +JAX-RS+`
	`86`	`+ * Now we are free to invoke our deployed service by using the +JAX-RS+`
`87`	`87`	`* client library.`
`88`	`88`	`*`
`89`	`89`	`* The asynchronous client library comes with multiple option on how`