From e58d755134bf91f59d4de7a240c0216417b4f48b Mon Sep 17 00:00:00 2001
From: Tom Copeland <tomcopeland@users.sourceforge.net>
Date: Mon, 16 Jan 2006 21:55:19 +0000
Subject: [PATCH] Moved JDK 1.5 jobs to a different file until I can figure out
 how to count lines of code there

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@4140 51baf565-9d33-0410-a72c-fc3788e3496d
---
 pmd-web/src/jdk15jobs.yaml | 12 ++++++++++++
 pmd-web/src/jobs.yaml      | 11 -----------
 pmd-web/src/processor.rb   |  5 +++--
 3 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 pmd-web/src/jdk15jobs.yaml

diff --git a/pmd-web/src/jdk15jobs.yaml b/pmd-web/src/jdk15jobs.yaml
new file mode 100644
index 0000000000..8320ecb8ac
--- /dev/null
+++ b/pmd-web/src/jdk15jobs.yaml
@@ -0,0 +1,12 @@
+Vector Visuals: 
+  module: vectors
+  unix_name: vectors
+  cvsroot: ":pserver:anonymous@cvs.sourceforge.net:/cvsroot/vectors"
+  srcdir: vectors/src
+  jdk15: true
+FindBugs-Contrib: 
+  module: fb-contrib
+  unix_name: fb-contrib
+  cvsroot: ":pserver:anonymous@cvs.sourceforge.net:/cvsroot/fb-contrib"
+  srcdir: fb-contrib/src
+  jdk15: true
diff --git a/pmd-web/src/jobs.yaml b/pmd-web/src/jobs.yaml
index f5f0782794..856d4e0ded 100644
--- a/pmd-web/src/jobs.yaml
+++ b/pmd-web/src/jobs.yaml
@@ -530,12 +530,6 @@ Ca
   unix_name: canyamo
   cvsroot: ":pserver:anonymous@cvs.sourceforge.net:/cvsroot/canyamo"
   srcdir: canyamo/src
-Vector Visuals: 
-  module: vectors
-  unix_name: vectors
-  cvsroot: ":pserver:anonymous@cvs.sourceforge.net:/cvsroot/vectors"
-  srcdir: vectors/src
-  jdk15: true
 "SUSHI - Universal Student Help Interface": 
   module: sushi
   unix_name: fugu
@@ -606,8 +600,3 @@ BioClipse:
   unix_name: bioclipse
   cvsroot: ":pserver:anonymous@cvs.sourceforge.net:/cvsroot/bioclipse"
   srcdir: bioclipse/src
-FindBugs-Contrib: 
-  module: fb-contrib
-  unix_name: fb-contrib
-  cvsroot: ":pserver:anonymous@cvs.sourceforge.net:/cvsroot/fb-contrib"
-  srcdir: fb-contrib/src
diff --git a/pmd-web/src/processor.rb b/pmd-web/src/processor.rb
index 194dac4e79..d8bbc99ec1 100644
--- a/pmd-web/src/processor.rb
+++ b/pmd-web/src/processor.rb
@@ -63,7 +63,7 @@ class Job
    `#{cmd}`
   end
   def run_pmd
-		cmd="java -Xmx512m -cp /home/tom/pmd/pmd/lib/jaxen-1.1-beta-7.jar:/home/tom/pmd/pmd-web/src/pmd-3.3.jar net.sourceforge.pmd.PMD \"#{ROOT}/#{@src}\" html unusedcode -shortnames #{self.jdk15? ? "-targetjdk 1.5" : ""} > #{report}"
+		cmd="java -Xmx512m -cp /home/tom/pmd/pmd/lib/jaxen-1.1-beta-7.jar:/home/tom/pmd/pmd-web/src/pmd-3.4.jar net.sourceforge.pmd.PMD \"#{ROOT}/#{@src}\" html unusedcode -shortnames #{self.jdk15? ? "-targetjdk 1.5" : ""} > #{report}"
     puts cmd
    `#{cmd}`
    if File.exists?(report)
@@ -75,7 +75,7 @@ class Job
 	  puts "PMD report contains #{pmd_lines} violations"
   end
   def run_cpd
-   cmd="java -Xmx512m -cp /home/tom/pmd/pmd/lib/jaxen-1.1-beta-7.jar:/home/tom/pmd/pmd-web/src/pmd-3.3.jar net.sourceforge.pmd.cpd.CPD --minimum-tokens 100 --files #{@src} > #{cpd_file}"
+   cmd="java -Xmx512m -cp /home/tom/pmd/pmd/lib/jaxen-1.1-beta-7.jar:/home/tom/pmd/pmd-web/src/pmd-3.4.jar net.sourceforge.pmd.cpd.CPD --minimum-tokens 100 --files #{@src} > #{cpd_file}"
    `#{cmd}`
 	  puts "CPD report contains #{cpd_lines} violations"
   end
@@ -217,6 +217,7 @@ if __FILE__ == $0
 	end
 	
 	jobs.each {|j| 
+		next if ARGV.include?("-job") && j.unix_name != ARGV.at(ARGV.index("-job")+1)
     puts "Copying up #{j}"
     j.copy_up
   } if ARGV.include?("-copy")