Resolve code review sugesstions for issue wso2#360

common/src/main/java/org/wso2/testgrid/common/TestGridConstants.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.wso2.testgrid.common;
+
+/**
+ * Class to maintain constants across modules.
+ *
+ * @since 1.0.0
+ */
+public class TestGridConstants {
+
+    // Logging constants
+    public static final String TEST_LOG_FILE_NAME = "test-run.log";
+}

core/src/main/java/org/wso2/testgrid/core/command/RunTestPlanCommand.java

@@ -28,6 +28,7 @@
 import org.wso2.testgrid.common.Infrastructure;
 import org.wso2.testgrid.common.Product;
 import org.wso2.testgrid.common.Status;
+import org.wso2.testgrid.common.TestGridConstants;
 import org.wso2.testgrid.common.TestPlan;
 import org.wso2.testgrid.common.TestScenario;
 import org.wso2.testgrid.common.exception.CommandExecutionException;
@@ -289,8 +290,8 @@ private void executeTestPlan(TestPlan testPlan, Infrastructure infrastructure) t
      */
     private String deriveLogFilePath(TestPlan testPlan) throws TestGridLoggingException {
         try {
-            Path testRunArtifactsDir = TestGridUtil.getTestRunArtifactsDirectory(testPlan);
-            return testRunArtifactsDir.resolve("test").toString();
+            Path testRunDirectory = TestGridUtil.getTestRunArtifactsDirectory(testPlan);
+            return testRunDirectory.resolve(TestGridConstants.TEST_LOG_FILE_NAME).toString();
         } catch (TestGridException e) {
             throw new TestGridLoggingException(
                     "Error in getting the test run artifacts directory location " +

distribution/bin/log4j2.xml

@@ -40,8 +40,8 @@
         <Routing name="Routing">
             <Routes pattern="$${path:key2}">
                 <Route>
-                    <RollingFile name="SCENARIO_LOGFILE" fileName="${env:TESTGRID_HOME}/${path:key2}.log"
-                                 filePattern="${env:TESTGRID_HOME}/${path:key2}.log">
+                    <RollingFile name="SCENARIO_LOGFILE" fileName="${env:TESTGRID_HOME}/${path:key2}"
+                                 filePattern="${env:TESTGRID_HOME}/${path:key2}">
                         <PatternLayout pattern="[%d] %5p {%c} - %m%ex%n" />
                         <Policies>
                             <SizeBasedTriggeringPolicy size="50 MB" />

web/pom.xml

@@ -85,6 +85,12 @@
             <artifactId>aws-java-sdk</artifactId>
         </dependency>
 
+        <!-- Other dependencies -->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+
         <!-- Jacoco agent -->
         <dependency>
             <groupId>org.jacoco</groupId>