QS-Tools cleanup: Fix formatting and other issues

hao1st · Jul 14, 2016 · 09abb2a · 09abb2a
1 parent 5c30445
commit 09abb2a
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 47 deletions.
diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.jboss.quickstarts.eap</groupId>
     <artifactId>jboss-batch-processing</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>7.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>JBoss EAP Quickstart: jboss-batch-processing</name>
     <description>Shows how to use a Chunk oriented batch processing</description>

diff --git a/cmt/src/main/java/org/jboss/as/quickstarts/cmt/mdb/HelloWorldMDB.java b/cmt/src/main/java/org/jboss/as/quickstarts/cmt/mdb/HelloWorldMDB.java
@@ -34,9 +34,9 @@
  *
  */
 @MessageDriven(name = "HelloWorldMDB", activationConfig = {
-    @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
-    @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/CMTQueue"),
-    @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
+        @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/CMTQueue"),
+        @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
 public class HelloWorldMDB implements MessageListener {
 
     private final static Logger LOGGER = Logger.getLogger(HelloWorldMDB.class.toString());

diff --git a/ejb-multi-server/pom.xml b/ejb-multi-server/pom.xml
@@ -105,9 +105,6 @@
         <!-- WildFly Maven plug-in to deploy your WAR to a local JBoss EAP container -->
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
-        <!-- other versions -->
-        <version.jboss.ejb.client>2.0.3.Final</version.jboss.ejb.client>
-
         <!-- other plug-in versions -->
         <version.compiler.plugin>3.1</version.compiler.plugin>
 

diff --git a/...b-propertysubstitution/src/main/java/org/jboss/as/quickstarts/mdb/HelloWorldQueueMDB.java b/...b-propertysubstitution/src/main/java/org/jboss/as/quickstarts/mdb/HelloWorldQueueMDB.java
@@ -33,9 +33,9 @@
  *
  */
 @MessageDriven(name = "HelloWorldQueueMDB", activationConfig = {
-    @ActivationConfigProperty(propertyName = "destinationLookup", propertyValue = "${property.helloworldmdb.queue}"),
-    @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
-    @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
+        @ActivationConfigProperty(propertyName = "destinationLookup", propertyValue = "${property.helloworldmdb.queue}"),
+        @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
 public class HelloWorldQueueMDB implements MessageListener {
 
     private final static Logger LOGGER = Logger.getLogger(HelloWorldQueueMDB.class.toString());

diff --git a/...b-propertysubstitution/src/main/java/org/jboss/as/quickstarts/mdb/HelloWorldTopicMDB.java b/...b-propertysubstitution/src/main/java/org/jboss/as/quickstarts/mdb/HelloWorldTopicMDB.java
@@ -33,9 +33,9 @@
  *
  */
 @MessageDriven(name = "HelloWorldQTopicMDB", activationConfig = {
-    @ActivationConfigProperty(propertyName = "destinationLookup", propertyValue = "${property.helloworldmdb.topic}"),
-    @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Topic"),
-    @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
+        @ActivationConfigProperty(propertyName = "destinationLookup", propertyValue = "${property.helloworldmdb.topic}"),
+        @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Topic"),
+        @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
 public class HelloWorldTopicMDB implements MessageListener {
 
     private final static Logger LOGGER = Logger.getLogger(HelloWorldTopicMDB.class.toString());

diff --git a/...bstitution/src/main/java/org/jboss/as/quickstarts/servlet/HelloWorldMDBServletClient.java b/...bstitution/src/main/java/org/jboss/as/quickstarts/servlet/HelloWorldMDBServletClient.java
@@ -49,7 +49,9 @@
             interfaceName = "javax.jms.Topic",
             destinationName = "HelloWorldMDBTopic"
         )
-    })
+    }
+)
+
 /**
  * <p>
  * A simple servlet 3 as client that sends several messages to a queue or a topic.

diff --git a/helloworld-mdb/src/main/java/org/jboss/as/quickstarts/mdb/HelloWorldQueueMDB.java b/helloworld-mdb/src/main/java/org/jboss/as/quickstarts/mdb/HelloWorldQueueMDB.java
@@ -33,9 +33,9 @@
  *
  */
 @MessageDriven(name = "HelloWorldQueueMDB", activationConfig = {
-    @ActivationConfigProperty(propertyName = "destinationLookup", propertyValue = "queue/HELLOWORLDMDBQueue"),
-    @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
-    @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
+        @ActivationConfigProperty(propertyName = "destinationLookup", propertyValue = "queue/HELLOWORLDMDBQueue"),
+        @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
 public class HelloWorldQueueMDB implements MessageListener {
 
     private final static Logger LOGGER = Logger.getLogger(HelloWorldQueueMDB.class.toString());

diff --git a/helloworld-mdb/src/main/java/org/jboss/as/quickstarts/mdb/HelloWorldTopicMDB.java b/helloworld-mdb/src/main/java/org/jboss/as/quickstarts/mdb/HelloWorldTopicMDB.java
@@ -33,9 +33,9 @@
  *
  */
 @MessageDriven(name = "HelloWorldQTopicMDB", activationConfig = {
-    @ActivationConfigProperty(propertyName = "destinationLookup", propertyValue = "topic/HELLOWORLDMDBTopic"),
-    @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Topic"),
-    @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
+        @ActivationConfigProperty(propertyName = "destinationLookup", propertyValue = "topic/HELLOWORLDMDBTopic"),
+        @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Topic"),
+        @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
 public class HelloWorldTopicMDB implements MessageListener {
 
     private final static Logger LOGGER = Logger.getLogger(HelloWorldTopicMDB.class.toString());

diff --git a/...oworld-mdb/src/main/java/org/jboss/as/quickstarts/servlet/HelloWorldMDBServletClient.java b/...oworld-mdb/src/main/java/org/jboss/as/quickstarts/servlet/HelloWorldMDBServletClient.java
@@ -49,7 +49,9 @@
             interfaceName = "javax.jms.Topic",
             destinationName = "HelloWorldMDBTopic"
         )
-    })
+    }
+)
+
 /**
  * <p>
  * A simple servlet 3 as client that sends several messages to a queue or a topic.

diff --git a/jaxws-ejb/client/pom.xml b/jaxws-ejb/client/pom.xml
@@ -45,10 +45,6 @@
 
    </repositories>
 
-    <properties>
-     <version.exec-plugin>1.2.1</version.exec-plugin>
-   </properties>
-
     <dependencies>
 
       <dependency>

diff --git a/jaxws-pojo/pom.xml b/jaxws-pojo/pom.xml
@@ -102,7 +102,6 @@
         <version.exec.plugin>1.2.1</version.exec.plugin>
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
         <version.jboss.bom.eap>7.0.0-build-12</version.jboss.bom.eap>
-        <version.maven-jar-plugin>2.5</version.maven-jar-plugin>
         <version.war.plugin>2.6</version.war.plugin>
    </properties>
 

diff --git a/jta-crash-rec/src/main/java/org/jboss/as/quickstarts/xa/DbUpdaterMDB.java b/jta-crash-rec/src/main/java/org/jboss/as/quickstarts/xa/DbUpdaterMDB.java
@@ -37,9 +37,9 @@
  *
  */
 @MessageDriven(name = "DbUpdaterMDB", activationConfig = {
-    @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
-    @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/jta-crash-rec-quickstart"),
-    @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
+        @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/jta-crash-rec-quickstart"),
+        @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
 public class DbUpdaterMDB implements MessageListener {
 
     private final static Logger LOGGER = Logger.getLogger(DbUpdaterMDB.class.getName());

diff --git a/...ication-component-2/src/main/java/org/jboss/as/quickstarts/cmt/jts/mdb/HelloWorldMDB.java b/...ication-component-2/src/main/java/org/jboss/as/quickstarts/cmt/jts/mdb/HelloWorldMDB.java
@@ -35,9 +35,9 @@
  *
  */
 @MessageDriven(name = "HelloWorldMDB", activationConfig = {
-    @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
-    @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/jts-quickstart"),
-    @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
+        @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
+        @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/jts-quickstart"),
+        @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
 public class HelloWorldMDB implements MessageListener {
 
     private final static Logger LOGGER = Logger.getLogger(HelloWorldMDB.class.toString());

diff --git a/managed-executor-service/pom.xml b/managed-executor-service/pom.xml
@@ -101,7 +101,6 @@
         <!-- Define the version of the JBoss BOMs we want to import to specify
             tested stacks. -->
         <version.jboss.bom.eap>7.0.0-build-12</version.jboss.bom.eap>
-        <version.resteasy>3.0.10.Final</version.resteasy>
 
         <!-- other plug-in versions -->
         <version.surefire.plugin>2.16</version.surefire.plugin>

diff --git a/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/model/Task.java b/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/model/Task.java
@@ -74,8 +74,7 @@ public void setId(Long id) {
     @XmlTransient
     // JSON: uncomment to include json support (note json is not part of the JAX-RS standard)
     //    @JsonIgnore
-        public
-        User getOwner() {
+    public User getOwner() {
         return owner;
     }
 

diff --git a/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/service/TaskResource.java b/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/service/TaskResource.java
@@ -82,9 +82,8 @@ public void deleteTaskById(@Context SecurityContext context, @PathParam("id") Lo
     @Path("tasks/id/{id}")
     // JSON: include "application/json" in the @Produces annotation to include json support
     //@Produces({ "application/xml", "application/json" })
-        @Produces({ "application/xml" })
-        public
-        Task getTaskById(@Context SecurityContext context, @PathParam("id") Long id) {
+    @Produces({ "application/xml" })
+    public Task getTaskById(@Context SecurityContext context, @PathParam("id") Long id) {
         User user = getUser(context);
 
         return getTask(user, id);
@@ -94,19 +93,17 @@ Task getTaskById(@Context SecurityContext context, @PathParam("id") Long id) {
     @Path("tasks/title/{title}")
     // JSON: include "application/json" in the @Produces annotation to include json support
     //@Produces({ "application/xml", "application/json" })
-        @Produces({ "application/xml" })
-        public
-        List<Task> getTasksByTitle(@Context SecurityContext context, @PathParam("title") String title) {
+    @Produces({ "application/xml" })
+    public List<Task> getTasksByTitle(@Context SecurityContext context, @PathParam("title") String title) {
         return getTasks(getUser(context), title);
     }
 
     @GET
     @Path("tasks/title")
     // JSON: include "application/json" in the @Produces annotation to include json support
     //@Produces({ "application/xml", "application/json" })
-        @Produces({ "application/xml" })
-        public
-        List<Task> getTasks(@Context SecurityContext context) {
+    @Produces({ "application/xml" })
+    public List<Task> getTasks(@Context SecurityContext context) {
         return getTasks(getUser(context));
     }
 

diff --git a/...ain/java/org/jboss/as/quickstarts/threadracing/stage/jms/JMSRaceStageMessageListener.java b/...ain/java/org/jboss/as/quickstarts/threadracing/stage/jms/JMSRaceStageMessageListener.java
@@ -37,11 +37,12 @@
     interfaceName = "javax.jms.Queue",
     destinationName = "JMSThreadRacingQueue")
 @MessageDriven(activationConfig = {
-    @ActivationConfigProperty(propertyName = "destinationLookup",
+        @ActivationConfigProperty(propertyName = "destinationLookup",
         propertyValue = JMSRaceStageMessageListener.REQUEST_QUEUE),
-    @ActivationConfigProperty(propertyName = "destinationType",
+        @ActivationConfigProperty(propertyName = "destinationType",
         propertyValue = "javax.jms.Queue"),
-})
+        }
+)
 public class JMSRaceStageMessageListener implements MessageListener {
 
     public static final String REQUEST_QUEUE = "java:global/threadRacing/stages/jms/requestQueue";
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,7 +49,9 @@ @@
                 interfaceName = "javax.jms.Topic",
                 destinationName = "HelloWorldMDBTopic"
             )
-        })
+        }
+    )
     /**
      * <p>
      * A simple servlet 3 as client that sends several messages to a queue or a topic.
@@ Expand Down @@