diff options
| author | Young Gyu Park <younggyu@google.com> | 2018-02-09 16:03:38 +0900 |
|---|---|---|
| committer | Young Gyu Park <younggyu@google.com> | 2018-02-22 10:33:54 +0900 |
| commit | 6a63048585642a823cc7d0a339146e6cdd670277 (patch) | |
| tree | deac15a5460516fd9ebd3ca98c236e9fe6a07a7b /src/main/webapp | |
| parent | 2f97c8e74546ca80a0c25b59bd5ee46742b4e089 (diff) | |
| download | dashboard-6a63048585642a823cc7d0a339146e6cdd670277.tar.gz | |
GCS Log File Info Access from appspot projectandroid-p-preview-1android-o-mr1-iot-preview-7o-mr1-iot-preview-7
Test: Tested with browser on
GAE(go/vts-web-staging/show_gcs_log)
Bug: 73090948
Change-Id: I4061ff2b8cf29886d6387c987a5fa59ee888a3a5
Diffstat (limited to 'src/main/webapp')
| -rw-r--r-- | src/main/webapp/WEB-INF/appengine-web.xml | 5 | ||||
| -rw-r--r-- | src/main/webapp/WEB-INF/jsp/show_gcs_log.jsp | 69 | ||||
| -rw-r--r-- | src/main/webapp/WEB-INF/web.xml | 10 |
3 files changed, 82 insertions, 2 deletions
diff --git a/src/main/webapp/WEB-INF/appengine-web.xml b/src/main/webapp/WEB-INF/appengine-web.xml index a7d50bf..4023fb1 100644 --- a/src/main/webapp/WEB-INF/appengine-web.xml +++ b/src/main/webapp/WEB-INF/appengine-web.xml @@ -13,8 +13,6 @@ --> <appengine-web-app xmlns="http://appengine.google.com/ns/1.0"> - <application>s~google.com:android-vts-staging</application> - <version>4</version> <threadsafe>true</threadsafe> <sessions-enabled>true</sessions-enabled> <runtime>java8</runtime> @@ -28,6 +26,9 @@ <property name="GERRIT_URI" value="${gerrit.uri}" /> <property name="GERRIT_SCOPE" value="${gerrit.scope}" /> <property name="ANALYTICS_ID" value="${analytics.id}" /> + <property name="GCS_PROJECT_ID" value="${gcs.projectID}" /> + <property name="GCS_KEY_FILE" value="${gcs.keyFile}" /> + <property name="GCS_BUCKET_NAME" value="${gcs.bucketName}" /> </system-properties> </appengine-web-app>
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/show_gcs_log.jsp b/src/main/webapp/WEB-INF/jsp/show_gcs_log.jsp new file mode 100644 index 0000000..5c175ea --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/show_gcs_log.jsp @@ -0,0 +1,69 @@ +<%-- + ~ Copyright (c) 2018 Google Inc. All Rights Reserved. + ~ + ~ Licensed 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. + --%> +<%@ page contentType='text/html;charset=UTF-8' language='java' %> +<%@ taglib prefix='fn' uri='http://java.sun.com/jsp/jstl/functions' %> +<%@ taglib prefix='c' uri='http://java.sun.com/jsp/jstl/core'%> + +<html> + <%@ include file="header.jsp" %> + <link rel='stylesheet' href='/css/show_plan_release.css'> + <link rel='stylesheet' href='/css/plan_runs.css'> + <link rel='stylesheet' href='/css/search_header.css'> + <script src='https://www.gstatic.com/external_hosted/moment/min/moment-with-locales.min.js'></script> + <script src='js/time.js'></script> + <script src='js/plan_runs.js'></script> + <script src='js/search_header.js'></script> + <script type='text/javascript'> + var search; + $(document).ready(function() { + + }); + </script> + + <body> + <div class='wide container'> + <div class='row' id='release-container'> + <h3>Directory List</h3> + <c:forEach varStatus="dirLoop" var="dirName" items="${dirList}"> + <p> + <a href="${requestScope['javax.servlet.forward.servlet_path']}?path=${dirName}"> + <c:out value="${dirName}"></c:out> + <c:if test="${dirLoop.first && path ne '/'}"> + (Move to Parent) + </c:if> + </a> + </p> + <c:if test="${!dirLoop.last}"> + </c:if> + </c:forEach> + <hr/> + <h5>Current Directory Path : ${path}</h5> + <hr/> + <h3>File List</h3> + <c:forEach varStatus="fileLoop" var="fileName" items="${fileList}"> + <p> + <a href="${requestScope['javax.servlet.forward.servlet_path']}?path=${fileName}"> + <c:out value="${fileName}"></c:out> + </a> + </p> + <c:if test="${!fileLoop.last}"> + </c:if> + </c:forEach> + </div> + </div> + <%@ include file="footer.jsp" %> + </body> +</html> diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index dc1cf76..4c13bd7 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -86,6 +86,11 @@ Copyright 2016 Google Inc. All Rights Reserved. </servlet> <servlet> + <servlet-name>show_gcs_log</servlet-name> + <servlet-class>com.android.vts.servlet.ShowGcsLogServlet</servlet-class> +</servlet> + +<servlet> <servlet-name>test_data</servlet-name> <servlet-class>com.android.vts.api.TestDataForDevServlet</servlet-class> </servlet> @@ -211,6 +216,11 @@ Copyright 2016 Google Inc. All Rights Reserved. </servlet-mapping> <servlet-mapping> + <servlet-name>show_gcs_log</servlet-name> + <url-pattern>/show_gcs_log/*</url-pattern> +</servlet-mapping> + +<servlet-mapping> <servlet-name>bigtable_legacy</servlet-name> <url-pattern>/api/bigtable/*</url-pattern> </servlet-mapping> |