The Unified and Autonomous Development Platform
Add page to show build artifacts and html reports
Robin Shen0cd71940c047
diff --git a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.javaindex 335c2521f0..2342ab2628 100644--- a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java+++ b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java@@ -276,7 +276,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableTelsesnapshot = null;- Logger logger = logManager.getLogger(build.getProject().getId(), build.getId(), job.getLogLevel());+ Logger logger = logManager.getLogger(build, job.getLogLevel());Long buildId = build.getId();JobExecution execution = new JobExecution(executorService.submit(new Runnable() {diff --git a/core/src/main/java/io/onedev/server/ci/job/JobOutcome.java b/core/src/main/java/io/onedev/server/ci/job/JobOutcome.javaindex 0169507b65..d15e56922e 100644--- a/core/src/main/java/io/onedev/server/ci/job/JobOutcome.java+++ b/core/src/main/java/io/onedev/server/ci/job/JobOutcome.java@@ -47,7 +47,7 @@ public abstract class JobOutcome implements Serializable {public static File getOutcomeDir(Build build, String outcomeDir) {File buildDir = OneDev.getInstance(StorageManager.class)- .getBuildDir(build.getProject().getId(), build.getId());+ .getBuildDir(build.getProject().getId(), build.getNumber());return new File(buildDir, outcomeDir);}diff --git a/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java b/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.javaindex 153788ce3d..d2edad299a 100644--- a/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java+++ b/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java@@ -85,13 +85,16 @@ public class DefaultLogManager implements LogManager {this.logNormalizers = logNormalizers;}- private File getLogFile(Long projectId, Long buildId) {- File buildDir = storageManager.getBuildDir(projectId, buildId);+ private File getLogFile(Long projectId, Long buildNumber) {+ File buildDir = storageManager.getBuildDir(projectId, buildNumber);return new File(buildDir, LOG_FILE);}@Override- public Logger getLogger(Long projectId, Long buildId, LogLevel loggerLevel) {+ public Logger getLogger(Build build, LogLevel loggerLevel) {+ Long projectId = build.getProject().getId();+ Long buildId = build.getId();+ Long buildNumber = build.getNumber();return new JobLogger(loggerLevel) {private static final long serialVersionUID = 1L;@@ -111,7 +114,7 @@ public class DefaultLogManager implements LogManager {try {LogSnippet snippet = recentSnippets.get(buildId);if (snippet == null) {- File logFile = getLogFile(projectId, buildId);+ File logFile = getLogFile(projectId, buildNumber);if (!logFile.exists()) {snippet = new LogSnippet();recentSnippets.put(buildId, snippet);@@ -120,7 +123,7 @@ public class DefaultLogManager implements LogManager {if (snippet != null) {snippet.entries.add(new LogEntry(new Date(), logLevel, message));if (snippet.entries.size() > MAX_CACHE_ENTRIES) {- File logFile = getLogFile(projectId, buildId);+ File logFile = getLogFile(projectId, buildNumber);try (ObjectOutputStream oos = newOutputStream(logFile)) {while (snippet.entries.size() > MIN_CACHE_ENTRIES) {LogEntry entry = snippet.entries.remove(0);@@ -257,7 +260,7 @@ public class DefaultLogManager implements LogManager {Lock lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).readLock();lock.lock();try {- File logFile = getLogFile(build.getProject().getId(), build.getId());+ File logFile = getLogFile(build.getProject().getId(), build.getNumber());LogSnippet snippet = recentSnippets.get(build.getId());if (snippet != null) {if (from >= snippet.offset) {@@ -285,7 +288,7 @@ public class DefaultLogManager implements LogManager {Lock lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).readLock();lock.lock();try {- File logFile = getLogFile(build.getProject().getId(), build.getId());+ File logFile = getLogFile(build.getProject().getId(), build.getNumber());LogSnippet recentSnippet = recentSnippets.get(build.getId());if (recentSnippet != null) {LogSnippet snippet = new LogSnippet();@@ -334,7 +337,7 @@ public class DefaultLogManager implements LogManager {try {LogSnippet snippet = recentSnippets.remove(build.getId());if (snippet != null) {- File logFile = getLogFile(build.getProject().getId(), build.getId());+ File logFile = getLogFile(build.getProject().getId(), build.getNumber());try (ObjectOutputStream oos = newOutputStream(logFile)) {for (LogEntry entry: snippet.entries)oos.writeObject(entry);@@ -368,7 +371,7 @@ public class DefaultLogManager implements LogManager {lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).readLock();lock.lock();try {- File logFile = getLogFile(build.getProject().getId(), build.getId());+ File logFile = getLogFile(build.getProject().getId(), build.getNumber());if (logFile.exists())ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)));diff --git a/core/src/main/java/io/onedev/server/ci/job/log/LogManager.java b/core/src/main/java/io/onedev/server/ci/job/log/LogManager.javaindex f6e7304b95..98bcea746e 100644--- a/core/src/main/java/io/onedev/server/ci/job/log/LogManager.java+++ b/core/src/main/java/io/onedev/server/ci/job/log/LogManager.java@@ -9,7 +9,7 @@ import io.onedev.server.model.Build;public interface LogManager {- Logger getLogger(Long projectId, Long buildId, LogLevel logLevel);+ Logger getLogger(Build build, LogLevel logLevel);/*** Read specified number of log entries from specified build, starting from specified indexdiff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 831541a989..3c6accf526 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -84,7 +84,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsquery.setParameter("build", build);query.executeUpdate();- FileUtils.deleteDir(storageManager.getBuildDir(build.getProject().getId(), build.getId()));+ FileUtils.deleteDir(storageManager.getBuildDir(build.getProject().getId(), build.getNumber()));super.delete(build);listenerRegistry.post(new BuildDeleted(userManager.getCurrent(), build));}@@ -257,6 +257,6 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Listenpublic void on(BuildSubmitted event) {Build build = event.getBuild();- FileUtils.deleteDir(storageManager.getBuildDir(build.getProject().getId(), build.getId()));+ FileUtils.deleteDir(storageManager.getBuildDir(build.getProject().getId(), build.getNumber()));}}diff --git a/core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java b/core/src/main/java/io/onedev/server/storage/DefaultStorageManager.javaindex cfa17fb9cd..32ddfd8a22 100644--- a/core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java+++ b/core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java@@ -161,8 +161,8 @@ public class DefaultStorageManager implements StorageManager {}@Override- public File getBuildDir(Long projectId, Long buildId) {- File buildDir = new File(getBuildsDir(projectId), String.valueOf(buildId));+ public File getBuildDir(Long projectId, Long buildNumber) {+ File buildDir = new File(getBuildsDir(projectId), String.valueOf(buildNumber));FileUtils.createDir(buildDir);return buildDir;}diff --git a/core/src/main/java/io/onedev/server/storage/StorageManager.java b/core/src/main/java/io/onedev/server/storage/StorageManager.javaindex 47a358a813..25caeb2dae 100644--- a/core/src/main/java/io/onedev/server/storage/StorageManager.java+++ b/core/src/main/java/io/onedev/server/storage/StorageManager.java@@ -47,6 +47,6 @@ public interface StorageManager {* directory store build related files such as logs, artifacts and reports. The directory* will be exist after calling this method*/- File getBuildDir(Long projectId, Long buildId);+ File getBuildDir(Long projectId, Long buildNumber);}diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex 128bbc0bc3..8c34f5bfdc 100644--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -10,6 +10,11 @@ import org.apache.wicket.request.IRequestHandler;import org.apache.wicket.request.Url;import org.apache.wicket.request.mapper.CompoundRequestMapper;+import io.onedev.server.web.download.ArchiveDownloadResourceReference;+import io.onedev.server.web.download.AttachmentDownloadResourceReference;+import io.onedev.server.web.download.BuildLogDownloadResourceReference;+import io.onedev.server.web.download.RawBlobDownloadResourceReference;+import io.onedev.server.web.download.ServerLogDownloadResourceReference;import io.onedev.server.web.mapper.OnePageMapper;import io.onedev.server.web.mapper.OneResourceMapper;import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;@@ -58,8 +63,8 @@ import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;import io.onedev.server.web.page.project.issues.create.NewIssuePage;-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.page.project.issues.detail.FixingBuildsPage;+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.page.project.issues.list.IssueListPage;import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;@@ -88,11 +93,6 @@ import io.onedev.server.web.page.security.ForgetPage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.page.security.LogoutPage;import io.onedev.server.web.page.security.RegisterPage;-import io.onedev.server.web.stream.ArchiveStreamResourceReference;-import io.onedev.server.web.stream.AttachmentStreamResourceReference;-import io.onedev.server.web.stream.BuildLogStreamResourceReference;-import io.onedev.server.web.stream.RawBlobStreamResourceReference;-import io.onedev.server.web.stream.ServerLogStreamResourceReference;public class OneUrlMapper extends CompoundRequestMapper {@@ -115,13 +115,11 @@ public class OneUrlMapper extends CompoundRequestMapper {}private void addResources() {- add(new ResourceMapper("server-log-stream", new ServerLogStreamResourceReference()));- add(new ResourceMapper("projects/${project}/archive/${revision}", new ArchiveStreamResourceReference()));- add(new ResourceMapper("projects/${project}/builds/${build}/log-stream", new BuildLogStreamResourceReference()));-- add(new OneResourceMapper("projects/${project}/raw/${revision}/${path}", new RawBlobStreamResourceReference()));- add(new ResourceMapper("projects/${project}/attachment/${uuid}/${attachment}",- new AttachmentStreamResourceReference()));+ add(new ResourceMapper("downloads/server-log", new ServerLogDownloadResourceReference()));+ add(new ResourceMapper("downloads/projects/${project}/builds/${build}/log", new BuildLogDownloadResourceReference()));+ add(new ResourceMapper("projects/${project}/archive/${revision}", new ArchiveDownloadResourceReference()));+ add(new OneResourceMapper("projects/${project}/raw/${revision}/${path}", new RawBlobDownloadResourceReference()));+ add(new ResourceMapper("projects/${project}/attachment/${uuid}/${attachment}", new AttachmentDownloadResourceReference()));}private void addSecurityPages() {diff --git a/core/src/main/java/io/onedev/server/web/component/link/ArchiveMenuLink.java b/core/src/main/java/io/onedev/server/web/component/link/ArchiveMenuLink.javaindex 68b75b9327..ab8f68280d 100644--- a/core/src/main/java/io/onedev/server/web/component/link/ArchiveMenuLink.java+++ b/core/src/main/java/io/onedev/server/web/component/link/ArchiveMenuLink.java@@ -11,8 +11,8 @@ import io.onedev.server.model.Project;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.menu.MenuItem;import io.onedev.server.web.component.menu.MenuLink;-import io.onedev.server.web.stream.ArchiveStreamResource;-import io.onedev.server.web.stream.ArchiveStreamResourceReference;+import io.onedev.server.web.download.ArchiveDownloadResource;+import io.onedev.server.web.download.ArchiveDownloadResourceReference;@SuppressWarnings("serial")public abstract class ArchiveMenuLink extends MenuLink {@@ -36,8 +36,8 @@ public abstract class ArchiveMenuLink extends MenuLink {@Overridepublic AbstractLink newLink(String id) {- return new ResourceLink<Void>(id, new ArchiveStreamResourceReference(),- ArchiveStreamResource.paramsOf(projectModel.getObject(), getRevision(), ArchiveStreamResource.FORMAT_ZIP)) {+ return new ResourceLink<Void>(id, new ArchiveDownloadResourceReference(),+ ArchiveDownloadResource.paramsOf(projectModel.getObject(), getRevision(), ArchiveDownloadResource.FORMAT_ZIP)) {@Overrideprotected CharSequence getOnClickScript(CharSequence url) {@@ -57,8 +57,8 @@ public abstract class ArchiveMenuLink extends MenuLink {@Overridepublic AbstractLink newLink(String id) {- return new ResourceLink<Void>(id, new ArchiveStreamResourceReference(),- ArchiveStreamResource.paramsOf(projectModel.getObject(), getRevision(), ArchiveStreamResource.FORMAT_TGZ)) {+ return new ResourceLink<Void>(id, new ArchiveDownloadResourceReference(),+ ArchiveDownloadResource.paramsOf(projectModel.getObject(), getRevision(), ArchiveDownloadResource.FORMAT_TGZ)) {@Overrideprotected CharSequence getOnClickScript(CharSequence url) {diff --git a/core/src/main/java/io/onedev/server/web/stream/ArchiveStreamResource.java b/core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/web/stream/ArchiveStreamResource.javarename to core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.javaindex 7b67da8089..94e3f852fd 100644--- a/core/src/main/java/io/onedev/server/web/stream/ArchiveStreamResource.java+++ b/core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.java@@ -1,4 +1,4 @@-package io.onedev.server.web.stream;+package io.onedev.server.web.download;import java.io.IOException;import java.io.UnsupportedEncodingException;@@ -24,7 +24,7 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;-public class ArchiveStreamResource extends AbstractResource {+public class ArchiveDownloadResource extends AbstractResource {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/web/stream/ArchiveStreamResourceReference.java b/core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResourceReference.javasimilarity index 55%rename from core/src/main/java/io/onedev/server/web/stream/ArchiveStreamResourceReference.javarename to core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResourceReference.javaindex 0862195f9a..e44438e11e 100644--- a/core/src/main/java/io/onedev/server/web/stream/ArchiveStreamResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResourceReference.java@@ -1,19 +1,19 @@-package io.onedev.server.web.stream;+package io.onedev.server.web.download;import org.apache.wicket.request.resource.IResource;import org.apache.wicket.request.resource.ResourceReference;-public class ArchiveStreamResourceReference extends ResourceReference {+public class ArchiveDownloadResourceReference extends ResourceReference {private static final long serialVersionUID = 1L;- public ArchiveStreamResourceReference() {+ public ArchiveDownloadResourceReference() {super("archive");}@Overridepublic IResource getResource() {- return new ArchiveStreamResource();+ return new ArchiveDownloadResource();}}diff --git a/core/src/main/java/io/onedev/server/web/stream/AttachmentStreamResource.java b/core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResource.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/stream/AttachmentStreamResource.javarename to core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResource.javaindex 17ca14819f..73fdc506e1 100644--- a/core/src/main/java/io/onedev/server/web/stream/AttachmentStreamResource.java+++ b/core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResource.java@@ -1,4 +1,4 @@-package io.onedev.server.web.stream;+package io.onedev.server.web.download;import java.io.File;import java.io.FileInputStream;@@ -21,7 +21,7 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.storage.AttachmentStorageManager;import io.onedev.server.util.facade.ProjectFacade;-public class AttachmentStreamResource extends AbstractResource {+public class AttachmentDownloadResource extends AbstractResource {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/web/stream/AttachmentStreamResourceReference.java b/core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResourceReference.javasimilarity index 54%rename from core/src/main/java/io/onedev/server/web/stream/AttachmentStreamResourceReference.javarename to core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResourceReference.javaindex d2e13627cc..575f3992a6 100644--- a/core/src/main/java/io/onedev/server/web/stream/AttachmentStreamResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResourceReference.java@@ -1,19 +1,19 @@-package io.onedev.server.web.stream;+package io.onedev.server.web.download;import org.apache.wicket.request.resource.IResource;import org.apache.wicket.request.resource.ResourceReference;-public class AttachmentStreamResourceReference extends ResourceReference {+public class AttachmentDownloadResourceReference extends ResourceReference {private static final long serialVersionUID = 1L;- public AttachmentStreamResourceReference() {+ public AttachmentDownloadResourceReference() {super("attachment");}@Overridepublic IResource getResource() {- return new AttachmentStreamResource();+ return new AttachmentDownloadResource();}}diff --git a/core/src/main/java/io/onedev/server/web/stream/BuildLogStreamResource.java b/core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/stream/BuildLogStreamResource.javarename to core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.javaindex 58c5e3aed8..0b5608de71 100644--- a/core/src/main/java/io/onedev/server/web/stream/BuildLogStreamResource.java+++ b/core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java@@ -1,4 +1,4 @@-package io.onedev.server.web.stream;+package io.onedev.server.web.download;import java.io.IOException;import java.io.InputStream;@@ -24,7 +24,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;-public class BuildLogStreamResource extends AbstractResource {+public class BuildLogDownloadResource extends AbstractResource {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/web/stream/BuildLogStreamResourceReference.java b/core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResourceReference.javasimilarity index 54%rename from core/src/main/java/io/onedev/server/web/stream/BuildLogStreamResourceReference.javarename to core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResourceReference.javaindex f426290e0e..d6d45dc44d 100644--- a/core/src/main/java/io/onedev/server/web/stream/BuildLogStreamResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResourceReference.java@@ -1,19 +1,19 @@-package io.onedev.server.web.stream;+package io.onedev.server.web.download;import org.apache.wicket.request.resource.IResource;import org.apache.wicket.request.resource.ResourceReference;-public class BuildLogStreamResourceReference extends ResourceReference {+public class BuildLogDownloadResourceReference extends ResourceReference {private static final long serialVersionUID = 1L;- public BuildLogStreamResourceReference() {+ public BuildLogDownloadResourceReference() {super("build-log");}@Overridepublic IResource getResource() {- return new BuildLogStreamResource();+ return new BuildLogDownloadResource();}}diff --git a/core/src/main/java/io/onedev/server/web/stream/RawBlobStreamResource.java b/core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/web/stream/RawBlobStreamResource.javarename to core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.javaindex 93b83756cf..cf589ca225 100644--- a/core/src/main/java/io/onedev/server/web/stream/RawBlobStreamResource.java+++ b/core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java@@ -1,4 +1,4 @@-package io.onedev.server.web.stream;+package io.onedev.server.web.download;import java.io.ByteArrayInputStream;import java.io.IOException;@@ -28,11 +28,11 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;-public class RawBlobStreamResource extends AbstractResource {+public class RawBlobDownloadResource extends AbstractResource {private static final long serialVersionUID = 1L;- private static final String PARAM_DEPOT = "project";+ private static final String PARAM_PROJECT = "project";private static final String PARAM_REVISION = "revision";@@ -44,7 +44,7 @@ public class RawBlobStreamResource extends AbstractResource {protected ResourceResponse newResourceResponse(Attributes attributes) {PageParameters params = attributes.getParameters();- String projectName = params.get(PARAM_DEPOT).toString();+ String projectName = params.get(PARAM_PROJECT).toString();if (StringUtils.isBlank(projectName))throw new IllegalArgumentException("project name has to be specified");@@ -152,7 +152,7 @@ public class RawBlobStreamResource extends AbstractResource {public static PageParameters paramsOf(Project project, BlobIdent blobIdent) {PageParameters params = new PageParameters();- params.set(PARAM_DEPOT, project.getName());+ params.set(PARAM_PROJECT, project.getName());params.set(PARAM_REVISION, blobIdent.revision);params.set(PARAM_PATH, blobIdent.path);diff --git a/core/src/main/java/io/onedev/server/web/stream/RawBlobStreamResourceReference.java b/core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResourceReference.javasimilarity index 55%rename from core/src/main/java/io/onedev/server/web/stream/RawBlobStreamResourceReference.javarename to core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResourceReference.javaindex 0c86adc72c..c4be241978 100644--- a/core/src/main/java/io/onedev/server/web/stream/RawBlobStreamResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResourceReference.java@@ -1,19 +1,19 @@-package io.onedev.server.web.stream;+package io.onedev.server.web.download;import org.apache.wicket.request.resource.IResource;import org.apache.wicket.request.resource.ResourceReference;-public class RawBlobStreamResourceReference extends ResourceReference {+public class RawBlobDownloadResourceReference extends ResourceReference {private static final long serialVersionUID = 1L;- public RawBlobStreamResourceReference() {+ public RawBlobDownloadResourceReference() {super("rawblob");}@Overridepublic IResource getResource() {- return new RawBlobStreamResource();+ return new RawBlobDownloadResource();}}diff --git a/core/src/main/java/io/onedev/server/web/stream/ServerLogStreamResource.java b/core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResource.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/web/stream/ServerLogStreamResource.javarename to core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResource.javaindex 60486d0614..d2e31916bf 100644--- a/core/src/main/java/io/onedev/server/web/stream/ServerLogStreamResource.java+++ b/core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResource.java@@ -1,4 +1,4 @@-package io.onedev.server.web.stream;+package io.onedev.server.web.download;import java.io.File;import java.io.IOException;@@ -18,7 +18,7 @@ import io.onedev.server.security.SecurityUtils;import com.google.common.base.Charsets;import com.google.common.base.Joiner;-public class ServerLogStreamResource extends AbstractResource {+public class ServerLogDownloadResource extends AbstractResource {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/web/stream/ServerLogStreamResourceReference.java b/core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResourceReference.javasimilarity index 54%rename from core/src/main/java/io/onedev/server/web/stream/ServerLogStreamResourceReference.javarename to core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResourceReference.javaindex 189f9d9db2..bcc3e32a22 100644--- a/core/src/main/java/io/onedev/server/web/stream/ServerLogStreamResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResourceReference.java@@ -1,19 +1,19 @@-package io.onedev.server.web.stream;+package io.onedev.server.web.download;import org.apache.wicket.request.resource.IResource;import org.apache.wicket.request.resource.ResourceReference;-public class ServerLogStreamResourceReference extends ResourceReference {+public class ServerLogDownloadResourceReference extends ResourceReference {private static final long serialVersionUID = 1L;- public ServerLogStreamResourceReference() {+ public ServerLogDownloadResourceReference() {super("server-log");}@Overridepublic IResource getResource() {- return new ServerLogStreamResource();+ return new ServerLogDownloadResource();}}diff --git a/core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.java b/core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.javaindex 5ae3a37df6..21a95c1bf8 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.java@@ -9,9 +9,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.base.Joiner;+import io.onedev.server.web.download.ServerLogDownloadResource;+import io.onedev.server.web.download.ServerLogDownloadResourceReference;import io.onedev.server.web.page.admin.AdministrationPage;-import io.onedev.server.web.stream.ServerLogStreamResource;-import io.onedev.server.web.stream.ServerLogStreamResourceReference;@SuppressWarnings("serial")public class ServerLogPage extends AdministrationPage {@@ -26,9 +26,9 @@ public class ServerLogPage extends AdministrationPage {protected void onInitialize() {super.onInitialize();- add(new ResourceLink<Void>("download", new ServerLogStreamResourceReference()));+ add(new ResourceLink<Void>("download", new ServerLogDownloadResourceReference()));- List<String> lines = ServerLogStreamResource.readServerLog();+ List<String> lines = ServerLogDownloadResource.readServerLog();String content;if (lines.size() > MAX_DISPLAY_LINES) {add(new Label("warning", "Too many log entries, displaying recent " + MAX_DISPLAY_LINES));diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 911a1a5565..d764b2be9b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -89,6 +89,7 @@ import io.onedev.server.web.component.menu.MenuLink;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.revisionpicker.RevisionPicker;+import io.onedev.server.web.download.RawBlobDownloadResourceReference;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.navigator.BlobNavigator;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;@@ -101,7 +102,6 @@ import io.onedev.server.web.page.project.blob.search.advanced.AdvancedSearchPaneimport io.onedev.server.web.page.project.blob.search.quick.QuickSearchPanel;import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;-import io.onedev.server.web.stream.RawBlobStreamResourceReference;import io.onedev.server.web.websocket.PageDataChanged;import io.onedev.server.web.websocket.WebSocketManager;@@ -191,7 +191,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {if (params.get(PARAM_RAW).toBoolean(false)) {RequestCycle.get().scheduleRequestHandlerAfterCurrent(- new ResourceReferenceRequestHandler(new RawBlobStreamResourceReference(), getPageParameters()));+ new ResourceReferenceRequestHandler(new RawBlobDownloadResourceReference(), getPageParameters()));}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.javaindex 35cc73468e..f22f8e8dbe 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java@@ -1,10 +1,9 @@package io.onedev.server.web.page.project.blob.render.edit;-import org.apache.wicket.Component;import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxCallListener;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.attributes.IAjaxCallListener;import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.IEvent;@@ -116,54 +115,8 @@ public abstract class BlobEditPanel extends Panel {protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new IAjaxCallListener() {-- @Override- public CharSequence getSuccessHandler(Component component) {- return null;- }-- @Override- public CharSequence getPrecondition(Component component) {- return null;- }-- @Override- public CharSequence getInitHandler(Component component) {- return null;- }-- @Override- public CharSequence getFailureHandler(Component component) {- return null;- }-- @Override- public CharSequence getDoneHandler(Component component) {- return null;- }-- @Override- public CharSequence getCompleteHandler(Component component) {- return null;- }-- @Override- public CharSequence getBeforeSendHandler(Component component) {- return null;- }-- @Override- public CharSequence getBeforeHandler(Component component) {- return "$('.blob-submit-aware').trigger('beforeSubmit');";- }-- @Override- public CharSequence getAfterHandler(Component component) {- return null;- }-- });+ attributes.getAjaxCallListeners().add(new AjaxCallListener()+ .onBefore("$('.blob-submit-aware').trigger('beforeSubmit');"));}};diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.javaindex 36668f2a8f..7174174d7c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.java@@ -4,10 +4,10 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.image.Image;+import io.onedev.server.web.download.RawBlobDownloadResource;+import io.onedev.server.web.download.RawBlobDownloadResourceReference;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;-import io.onedev.server.web.stream.RawBlobStreamResource;-import io.onedev.server.web.stream.RawBlobStreamResourceReference;@SuppressWarnings("serial")public class ImageViewPanel extends BlobViewPanel {@@ -20,8 +20,8 @@ public class ImageViewPanel extends BlobViewPanel {protected void onInitialize() {super.onInitialize();- add(new Image("img", new RawBlobStreamResourceReference(),- RawBlobStreamResource.paramsOf(context.getProject(), context.getBlobIdent())));+ add(new Image("img", new RawBlobDownloadResourceReference(),+ RawBlobDownloadResource.paramsOf(context.getProject(), context.getBlobIdent())));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.javaindex 3f8bf8f401..efc9ee7a1f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.java@@ -6,10 +6,10 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.request.cycle.RequestCycle;+import io.onedev.server.web.download.RawBlobDownloadResource;+import io.onedev.server.web.download.RawBlobDownloadResourceReference;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;-import io.onedev.server.web.stream.RawBlobStreamResource;-import io.onedev.server.web.stream.RawBlobStreamResourceReference;@SuppressWarnings("serial")public class VideoViewPanel extends BlobViewPanel {@@ -22,8 +22,8 @@ public class VideoViewPanel extends BlobViewPanel {protected void onInitialize() {super.onInitialize();- String url = RequestCycle.get().urlFor(new RawBlobStreamResourceReference(),- RawBlobStreamResource.paramsOf(context.getProject(), context.getBlobIdent())).toString();+ String url = RequestCycle.get().urlFor(new RawBlobDownloadResourceReference(),+ RawBlobDownloadResource.paramsOf(context.getProject(), context.getBlobIdent())).toString();add(new WebMarkupContainer("video").add(AttributeAppender.append("src", url)));}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.javaindex 009f83b602..7e06139641 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java@@ -34,10 +34,10 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.ajaxlistener.TrackViewStateListener;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;+import io.onedev.server.web.download.RawBlobDownloadResource;+import io.onedev.server.web.download.RawBlobDownloadResourceReference;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;-import io.onedev.server.web.stream.RawBlobStreamResource;-import io.onedev.server.web.stream.RawBlobStreamResourceReference;@SuppressWarnings("serial")public abstract class BlobViewPanel extends Panel {@@ -199,8 +199,8 @@ public abstract class BlobViewPanel extends Panel {add(newOptions("options"));- add(new ResourceLink<Void>("raw", new RawBlobStreamResourceReference(),- RawBlobStreamResource.paramsOf(context.getProject(), context.getBlobIdent())));+ add(new ResourceLink<Void>("raw", new RawBlobDownloadResourceReference(),+ RawBlobDownloadResource.paramsOf(context.getProject(), context.getBlobIdent())));add(new CheckBox("viewPlain", Model.of(context.getMode() == Mode.VIEW_PLAIN)) {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 3e1b1adc06..bc95c4d7c1 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -65,7 +65,7 @@ public abstract class BuildDetailPage extends ProjectPage {protected final IModel<Build> buildModel;- final QueryPosition position;+ private final QueryPosition position;public BuildDetailPage(PageParameters params) {super(params);@@ -86,10 +86,15 @@ public abstract class BuildDetailPage extends ProjectPage {position = QueryPosition.from(params);}- protected Build getBuild() {+ public Build getBuild() {return buildModel.getObject();}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }+private WebSocketObserver newBuildObserver(Long buildId) {return new WebSocketObserver() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildLogPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildLogPage.javaindex cf023c218f..96a9903084 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildLogPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildLogPage.java@@ -8,8 +8,8 @@ import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.web.component.build.log.BuildLogPanel;-import io.onedev.server.web.stream.BuildLogStreamResource;-import io.onedev.server.web.stream.BuildLogStreamResourceReference;+import io.onedev.server.web.download.BuildLogDownloadResource;+import io.onedev.server.web.download.BuildLogDownloadResourceReference;@SuppressWarnings("serial")public class BuildLogPage extends BuildDetailPage {@@ -33,8 +33,8 @@ public class BuildLogPage extends BuildDetailPage {public Component renderOptions(String componentId) {Fragment fragment = new Fragment(componentId, "optionsFrag", this);- fragment.add(new ResourceLink<Void>("download", new BuildLogStreamResourceReference(),- BuildLogStreamResource.paramsOf(projectModel.getObject(), getBuild().getNumber())));+ fragment.add(new ResourceLink<Void>("download", new BuildLogDownloadResourceReference(),+ BuildLogDownloadResource.paramsOf(projectModel.getObject(), getBuild().getNumber())));return fragment;}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.javaindex 1a794cda9e..6c4268bf00 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java@@ -24,7 +24,7 @@ public class BuildTab extends PageTab {protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {BuildDetailPage page = (BuildDetailPage) getPage();return new ViewStateAwarePageLink<Void>(linkId, pageClass,- BuildDetailPage.paramsOf(page.getBuild(), page.position));+ BuildDetailPage.paramsOf(page.getBuild(), page.getPosition()));}};diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.js b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.jsindex 86df43dee0..8480866354 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.js+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.js@@ -7,10 +7,10 @@ onedev.server.buildDetail = {},onLogDomReady: function() {var $log = $("#build-detail>.main>div>.build-log");- function calcLogHeight() {+ function setLogHeight() {$log.height($(window).height() - $log.offset().top - 40);}- $(window).resize(calcLogHeight);- calcLogHeight();+ $(window).resize(setLogHeight);+ setLogHeight();}}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex cbae558f8f..4320a12dc8 100644--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -6,12 +6,6 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.BuildParamManager;-import io.onedev.server.model.Build;-import io.onedev.server.model.BuildParam;-import io.onedev.server.persistence.TransactionManager;import io.onedev.server.web.page.base.BasePage;@SuppressWarnings("serial")@@ -29,46 +23,6 @@ public class TestPage extends BasePage {@Overridepublic void onClick() {- BuildManager buildManager = OneDev.getInstance(BuildManager.class);- BuildParamManager buildParamManager = OneDev.getInstance(BuildParamManager.class);- for (int i=1; i<=250; i++) {- int i2 = i;- OneDev.getInstance(TransactionManager.class).run(new Runnable() {-- @Override- public void run() {- for (int j=1; j<=1000; j++) {- Long buildId = (i2-1)*1000L + j;- Build build = buildManager.load(buildId);- BuildParam param = new BuildParam();- param.setBuild(build);- param.setName("param1");- param.setValue("param1.value1");- buildParamManager.save(param);-- param = new BuildParam();- param.setBuild(build);- param.setName("param1");- param.setValue("param1.value2");- buildParamManager.save(param);-- param = new BuildParam();- param.setBuild(build);- param.setName("param2");- param.setValue("param2.value1");- buildParamManager.save(param);-- param = new BuildParam();- param.setBuild(build);- param.setName("param2");- param.setValue("param2.value2");- buildParamManager.save(param);- }- }-- });- System.out.println(i2);- }}});diff --git a/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java b/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.javaindex 50823666d4..dcac1518e5 100644--- a/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java+++ b/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java@@ -23,8 +23,8 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.storage.AttachmentStorageManager;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.web.component.markdown.AttachmentSupport;-import io.onedev.server.web.stream.AttachmentStreamResource;-import io.onedev.server.web.stream.AttachmentStreamResourceReference;+import io.onedev.server.web.download.AttachmentDownloadResource;+import io.onedev.server.web.download.AttachmentDownloadResourceReference;public class ProjectAttachmentSupport implements AttachmentSupport {@@ -45,8 +45,8 @@ public class ProjectAttachmentSupport implements AttachmentSupport {@Overridepublic String getAttachmentUrl(String attachment) {- PageParameters params = AttachmentStreamResource.paramsOf(getProject(), attachmentDirUUID, attachment);- return RequestCycle.get().urlFor(new AttachmentStreamResourceReference(), params).toString();+ PageParameters params = AttachmentDownloadResource.paramsOf(getProject(), attachmentDirUUID, attachment);+ return RequestCycle.get().urlFor(new AttachmentDownloadResourceReference(), params).toString();}@Overridediff --git a/core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java b/core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.javaindex 87f3fcde38..7958ac3f32 100644--- a/core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java+++ b/core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java@@ -469,8 +469,6 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer implemepublic FormComponent(final String id, IModel<T> model){super(id, model);- if (model != null)- setConvertedInput(model.getObject());// the form decides whether form components are versioned or not// see Form.setVersionedsetVersioned(false);diff --git a/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactDownloadResource.java b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactDownloadResource.javanew file mode 100644index 0000000000..0cae4ca372--- /dev/null+++ b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactDownloadResource.java@@ -0,0 +1,139 @@+package io.onedev.server.plugin.artifact;++import java.io.File;+import java.io.FileInputStream;+import java.io.IOException;+import java.io.InputStream;+import java.io.UnsupportedEncodingException;+import java.net.URLEncoder;+import java.util.ArrayList;+import java.util.List;+import java.util.concurrent.Callable;++import javax.persistence.EntityNotFoundException;++import org.apache.commons.lang3.StringUtils;+import org.apache.shiro.authz.UnauthorizedException;+import org.apache.tika.io.IOUtils;+import org.apache.tika.mime.MimeTypes;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.request.resource.AbstractResource;++import com.google.common.base.Charsets;+import com.google.common.base.Joiner;++import io.onedev.commons.utils.LockUtils;+import io.onedev.server.OneDev;+import io.onedev.server.OneException;+import io.onedev.server.ci.job.JobOutcome;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.storage.StorageManager;++public class ArtifactDownloadResource extends AbstractResource {++ private static final long serialVersionUID = 1L;++ private static final String PARAM_PROJECT = "project";++ private static final String PARAM_BUILD = "build";++ private static final String PARAM_PATH = "path";++ @Override+ protected ResourceResponse newResourceResponse(Attributes attributes) {+ PageParameters params = attributes.getParameters();++ String projectName = params.get(PARAM_PROJECT).toString();+ if (StringUtils.isBlank(projectName))+ throw new IllegalArgumentException("project name has to be specified");++ Project project = OneDev.getInstance(ProjectManager.class).find(projectName);++ if (project == null)+ throw new EntityNotFoundException("Unable to find project: " + projectName);++ if (!SecurityUtils.canReadCode(project.getFacade()))+ throw new UnauthorizedException();++ Long buildNumber = params.get(PARAM_BUILD).toOptionalLong();++ if (buildNumber == null)+ throw new IllegalArgumentException("build number has to be specified");++ Build build = OneDev.getInstance(BuildManager.class).find(project, buildNumber);++ if (build == null) {+ String message = String.format("Unable to find build (project: %s, build number: %d)",+ project.getName(), buildNumber);+ throw new EntityNotFoundException(message);+ }++ List<String> pathSegments = new ArrayList<>();+ String pathSegment = params.get(PARAM_PATH).toString();+ if (pathSegment.length() != 0)+ pathSegments.add(pathSegment);+ else+ throw new OneException("Artifact path has to be specified");++ for (int i = 0; i < params.getIndexedCount(); i++) {+ pathSegment = params.get(i).toString();+ if (pathSegment.length() != 0)+ pathSegments.add(pathSegment);+ }++ String artifactPath = Joiner.on("/").join(pathSegments);++ File buildDir = OneDev.getInstance(StorageManager.class).getBuildDir(project.getId(), build.getNumber());+ File artifactsDir = new File(buildDir, JobArtifacts.DIR);+ File artifactFile = new File(artifactsDir, artifactPath);+ if (!artifactFile.exists() || artifactFile.isDirectory()) {+ String message = String.format("Specified artifact path does not exist or is a directory (project: %s, build number: %d, path: %s)",+ project.getName(), build.getNumber(), artifactPath);+ throw new OneException(message);+ }++ ResourceResponse response = new ResourceResponse();+ response.setContentType(MimeTypes.OCTET_STREAM);++ response.disableCaching();++ try {+ response.setFileName(URLEncoder.encode(artifactFile.getName(), Charsets.UTF_8.name()));+ } catch (UnsupportedEncodingException e) {+ throw new RuntimeException(e);+ }+ response.setWriteCallback(new WriteCallback() {++ @Override+ public void writeData(Attributes attributes) throws IOException {+ LockUtils.read(JobOutcome.getLockKey(build, JobArtifacts.DIR), new Callable<Void>() {++ @Override+ public Void call() throws Exception {+ try (InputStream is = new FileInputStream(artifactFile)) {+ IOUtils.copy(is, attributes.getResponse().getOutputStream());+ }+ return null;+ }++ });+ }++ });++ return response;+ }++ public static PageParameters paramsOf(Project project, Long buildNumber, String path) {+ PageParameters params = new PageParameters();+ params.set(PARAM_PROJECT, project.getName());+ params.set(PARAM_BUILD, buildNumber);+ params.set(PARAM_PATH, path);+ return params;+ }++}diff --git a/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactDownloadResourceReference.java b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactDownloadResourceReference.javanew file mode 100644index 0000000000..c41c4e9e78--- /dev/null+++ b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactDownloadResourceReference.java@@ -0,0 +1,19 @@+package io.onedev.server.plugin.artifact;++import org.apache.wicket.request.resource.IResource;+import org.apache.wicket.request.resource.ResourceReference;++public class ArtifactDownloadResourceReference extends ResourceReference {++ private static final long serialVersionUID = 1L;++ public ArtifactDownloadResourceReference() {+ super("build-artifact");+ }++ @Override+ public IResource getResource() {+ return new ArtifactDownloadResource();+ }++}diff --git a/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactModule.java b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactModule.javaindex 329ac41a69..937dd12025 100644--- a/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactModule.java+++ b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactModule.java@@ -18,6 +18,7 @@ import io.onedev.server.ci.job.JobOutcome;import io.onedev.server.model.Build;import io.onedev.server.web.WebApplicationConfigurator;import io.onedev.server.web.mapper.OnePageMapper;+import io.onedev.server.web.mapper.OneResourceMapper;import io.onedev.server.web.page.project.builds.detail.BuildTab;import io.onedev.server.web.page.project.builds.detail.BuildTabContribution;@@ -74,6 +75,8 @@ public class ArtifactModule extends AbstractPluginModule {@Overridepublic void configure(WebApplication application) {application.mount(new OnePageMapper("projects/${project}/builds/${build}/artifacts", BuildArtifactsPage.class));+ application.mount(new OneResourceMapper("downloads/projects/${project}/builds/${build}/artifacts/${path}",+ new ArtifactDownloadResourceReference()));}});diff --git a/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsCssResourceReference.java b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsCssResourceReference.javanew file mode 100644index 0000000000..f4354a22f7--- /dev/null+++ b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.plugin.artifact;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class BuildArtifactsCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public BuildArtifactsCssResourceReference() {+ super(BuildArtifactsCssResourceReference.class, "build-artifacts.css");+ }++}diff --git a/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.html b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.htmlindex 4dc78b2f67..21c7b6b32d 100644--- a/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.html+++ b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.html@@ -1,3 +1,6 @@<wicket:extend>- Build artifacts+ <div wicket:id="artifacts" class="build-artifacts"></div>+ <wicket:fragment wicket:id="contentFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.javaindex 6f7c94ee82..10b273be4e 100644--- a/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java+++ b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java@@ -1,7 +1,45 @@package io.onedev.server.plugin.artifact;+import java.io.File;+import java.io.FileFilter;+import java.util.ArrayList;+import java.util.Arrays;+import java.util.Comparator;+import java.util.Date;+import java.util.Iterator;+import java.util.List;++import org.apache.commons.io.FileUtils;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;+import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;+import org.apache.wicket.extensions.markup.html.repeater.tree.TableTree;+import org.apache.wicket.extensions.markup.html.repeater.tree.table.TreeColumn;+import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.ResourceLink;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.markup.repeater.OddEvenItem;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.OneDev;+import io.onedev.server.model.Build;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.storage.StorageManager;+import io.onedev.server.util.DateUtils;import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;@SuppressWarnings("serial")@@ -11,4 +49,151 @@ public class BuildArtifactsPage extends BuildDetailPage {super(params);}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }++ @Override+ public void onInitialize() {+ super.onInitialize();++ List<IColumn<File, Void>> columns = new ArrayList<>();++ columns.add(new TreeColumn<File, Void>(Model.of("Name")));+ columns.add(new AbstractColumn<File, Void>(Model.of("Size")) {++ @Override+ public void populateItem(Item<ICellPopulator<File>> cellItem, String componentId, IModel<File> rowModel) {+ File file = rowModel.getObject();+ if (file.isDirectory())+ cellItem.add(new Label(componentId, ""));+ else+ cellItem.add(new Label(componentId, FileUtils.byteCountToDisplaySize(file.length())));+ }++ });+ columns.add(new AbstractColumn<File, Void>(Model.of("Last Modified")) {++ @Override+ public void populateItem(Item<ICellPopulator<File>> cellItem, String componentId, IModel<File> rowModel) {+ File file = rowModel.getObject();+ cellItem.add(new Label(componentId, DateUtils.formatAge(new Date(file.lastModified()))));+ }++ });++ ITreeProvider<File> dataProvider = new ITreeProvider<File>() {++ @Override+ public void detach() {+ }++ @Override+ public Iterator<? extends File> getChildren(File node) {+ List<File> dirs = new ArrayList<File>(Arrays.asList(node.listFiles(new FileFilter() {++ @Override+ public boolean accept(File pathname) {+ return pathname.isDirectory();+ }++ })));+ dirs.sort(Comparator.comparing(File::getName));++ List<File> files = new ArrayList<File>(Arrays.asList(node.listFiles(new FileFilter() {++ @Override+ public boolean accept(File pathname) {+ return pathname.isFile();+ }++ })));+ files.sort(Comparator.comparing(File::getName));++ List<File> children = new ArrayList<>();+ children.addAll(dirs);+ children.addAll(files);++ return children.iterator();+ }++ @Override+ public Iterator<? extends File> getRoots() {+ return getChildren(getArtifactsDir());+ }++ @Override+ public boolean hasChildren(File node) {+ return node.isDirectory() && node.listFiles().length != 0;+ }++ @Override+ public IModel<File> model(File object) {+ return Model.of(object);+ }++ };++ add(new TableTree<File, Void>("artifacts", columns, dataProvider, Integer.MAX_VALUE) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getTable().addTopToolbar(new HeadersToolbar<Void>(getTable(), null));+ getTable().addBottomToolbar(new NoRecordsToolbar(getTable()));+ add(new HumanTheme());+ }++ @Override+ protected Item<File> newRowItem(String id, int index, IModel<File> model) {+ return new OddEvenItem<File>(id, index, model);+ }++ @Override+ protected Component newContentComponent(String id, IModel<File> model) {+ Fragment fragment = new Fragment(id, "contentFrag", BuildArtifactsPage.this);+ File file = model.getObject();+ WebMarkupContainer link;+ if (file.isDirectory()) {+ link = new AjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (getState(file) == State.EXPANDED)+ collapse(file);+ else+ expand(file);+ }++ };+ link.add(AttributeAppender.append("class", "folder"));+ } else {+ String artifactPath = getArtifactsDir().toURI().relativize(file.toURI()).getPath();+ PageParameters params = ArtifactDownloadResource.paramsOf(+ getBuild().getProject(), getBuild().getNumber(), artifactPath);+ link = new ResourceLink<Void>("link", new ArtifactDownloadResourceReference(), params);+ link.add(AttributeAppender.append("class", "file"));+ }+ link.add(new Label("label", file.getName()));+ fragment.add(link);++ return fragment;+ }++ });+ }++ private File getArtifactsDir() {+ Build build = getBuild();+ File buildDir = OneDev.getInstance(StorageManager.class).getBuildDir(build.getProject().getId(), build.getNumber());+ return new File(buildDir, JobArtifacts.DIR);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new BuildArtifactsCssResourceReference()));+ }+}diff --git a/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/build-artifacts.css b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/build-artifacts.cssnew file mode 100644index 0000000000..748c5fb9b0--- /dev/null+++ b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/build-artifacts.css@@ -0,0 +1,25 @@+.build-artifacts th, .build-artifacts td {+ padding: 8px;+ border-bottom: 1px solid #DDD;+}+.build-artifacts th.tree {+ padding-left: 18px;+}+.build-artifacts td.tree {+ padding-left: 0px;+}+.build-artifacts th {+ border-bottom-width: 2px;+}+.build-artifacts .tree-content>a:before {+ margin-right: 4px;+ width: 1.28571429em;+ text-align: center;+ font-family: "FontAwesome";+}+.build-artifacts .tree-content>a.folder:before {+ content: "\f114";+}+.build-artifacts .tree-content>a.file:before {+ content: "\f0f6";+}\ No newline at end of filediff --git a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportDownloadResource.java b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportDownloadResource.javanew file mode 100644index 0000000000..eb5227e054--- /dev/null+++ b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportDownloadResource.java@@ -0,0 +1,143 @@+package io.onedev.server.plugin.htmlreport;++import java.io.File;+import java.io.FileInputStream;+import java.io.IOException;+import java.io.InputStream;+import java.io.UnsupportedEncodingException;+import java.net.URLEncoder;+import java.nio.file.Files;+import java.util.ArrayList;+import java.util.List;+import java.util.concurrent.Callable;++import javax.persistence.EntityNotFoundException;++import org.apache.commons.lang3.StringUtils;+import org.apache.shiro.authz.UnauthorizedException;+import org.apache.tika.io.IOUtils;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.request.resource.AbstractResource;++import com.google.common.base.Charsets;+import com.google.common.base.Joiner;++import io.onedev.commons.utils.LockUtils;+import io.onedev.server.OneDev;+import io.onedev.server.OneException;+import io.onedev.server.ci.job.JobOutcome;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.storage.StorageManager;++public class HtmlReportDownloadResource extends AbstractResource {++ private static final long serialVersionUID = 1L;++ private static final String PARAM_PROJECT = "project";++ private static final String PARAM_BUILD = "build";++ private static final String PARAM_PATH = "path";++ @Override+ protected ResourceResponse newResourceResponse(Attributes attributes) {+ PageParameters params = attributes.getParameters();++ String projectName = params.get(PARAM_PROJECT).toString();+ if (StringUtils.isBlank(projectName))+ throw new IllegalArgumentException("project name has to be specified");++ Project project = OneDev.getInstance(ProjectManager.class).find(projectName);++ if (project == null)+ throw new EntityNotFoundException("Unable to find project: " + projectName);++ if (!SecurityUtils.canReadCode(project.getFacade()))+ throw new UnauthorizedException();++ Long buildNumber = params.get(PARAM_BUILD).toOptionalLong();++ if (buildNumber == null)+ throw new IllegalArgumentException("build number has to be specified");++ Build build = OneDev.getInstance(BuildManager.class).find(project, buildNumber);++ if (build == null) {+ String message = String.format("Unable to find build (project: %s, build number: %d)",+ project.getName(), buildNumber);+ throw new EntityNotFoundException(message);+ }++ List<String> pathSegments = new ArrayList<>();+ String pathSegment = params.get(PARAM_PATH).toString();+ if (pathSegment.length() != 0)+ pathSegments.add(pathSegment);+ else+ throw new OneException("Html report paah has to be specified");++ for (int i = 0; i < params.getIndexedCount(); i++) {+ pathSegment = params.get(i).toString();+ if (pathSegment.length() != 0)+ pathSegments.add(pathSegment);+ }++ String htmlPath = Joiner.on("/").join(pathSegments);++ File buildDir = OneDev.getInstance(StorageManager.class).getBuildDir(project.getId(), build.getNumber());+ File reportsDir = new File(buildDir, JobHtmlReport.DIR);+ File htmlFile = new File(reportsDir, htmlPath);+ if (!htmlFile.exists() || htmlFile.isDirectory()) {+ String message = String.format("Specified html path does not exist or is a directory (project: %s, build number: %d, path: %s)",+ project.getName(), build.getNumber(), htmlPath);+ throw new OneException(message);+ }++ ResourceResponse response = new ResourceResponse();+ try {+ response.setContentType(Files.probeContentType(htmlFile.toPath()));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }++ response.disableCaching();++ try {+ response.setFileName(URLEncoder.encode(htmlFile.getName(), Charsets.UTF_8.name()));+ } catch (UnsupportedEncodingException e) {+ throw new RuntimeException(e);+ }+ response.setWriteCallback(new WriteCallback() {++ @Override+ public void writeData(Attributes attributes) throws IOException {+ LockUtils.read(JobOutcome.getLockKey(build, JobHtmlReport.DIR), new Callable<Void>() {++ @Override+ public Void call() throws Exception {+ try (InputStream is = new FileInputStream(htmlFile)) {+ IOUtils.copy(is, attributes.getResponse().getOutputStream());+ }+ return null;+ }++ });+ }++ });++ return response;+ }++ public static PageParameters paramsOf(Project project, Long buildNumber, String path) {+ PageParameters params = new PageParameters();+ params.set(PARAM_PROJECT, project.getName());+ params.set(PARAM_BUILD, buildNumber);+ params.set(PARAM_PATH, path);+ return params;+ }++}diff --git a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportDownloadResourceReference.java b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportDownloadResourceReference.javanew file mode 100644index 0000000000..5da75e85ec--- /dev/null+++ b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportDownloadResourceReference.java@@ -0,0 +1,19 @@+package io.onedev.server.plugin.htmlreport;++import org.apache.wicket.request.resource.IResource;+import org.apache.wicket.request.resource.ResourceReference;++public class HtmlReportDownloadResourceReference extends ResourceReference {++ private static final long serialVersionUID = 1L;++ public HtmlReportDownloadResourceReference() {+ super("html-report");+ }++ @Override+ public IResource getResource() {+ return new HtmlReportDownloadResource();+ }++}diff --git a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportInfo.java b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportInfo.javadeleted file mode 100644index d5a9b00026..0000000000--- a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportInfo.java+++ /dev/null@@ -1,26 +0,0 @@-package io.onedev.server.plugin.htmlreport;--import java.io.Serializable;--public class HtmlReportInfo implements Serializable {-- private static final long serialVersionUID = 1L;-- private final String reportName;-- private final String startPage;-- public HtmlReportInfo(String reportName, String startPage) {- this.reportName = reportName;- this.startPage = startPage;- }-- public String getReportName() {- return reportName;- }-- public String getStartPage() {- return startPage;- }--}\ No newline at end of filediff --git a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportModule.java b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportModule.javaindex dc194b8d30..bdf19c648f 100644--- a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportModule.java+++ b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportModule.java@@ -1,12 +1,29 @@package io.onedev.server.plugin.htmlreport;+import java.io.File;+import java.util.ArrayList;import java.util.Collection;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.concurrent.Callable;++import org.apache.commons.lang3.SerializationUtils;+import org.apache.wicket.protocol.http.WebApplication;import com.google.common.collect.Sets;import io.onedev.commons.launcher.loader.AbstractPluginModule;import io.onedev.commons.launcher.loader.ImplementationProvider;+import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.LockUtils;import io.onedev.server.ci.job.JobOutcome;+import io.onedev.server.model.Build;+import io.onedev.server.web.WebApplicationConfigurator;+import io.onedev.server.web.mapper.OnePageMapper;+import io.onedev.server.web.mapper.OneResourceMapper;+import io.onedev.server.web.page.project.builds.detail.BuildTab;+import io.onedev.server.web.page.project.builds.detail.BuildTabContribution;public class HtmlReportModule extends AbstractPluginModule {@@ -27,6 +44,51 @@ public class HtmlReportModule extends AbstractPluginModule {}});++ contribute(BuildTabContribution.class, new BuildTabContribution() {++ @Override+ public List<BuildTab> getTabs(Build build) {+ List<BuildTab> tabs = new ArrayList<>();+ LockUtils.read(JobOutcome.getLockKey(build, JobHtmlReport.DIR), new Callable<Void>() {++ @Override+ public Void call() throws Exception {+ File startPagesFile = new File(JobOutcome.getOutcomeDir(build, JobHtmlReport.DIR), JobHtmlReport.START_PAGES);+ if (startPagesFile.exists()) {+ Map<String, String> startPages;+ if (startPagesFile.exists())+ startPages = SerializationUtils.deserialize(FileUtils.readFileToByteArray(startPagesFile));+ else+ startPages = new HashMap<>();+ for (String reportName: startPages.keySet())+ tabs.add(new HtmlReportTab(reportName));+ }+ return null;+ }++ });+ return tabs;+ }++ @Override+ public int getOrder() {+ return 200;+ }++ });++ contribute(WebApplicationConfigurator.class, new WebApplicationConfigurator() {++ @Override+ public void configure(WebApplication application) {+ application.mount(new OnePageMapper("projects/${project}/builds/${build}/html-reports/${report}", HtmlReportPage.class));+ application.mount(new OneResourceMapper("downloads/projects/${project}/builds/${build}/html-reports/${path}",+ new HtmlReportDownloadResourceReference()));+ }++ });+}}diff --git a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.html b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.htmlindex 1eb4168096..f7915ebf68 100644--- a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.html+++ b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.html@@ -1,3 +1,3 @@<wicket:extend>- Html report+ <iframe wicket:id="htmlReport" class="html-report"></iframe></wicket:extend>\ No newline at end of filediff --git a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.java b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.javaindex a4bb703cdc..f9d5c0c587 100644--- a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.java+++ b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.java@@ -1,14 +1,93 @@package io.onedev.server.plugin.htmlreport;+import java.io.File;+import java.util.HashMap;+import java.util.Map;+import java.util.concurrent.Callable;++import javax.annotation.Nullable;++import org.apache.commons.lang3.SerializationUtils;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnLoadHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.LockUtils;+import io.onedev.server.OneException;+import io.onedev.server.ci.job.JobOutcome;+import io.onedev.server.model.Build;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;+import io.onedev.server.web.util.QueryPosition;@SuppressWarnings("serial")public class HtmlReportPage extends BuildDetailPage {+ private static final String PARAM_REPORT = "report";++ private final String reportName;+public HtmlReportPage(PageParameters params) {super(params);++ reportName = params.get(PARAM_REPORT).toString();}+ @Override+ protected void onInitialize() {+ super.onInitialize();++ String startPage = LockUtils.read(JobOutcome.getLockKey(getBuild(), JobHtmlReport.DIR), new Callable<String>() {++ @Override+ public String call() throws Exception {+ Map<String, String> startPages;+ File infoFile = new File(JobOutcome.getOutcomeDir(getBuild(), JobHtmlReport.DIR), JobHtmlReport.START_PAGES);+ if (infoFile.exists())+ startPages = SerializationUtils.deserialize(FileUtils.readFileToByteArray(infoFile));+ else+ startPages = new HashMap<>();+ return startPages.get(reportName);+ }++ });++ if (startPage != null) {+ PageParameters params = HtmlReportDownloadResource.paramsOf(getProject(), getBuild().getNumber(), startPage);+ CharSequence startPageUrl = RequestCycle.get().urlFor(new HtmlReportDownloadResourceReference(), params);+ add(new WebMarkupContainer("htmlReport") {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new HtmlReportResourceReference()));+ String script = String.format("onedev.server.htmlReport.onWindowLoad('%s');", getMarkupId(true));+ response.render(OnLoadHeaderItem.forScript(script));+ }++ }.add(AttributeAppender.append("src", startPageUrl.toString())));+ } else {+ throw new OneException("Unable to find html report: " + reportName);+ }+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }++ public String getReportName() {+ return reportName;+ }++ public static PageParameters paramsOf(Build build, @Nullable QueryPosition position, String reportName) {+ PageParameters params = paramsOf(build, position);+ params.add(PARAM_REPORT, reportName);+ return params;+ }}diff --git a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportResourceReference.java b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportResourceReference.javanew file mode 100644index 0000000000..ffb75a2601--- /dev/null+++ b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportResourceReference.java@@ -0,0 +1,27 @@+package io.onedev.server.plugin.htmlreport;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class HtmlReportResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public HtmlReportResourceReference() {+ super(HtmlReportResourceReference.class, "html-report.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(+ HtmlReportResourceReference.class, "html-report.css")));+ return dependencies;+ }++}diff --git a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportTab.java b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportTab.javanew file mode 100644index 0000000000..026ac1bbb4--- /dev/null+++ b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportTab.java@@ -0,0 +1,45 @@+package io.onedev.server.plugin.htmlreport;++import org.apache.wicket.Component;+import org.apache.wicket.Page;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.tabbable.PageTabLink;+import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;+import io.onedev.server.web.page.project.builds.detail.BuildTab;++@SuppressWarnings("serial")+public class HtmlReportTab extends BuildTab {++ public HtmlReportTab(String reportName) {+ super(reportName, HtmlReportPage.class);+ }++ @Override+ public Component render(String componentId) {+ return new PageTabLink(componentId, this) {++ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ BuildDetailPage page = (BuildDetailPage) getPage();+ PageParameters params = HtmlReportPage.paramsOf(+ page.getBuild(), page.getPosition(), getTitle());+ return new ViewStateAwarePageLink<Void>(linkId, pageClass, params);+ }++ };+ }++ @Override+ public boolean isActive(Page currentPage) {+ if (super.isActive(currentPage)) {+ HtmlReportPage htmlReportPage = (HtmlReportPage) currentPage;+ return getTitle().equals(htmlReportPage.getReportName());+ } else {+ return false;+ }+ }++}diff --git a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/JobHtmlReport.java b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/JobHtmlReport.javaindex 76efb4c108..7fd96a4a35 100644--- a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/JobHtmlReport.java+++ b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/JobHtmlReport.java@@ -2,7 +2,8 @@ package io.onedev.server.plugin.htmlreport;import java.io.File;import java.io.IOException;-import java.util.ArrayList;+import java.util.HashMap;+import java.util.LinkedHashMap;import java.util.concurrent.Callable;import org.apache.commons.lang3.SerializationUtils;@@ -20,9 +21,9 @@ public class JobHtmlReport extends JobOutcome {private static final long serialVersionUID = 1L;- public static final String DIR = "html";+ public static final String DIR = "html-reports";- public static final String INFO = "$onedev-htmlreport-info$";+ public static final String START_PAGES = "$onedev-htmlreport-startpages$";private String reportName;@@ -59,14 +60,14 @@ public class JobHtmlReport extends JobOutcome {public Void call() throws Exception {File startPage = new File(workspace, getStartPage());if (startPage.exists()) {- ArrayList<HtmlReportInfo> infos;- File infoFile = new File(outcomeDir, INFO);- if (infoFile.exists())- infos = SerializationUtils.deserialize(FileUtils.readFileToByteArray(infoFile));+ HashMap<String, String> startPages;+ File startPagesFile = new File(outcomeDir, START_PAGES);+ if (startPagesFile.exists())+ startPages = SerializationUtils.deserialize(FileUtils.readFileToByteArray(startPagesFile));else- infos = new ArrayList<>();- infos.add(new HtmlReportInfo(getReportName(), getStartPage()));- FileUtils.writeByteArrayToFile(infoFile, SerializationUtils.serialize(infos));+ startPages = new LinkedHashMap<>();+ startPages.put(getReportName(), getStartPage());+ FileUtils.writeByteArrayToFile(startPagesFile, SerializationUtils.serialize(startPages));int baseLen = workspace.getAbsolutePath().length() + 1;for (File file: getPatternSet().listFiles(workspace)) {diff --git a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/html-report.css b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/html-report.cssnew file mode 100644index 0000000000..d28cf5b3c4--- /dev/null+++ b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/html-report.css@@ -0,0 +1,5 @@+.html-report {+ width: 100%;+ border: 2px solid #BBB;+ border-radius: 4px;+}\ No newline at end of filediff --git a/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/html-report.js b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/html-report.jsnew file mode 100644index 0000000000..c89d67a2f5--- /dev/null+++ b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/html-report.js@@ -0,0 +1,10 @@+onedev.server.htmlReport = {+ onWindowLoad: function(htmlReportId) {+ function setReportHeight() {+ var $htmlReport = $("#" + htmlReportId);+ $htmlReport.height($(window).height() - $htmlReport.offset().top - 20);+ }+ setReportHeight();+ $(window).resize(setReportHeight);+ }+}\ No newline at end of file