diff --git a/images/Jenkins_Checkpoint_Label.png b/images/Jenkins_Checkpoint_Label.png index 01c89a5..fd7fd1f 100644 Binary files a/images/Jenkins_Checkpoint_Label.png and b/images/Jenkins_Checkpoint_Label.png differ diff --git a/images/Jenkins_Integrity_Server_Configuration_Option.png b/images/Jenkins_Integrity_Server_Configuration_Option.png index 9449719..ada5c7d 100644 Binary files a/images/Jenkins_Integrity_Server_Configuration_Option.png and b/images/Jenkins_Integrity_Server_Configuration_Option.png differ diff --git a/images/Jenkins_Integrity_Settings_2_1.png b/images/Jenkins_Integrity_Settings_2_1.png index a355911..92a62fc 100644 Binary files a/images/Jenkins_Integrity_Settings_2_1.png and b/images/Jenkins_Integrity_Settings_2_1.png differ diff --git a/images/Jenkins_Integrity_Settings_Advanced_2_2.png b/images/Jenkins_Integrity_Settings_Advanced_2_2.png index 58c2fc7..105eac5 100644 Binary files a/images/Jenkins_Integrity_Settings_Advanced_2_2.png and b/images/Jenkins_Integrity_Settings_Advanced_2_2.png differ diff --git a/images/Jenkins_Polling_Log.png b/images/Jenkins_Polling_Log.png index 43dd99d..7464a2c 100644 Binary files a/images/Jenkins_Polling_Log.png and b/images/Jenkins_Polling_Log.png differ diff --git a/images/Jenkins_Post_Build_Action_Integrity_CM_Checkpoint.png b/images/Jenkins_Post_Build_Action_Integrity_CM_Checkpoint.png index f64e215..ff5fa65 100644 Binary files a/images/Jenkins_Post_Build_Action_Integrity_CM_Checkpoint.png and b/images/Jenkins_Post_Build_Action_Integrity_CM_Checkpoint.png differ diff --git a/images/Jenkins_SCM_Integrity.png b/images/Jenkins_SCM_Integrity.png index 4cbb6d8..9cc8094 100644 Binary files a/images/Jenkins_SCM_Integrity.png and b/images/Jenkins_SCM_Integrity.png differ diff --git a/images/Jenkins_Successful_Build_Checkpoint.png b/images/Jenkins_Successful_Build_Checkpoint.png index d15fab8..77a0d14 100644 Binary files a/images/Jenkins_Successful_Build_Checkpoint.png and b/images/Jenkins_Successful_Build_Checkpoint.png differ diff --git a/src/main/java/hudson/scm/IntegritySCM.java b/src/main/java/hudson/scm/IntegritySCM.java index 40919ef..d15bfe0 100644 --- a/src/main/java/hudson/scm/IntegritySCM.java +++ b/src/main/java/hudson/scm/IntegritySCM.java @@ -455,7 +455,7 @@ private void checkoutUsingLocalClient(Run run, listener.getLogger().println(eh.getMessage()); LOGGER.fine(eh.getCommand() + RETURNED_EXIT_CODE + eh.getExitCode()); listener.getLogger().println(eh.getCommand() + RETURNED_EXIT_CODE + eh.getExitCode()); - throw new AbortException("[Local Client] Caught Integrity APIException!"); + throw new AbortException("[Local Client] Caught Windchil RV&S APIException!"); } catch (Exception e) { e.printStackTrace(listener.getLogger()); LOGGER.log(Level.SEVERE, "[Local Client] Exception occured during checkout!", e); diff --git a/src/main/java/hudson/scm/api/session/APISession.java b/src/main/java/hudson/scm/api/session/APISession.java index 3fc278b..03d1763 100644 --- a/src/main/java/hudson/scm/api/session/APISession.java +++ b/src/main/java/hudson/scm/api/session/APISession.java @@ -57,7 +57,7 @@ public static synchronized ISession create(IntegrityConfigurable settings) // Attempt to open a connection to the Integrity Server try { LOGGER.fine( - "Creating Integrity API Session for :" + + "Creating Windchill RV&S API Session for :" + settings.getUserName() + settings.getSecure()); return new APISession(settings.getIpHostName(), settings.getIpPort(), @@ -85,7 +85,7 @@ public static synchronized ISession createLocalIntegrationPoint( { try { LOGGER.fine( - "Creating Integrity API Session for :" + + "Creating Windchill RV&S API Session for :" + settings.getUserName() + settings.getSecure()); return new APISession(settings.getIpHostName(), settings.getIpPort(), diff --git a/src/main/java/hudson/scm/localclient/IntegrityLcChangeLogParser.java b/src/main/java/hudson/scm/localclient/IntegrityLcChangeLogParser.java index ddb00d6..fce4b8a 100644 --- a/src/main/java/hudson/scm/localclient/IntegrityLcChangeLogParser.java +++ b/src/main/java/hudson/scm/localclient/IntegrityLcChangeLogParser.java @@ -10,6 +10,8 @@ import java.util.Set; import org.apache.commons.digester3.Digester; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.LineIterator; import org.xml.sax.SAXException; import hudson.model.Run; @@ -32,17 +34,26 @@ public IntegrityLcChangeLogParser(String url) } @Override - public IntegrityLcChangeSetList parse(@SuppressWarnings("rawtypes") Run build, - RepositoryBrowser browser, File changelogFile) - throws IOException, SAXException - { - List changeSetList = parseXML(build, browser, integrityUrl, changelogFile); - return new IntegrityLcChangeSetList(build, browser, integrityUrl, changeSetList); + public IntegrityLcChangeSetList parse(@SuppressWarnings("rawtypes") Run build, RepositoryBrowser browser, + File changelogFile) throws IOException, SAXException { + try { + List changeSetList = parseXML(build, browser, integrityUrl, changelogFile); + return new IntegrityLcChangeSetList(build, browser, integrityUrl, changeSetList); + } catch (SAXException e) { + LineIterator lineIterator = null; + try { + lineIterator = FileUtils.lineIterator(changelogFile, "UTF-8"); + return new IntegrityLcChangeSetList(build, browser, integrityUrl, parse(lineIterator)); + } finally { + LineIterator.closeQuietly(lineIterator); + } + + } } private List parseXML(@SuppressWarnings("rawtypes") Run build, RepositoryBrowser browser, String integrityUrl, File changelogFile) - throws IOException + throws IOException, SAXException { List changeSetList = new ArrayList(); Digester digester = new Digester(); @@ -69,7 +80,7 @@ private List parseXML(@SuppressWarnings("rawtypes") Run bu throw new IOException("Failed to parse " + changelogFile, e); } catch (SAXException e) { - throw new IOException("Failed to parse " + changelogFile, e); + throw new SAXException("Failed to parse " + changelogFile, e); } return changeSetList;