Merge pull request #1 from javaee-samples/master

Update from upstream

Author: arjantijms

.gitignore

@@ -5,6 +5,7 @@ target/
 libs/
 tmp/
 node_modules/
+jaxws/jaxws-client/src/main/
 
 # OS Files #
 .DS_Store

.travis.yml

@@ -0,0 +1,7 @@
+language: java
+
+jdk:
+  - oraclejdk8
+  - oraclejdk7
+
+script: mvn clean install -Ptomee-embedded-arquillian

Dockerfile

@@ -0,0 +1,2 @@
+FROM centos/wildfly
+ADD jaxrs/jaxrs-client/target/jaxrs-client.war /opt/wildfly/standalone/deployments/

README.md

@@ -109,5 +109,29 @@ That's it! Welcome in the community!
 
 ## CI Job ##
 
-* [WildFly](https://javaee-support.ci.cloudbees.com/job/javaee7-pull-request-builder/)
-* [GlassFish](https://javaee-support.ci.cloudbees.com/job/javaee7-pull-request-builder-glassfish/)
+* [WildFly](https://javaee-support.ci.cloudbees.com/job/javaee7-samples-wildfly-8.1/)
+* [GlassFish](https://javaee-support.ci.cloudbees.com/job/javaee7-samples-glassfish-4.1/)
+* [TomEE](https://javaee-support.ci.cloudbees.com/job/javaee7-samples-tomee-2.0/)
+
+## Run each sample in Docker
+
+* Install Docker client from http://boot2docker.io/
+* Build the sample that you want to run as
+  
+  ``mvn clean package -DskipTests``
+
+  For example:
+
+  ``mvn -f jaxrs/jaxrs-client/pom.xml clean package -DskipTests``
+
+* Change the second line in ``Dockerfile`` to specify the location of the generated WAR file
+* Run boot2docker and give the command
+
+  ``docker build -it -p 80:8080 javaee7-sample``
+
+* In a different shell, find out the IP address of the running container as:
+
+  ``boot2docker ip``
+
+* Access the sample as http://IP_ADDRESS:80/jaxrs-client/webresources/persons. The exact URL would differ based upon the sample.
+

batch/README.md

@@ -0,0 +1,27 @@
+# Java EE 7 Samples: Batch #
+
+The [JSR 352](https://jcp.org/en/jsr/detail?id=352) specifies a programming model for batch applications and a runtime for scheduling and executing jobs. 
+
+## Samples ##
+
+ - batchlet-simple
+ - chunk-checkpoint
+ - chunk-csv-database
+ - chunk-exception
+ - chunk-mapper
+ - chunk-optional-processor
+ - chunk-partition
+ - chunk-simple
+ - decision
+ - flow
+ - batch-listeners
+ - multiple-steps
+ - split
+ - chunk-simple-nobeans
+ - scheduling
+
+## How to run
+
+More information on how to run can be found at: <https://github.com/javaee-samples/javaee7-samples#how-to-run->
+
+

batch/batch-listeners/pom.xml

@@ -1,22 +1,22 @@
-<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">
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
     <parent>
-        <groupId>org.javaee7.batch</groupId>
-        <artifactId>batch-samples</artifactId>
+        <groupId>org.javaee7</groupId>
+        <artifactId>batch</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-
-    <artifactId>batch-listeners</artifactId>
+    <artifactId>batch-batch-listeners</artifactId>
     <packaging>war</packaging>
-    <name>Batch Listeners</name>
+    <name>Java EE 7 Sample: batch - batch-listeners</name>
     <description>Batch Listeners - Applying Listeners to Job, Chunk, Step, Reader, Processor and Writer</description>
 
     <dependencies>
         <dependency>
             <groupId>org.javaee7</groupId>
-            <artifactId>util-samples</artifactId>
+            <artifactId>util</artifactId>
         </dependency>
     </dependencies>
 </project>

batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyInputRecord.java

@@ -5,9 +5,10 @@
  */
 public class MyInputRecord {
     private int id;
-            
-    public MyInputRecord() { }
-    
+
+    public MyInputRecord() {
+    }
+
     public MyInputRecord(int id) {
         this.id = id;
     }
@@ -19,7 +20,7 @@ public int getId() {
     public void setId(int id) {
         this.id = id;
     }
-    
+
     @Override
     public String toString() {
         return "MyInputRecord: " + id;

batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyItemProcessor.java

@@ -12,7 +12,7 @@ public class MyItemProcessor implements ItemProcessor {
     @Override
     public Object processItem(Object t) {
         System.out.println("processItem: " + t);
-        
-        return (((MyInputRecord)t).getId() % 2 == 0) ? null : new MyOutputRecord(((MyInputRecord)t).getId() * 2);
+
+        return (((MyInputRecord) t).getId() % 2 == 0) ? null : new MyOutputRecord(((MyInputRecord) t).getId() * 2);
     }
 }

batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyItemReader.java

@@ -9,13 +9,13 @@
  */
 @Named
 public class MyItemReader extends AbstractItemReader {
-    
+
     private final StringTokenizer tokens;
-    
+
     public MyItemReader() {
         tokens = new StringTokenizer("1,2,3,4,5,6,7,8,9,10", ",");
     }
-    
+
     @Override
     public MyInputRecord readItem() {
         if (tokens.hasMoreTokens()) {

batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyOutputRecord.java

@@ -5,9 +5,10 @@
  */
 public class MyOutputRecord {
     private int id;
-            
-    public MyOutputRecord() { }
-    
+
+    public MyOutputRecord() {
+    }
+
     public MyOutputRecord(int id) {
         this.id = id;
     }
@@ -19,7 +20,7 @@ public int getId() {
     public void setId(int id) {
         this.id = id;
     }
-    
+
     @Override
     public String toString() {
         return "MyOutputRecord: " + id;