Merge pull request #239 from MicroFocus/octane-dev-latest

Octane 5.8.1 fixes

Author: grount

pom.xml

@@ -470,7 +470,7 @@
 		<dependency>
 			<artifactId>integrations-sdk</artifactId>
 			<groupId>com.hpe.adm.octane.ciplugins</groupId>
-			<version>2.0.46</version>
+			<version>2.0.55</version>
 		</dependency>
 
 		<!--BUILDER providers integration-->

src/main/java/com/microfocus/application/automation/tools/model/TestsFramework.java

@@ -0,0 +1,60 @@
+/*
+ * Certain versions of software and/or documents ("Material") accessible here may contain branding from
+ * Hewlett-Packard Company (now HP Inc.) and Hewlett Packard Enterprise Company.  As of September 1, 2017,
+ * the Material is now offered by Micro Focus, a separately owned and operated company.  Any reference to the HP
+ * and Hewlett Packard Enterprise/HPE marks is historical in nature, and the HP and Hewlett Packard Enterprise/HPE
+ * marks are the property of their respective owners.
+ * __________________________________________________________________
+ * MIT License
+ *
+ * (c) Copyright 2012-2019 Micro Focus or one of its affiliates.
+ *
+ * The only warranties for products and services of Micro Focus and its affiliates
+ * and licensors ("Micro Focus") are set forth in the express warranty statements
+ * accompanying such products and services. Nothing herein should be construed as
+ * constituting an additional warranty. Micro Focus shall not be liable for technical
+ * or editorial errors or omissions contained herein.
+ * The information contained herein is subject to change without notice.
+ * ___________________________________________________________________
+ */
+
+package com.microfocus.application.automation.tools.model;
+
+public class TestsFramework {
+
+    private String description;
+    private String name;
+    private String format;
+    private String delimiter;
+
+    public TestsFramework() {
+        this.name = "";
+        this.description = "";
+        this.format = "";
+        this.delimiter = "";
+    }
+
+    public TestsFramework(String name, String description, String format, String delimiter) {
+        this.name = name;
+        this.description = description;
+        this.format = format;
+        this.delimiter = delimiter;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getFormat() {
+        return format;
+    }
+
+    public String getDelimiter() {
+        return delimiter;
+    }
+
+}

src/main/java/com/microfocus/application/automation/tools/octane/CIJenkinsServicesImpl.java

@@ -48,6 +48,7 @@
 import com.microfocus.application.automation.tools.model.OctaneServerSettingsModel;
 import com.microfocus.application.automation.tools.octane.configuration.ConfigurationService;
 import com.microfocus.application.automation.tools.octane.configuration.FodConfigUtil;
+import com.microfocus.application.automation.tools.octane.configuration.SDKBasedLoggerProvider;
 import com.microfocus.application.automation.tools.octane.configuration.SSCServerConfigUtil;
 import com.microfocus.application.automation.tools.octane.executor.ExecutorConnectivityService;
 import com.microfocus.application.automation.tools.octane.executor.TestExecutionJobCreatorService;
@@ -70,7 +71,6 @@
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.io.IOUtils;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import javax.xml.bind.DatatypeConverter;
@@ -90,7 +90,7 @@
  */
 
 public class CIJenkinsServicesImpl extends CIPluginServices {
-	private static final Logger logger = LogManager.getLogger(CIJenkinsServicesImpl.class);
+	private static final Logger logger = SDKBasedLoggerProvider.getLogger(CIJenkinsServicesImpl.class);
 	private static final DTOFactory dtoFactory = DTOFactory.getInstance();
 
 	@Override
@@ -115,7 +115,7 @@ public void suspendCIEvents(boolean suspend) {
 
 	@Override
 	public File getAllowedOctaneStorage() {
-		return new File(Jenkins.get().getRootDir(), "userContent");
+		return getAllowedStorageFile();
 	}
 
 	@Override
@@ -775,6 +775,11 @@ private TopLevelItem getTopLevelItem(String jobRefId) {
 		return item;
 	}
 
+    public static File getAllowedStorageFile() {
+        Jenkins jenkins = Jenkins.getInstanceOrNull();
+        return (jenkins == null /*is slave*/) ? new File("octanePluginContent") : new File(jenkins.getRootDir(), "userContent") ;
+    }
+
 	public static CIServerInfo getJenkinsServerInfo() {
 		CIServerInfo result = dtoFactory.newDTO(CIServerInfo.class);
 		String serverUrl = Jenkins.get().getRootUrl();

src/main/java/com/microfocus/application/automation/tools/octane/ImpersonationUtil.java

@@ -24,10 +24,10 @@
 import com.hp.octane.integrations.exceptions.PermissionException;
 import com.microfocus.application.automation.tools.model.OctaneServerSettingsModel;
 import com.microfocus.application.automation.tools.octane.configuration.ConfigurationService;
+import com.microfocus.application.automation.tools.octane.configuration.SDKBasedLoggerProvider;
 import hudson.model.User;
 import hudson.security.ACL;
 import hudson.security.ACLContext;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import java.util.Collections;
@@ -37,8 +37,7 @@
  */
 
 public class ImpersonationUtil {
-
-    private static final Logger logger = LogManager.getLogger(ImpersonationUtil.class);
+    private static final Logger logger = SDKBasedLoggerProvider.getLogger(ImpersonationUtil.class);
 
     public static ACLContext startImpersonation(String instanceId) {
         OctaneServerSettingsModel settings = ConfigurationService.getSettings(instanceId);

src/main/java/com/microfocus/application/automation/tools/octane/actions/UFTTestDetectionPublisher.java

@@ -30,6 +30,7 @@
 import com.microfocus.application.automation.tools.model.OctaneServerSettingsModel;
 import com.microfocus.application.automation.tools.octane.Messages;
 import com.microfocus.application.automation.tools.octane.configuration.ConfigurationService;
+import com.microfocus.application.automation.tools.octane.configuration.SDKBasedLoggerProvider;
 import com.microfocus.application.automation.tools.octane.executor.UFTTestDetectionService;
 import com.microfocus.application.automation.tools.octane.executor.UftJobRecognizer;
 import hudson.Extension;
@@ -42,7 +43,6 @@
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
 import org.apache.commons.lang.StringUtils;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
@@ -57,12 +57,11 @@
  */
 
 public class UFTTestDetectionPublisher extends Recorder {
+	private static final Logger logger = SDKBasedLoggerProvider.getLogger(UFTTestDetectionPublisher.class);
 	private String configurationId;
 	private String workspaceName;
 	private String scmRepositoryId;
 
-	private static final Logger logger = LogManager.getLogger(UFTTestDetectionPublisher.class);
-
 	public String getWorkspaceName() {
 		return workspaceName;
 	}