Merge pull request #2 from jenkinsci/master

Pull request to match official release

Author: kevinfealey

Readme.md

@@ -5,6 +5,8 @@
 ##Project Description
 Configuring IBM Security AppScan Source scans in Jenkins can be time-consuming and error-prone when custom batch or shell scripts are used. This Jenkins plugin greatly simplifies the running of AppScan Source from Jenkins by providing centralized global settings and straight-forward input fields for scan configuration.
 
+Additional information about the plugin can be found here: https://wiki.jenkins-ci.org/display/JENKINS/IBM+AppScan+Source+Scanner+Plugin
+
 ##This plugin requires (Prerequisites):
 
 1. AppScan Source installed on the Jenkins Server
@@ -16,7 +18,7 @@ Configuring IBM Security AppScan Source scans in Jenkins can be time-consuming a
 To generate an AppScan Source login token, execute the AppScan Source CLI, then log in with the following parameters:
 `AppScan Enterprise Server URL, AppScan Source username, AppScan Source password -persist [-acceptssl]`
 
-ex. `AppScanSrcCli.exe http://localhost:9443/asc myHostname\administrator appScanSourcePassword! -persist -acceptssl`
+ex. `AppScanSrcCli.exe login http://localhost:9443/asc myHostname\administrator appScanSourcePassword! -persist -acceptssl`
 
 This will generate a file named ouncecli.token in the home directory of the user who executes the command.
 
@@ -25,13 +27,17 @@ http://www-01.ibm.com/support/knowledgecenter/SSS9LM_9.0.1/com.ibm.rational.apps
 
 ##Plugin Use:
 ###Install plugin
+####Automatically
+The plugin is available to install from within the Jenkins Update Center, which is accessible through the Manage Jenkins menu of your Jenkins installation. If the plugin is not listed as an available plugin, please update your Jenkins installation.
 
+####Manually
 1. From the Jenkins main page, select Manage Jenkins
 2. Select Manage Plugins
 3. Click "Advanced"
 4. Under Upload Plugin, choose the HPI file to upload (located in this project's "release" directory), then click "Upload"
 5. Restart Jenkins
 
+
 ###Configure Plugin
 
 1. From the Jenkins main page, select Manage Jenkins

pom.xml

@@ -11,7 +11,7 @@
   </parent>
   <groupId>com.aspectsecurity.automationservices.plugins.jenkins</groupId>
   <artifactId>ibm-security-appscansource-scanner</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.4-SNAPSHOT</version>
   <packaging>hpi</packaging>
 
   <name>IBM Security AppScan Source Scanner</name>

release/ibm-security-appscansource-scanner-1.0.3.hpi

@@ -181,16 +181,29 @@ public static boolean checkApplicationFileName(String filePath){
     	return false;
     }
 
-    public static boolean checkApplicationFileNameExists(String filePath){
-    	return new File(filePath).exists();
+    public boolean checkApplicationFileNameExists(String filePath) {
+    	try {
+    		return new FilePath(new File(filePath)).exists();
+    	} catch (IOException e) {
+    		logger.println(filePath + " could not be found. Cannot continue.");
+    	} catch (InterruptedException e) {
+    		logger.println("AppScan Source plugin thread interrupted.");
+    	}
+    	return false;
     }
 
     public boolean checkScanWorkspace(String jobScanWorkspace){
-    	File path = new File(jobScanWorkspace);
-    	if(!path.exists()){
-			logger.println("Scan Workspace does not exist.");
-			logger.println(path.getAbsolutePath());
-			return false;
+    	FilePath path = new FilePath(new File(jobScanWorkspace));
+    	try {
+			if(!path.exists()){
+				logger.println("Scan Workspace does not exist.");
+				logger.println(path.getRemote());
+				return false;
+			}
+		} catch (IOException e) {
+			logger.println(jobScanWorkspace + " could not be found. Cannot continue.");
+		} catch (InterruptedException e) {
+			logger.println("AppScan Source plugin thread interrupted.");
 		}
     	return true;
     }