Diff
Modified: trunk/hudson/plugins/fortify360/fortifyclient/src/test/java/org/jvnet/hudson/plugins/fortify360/fortifyclient/FortifyClientTest.java (40610 => 40611)
--- trunk/hudson/plugins/fortify360/fortifyclient/src/test/java/org/jvnet/hudson/plugins/fortify360/fortifyclient/FortifyClientTest.java 2012-05-25 13:33:28 UTC (rev 40610)
+++ trunk/hudson/plugins/fortify360/fortifyclient/src/test/java/org/jvnet/hudson/plugins/fortify360/fortifyclient/FortifyClientTest.java 2012-05-26 07:53:01 UTC (rev 40611)
@@ -63,9 +63,17 @@
token = "d05eb1fa-0c71-4420-9122-e72059c316fa";
auditToken = "c8102e40-c2cf-47d6-9e53-1e4c9c36babe";
url = "" "ssc");
+ } else if ( "3.40".equals(version) ) {
+ token = "127403a6-2ced-4114-b591-3e4d7617c0ef";
+ auditToken = "4d4f86d6-f7bd-4e58-8ce2-f5309700404d";
+ url = "" "ssc");
+ } else if ( "3.50".equals(version) ) {
+ token = "3d4015f2-5a62-4843-a9fc-5b7ebd3ec538";
+ auditToken = "4241463e-d5a2-4d55-a11c-484b199ee09b";
+ url = "" "ssc");
} else {
System.out.println("##################################################################");
- System.out.println("Only F360 Server 2.5 - 3.30 are supported, your version is: " + version);
+ System.out.println("Only F360 Server 2.5 - 3.50 are supported, your version is: " + version);
System.out.println("##################################################################");
}
Modified: trunk/hudson/plugins/fortify360/src/main/java/org/jvnet/hudson/plugins/fortify360/FPRPublisher.java (40610 => 40611)
--- trunk/hudson/plugins/fortify360/src/main/java/org/jvnet/hudson/plugins/fortify360/FPRPublisher.java 2012-05-25 13:33:28 UTC (rev 40610)
+++ trunk/hudson/plugins/fortify360/src/main/java/org/jvnet/hudson/plugins/fortify360/FPRPublisher.java 2012-05-26 07:53:01 UTC (rev 40611)
@@ -384,7 +384,7 @@
if ( StringUtils.isBlank(value) ) return FormValidation.ok();
String ver = value.trim();
- String[] allowedVersion = {"2.5", "2.5.0", "2.6", "2.6.0", "2.6.1", "2.6.5", "3.0.0", "3.1.0", "3.20", "3.30"};
+ String[] allowedVersion = {"2.5", "2.5.0", "2.6", "2.6.0", "2.6.1", "2.6.5", "3.0.0", "3.1.0", "3.20", "3.30", "3.40", "3.50"};
if ( contains(allowedVersion, ver) ) {
return FormValidation.ok();
} else {
Modified: trunk/hudson/plugins/fortify360/src/main/java/org/jvnet/hudson/plugins/fortify360/FortifyClientClassLoader.java (40610 => 40611)
--- trunk/hudson/plugins/fortify360/src/main/java/org/jvnet/hudson/plugins/fortify360/FortifyClientClassLoader.java 2012-05-25 13:33:28 UTC (rev 40610)
+++ trunk/hudson/plugins/fortify360/src/main/java/org/jvnet/hudson/plugins/fortify360/FortifyClientClassLoader.java 2012-05-26 07:53:01 UTC (rev 40611)
@@ -44,6 +44,8 @@
wsclientMd5.put("8dca96072c49f8ab2de000574760b9dd", "3.1.0");
wsclientMd5.put("00d01db3c35f28adca7a3efb4c89bd34", "3.20");
wsclientMd5.put("e435cf228483466d22abd491f9eaddb9", "3.30");
+ wsclientMd5.put("10083805168cf5fb8ff3122f56a7884e", "3.40");
+ wsclientMd5.put("51299a19a83fe85b2e0f753ea8f31dd1", "3.50");
}
if ( null == wsobjectsMd5 ) {
@@ -57,6 +59,8 @@
wsobjectsMd5.put("841eabd671fc1ecb78c9a7123db0d558", "3.1.0");
wsobjectsMd5.put("d1c1beb9f92ab01a7431b1a0b554da4e", "3.20");
wsobjectsMd5.put("f5df453aae5c6bcb67ae16cff1b2a089", "3.30");
+ wsobjectsMd5.put("ccd27276a65a1abb80c71959b4431659", "3.40");
+ wsobjectsMd5.put("c8ce5499a6aa3d4a57ce095ee3e0219c", "3.50");
}
}
@@ -93,7 +97,9 @@
log.println("FortifyClientClassLoader: version = " + version + " (by checking md5 of wsclient.jar and wsobjects.jar)");
} else {
// check the path name, the checking is pretty simple
- if ( -1 != jarsPath.indexOf("3.30") ) version = "3.30";
+ if ( -1 != jarsPath.indexOf("3.50") ) version = "3.50";
+ else if ( -1 != jarsPath.indexOf("3.40") ) version = "3.40";
+ else if ( -1 != jarsPath.indexOf("3.30") ) version = "3.30";
else if ( -1 != jarsPath.indexOf("3.20") ) version = "3.20";
else if ( -1 != jarsPath.indexOf("3.1.0") ) version = "3.1.0";
else if ( -1 != jarsPath.indexOf("3.0.0") ) version = "3.0.0";
Added: trunk/hudson/plugins/fortify360/src/main/resources/fortifyclient-3.40.jar
(Binary files differ)
Added: svn:mime-type
Added: trunk/hudson/plugins/fortify360/src/main/resources/fortifyclient-3.50.jar
(Binary files differ)
Added: svn:mime-type
Modified: trunk/hudson/plugins/fortify360/src/main/webapp/help-f360version.html (40610 => 40611)
--- trunk/hudson/plugins/fortify360/src/main/webapp/help-f360version.html 2012-05-25 13:33:28 UTC (rev 40610)
+++ trunk/hudson/plugins/fortify360/src/main/webapp/help-f360version.html 2012-05-26 07:53:01 UTC (rev 40611)
@@ -1,5 +1,5 @@
<div>
<p>
- Fortify 360 version. Currently, we only support 2.5 to 3.30. It will be auto-detected if not specified.
+ Fortify 360 version. Currently, we only support 2.5 to 3.50. It will be auto-detected if not specified.
</p>
</div>
\ No newline at end of file
Modified: trunk/hudson/plugins/fortify360/src/test/java/org/jvnet/hudson/plugins/fortify360/FortifyClientClassLoaderTest.java (40610 => 40611)
--- trunk/hudson/plugins/fortify360/src/test/java/org/jvnet/hudson/plugins/fortify360/FortifyClientClassLoaderTest.java 2012-05-25 13:33:28 UTC (rev 40610)
+++ trunk/hudson/plugins/fortify360/src/test/java/org/jvnet/hudson/plugins/fortify360/FortifyClientClassLoaderTest.java 2012-05-26 07:53:01 UTC (rev 40611)
@@ -16,9 +16,9 @@
public class FortifyClientClassLoaderTest {
- private static final String F360_PATH = "C:\\Program Files\\Fortify Software\\HP Fortify v3.30\\Core\\lib";
+ private static final String F360_PATH = "C:\\Program Files\\Fortify Software\\HP Fortify v3.50\\Core\\lib";
private static final String F360_URL = "http://localhost:8180/ssc/fm-ws/services";
- private static final String F360_TOKEN = "d05eb1fa-0c71-4420-9122-e72059c316fa";
+ private static final String F360_TOKEN = "3d4015f2-5a62-4843-a9fc-5b7ebd3ec538";
@Test
public void testFindWSClientPath() throws IOException {
Modified: trunk/hudson/plugins/fortify360/src/test/java/org/jvnet/hudson/plugins/fortify360/PathUtilsTest.java (40610 => 40611)
--- trunk/hudson/plugins/fortify360/src/test/java/org/jvnet/hudson/plugins/fortify360/PathUtilsTest.java 2012-05-25 13:33:28 UTC (rev 40610)
+++ trunk/hudson/plugins/fortify360/src/test/java/org/jvnet/hudson/plugins/fortify360/PathUtilsTest.java 2012-05-26 07:53:01 UTC (rev 40611)
@@ -19,7 +19,7 @@
File[] list = PathUtils.locateBaesnameInPath("fortifyclient");
Assert.assertNotNull(list);
Assert.assertEquals(1, list.length);
- File file = new File("C:\\Program Files\\Fortify Software\\HP Fortify v3.30\\bin\\fortifyclient.bat");
+ File file = new File("C:\\Program Files\\Fortify Software\\HP Fortify v3.50\\bin\\fortifyclient.bat");
Assert.assertEquals(file, list[0]);
}
}
