[jboss-cvs] JBossAS SVN: r68538 - in projects/test/trunk: src/main/java/org/jboss/test and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2007-12-22 07:09:30 -0500 (Sat, 22 Dec 2007)
New Revision: 68538

Modified:
   projects/test/trunk/pom.xml
   projects/test/trunk/src/main/java/org/jboss/test/JBossTestClusteredSetup.java
Log:
Versions update + single place to keep them - in properties.

Modified: projects/test/trunk/pom.xml
===================================================================
--- projects/test/trunk/pom.xml	2007-12-22 10:53:17 UTC (rev 68537)
+++ projects/test/trunk/pom.xml	2007-12-22 12:09:30 UTC (rev 68538)
@@ -17,6 +17,15 @@
     <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/test/trunk/</developerConnection>
   </scm>
 
+  <properties>
+    <version.jboss.common.core>2.2.3.GA</version.jboss.common.core>
+    <version.jboss.logging>2.0.4.GA</version.jboss.logging>
+    <version.jboss.profiler.jvmti>1.0.0.CR5</version.jboss.profiler.jvmti>
+    <version.apache.ant>1.7.0</version.apache.ant>
+    <version.junit>3.8.1</version.junit>
+    <version.apache.log4j>1.2.14</version.apache.log4j>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -43,46 +52,52 @@
         </plugin>
     </plugins>
   </build>
-  <dependencies>
-    <dependency>
-      <groupId>ant</groupId>
-      <artifactId>ant</artifactId>
-      <version>1.6.5</version>
-    </dependency>
-    <dependency>
-      <groupId>ant</groupId>
-      <artifactId>ant-junit</artifactId>
-      <version>1.6.5</version>
-    </dependency>
-    <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jboss-common-logging-spi</artifactId>
-      <version>2.0.4.GA</version>
-    </dependency>
-    <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jboss-common-logging-log4j</artifactId>
-      <version>2.0.4.GA</version>
-    </dependency>
-    <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jboss-common-core</artifactId>
-      <version>2.0.4.GA</version>
-    </dependency>
-    <dependency>
-      <groupId>jboss.profiler.jvmti</groupId>
-      <artifactId>jboss-profiler-jvmti</artifactId>
-      <version>1.0.0.CR5</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
-    </dependency>
-  </dependencies>  
+   <dependencies>
+     <dependency>
+       <groupId>org.apache.ant</groupId>
+       <artifactId>ant</artifactId>
+       <version>${version.apache.ant}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.ant</groupId>
+       <artifactId>ant-junit</artifactId>
+       <version>${version.apache.ant}</version>
+     </dependency>
+     <dependency>
+       <groupId>jboss</groupId>
+       <artifactId>jboss-common-logging-spi</artifactId>
+       <version>${version.jboss.logging}</version>
+     </dependency>
+     <dependency>
+       <groupId>jboss</groupId>
+       <artifactId>jboss-common-logging-log4j</artifactId>
+       <version>${version.jboss.logging}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>jboss</groupId>
+            <artifactId>jboss-common-core</artifactId>
+          </exclusion>
+        </exclusions>
+     </dependency>
+     <dependency>
+       <groupId>org.jboss</groupId>
+       <artifactId>jboss-common-core</artifactId>
+       <version>${version.jboss.common.core}</version>
+     </dependency>
+     <dependency>
+        <groupId>jboss.profiler.jvmti</groupId>
+        <artifactId>jboss-profiler-jvmti</artifactId>
+        <version>${version.jboss.profiler.jvmti}</version>
+     </dependency>
+     <dependency>
+       <groupId>junit</groupId>
+       <artifactId>junit</artifactId>
+       <version>${version.junit}</version>
+     </dependency>
+     <dependency>
+       <groupId>log4j</groupId>
+       <artifactId>log4j</artifactId>
+       <version>${version.apache.log4j}</version>
+     </dependency>
+   </dependencies>
 </project>
\ No newline at end of file

Modified: projects/test/trunk/src/main/java/org/jboss/test/JBossTestClusteredSetup.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/JBossTestClusteredSetup.java	2007-12-22 10:53:17 UTC (rev 68537)
+++ projects/test/trunk/src/main/java/org/jboss/test/JBossTestClusteredSetup.java	2007-12-22 12:09:30 UTC (rev 68538)
@@ -85,7 +85,7 @@
       {
          // deploy the comma seperated list of jars
          StringTokenizer st = new StringTokenizer(jarNames, ", ");
-         while (st != null && st.hasMoreTokens())
+         while (st.hasMoreTokens())
          {
             String jarName = st.nextToken();
             this.redeploy(jarName);