The Unified and Autonomous Development Platform
Add build detail page and build log page
Robin Shenacca9aa81cc2
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex ce87e735dc..246789b00c 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -82,12 +82,12 @@ import io.onedev.server.cache.DefaultUserInfoManager;import io.onedev.server.cache.UserInfoManager;import io.onedev.server.ci.detector.CISpecDetector;import io.onedev.server.ci.job.DefaultJobScheduler;+import io.onedev.server.ci.job.DependencyPopulator;import io.onedev.server.ci.job.JobScheduler;import io.onedev.server.ci.job.log.DefaultLogManager;import io.onedev.server.ci.job.log.LogManager;import io.onedev.server.ci.job.log.instruction.LogInstruction;import io.onedev.server.ci.job.log.normalizer.LogNormalizer;-import io.onedev.server.ci.job.outcome.DependencyPopulator;import io.onedev.server.command.ApplyDBConstraintsCommand;import io.onedev.server.command.BackupDBCommand;import io.onedev.server.command.CheckDataVersionCommand;diff --git a/core/src/main/java/io/onedev/server/ci/detector/MavenDetector.java b/core/src/main/java/io/onedev/server/ci/detector/MavenDetector.javaindex 4e4f91451a..4807d83608 100644--- a/core/src/main/java/io/onedev/server/ci/detector/MavenDetector.java+++ b/core/src/main/java/io/onedev/server/ci/detector/MavenDetector.java@@ -9,17 +9,17 @@ import io.onedev.server.ci.CISpec;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.cache.JobCache;import io.onedev.server.ci.job.trigger.BranchPushedTrigger;+import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;-import io.onedev.server.git.exception.ObjectNotFoundException;import io.onedev.server.model.Project;public class MavenDetector implements CISpecDetector {@Overridepublic CISpec detect(Project project, ObjectId commitId) {- try {- project.getBlob(new BlobIdent(commitId.name(), "pom.xml", FileMode.TYPE_FILE));+ Blob blob = project.getBlob(new BlobIdent(commitId.name(), "pom.xml", FileMode.TYPE_FILE), false);+ if (blob != null) {CISpec ciSpec = new CISpec();Job job = new Job();@@ -44,9 +44,9 @@ public class MavenDetector implements CISpecDetector {ciSpec.getJobs().add(job);return ciSpec;- } catch (ObjectNotFoundException e) {+ } else {return null;- }+ }}@Overridediff --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 b3406bebf9..335c2521f0 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@@ -38,8 +38,6 @@ import io.onedev.server.ci.CISpec;import io.onedev.server.ci.Dependency;import io.onedev.server.ci.InvalidCISpecException;import io.onedev.server.ci.job.log.LogManager;-import io.onedev.server.ci.job.outcome.DependencyPopulator;-import io.onedev.server.ci.job.outcome.JobOutcome;import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.entitymanager.BuildManager;diff --git a/core/src/main/java/io/onedev/server/ci/job/outcome/DependencyPopulator.java b/core/src/main/java/io/onedev/server/ci/job/DependencyPopulator.javasimilarity index 78%rename from core/src/main/java/io/onedev/server/ci/job/outcome/DependencyPopulator.javarename to core/src/main/java/io/onedev/server/ci/job/DependencyPopulator.javaindex 4c825999f7..602c125c57 100644--- a/core/src/main/java/io/onedev/server/ci/job/outcome/DependencyPopulator.java+++ b/core/src/main/java/io/onedev/server/ci/job/DependencyPopulator.java@@ -1,4 +1,4 @@-package io.onedev.server.ci.job.outcome;+package io.onedev.server.ci.job;import java.io.File;diff --git a/core/src/main/java/io/onedev/server/ci/job/Job.java b/core/src/main/java/io/onedev/server/ci/job/Job.javaindex 430673e6d0..bcbb6e2019 100644--- a/core/src/main/java/io/onedev/server/ci/job/Job.java+++ b/core/src/main/java/io/onedev/server/ci/job/Job.java@@ -14,7 +14,6 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.ci.Dependency;import io.onedev.server.ci.job.cache.JobCache;import io.onedev.server.ci.job.log.LogLevel;-import io.onedev.server.ci.job.outcome.JobOutcome;import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.event.ProjectEvent;import io.onedev.server.util.inputspec.InputSpec;diff --git a/core/src/main/java/io/onedev/server/ci/job/outcome/JobOutcome.java b/core/src/main/java/io/onedev/server/ci/job/JobOutcome.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/ci/job/outcome/JobOutcome.javarename to core/src/main/java/io/onedev/server/ci/job/JobOutcome.javaindex aba0b17da2..0169507b65 100644--- a/core/src/main/java/io/onedev/server/ci/job/outcome/JobOutcome.java+++ b/core/src/main/java/io/onedev/server/ci/job/JobOutcome.java@@ -1,4 +1,4 @@-package io.onedev.server.ci.job.outcome;+package io.onedev.server.ci.job;import java.io.File;import java.io.Serializable;diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 60e6c7e313..4e4efcc900 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -274,7 +274,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestString merged = Preconditions.checkNotNull(preview.getMerged());ObjectId mergedId = ObjectId.fromString(merged);- RevCommit mergedCommit = request.getTargetProject().getRevCommit(mergedId);+ RevCommit mergedCommit = request.getTargetProject().getRevCommit(mergedId, true);PersonIdent committer = new PersonIdent(OneDev.NAME, "");diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.javaindex 8559baad53..d0ef425484 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java@@ -64,7 +64,7 @@ public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullR.setRemote(request.getSourceProject().getGitDir().getAbsolutePath()).setRefSpecs(new RefSpec(GitUtils.branch2ref(request.getSourceBranch()) + ":" + update.getHeadRef())).call();- if (!request.getTargetProject().getObjectId(update.getHeadRef()).equals(updateHeadId)) {+ if (!request.getTargetProject().getObjectId(update.getHeadRef(), true).equals(updateHeadId)) {RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(),update.getHeadRef());refUpdate.setNewObjectId(updateHeadId);diff --git a/core/src/main/java/io/onedev/server/model/CodeComment.java b/core/src/main/java/io/onedev/server/model/CodeComment.javaindex a72a7ef326..24074614f9 100644--- a/core/src/main/java/io/onedev/server/model/CodeComment.java+++ b/core/src/main/java/io/onedev/server/model/CodeComment.java@@ -216,14 +216,14 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupp@Nullablepublic TextRange mapRange(BlobIdent blobIdent) {- RevCommit commit = project.getRevCommit(blobIdent.revision);+ RevCommit commit = project.getRevCommit(blobIdent.revision, true);if (commit.name().equals(getMarkPos().getCommit())) {return getMarkPos().getRange();} else {List<String> newLines = GitUtils.readLines(getProject().getRepository(),commit, blobIdent.path, WhitespaceOption.DEFAULT);List<String> oldLines = GitUtils.readLines(getProject().getRepository(),- project.getRevCommit(getMarkPos().getCommit()), getMarkPos().getPath(),+ project.getRevCommit(getMarkPos().getCommit(), true), getMarkPos().getPath(),WhitespaceOption.DEFAULT);return DiffUtils.mapRange(DiffUtils.mapLines(oldLines, newLines), getMarkPos().getRange());}@@ -245,7 +245,7 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupptreeWalk.getRawMode(0));Blob newBlob = new Blob(blobIdent, blobId, treeWalk.getObjectReader());Blob oldBlob = project.getBlob(new BlobIdent(markPos.getCommit(),- markPos.getPath(), FileMode.REGULAR_FILE.getBits()));+ markPos.getPath(), FileMode.REGULAR_FILE.getBits()), true);Preconditions.checkState(oldBlob != null && oldBlob.getText() != null);List<String> oldLines = new ArrayList<>();diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex 05426f51cc..10a7865b30 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -276,7 +276,7 @@ public class Project extends AbstractEntity {private transient Repository repository;- private transient Map<BlobIdent, Blob> blobCache;+ private transient Map<BlobIdent, Optional<Blob>> blobCache;private transient Map<String, Optional<ObjectId>> objectIdCache;@@ -516,7 +516,7 @@ public class Project extends AbstractEntity {defaultBranchOptional = null;}- private Map<BlobIdent, Blob> getBlobCache() {+ private Map<BlobIdent, Optional<Blob>> getBlobCache() {if (blobCache == null) {synchronized(this) {if (blobCache == null)@@ -542,43 +542,51 @@ public class Project extends AbstractEntity {* ObjectNotFoundException if blob of specified ident can not be found in repository**/- public Blob getBlob(BlobIdent blobIdent) {+ @Nullable+ public Blob getBlob(BlobIdent blobIdent, boolean mustExist) {Preconditions.checkArgument(blobIdent.revision!=null && blobIdent.path!=null && blobIdent.mode!=null,"Revision, path and mode of ident param should be specified");- Blob blob = getBlobCache().get(blobIdent);+ Optional<Blob> blob = getBlobCache().get(blobIdent);if (blob == null) {try (RevWalk revWalk = new RevWalk(getRepository())) {- ObjectId revId = getObjectId(blobIdent.revision);+ ObjectId revId = getObjectId(blobIdent.revision, true);RevTree revTree = revWalk.parseCommit(revId).getTree();TreeWalk treeWalk = TreeWalk.forPath(getRepository(), blobIdent.path, revTree);if (treeWalk != null) {ObjectId blobId = treeWalk.getObjectId(0);if (blobIdent.isGitLink()) {String url = getSubmodules(blobIdent.revision).get(blobIdent.path);- if (url == null)- throw new ObjectNotFoundException("Unable to find submodule '" + blobIdent.path + "' in .gitmodules");- String hash = blobId.name();- blob = new Blob(blobIdent, blobId, new Submodule(url, hash).toString().getBytes());+ if (url == null) {+ if (mustExist)+ throw new ObjectNotFoundException("Unable to find submodule '" + blobIdent.path + "' in .gitmodules");+ else+ blob = Optional.absent();+ } else {+ String hash = blobId.name();+ blob = Optional.of(new Blob(blobIdent, blobId, new Submodule(url, hash).toString().getBytes()));+ }} else if (blobIdent.isTree()) {throw new NotFileException("Path '" + blobIdent.path + "' is a tree");} else {- blob = new Blob(blobIdent, blobId, treeWalk.getObjectReader());+ blob = Optional.of(new Blob(blobIdent, blobId, treeWalk.getObjectReader()));}- getBlobCache().put(blobIdent, blob);- } else {+ } else if (mustExist) {throw new ObjectNotFoundException("Unable to find blob path '" + blobIdent.path + "' in revision '" + blobIdent.revision + "'");+ } else {+ blob = Optional.absent();}+ getBlobCache().put(blobIdent, blob);} catch (IOException e) {throw new RuntimeException(e);}}- return blob;+ return blob.orNull();}public InputStream getInputStream(BlobIdent ident) {try (RevWalk revWalk = new RevWalk(getRepository())) {- ObjectId commitId = getObjectId(ident.revision);+ ObjectId commitId = getObjectId(ident.revision, true);RevTree revTree = revWalk.parseCommit(commitId).getTree();TreeWalk treeWalk = TreeWalk.forPath(getRepository(), ident.path, revTree);if (treeWalk != null) {@@ -619,10 +627,6 @@ public class Project extends AbstractEntity {return optional.orNull();}- public ObjectId getObjectId(String revision) {- return getObjectId(revision, true);- }-public void cacheObjectId(String revision, @Nullable ObjectId objectId) {if (objectIdCache == null)objectIdCache = new HashMap<>();@@ -646,10 +650,10 @@ public class Project extends AbstractEntity {ciSpecCache = new HashMap<>();Optional<CISpec> ciSpecOpt = ciSpecCache.get(commitId);if (ciSpecOpt == null) {- try {- Blob blob = getBlob(new BlobIdent(commitId.name(), CISpec.BLOB_PATH, FileMode.TYPE_FILE));+ Blob blob = getBlob(new BlobIdent(commitId.name(), CISpec.BLOB_PATH, FileMode.TYPE_FILE), false);+ if (blob != null) {ciSpecOpt = Optional.of(CISpec.parse(blob.getBytes()));- } catch (ObjectNotFoundException e) {+ } else {List<CISpecDetector> detectors = new ArrayList<>(OneDev.getExtensions(CISpecDetector.class));detectors.sort(Comparator.comparing(CISpecDetector::getPriority));CISpec ciSpec = null;@@ -666,7 +670,7 @@ public class Project extends AbstractEntity {}public List<String> getJobNames() {- CISpec ciSpec = getCISpec(getObjectId(getDefaultBranch()));+ CISpec ciSpec = getCISpec(getObjectId(getDefaultBranch(), true));if (ciSpec != null) {List<String> jobNames = new ArrayList<>(ciSpec.getJobMap().keySet());Collections.sort(jobNames);@@ -730,7 +734,7 @@ public class Project extends AbstractEntity {cache = null;}- final AnyObjectId commitId = getObjectId(revision);+ final AnyObjectId commitId = getObjectId(revision, true);long time = System.currentTimeMillis();LastCommitsOfChildren lastCommits = new LastCommitsOfChildren(getRepository(), commitId, path, cache);@@ -796,10 +800,6 @@ public class Project extends AbstractEntity {}}- public RevCommit getRevCommit(String revision) {- return getRevCommit(revision, true);- }-@Nullablepublic RevCommit getRevCommit(ObjectId revId, boolean mustExist) {if (commitCache == null)@@ -820,10 +820,6 @@ public class Project extends AbstractEntity {return commit;}- public RevCommit getRevCommit(ObjectId revId) {- return getRevCommit(revId, true);- }-public List<Ref> getRefs(String prefix) {try {return getRepository().getRefDatabase().getRefsByPrefix(prefix);@@ -835,7 +831,7 @@ public class Project extends AbstractEntity {public Map<String, String> getSubmodules(String revision) {Map<String, String> submodules = new HashMap<>();- Blob blob = getBlob(new BlobIdent(revision, ".gitmodules", FileMode.REGULAR_FILE.getBits()));+ Blob blob = getBlob(new BlobIdent(revision, ".gitmodules", FileMode.REGULAR_FILE.getBits()), true);String content = new String(blob.getBytes());String path = null;@@ -861,7 +857,7 @@ public class Project extends AbstractEntity {public void deleteBranch(String branch) {String refName = GitUtils.branch2ref(branch);- ObjectId commitId = getObjectId(refName);+ ObjectId commitId = getObjectId(refName, true);try {git().branchDelete().setForce(true).setBranchNames(branch).call();} catch (Exception e) {@@ -897,8 +893,8 @@ public class Project extends AbstractEntity {try {CreateBranchCommand command = git().branchCreate();command.setName(branchName);- RevCommit commit = getRevCommit(branchRevision);- command.setStartPoint(getRevCommit(branchRevision));+ RevCommit commit = getRevCommit(branchRevision, true);+ command.setStartPoint(getRevCommit(branchRevision, true));command.call();String refName = GitUtils.branch2ref(branchName);cacheObjectId(refName, commit);@@ -939,7 +935,7 @@ public class Project extends AbstractEntity {if (tagMessage != null)tag.setMessage(tagMessage);tag.setTagger(taggerIdent);- tag.setObjectId(getRevCommit(tagRevision));+ tag.setObjectId(getRevCommit(tagRevision, true));tag.call();String refName = GitUtils.tag2ref(tagName);@@ -976,7 +972,7 @@ public class Project extends AbstractEntity {public void deleteTag(String tag) {String refName = GitUtils.tag2ref(tag);- ObjectId commitId = getRevCommit(refName).getId();+ ObjectId commitId = getRevCommit(refName, true).getId();try {git().tagDelete().setTags(tag).call();} catch (GitAPIException e) {@@ -1145,7 +1141,7 @@ public class Project extends AbstractEntity {}public List<BlobIdent> getChildren(BlobIdent blobIdent, BlobIdentFilter blobIdentFilter) {- return getChildren(blobIdent, blobIdentFilter, getObjectId(blobIdent.revision));+ return getChildren(blobIdent, blobIdentFilter, getObjectId(blobIdent.revision, true));}public List<BlobIdent> getChildren(BlobIdent blobIdent, BlobIdentFilter blobIdentFilter, ObjectId commitId) {@@ -1177,7 +1173,7 @@ public class Project extends AbstractEntity {public int getMode(String revision, @Nullable String path) {if (path != null) {- RevCommit commit = getRevCommit(revision);+ RevCommit commit = getRevCommit(revision, true);try {TreeWalk treeWalk = TreeWalk.forPath(getRepository(), path, commit.getTree());if (treeWalk != null) {diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.javaindex 305beaf59b..a0562c0c34 100644--- a/core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java@@ -314,11 +314,11 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach}public RevCommit getBaseCommit() {- return getTargetProject().getRevCommit(ObjectId.fromString(getBaseCommitHash()));+ return getTargetProject().getRevCommit(ObjectId.fromString(getBaseCommitHash()), true);}public RevCommit getHeadCommit() {- return getTargetProject().getRevCommit(ObjectId.fromString(getHeadCommitHash()));+ return getTargetProject().getRevCommit(ObjectId.fromString(getHeadCommitHash()), true);}/**diff --git a/core/src/main/java/io/onedev/server/model/PullRequestUpdate.java b/core/src/main/java/io/onedev/server/model/PullRequestUpdate.javaindex b0478e7efe..9072627dc6 100644--- a/core/src/main/java/io/onedev/server/model/PullRequestUpdate.java+++ b/core/src/main/java/io/onedev/server/model/PullRequestUpdate.java@@ -249,7 +249,7 @@ public class PullRequestUpdate extends AbstractEntity {}public RevCommit getHeadCommit() {- return request.getWorkProject().getRevCommit(ObjectId.fromString(getHeadCommitHash()));+ return request.getWorkProject().getRevCommit(ObjectId.fromString(getHeadCommitHash()), true);}}diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.javaindex 8f2701c239..195ab8004f 100644--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java@@ -252,11 +252,6 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDafor (CacheAllocation allocation: allocations) {if (allocation.isWorkspace()) {workspaceCache = allocation.getInstance();- try {- FileUtils.copyDirectory(workspace, workspaceCache);- } catch (IOException e) {- throw new RuntimeException(e);- }break;}}@@ -267,7 +262,15 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDalogger.info("Cloning source code...");snapshot.checkout(effectiveWorkspace);}-++ if (workspaceCache != null) {+ try {+ FileUtils.copyDirectory(workspace, workspaceCache);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+cmd.addArgs("-v", effectiveWorkspace.getAbsolutePath() + ":" + dockerWorkspacePath);for (CacheAllocation allocation: allocations) {if (!allocation.isWorkspace())diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/SourceSnapshot.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/SourceSnapshot.javaindex 8332a71b48..8d2c1f008c 100644--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/SourceSnapshot.java+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/SourceSnapshot.java@@ -8,9 +8,7 @@ import org.eclipse.jgit.api.errors.GitAPIException;import org.eclipse.jgit.lib.ObjectId;import io.onedev.commons.utils.ExceptionUtils;-import io.onedev.server.ci.job.cache.JobCache;import io.onedev.server.git.command.CheckoutCommand;-import io.onedev.server.git.command.CleanCommand;import io.onedev.server.git.command.FetchCommand;import io.onedev.server.model.Project;@@ -41,7 +39,6 @@ public class SourceSnapshot {public void checkout(File dir) {if (new File(dir, ".git").exists()) {try (Git git = Git.open(dir)) {- new CleanCommand(dir).options("-d", "-f", "--exclude", JobCache.LOCK_FILE).call();fetchAndCheckout(dir);} catch (IOException e) {throw new RuntimeException(e);diff --git a/core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java b/core/src/main/java/io/onedev/server/notification/CommitNotificationManager.javaindex 3d51bca57d..850e369634 100644--- a/core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java+++ b/core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java@@ -73,7 +73,7 @@ public class CommitNotificationManager {}}- RevCommit commit = project.getRevCommit(event.getNewCommitId());+ RevCommit commit = project.getRevCommit(event.getNewCommitId(), true);String subject = String.format("Subscribed commit at ref '%s': %s", event.getRefName(), commit.getShortMessage());String url = urlManager.urlFor(project, commit);String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);diff --git a/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java b/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.javaindex 3041c92a62..9325285429 100644--- a/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java+++ b/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java@@ -150,7 +150,7 @@ public class CommitQueryUtils {public static boolean matches(RefUpdated event, User user, @Nullable String queryString) {if (!event.getNewCommitId().equals(ObjectId.zeroId())) {Project project = event.getProject();- RevCommit commit = project.getRevCommit(event.getNewCommitId());+ RevCommit commit = project.getRevCommit(event.getNewCommitId(), true);QueryContext query = parse(queryString);if (query != null && query.ALL() == null) {diff --git a/core/src/main/java/io/onedev/server/util/DateUtils.java b/core/src/main/java/io/onedev/server/util/DateUtils.javaindex 6c8f132059..aefc9a3397 100644--- a/core/src/main/java/io/onedev/server/util/DateUtils.java+++ b/core/src/main/java/io/onedev/server/util/DateUtils.java@@ -5,6 +5,7 @@ import java.util.List;import javax.annotation.Nullable;+import org.apache.commons.lang3.time.DurationFormatUtils;import org.joda.time.DateTime;import org.ocpsoft.prettytime.PrettyTime;@@ -43,4 +44,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {return null;}+ public static String formatDuration(long durationMillis) {+ return DurationFormatUtils.formatDurationWords(durationMillis, true, true);+ }}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex 903bfa2d1c..ce04da22fc 100644--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -46,8 +46,10 @@ import io.onedev.server.web.page.project.NoCommitsPage;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.branches.ProjectBranchesPage;-import io.onedev.server.web.page.project.builds.BuildListPage;-import io.onedev.server.web.page.project.builds2.detail.BuildDetailPage;+import io.onedev.server.web.page.project.builds.detail.BuildChangesPage;+import io.onedev.server.web.page.project.builds.detail.BuildLogPage;+import io.onedev.server.web.page.project.builds.detail.FixedIssuesPage;+import io.onedev.server.web.page.project.builds.list.BuildListPage;import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;@@ -229,7 +231,10 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("projects/${project}/issues/${issue}/activities", IssueActivitiesPage.class));add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));add(new OnePageMapper("projects/${project}/builds", BuildListPage.class));- add(new OnePageMapper("projects/${project}/builds/${build}", BuildDetailPage.class));+ add(new OnePageMapper("projects/${project}/builds/${build}", BuildLogPage.class));+ add(new OnePageMapper("projects/${project}/builds/${build}/log", BuildLogPage.class));+ add(new OnePageMapper("projects/${project}/builds/${build}/changes", BuildChangesPage.class));+ add(new OnePageMapper("projects/${project}/builds/${build}/fixed-issues", FixedIssuesPage.class));add(new OnePageMapper("projects/${project}/milestones", MilestoneListPage.class));add(new OnePageMapper("projects/${project}/milestones/${milestone}", MilestoneDetailPage.class));add(new OnePageMapper("projects/${project}/milestones/${milestone}/edit", MilestoneEditPage.class));diff --git a/core/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageBehavior.javaindex 867f58e830..feb634e57b 100644--- a/core/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageBehavior.java@@ -24,7 +24,7 @@ public abstract class BlameMessageBehavior extends AbstractPostAjaxBehavior {String tooltipId = params.getParameterValue("tooltip").toString();String commitHash = params.getParameterValue("commit").toString();- RevCommit commit = getProject().getRevCommit(commitHash);+ RevCommit commit = getProject().getRevCommit(commitHash, true);String authoring;if (commit.getAuthorIdent() != null) {authoring = commit.getAuthorIdent().getName();diff --git a/core/src/main/java/io/onedev/server/web/component/BlobIcon.java b/core/src/main/java/io/onedev/server/web/component/blob/BlobIcon.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/web/component/BlobIcon.javarename to core/src/main/java/io/onedev/server/web/component/blob/BlobIcon.javaindex 0a34510edb..72675e9aa1 100644--- a/core/src/main/java/io/onedev/server/web/component/BlobIcon.java+++ b/core/src/main/java/io/onedev/server/web/component/blob/BlobIcon.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component;+package io.onedev.server.web.component.blob;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebComponent;diff --git a/core/src/main/java/io/onedev/server/web/component/blobpicker/BlobPicker.html b/core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/component/blobpicker/BlobPicker.htmlrename to core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.htmldiff --git a/core/src/main/java/io/onedev/server/web/component/blobpicker/BlobPicker.java b/core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/web/component/blobpicker/BlobPicker.javarename to core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.javaindex bf5847bb2e..1b81cac8b7 100644--- a/core/src/main/java/io/onedev/server/web/component/blobpicker/BlobPicker.java+++ b/core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.blobpicker;+package io.onedev.server.web.component.blob;import java.util.Iterator;import java.util.List;@@ -24,7 +24,6 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.BlobIdentFilter;import io.onedev.server.model.Project;-import io.onedev.server.web.component.BlobIcon;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;@SuppressWarnings("serial")diff --git a/core/src/main/java/io/onedev/server/web/component/blobpicker/BlobPickerResourceReference.java b/core/src/main/java/io/onedev/server/web/component/blob/BlobPickerResourceReference.javasimilarity index 85%rename from core/src/main/java/io/onedev/server/web/component/blobpicker/BlobPickerResourceReference.javarename to core/src/main/java/io/onedev/server/web/component/blob/BlobPickerResourceReference.javaindex 3e809c34dc..07239fcfab 100644--- a/core/src/main/java/io/onedev/server/web/component/blobpicker/BlobPickerResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/component/blob/BlobPickerResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.blobpicker;+package io.onedev.server.web.component.blob;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;diff --git a/core/src/main/java/io/onedev/server/web/component/blobpicker/blob-picker.css b/core/src/main/java/io/onedev/server/web/component/blob/blob-picker.csssimilarity index 100%rename from core/src/main/java/io/onedev/server/web/component/blobpicker/blob-picker.cssrename to core/src/main/java/io/onedev/server/web/component/blob/blob-picker.cssdiff --git a/core/src/main/java/io/onedev/server/web/component/build/BuildTitleLabel.java b/core/src/main/java/io/onedev/server/web/component/build/BuildTitleLabel.javanew file mode 100644index 0000000000..a49f6ca6e1--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/build/BuildTitleLabel.java@@ -0,0 +1,27 @@+package io.onedev.server.web.component.build;++import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;++import io.onedev.server.model.Build;++@SuppressWarnings("serial")+public class BuildTitleLabel extends Label {++ public BuildTitleLabel(String id, IModel<Build> model) {+ super(id, new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ Build build = model.getObject();+ if (build.getVersion() != null)+ return "#" + build.getNumber() + " (" + build.getVersion() + ")";+ else+ return "#" + build.getNumber();+ }++ });+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.htmlindex 6ca5eeb0e5..df250b8b34 100644--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html@@ -17,14 +17,13 @@<div class="body"><div wicket:id="feedback"></div><table wicket:id="builds" class="table"></table>- <div class="help-block"><i class="fa fa-info-circle"></i> This page lists builds containig recent commits fixing the issue</div></div></div>- <wicket:fragment wicket:id="numberFrag">+ <wicket:fragment wicket:id="linkFrag"><a wicket:id="link"><span wicket:id="label"></span></a>- </wicket:fragment>+ </wicket:fragment><wicket:fragment wicket:id="statusFrag">- <span wicket:id="icon"></span> <span wicket:id="name"></span>+ <span wicket:id="icon"></span> <span wicket:id="label"></span></wicket:fragment><wicket:fragment wicket:id="commitFrag"><a wicket:id="hashLink" class="hash"><span wicket:id="hash"></span></a>diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 49c0116c21..2013fabdb5 100644--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -17,6 +17,7 @@ import org.apache.wicket.event.Broadcast;import org.apache.wicket.event.IEvent;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.DataTable;import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;import org.apache.wicket.markup.ComponentTag;@@ -31,6 +32,7 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.markup.repeater.OddEvenItem;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;@@ -56,15 +58,19 @@ import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.BuildQueryBehavior;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;+import io.onedev.server.web.component.build.BuildTitleLabel;import io.onedev.server.web.component.build.status.BuildStatusIcon;+import io.onedev.server.web.component.build.status.BuildStatusLabel;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;+import io.onedev.server.web.component.job.JobLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.page.project.builds2.detail.BuildDetailPage;+import io.onedev.server.web.page.project.builds.detail.BuildLogPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.savedquery.SavedQueriesClosed;import io.onedev.server.web.page.project.savedquery.SavedQueriesOpened;import io.onedev.server.web.util.PagingHistorySupport;+import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QuerySaveSupport;import io.onedev.server.web.util.VisibleVisitor;@@ -96,6 +102,8 @@ public abstract class BuildListPanel extends GenericPanel<String> {};+ private DataTable<Build, Void> buildsTable;+private SortableDataProvider<Build, Void> dataProvider;public BuildListPanel(String id, IModel<String> queryModel) {@@ -272,22 +280,16 @@ public abstract class BuildListPanel extends GenericPanel<String> {@Overridepublic void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId, IModel<Build> rowModel) {- Fragment fragment = new Fragment(componentId, "numberFrag", BuildListPanel.this);+ Fragment fragment = new Fragment(componentId, "linkFrag", BuildListPanel.this);Build build = rowModel.getObject();Long buildId = build.getId();- Link<Void> link = new BookmarkablePageLink<Void>("link", BuildDetailPage.class, BuildDetailPage.paramsOf(build));- link.add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- Build build = OneDev.getInstance(BuildManager.class).load(buildId);- if (build.getVersion() != null)- return "#" + build.getNumber() + " (" + build.getVersion() + ")";- else- return "#" + build.getNumber();- }-- }) {++ OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);+ QueryPosition position = new QueryPosition(parsedQueryModel.getObject().toString(), (int)buildsTable.getItemCount(),+ (int)buildsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());++ Link<Void> link = new BookmarkablePageLink<Void>("link", BuildLogPage.class, BuildLogPage.paramsOf(build, position));+ link.add(new BuildTitleLabel("label", rowModel) {@Overrideprotected void onInitialize() {@@ -315,14 +317,7 @@ public abstract class BuildListPanel extends GenericPanel<String> {fragment.add(new BuildStatusIcon("icon", rowModel));Long buildId = rowModel.getObject().getId();- fragment.add(new Label("name", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return StringUtils.capitalize(rowModel.getObject().getStatus().name().replace('_', ' ').toLowerCase());- }-- }) {+ fragment.add(new BuildStatusLabel("label", rowModel) {@Overrideprotected void onInitialize() {@@ -346,7 +341,19 @@ public abstract class BuildListPanel extends GenericPanel<String> {@Overridepublic void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,IModel<Build> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getJobName()));+ Build build = rowModel.getObject();+ Fragment fragment = new Fragment(componentId, "linkFrag", BuildListPanel.this);+ Link<Void> link = new JobLink("link", new AbstractReadOnlyModel<Project>() {++ @Override+ public Project getObject() {+ return getProject();+ }++ }, build.getCommitHash(), build.getJobName());+ link.add(new Label("label", build.getJobName()));+ fragment.add(link);+ cellItem.add(fragment);}});@@ -389,7 +396,7 @@ public abstract class BuildListPanel extends GenericPanel<String> {}});- add(new HistoryAwareDataTable<Build, Void>("builds", columns, dataProvider,+ add(buildsTable = new HistoryAwareDataTable<Build, Void>("builds", columns, dataProvider,WebConstants.PAGE_SIZE, getPagingHistorySupport()));setOutputMarkupId(true);diff --git a/core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java b/core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.javaindex b777b3f7d1..8ba3b24860 100644--- a/core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java@@ -24,7 +24,7 @@ import io.onedev.server.web.behavior.WebSocketObserver;@SuppressWarnings("serial")public class BuildLogPanel extends GenericPanel<Build> {- private static final int MAX_LOG_ENTRIES = 5000;+ private static final int MAX_LOG_ENTRIES = 1000;private int nextOffset;@@ -92,7 +92,7 @@ public class BuildLogPanel extends GenericPanel<Build> {nextOffset = snippet.offset + snippet.entries.size();- String script = String.format("onedev.server.buildLog.appendLogEntries('%s', %s, %d);",+ String script = String.format("onedev.server.buildLog.onDomReady('%s', %s, %d);",getMarkupId(), asJSON(snippet.entries), MAX_LOG_ENTRIES);response.render(OnDomReadyHeaderItem.forScript(script));diff --git a/core/src/main/java/io/onedev/server/web/component/build/log/BuildLogResourceReference.java b/core/src/main/java/io/onedev/server/web/component/build/log/BuildLogResourceReference.javaindex 6aecd04106..b74f1b97b2 100644--- a/core/src/main/java/io/onedev/server/web/component/build/log/BuildLogResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/component/build/log/BuildLogResourceReference.java@@ -7,6 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import io.onedev.server.web.asset.moment.MomentResourceReference;+import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;@@ -21,6 +22,7 @@ public class BuildLogResourceReference extends BaseDependentResourceReference {@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new MomentResourceReference()));dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(BuildLogResourceReference.class, "build-log.css")));diff --git a/core/src/main/java/io/onedev/server/web/component/build/log/build-log.css b/core/src/main/java/io/onedev/server/web/component/build/log/build-log.cssindex 63ae839b16..f1ef9e1a08 100644--- a/core/src/main/java/io/onedev/server/web/component/build/log/build-log.css+++ b/core/src/main/java/io/onedev/server/web/component/build/log/build-log.css@@ -1,9 +1,8 @@.build-log {overflow: auto;- height: 600px;background: black;color: white;- border-radius: 4px;+ position: relative;}.build-log>.log-entry.ERROR {color: red;@@ -23,7 +22,7 @@.build-log>.log-entry>.message {padding-right: 0;}-.build-log>.too-many-entries {+.build-log>.too-many-entries, .build-log>.no-entries {color: red;font-size: 16px;font-weight: bold;diff --git a/core/src/main/java/io/onedev/server/web/component/build/log/build-log.js b/core/src/main/java/io/onedev/server/web/component/build/log/build-log.jsindex c0bfb20d82..7086fd27fb 100644--- a/core/src/main/java/io/onedev/server/web/component/build/log/build-log.js+++ b/core/src/main/java/io/onedev/server/web/component/build/log/build-log.js@@ -1,4 +1,12 @@onedev.server.buildLog = {+ onDomReady: function(containerId, logEntries, maxNumOfLogEntries) {+ var $buildLog = $("#" + containerId + ">.build-log");+ var ps = new PerfectScrollbar($buildLog[0]);+ $(window).resize(function() {+ ps.update();+ });+ onedev.server.buildLog.appendLogEntries(containerId, logEntries, maxNumOfLogEntries);+ },renderLogEntry: function(logEntry) {return "<div class='log-entry " + logEntry.level + "'>" +"<span class='date'>" + moment(logEntry.date).format("HH:mm:ss") + "</span>" +@@ -9,19 +17,24 @@ onedev.server.buildLog = {appendLogEntries: function(containerId, logEntries, maxNumOfLogEntries) {var $buildLog = $("#" + containerId + ">.build-log");- for (var i=0; i<logEntries.length; i++) {+ for (var i=0; i<logEntries.length; i++)$buildLog.append(onedev.server.buildLog.renderLogEntry(logEntries[i]));- }var $logEntries = $buildLog.children(".log-entry");var numOfEntriesToRemove = $logEntries.length - maxNumOfLogEntries;if (numOfEntriesToRemove > 0) {$logEntries.slice(0, numOfEntriesToRemove).remove();- if ($buildLog.children(".too-many-entries").length == 0) {+ if ($buildLog.children(".too-many-entries").length == 0)$buildLog.prepend("<div class='too-many-entries'>Too many log entries, displaying recent " + maxNumOfLogEntries + "</div>")- }+ }+ if ($logEntries.length == 0) {+ if ($buildLog.children(".no-entries").length == 0)+ $buildLog.prepend("<div class='no-entries'>No log entries</div>");+ } else {+ $buildLog.children(".no-entries").remove();}+$buildLog.scrollTop($buildLog[0].scrollHeight);}diff --git a/core/src/main/java/io/onedev/server/web/component/build/side/BuildSideCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/build/side/BuildSideCssResourceReference.javanew file mode 100644index 0000000000..b3b2de9fe1--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/build/side/BuildSideCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.build.side;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class BuildSideCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public BuildSideCssResourceReference() {+ super(BuildSideCssResourceReference.class, "build-side.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html b/core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.htmlnew file mode 100644index 0000000000..3cc8bbbee4--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html@@ -0,0 +1,72 @@+<wicket:panel>+ <div class="build-side">+ <div wicket:id="buildNav" class="nav"></div>+ <div wicket:id="general" class="general table">+ <div class="commit">+ <div class="name">Commit</div>+ <div class="value">+ <a wicket:id="commitHash" class="hash"><span wicket:id="label"></span></a>+ <a wicket:id="copyCommitHash" class="copy"><i class="fa fa-clipboard"></i></a>+ </div>+ </div>+ <div>+ <div class="name">Job</div>+ <div class="value">+ <a wicket:id="job"><span wicket:id="label"></span></a>+ </div>+ </div>+ <div>+ <div class="name">Submitted By</div>+ <div class="value">+ <a wicket:id="submitter"></a>+ </div>+ </div>+ <div>+ <div class="name">Submitted At</div>+ <div class="value"><span wicket:id="submitDate"></span></div>+ </div>+ <wicket:enclosure child="waitingInQueue">+ <div>+ <div class="name">Waiting in Queue</div>+ <div class="value"><span wicket:id="waitingInQueue"></span></div>+ </div>+ </wicket:enclosure>+ <wicket:enclosure child="runningTakes">+ <div>+ <div class="name">Running Takes</div>+ <div class="value"><span wicket:id="runningTakes"></span></div>+ </div>+ </wicket:enclosure>+ <wicket:enclosure child="canceller">+ <div>+ <div class="name">Cancelled By</div>+ <div class="value">+ <a wicket:id="canceller"></a>+ </div>+ </div>+ </wicket:enclosure>+ </div>+ <wicket:enclosure child="params">+ <div class="params table">+ <div wicket:id="params">+ <div wicket:id="name" class="name"></div>+ <div wicket:id="value" class="value"></div>+ </div>+ </div>+ </wicket:enclosure>+ <div wicket:id="dependences" class="dependences">+ <wicket:enclosure child="dependencies">+ Depends on <a wicket:id="dependencies"><span wicket:id="label"></span></a>+ </wicket:enclosure>+ <span wicket:id="comma">, </span>+ <wicket:enclosure child="dependents">+ <a wicket:id="dependents"><span wicket:id="label"></span></a> depends on me+ </wicket:enclosure>+ </div>+ <wicket:enclosure child="delete">+ <div class="actions">+ <a wicket:id="delete" class="delete btn btn-danger btn-sm"><i class="fa fa-trash"></i> Delete</a>+ </div>+ </wicket:enclosure>+ </div>+</wicket:panel>diff --git a/core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javanew file mode 100644index 0000000000..617dd91db4--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -0,0 +1,268 @@+package io.onedev.server.web.component.build.side;++import java.util.ArrayList;+import java.util.Comparator;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.AjaxSelfUpdatingTimerBehavior;+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.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.util.time.Duration;+import org.eclipse.jgit.revwalk.RevCommit;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Build;+import io.onedev.server.model.BuildParam;+import io.onedev.server.model.Project;+import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.search.entity.build.BuildQuery;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.DateUtils;+import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.userident.UserIdent;+import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;+import io.onedev.server.web.component.entity.nav.EntityNavPanel;+import io.onedev.server.web.component.job.JobLink;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.user.ident.UserIdentPanel;+import io.onedev.server.web.page.project.builds.list.BuildListPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.util.QueryPositionSupport;++@SuppressWarnings("serial")+public abstract class BuildSidePanel extends Panel {++ public BuildSidePanel(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new EntityNavPanel<Build>("buildNav") {++ @Override+ protected EntityQuery<Build> parse(String queryString) {+ return BuildQuery.parse(getProject(), queryString, true);+ }++ @Override+ protected Build getEntity() {+ return getBuild();+ }++ @Override+ protected List<Build> query(EntityQuery<Build> query, int offset, int count) {+ return getBuildManager().query(getProject(), SecurityUtils.getUser(), query, offset, count);+ }++ @Override+ protected QueryPositionSupport<Build> getQueryPositionSupport() {+ return BuildSidePanel.this.getQueryPositionSupport();+ }++ });++ WebMarkupContainer general = new WebMarkupContainer("general");+ general.add(new AjaxSelfUpdatingTimerBehavior(Duration.ONE_SECOND) {++ @Override+ protected void onPostProcessTarget(AjaxRequestTarget target) {+ super.onPostProcessTarget(target);+ if (getBuild().isFinished())+ stop(target);+ }++ });+ general.setOutputMarkupId(true);+ add(general);++ RevCommit commit = getProject().getRevCommit(getBuild().getCommitHash(), true);+ CommitDetailPage.State commitState = new CommitDetailPage.State();+ commitState.revision = commit.name();+ PageParameters pageParams = CommitDetailPage.paramsOf(getProject(), commitState);++ Link<Void> hashLink = new ViewStateAwarePageLink<Void>("commitHash", CommitDetailPage.class, pageParams);+ hashLink.add(new Label("label", GitUtils.abbreviateSHA(commit.name())));+ general.add(hashLink);++ general.add(new WebMarkupContainer("copyCommitHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));++ Link<Void> jobLink = new JobLink("job", new AbstractReadOnlyModel<Project>() {++ @Override+ public Project getObject() {+ return getProject();+ }++ }, getBuild().getCommitHash(), getBuild().getJobName());+ jobLink.add(new Label("label", getBuild().getJobName()));+ general.add(jobLink);++ UserIdent submitter = UserIdent.of(UserFacade.of(getBuild().getSubmitter()), getBuild().getSubmitterName());+ general.add(new UserIdentPanel("submitter", submitter, UserIdentPanel.Mode.AVATAR_AND_NAME));++ UserIdent canceller = UserIdent.of(UserFacade.of(getBuild().getCanceller()), getBuild().getCancellerName());+ general.add(new UserIdentPanel("canceller", canceller, UserIdentPanel.Mode.AVATAR_AND_NAME) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getBuild().getCanceller() != null || getBuild().getCancellerName() != null);+ }++ });++ general.add(new Label("submitDate", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return DateUtils.formatAge(getBuild().getSubmitDate());+ }++ }));++ general.add(new Label("waitingInQueue", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ long duration;+ if (getBuild().getRunningDate() != null)+ duration = getBuild().getRunningDate().getTime() - getBuild().getQueueingDate().getTime();+ else+ duration = System.currentTimeMillis() - getBuild().getQueueingDate().getTime();+ return DateUtils.formatDuration(duration);+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getBuild().getQueueingDate() != null);+ }++ });++ general.add(new Label("runningTakes", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ long duration;+ if (getBuild().getFinishDate() != null)+ duration = getBuild().getFinishDate().getTime() - getBuild().getRunningDate().getTime();+ else+ duration = System.currentTimeMillis() - getBuild().getRunningDate().getTime();+ return DateUtils.formatDuration(duration);+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getBuild().getRunningDate() != null);+ }++ });++ add(new ListView<BuildParam>("params", new LoadableDetachableModel<List<BuildParam>>() {++ @Override+ protected List<BuildParam> load() {+ List<BuildParam> params = new ArrayList<>(getBuild().getParams());+ params.sort(Comparator.comparing(BuildParam::getName));+ return params;+ }++ }) {++ @Override+ protected void populateItem(ListItem<BuildParam> item) {+ BuildParam param = item.getModelObject();+ item.add(new Label("name", param.getName()));+ item.add(new Label("value", param.getValue()));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getBuild().getParams().isEmpty());+ }++ });++ WebMarkupContainer dependencesContainer = new WebMarkupContainer("dependences");+ add(dependencesContainer);++ Link<Void> dependentsLink = new BookmarkablePageLink<Void>("dependents", BuildListPage.class,+ BuildListPage.paramsOf(getProject(), "depends on " + BuildQuery.quote("#" + getBuild().getNumber())));+ dependentsLink.setVisible(!getBuild().getDependents().isEmpty());++ if (getBuild().getDependents().size() > 1)+ dependentsLink.add(new Label("label", getBuild().getDependents().size() + " builds"));+ else+ dependentsLink.add(new Label("label", getBuild().getDependents().size() + " build"));++ dependencesContainer.add(dependentsLink);++ Link<Void> dependenciesLink = new BookmarkablePageLink<Void>("dependencies", BuildListPage.class,+ BuildListPage.paramsOf(getProject(), "dependencies of " + BuildQuery.quote("#" + getBuild().getNumber())));+ dependenciesLink.setVisible(!getBuild().getDependencies().isEmpty());+ if (getBuild().getDependencies().size() > 1)+ dependenciesLink.add(new Label("label", getBuild().getDependencies().size() + " builds"));+ else+ dependenciesLink.add(new Label("label", getBuild().getDependencies().size() + " build"));+ dependencesContainer.add(dependenciesLink);++ WebMarkupContainer comma = new WebMarkupContainer("comma");+ comma.setVisible(dependenciesLink.isVisible() && dependentsLink.isVisible());+ dependencesContainer.add(comma);++ dependencesContainer.setVisible(dependentsLink.isVisible() || dependenciesLink.isVisible());++ add(newDeleteLink("delete"));++ setOutputMarkupId(true);+ }++ private Project getProject() {+ return getBuild().getProject();+ }++ private BuildManager getBuildManager() {+ return OneDev.getInstance(BuildManager.class);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new BuildSideCssResourceReference()));+ }++ protected abstract Build getBuild();++ @Nullable+ protected abstract QueryPositionSupport<Build> getQueryPositionSupport();++ protected abstract Component newDeleteLink(String componentId);++}diff --git a/core/src/main/java/io/onedev/server/web/component/build/side/build-side.css b/core/src/main/java/io/onedev/server/web/component/build/side/build-side.cssnew file mode 100644index 0000000000..3e4ceb60df--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/build/side/build-side.css@@ -0,0 +1,24 @@+.build-side>* {+ margin-bottom: 20px;+ border-top: 1px solid #E8E8E8;+ padding-top: 20px;+}+.build-side>div:first-child {+ border-top: none;+ padding-top: 0;+}+.build-side>.table {+ width: 100%;+ display: table;+}+.build-side>.table>div {+ display: table-row;+}+.build-side>.table>div>div {+ display: table-cell;+ padding: 8px 0;+}+.build-side>.table>div>div.name {+ padding-right: 12px;+ width: 50%;+}diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.java b/core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.javaindex 3d606a68a8..25e91a52a1 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.java@@ -13,7 +13,8 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import io.onedev.server.model.Build;-import io.onedev.server.web.page.project.builds2.detail.BuildDetailPage;+import io.onedev.server.web.component.build.BuildTitleLabel;+import io.onedev.server.web.page.project.builds.detail.BuildLogPage;@SuppressWarnings("serial")public class BuildDetailPanel extends GenericPanel<List<Build>> {@@ -30,8 +31,8 @@ public class BuildDetailPanel extends GenericPanel<List<Build>> {Build build = item.getModelObject();item.add(new Label("job", build.getJobName()));- Link<Void> link = new BookmarkablePageLink<Void>("number", BuildDetailPage.class, BuildDetailPage.paramsOf(build));- link.add(new Label("label", "#" + build.getNumber()));+ Link<Void> link = new BookmarkablePageLink<Void>("number", BuildLogPage.class, BuildLogPage.paramsOf(build, null));+ link.add(new BuildTitleLabel("label", item.getModel()));item.add(link);}diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java b/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.javaindex 932735c599..8e338d57aa 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java+++ b/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java@@ -47,29 +47,19 @@ public class BuildStatusIcon extends GenericPanel<Build> {title = "Build is being queued due to limited capacity";} else if (build.getStatus() == Status.IN_ERROR) {cssClass += "fa-warning";- if (build.getStatusMessage() != null)- title = build.getStatusMessage();- else- title = "Build is in error";+ title = "Build is in error";} else if (build.getStatus() == Status.FAILED) {cssClass += "fa-times";title = "Build is failed";- if (build.getStatusMessage() != null)- title = build.getStatusMessage();- else- title = "Build is failed";} else if (build.getStatus() == Status.RUNNING) {- cssClass += "fa-circle";+ cssClass += "fa-circle-o-notch fa-spin";title = "Build is running";} else if (build.getStatus() == Status.SUCCESSFUL) {- cssClass += "fa-check";+ cssClass += "fa-check-circle";title = "Build is successful";} else if (build.getStatus() == Status.CANCELLED) {cssClass += "fa-ban";- if (build.getStatusMessage() != null)- title = build.getStatusMessage();- else- title = "Build is cancelled";+ title = "Build is cancelled";} else if (build.getStatus() == Status.TIMED_OUT) {cssClass += "fa-clock-o";title = "Build timed out";diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusLabel.java b/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusLabel.javanew file mode 100644index 0000000000..c5751b3638--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusLabel.java@@ -0,0 +1,30 @@+package io.onedev.server.web.component.build.status;++import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.model.Build;++@SuppressWarnings("serial")+public class BuildStatusLabel extends Label {++ public BuildStatusLabel(String id, IModel<Build> model) {+ super(id, new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return StringUtils.capitalize(model.getObject().getStatus().name().replace('_', ' ').toLowerCase());+ }++ @Override+ public void detach() {+ model.detach();+ super.detach();+ }++ });+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildsStatusPanel.java b/core/src/main/java/io/onedev/server/web/component/build/status/BuildsStatusPanel.javaindex d047353869..2f37f68721 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/BuildsStatusPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/status/BuildsStatusPanel.java@@ -79,10 +79,10 @@ public class BuildsStatusPanel extends GenericPanel<List<Build>> {cssClass += "fa-hourglass-1 " + Status.QUEUEING.name().toLowerCase();title = "Some builds are queueing, click for details";} else if (hasStatus(builds, Status.RUNNING)) {- cssClass += "fa-circle " + Status.RUNNING.name().toLowerCase();+ cssClass += "fa-circle-o-notch fa-spin " + Status.RUNNING.name().toLowerCase();title = "Some builds are running, click for details";} else {- cssClass += "fa-check " + Status.SUCCESSFUL.name().toLowerCase();+ cssClass += "fa-check-circle " + Status.SUCCESSFUL.name().toLowerCase();title = "Builds are successful, click for details";}tag.put("class", cssClass);diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.java b/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.javaindex 2adc221ec5..d2ef852312 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.java@@ -23,7 +23,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestBuild;-import io.onedev.server.web.page.project.builds2.detail.BuildDetailPage;+import io.onedev.server.web.page.project.builds.detail.BuildLogPage;import io.onedev.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")@@ -84,7 +84,7 @@ public class PullRequestBuildsPanel extends GenericPanel<PullRequest> {}));- Link<Void> link = new BookmarkablePageLink<Void>("number", BuildDetailPage.class, BuildDetailPage.paramsOf(build.getBuild()));+ Link<Void> link = new BookmarkablePageLink<Void>("number", BuildLogPage.class, BuildLogPage.paramsOf(build.getBuild(), null));link.add(new Label("label", "#" + build.getBuild().getNumber()));item.add(link);} else {diff --git a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex 67ca20ca60..5698d9b003 100644--- a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -145,8 +145,7 @@ public class CommitListPanel extends Panel {labelsView.add(new Label(labelsView.newChildId(), label));fragment.add(labelsView);- fragment.add(new ContributorPanel("contribution",- commit.getAuthorIdent(), commit.getCommitterIdent(), true));+ fragment.add(new ContributorPanel("contribution", commit.getAuthorIdent(), commit.getCommitterIdent()));fragment.add(new BuildsStatusPanel("buildStatus",new LoadableDetachableModel<List<Build>>() {diff --git a/core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.html b/core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.htmlindex 9b9e20f0a3..5cc5b98f59 100644--- a/core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.html@@ -1,8 +1,9 @@<wicket:panel><span class="contributor"><a wicket:id="author" class="name"></a>- <wicket:enclosure child="committer">- committed with <a wicket:id="committer" class="name"></a>+ committed+ <wicket:enclosure child="committer">+ with <a wicket:id="committer" class="name"></a></wicket:enclosure><span wicket:id="date"></span></span>diff --git a/core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java b/core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.javaindex 18f8ca6254..24f0118d1d 100644--- a/core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java@@ -19,13 +19,10 @@ public class ContributorPanel extends Panel {private final PersonIdent committer;- private final boolean withDate;-- public ContributorPanel(String id, PersonIdent author, PersonIdent committer, boolean withDate) {+ public ContributorPanel(String id, PersonIdent author, PersonIdent committer) {super(id);this.author = author;this.committer = committer;- this.withDate = withDate;}@Override@@ -39,10 +36,7 @@ public class ContributorPanel extends Panel {} else {add(new UserIdentPanel("committer", UserIdent.of(committer), Mode.NAME));}- if (withDate)- add(new Label("date", DateUtils.formatAge(committer.getWhen())));- else- add(new WebMarkupContainer("date").setVisible(false));+ add(new Label("date", DateUtils.formatAge(committer.getWhen())));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.javaindex 3f0f06e783..ec989f1c08 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java@@ -477,7 +477,7 @@ public class TextDiffPanel extends Panel implements SourceAware {if (oldRev.equals(ObjectId.zeroId().name().toString())) {return ObjectId.zeroId();} else {- return projectModel.getObject().getRevCommit(oldRev);+ return projectModel.getObject().getRevCommit(oldRev, true);}}@@ -486,7 +486,7 @@ public class TextDiffPanel extends Panel implements SourceAware {if (newRev.equals(ObjectId.zeroId().name().toString())) {return ObjectId.zeroId();} else {- return projectModel.getObject().getRevCommit(newRev);+ return projectModel.getObject().getRevCommit(newRev, true);}}diff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex 52ef2fe9fc..07def7ba76 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -139,8 +139,8 @@ public class RevisionDiffPanel extends Panel {@Overrideprotected List<DiffEntry> load() {- AnyObjectId oldRevId = projectModel.getObject().getObjectId(oldRev);- AnyObjectId newRevId = projectModel.getObject().getObjectId(newRev);+ AnyObjectId oldRevId = projectModel.getObject().getObjectId(oldRev, true);+ AnyObjectId newRevId = projectModel.getObject().getObjectId(newRev, true);return GitUtils.diff(projectModel.getObject().getRepository(), oldRevId, newRevId);}@@ -159,7 +159,7 @@ public class RevisionDiffPanel extends Panel {@Overridepublic Blob getBlob(BlobIdent blobIdent) {- return projectModel.getObject().getBlob(blobIdent);+ return projectModel.getObject().getBlob(blobIdent, true);}};@@ -177,7 +177,7 @@ public class RevisionDiffPanel extends Panel {@Overridepublic Blob getBlob(BlobIdent blobIdent) {- return projectModel.getObject().getBlob(blobIdent);+ return projectModel.getObject().getBlob(blobIdent, true);}});@@ -193,7 +193,7 @@ public class RevisionDiffPanel extends Panel {@Overridepublic Blob getBlob(BlobIdent blobIdent) {- return projectModel.getObject().getBlob(blobIdent);+ return projectModel.getObject().getBlob(blobIdent, true);}});@@ -260,7 +260,7 @@ public class RevisionDiffPanel extends Panel {@Overridepublic Blob getBlob(BlobIdent blobIdent) {- return projectModel.getObject().getBlob(blobIdent);+ return projectModel.getObject().getBlob(blobIdent, true);}};@@ -1261,7 +1261,7 @@ public class RevisionDiffPanel extends Panel {if (oldRev.equals(ObjectId.zeroId().name().toString())) {return ObjectId.zeroId();} else {- return projectModel.getObject().getRevCommit(oldRev);+ return projectModel.getObject().getRevCommit(oldRev, true);}}@@ -1269,7 +1269,7 @@ public class RevisionDiffPanel extends Panel {if (newRev.equals(ObjectId.zeroId().name().toString())) {return ObjectId.zeroId();} else {- return projectModel.getObject().getRevCommit(newRev);+ return projectModel.getObject().getRevCommit(newRev, true);}}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex fed3af23c9..fe64c9da60 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -38,7 +38,7 @@ import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.builds2.detail.BuildDetailPage;+import io.onedev.server.web.page.project.builds.detail.BuildLogPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;@@ -84,7 +84,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {Build build = OneDev.getInstance(BuildManager.class).get(Long.valueOf(value));if (build != null) {Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);- Link<Void> link = new BookmarkablePageLink<Void>("link", BuildDetailPage.class, BuildDetailPage.paramsOf(build));+ Link<Void> link = new BookmarkablePageLink<Void>("link", BuildLogPage.class, BuildLogPage.paramsOf(build, null));link.add(new Label("label", "#" + build.getNumber()));linkFrag.add(link);item.add(linkFrag);diff --git a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.htmlindex 69c89eefef..099d88b907 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html@@ -20,16 +20,4 @@</div></form></wicket:fragment>- <wicket:fragment wicket:id="titleEditFrag">- <div wicket:id="feedback"></div>- <form wicket:id="form" class="form-inline clearable-wrapper">- <input wicket:id="title" type="text" placeholder="Input title" class="form-control">- <input wicket:id="save" type="submit" value="Save" class="btn btn-primary"/>- <input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default"/>- </form>- </wicket:fragment>- <wicket:fragment wicket:id="titleViewFrag">- <span wicket:id="title"></span>- <a wicket:id="edit" title="Edit title" class="edit"><i class="fa fa-pencil"></i></a>- </wicket:fragment></wicket:panel>diff --git a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.javaindex c5bf914759..2fd37ae09d 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java@@ -48,9 +48,9 @@ import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.util.inputspec.dateinput.DateInput;import io.onedev.server.web.component.issue.IssueStateLabel;import io.onedev.server.web.component.markdown.AttachmentSupport;-import io.onedev.server.web.component.moreinfoside.MoreInfoSideClosed;-import io.onedev.server.web.component.moreinfoside.MoreInfoSideOpened;import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.component.sideinfo.SideInfoClosed;+import io.onedev.server.web.component.sideinfo.SideInfoOpened;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.util.ProjectAttachmentSupport;@@ -211,8 +211,8 @@ public abstract class IssueOperationsPanel extends Panel {@Overridepublic void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof MoreInfoSideClosed) {- MoreInfoSideClosed moreInfoSideClosed = (MoreInfoSideClosed) event.getPayload();+ if (event.getPayload() instanceof SideInfoClosed) {+ SideInfoClosed moreInfoSideClosed = (SideInfoClosed) event.getPayload();setVisible(true);moreInfoSideClosed.getHandler().add(this);}@@ -222,7 +222,7 @@ public abstract class IssueOperationsPanel extends Panel {public void onClick(AjaxRequestTarget target) {setVisible(false);target.add(this);- send(getPage(), Broadcast.BREADTH, new MoreInfoSideOpened(target));+ send(getPage(), Broadcast.BREADTH, new SideInfoOpened(target));}}.setOutputMarkupPlaceholderTag(true));diff --git a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSideCssResourceReference.javasimilarity index 54%rename from core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoCssResourceReference.javarename to core/src/main/java/io/onedev/server/web/component/issue/side/IssueSideCssResourceReference.javaindex 8bf5e08543..043ddcc79e 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoCssResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSideCssResourceReference.java@@ -2,12 +2,12 @@ package io.onedev.server.web.component.issue.side;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;-public class IssueInfoCssResourceReference extends BaseDependentCssResourceReference {+public class IssueSideCssResourceReference extends BaseDependentCssResourceReference {private static final long serialVersionUID = 1L;- public IssueInfoCssResourceReference() {- super(IssueInfoCssResourceReference.class, "issue-info.css");+ public IssueSideCssResourceReference() {+ super(IssueSideCssResourceReference.class, "issue-side.css");}}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.htmlsimilarity index 99%rename from core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.htmlrename to core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.htmlindex 3583eac567..ba81f5cddf 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="issue-info">+ <div class="issue-side"><div wicket:id="issueNav" class="nav"></div><div wicket:id="fields" class="fields"></div><div class="milestone">diff --git a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.javarename to core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.javaindex 6620baa61c..112283a42a 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java@@ -73,11 +73,11 @@ import io.onedev.server.web.util.QueryPositionSupport;import io.onedev.server.web.util.ajaxlistener.AppendLoadingIndicatorListener;@SuppressWarnings("serial")-public abstract class IssueInfoPanel extends Panel {+public abstract class IssueSidePanel extends Panel {private static final int MAX_DISPLAY_AVATARS = 20;- public IssueInfoPanel(String id) {+ public IssueSidePanel(String id) {super(id);}@@ -104,7 +104,7 @@ public abstract class IssueInfoPanel extends Panel {@Overrideprotected QueryPositionSupport<Issue> getQueryPositionSupport() {- return IssueInfoPanel.this.getQueryPositionSupport();+ return IssueSidePanel.this.getQueryPositionSupport();}});@@ -173,7 +173,7 @@ public abstract class IssueInfoPanel extends Panel {@Overrideprotected Issue getIssue() {- return IssueInfoPanel.this.getIssue();+ return IssueSidePanel.this.getIssue();}@Override@@ -205,7 +205,7 @@ public abstract class IssueInfoPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- Fragment fragment = new Fragment("fields", "fieldsEditFrag", IssueInfoPanel.this);+ Fragment fragment = new Fragment("fields", "fieldsEditFrag", IssueSidePanel.this);Form<?> form = new Form<Void>("form");Class<?> fieldBeanClass = IssueUtils.defineBeanClass(getProject());@@ -225,7 +225,7 @@ public abstract class IssueInfoPanel extends Panel {Map<String, Object> fieldValues = IssueUtils.getFieldValues(beanEditor.getOneContext(), fieldBean, getIssue().getFieldNames());OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldValues, SecurityUtils.getUser());Component fieldsContainer = newFieldsContainer();- IssueInfoPanel.this.replace(fieldsContainer);+ IssueSidePanel.this.replace(fieldsContainer);target.add(fieldsContainer);}@@ -242,7 +242,7 @@ public abstract class IssueInfoPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {Component fieldsContainer = newFieldsContainer();- IssueInfoPanel.this.replace(fieldsContainer);+ IssueSidePanel.this.replace(fieldsContainer);target.add(fieldsContainer);}@@ -250,7 +250,7 @@ public abstract class IssueInfoPanel extends Panel {fragment.add(form);fragment.setOutputMarkupId(true);- IssueInfoPanel.this.replace(fragment);+ IssueSidePanel.this.replace(fragment);target.add(fragment);}@@ -294,7 +294,7 @@ public abstract class IssueInfoPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- Fragment fragment = new Fragment("milestone", "milestoneEditFrag", IssueInfoPanel.this);+ Fragment fragment = new Fragment("milestone", "milestoneEditFrag", IssueSidePanel.this);Form<?> form = new Form<Void>("form");IModel<Map<String, String>> choicesModel = new LoadableDetachableModel<Map<String, String>>() {@@ -330,7 +330,7 @@ public abstract class IssueInfoPanel extends Panel {Milestone milestone = getProject().getMilestone(milestoneName);getIssueChangeManager().changeMilestone(getIssue(), milestone, SecurityUtils.getUser());Component container = newMilestoneContainer();- IssueInfoPanel.this.replace(container);+ IssueSidePanel.this.replace(container);target.add(container);}@@ -340,14 +340,14 @@ public abstract class IssueInfoPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {Component container = newMilestoneContainer();- IssueInfoPanel.this.replace(container);+ IssueSidePanel.this.replace(container);target.add(container);}});fragment.add(form);fragment.setOutputMarkupId(true);- IssueInfoPanel.this.replace(fragment);+ IssueSidePanel.this.replace(fragment);target.add(fragment);}@@ -506,7 +506,7 @@ public abstract class IssueInfoPanel extends Panel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new IssueInfoCssResourceReference()));+ response.render(CssHeaderItem.forReference(new IssueSideCssResourceReference()));}protected abstract Issue getIssue();diff --git a/core/src/main/java/io/onedev/server/web/component/issue/side/issue-info.css b/core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.csssimilarity index 55%rename from core/src/main/java/io/onedev/server/web/component/issue/side/issue-info.cssrename to core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.cssindex 8cfe0807d2..fdef3be610 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/side/issue-info.css+++ b/core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css@@ -1,42 +1,42 @@-.issue-info>div>.head {+.issue-side>div>.head {font-weight: bold;margin-bottom: 16px;}-.issue-info>div .body>* {+.issue-side>div .body>* {margin-bottom: 16px;}-.issue-info>div>.body a.avatar {+.issue-side>div>.body a.avatar {margin-right: 8px;}-.issue-info>div>.body .field-values a.avatar {+.issue-side>div>.body .field-values a.avatar {margin-right: 0;}-.issue-info>* {+.issue-side>* {margin-bottom: 20px;border-top: 1px solid #E8E8E8;padding-top: 20px;}-.issue-info>div:first-child {+.issue-side>div:first-child {border-top: none;padding-top: 0;}-.issue-info .fields td {+.issue-side .fields td {padding-bottom: 12px;vertical-align: top;}-.issue-info .fields tr:last-child td {+.issue-side .fields tr:last-child td {padding-bottom: 0;}-.issue-info .fields td.name {+.issue-side .fields td.name {white-space: nowrap;padding-right: 20px;}-.issue-info a.action {+.issue-side a.action {margin-top: 0;margin-left: 8px;color: #666;}-.issue-info .milestone>.body>.progress {+.issue-side .milestone>.body>.progress {margin-top: 20px;}diff --git a/core/src/main/java/io/onedev/server/web/component/job/JobLink.java b/core/src/main/java/io/onedev/server/web/component/job/JobLink.javanew file mode 100644index 0000000000..e72964460a--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/job/JobLink.java@@ -0,0 +1,69 @@+package io.onedev.server.web.component.job;++import java.io.UnsupportedEncodingException;+import java.net.URLEncoder;++import org.apache.commons.io.Charsets;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.model.IModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.FileMode;++import io.onedev.server.ci.CISpec;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;++@SuppressWarnings("serial")+public class JobLink extends BookmarkablePageLink<Void> {++ private final IModel<Project> projectModel;++ private final String revision;++ private final String jobName;++ public JobLink(String id, IModel<Project> projectModel, String revision, String jobName) {+ super(id, ProjectBlobPage.class);+ this.projectModel = projectModel;+ this.revision = revision;+ this.jobName = jobName;+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(SecurityUtils.canReadCode(projectModel.getObject().getFacade()));+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (!isEnabled())+ tag.setName("span");+ }++ @Override+ protected void onDetach() {+ projectModel.detach();+ super.onDetach();+ }++ @Override+ public PageParameters getPageParameters() {+ return ProjectBlobPage.paramsOf(projectModel.getObject(),+ new BlobIdent(revision, CISpec.BLOB_PATH, FileMode.REGULAR_FILE.getBits()));+ }++ @Override+ protected CharSequence getURL() {+ try {+ return super.getURL() + "#jobs/" + URLEncoder.encode(jobName, Charsets.UTF_8.name());+ } catch (UnsupportedEncodingException e) {+ throw new RuntimeException(e);+ }+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/jobchoice/JobMultiChoice.java b/core/src/main/java/io/onedev/server/web/component/job/JobMultiChoice.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/component/jobchoice/JobMultiChoice.javarename to core/src/main/java/io/onedev/server/web/component/job/JobMultiChoice.javaindex 12e3cc4324..de3879777d 100644--- a/core/src/main/java/io/onedev/server/web/component/jobchoice/JobMultiChoice.java+++ b/core/src/main/java/io/onedev/server/web/component/job/JobMultiChoice.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.jobchoice;+package io.onedev.server.web.component.job;import java.util.Collection;import java.util.LinkedHashMap;diff --git a/core/src/main/java/io/onedev/server/web/component/jobchoice/JobSingleChoice.java b/core/src/main/java/io/onedev/server/web/component/job/JobSingleChoice.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/component/jobchoice/JobSingleChoice.javarename to core/src/main/java/io/onedev/server/web/component/job/JobSingleChoice.javaindex c4a92fddfc..fc2b414230 100644--- a/core/src/main/java/io/onedev/server/web/component/jobchoice/JobSingleChoice.java+++ b/core/src/main/java/io/onedev/server/web/component/job/JobSingleChoice.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.jobchoice;+package io.onedev.server.web.component.job;import java.util.LinkedHashMap;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.javaindex b906483882..50f37443fd 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java@@ -50,7 +50,7 @@ import io.onedev.commons.utils.UrlUtils;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.BlobIdentFilter;import io.onedev.server.model.Project;-import io.onedev.server.web.component.blobpicker.BlobPicker;+import io.onedev.server.web.component.blob.BlobPicker;import io.onedev.server.web.component.dropzonefield.DropzoneField;import io.onedev.server.web.component.tabbable.AjaxActionTab;import io.onedev.server.web.component.tabbable.Tab;diff --git a/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSideClosed.java b/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSideClosed.javadeleted file mode 100644index f4d5247880..0000000000--- a/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSideClosed.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.component.moreinfoside;--import org.apache.wicket.ajax.AjaxRequestTarget;--import io.onedev.server.web.util.AjaxPayload;--public class MoreInfoSideClosed extends AjaxPayload {-- public MoreInfoSideClosed(AjaxRequestTarget target) {- super(target);- }--}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSideOpened.java b/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSideOpened.javadeleted file mode 100644index 22907cd8f8..0000000000--- a/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSideOpened.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.component.moreinfoside;--import org.apache.wicket.ajax.AjaxRequestTarget;--import io.onedev.server.web.util.AjaxPayload;--public class MoreInfoSideOpened extends AjaxPayload {-- public MoreInfoSideOpened(AjaxRequestTarget target) {- super(target);- }--}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.java b/core/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.javaindex 5767324eb6..08891ac9d3 100644--- a/core/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.java+++ b/core/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.java@@ -31,7 +31,7 @@ import org.eclipse.jgit.treewalk.TreeWalk;import io.onedev.commons.utils.StringUtils;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;-import io.onedev.server.web.component.BlobIcon;+import io.onedev.server.web.component.blob.BlobIcon;import io.onedev.server.web.component.link.PreventDefaultAjaxLink;@SuppressWarnings("serial")@@ -68,7 +68,7 @@ public abstract class PathSelector extends Panel {Repository repository = projectModel.getObject().getRepository();try ( RevWalk revWalk = new RevWalk(repository);TreeWalk treeWalk = new TreeWalk(repository)) {- RevCommit commit = revWalk.parseCommit(projectModel.getObject().getObjectId(revision));+ RevCommit commit = revWalk.parseCommit(projectModel.getObject().getObjectId(revision, true));treeWalk.addTree(commit.getTree());List<BlobIdent> roots = new ArrayList<>();@@ -94,7 +94,7 @@ public abstract class PathSelector extends Panel {public Iterator<? extends BlobIdent> getChildren(BlobIdent node) {Repository repository = projectModel.getObject().getRepository();try (RevWalk revWalk = new RevWalk(repository)) {- RevCommit commit = revWalk.parseCommit(projectModel.getObject().getObjectId(revision));+ RevCommit commit = revWalk.parseCommit(projectModel.getObject().getObjectId(revision, true));TreeWalk treeWalk = TreeWalk.forPath(repository, node.path, commit.getTree());treeWalk.enterSubtree();List<BlobIdent> children = new ArrayList<>();diff --git a/core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoClosed.java b/core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoClosed.javanew file mode 100644index 0000000000..914ed1ae9a--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoClosed.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.sideinfo;++import org.apache.wicket.ajax.AjaxRequestTarget;++import io.onedev.server.web.util.AjaxPayload;++public class SideInfoClosed extends AjaxPayload {++ public SideInfoClosed(AjaxRequestTarget target) {+ super(target);+ }++}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoOpened.java b/core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoOpened.javanew file mode 100644index 0000000000..e20d317247--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoOpened.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.sideinfo;++import org.apache.wicket.ajax.AjaxRequestTarget;++import io.onedev.server.web.util.AjaxPayload;++public class SideInfoOpened extends AjaxPayload {++ public SideInfoOpened(AjaxRequestTarget target) {+ super(target);+ }++}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSidePanel.html b/core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSidePanel.htmlrename to core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSidePanel.java b/core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.javasimilarity index 66%rename from core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSidePanel.javarename to core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.javaindex a347c1339e..31e09a97ed 100644--- a/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSidePanel.java+++ b/core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.moreinfoside;+package io.onedev.server.web.component.sideinfo;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -12,9 +12,9 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.panel.Panel;@SuppressWarnings("serial")-public abstract class MoreInfoSidePanel extends Panel {+public abstract class SideInfoPanel extends Panel {- public MoreInfoSidePanel(String id) {+ public SideInfoPanel(String id) {super(id);}@@ -27,21 +27,21 @@ public abstract class MoreInfoSidePanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- String script = String.format("$('#%s').hide('slide', {direction: 'right', duration: 200});", MoreInfoSidePanel.this.getMarkupId());+ String script = String.format("$('#%s').hide('slide', {direction: 'right', duration: 200});", SideInfoPanel.this.getMarkupId());target.appendJavaScript(script);- send(getPage(), Broadcast.BREADTH, new MoreInfoSideClosed(target));+ send(getPage(), Broadcast.BREADTH, new SideInfoClosed(target));}});- add(AttributeAppender.append("class", "more-info-side closed"));+ add(AttributeAppender.append("class", "side-info closed"));}@Overridepublic void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof MoreInfoSideOpened) {- MoreInfoSideOpened moreInfoSideOpened = (MoreInfoSideOpened) event.getPayload();+ if (event.getPayload() instanceof SideInfoOpened) {+ SideInfoOpened moreInfoSideOpened = (SideInfoOpened) event.getPayload();String script = String.format("$('#%s').show('slide', {direction: 'right', duration: 200});", getMarkupId());moreInfoSideOpened.getHandler().appendJavaScript(script);}@@ -50,9 +50,9 @@ public abstract class MoreInfoSidePanel extends Panel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new MoreInfoSideResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new SideInfoResourceReference()));- String script = String.format("onedev.server.moreInfoSide.onDomReady('%s');", getMarkupId());+ String script = String.format("onedev.server.sideInfo.onDomReady('%s');", getMarkupId());response.render(OnDomReadyHeaderItem.forScript(script));}diff --git a/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSideResourceReference.java b/core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoResourceReference.javasimilarity index 76%rename from core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSideResourceReference.javarename to core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoResourceReference.javaindex 9d1c58a001..b601658c3c 100644--- a/core/src/main/java/io/onedev/server/web/component/moreinfoside/MoreInfoSideResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.moreinfoside;+package io.onedev.server.web.component.sideinfo;import java.util.List;@@ -11,12 +11,12 @@ import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReferimport io.onedev.server.web.page.base.BaseDependentCssResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;-public class MoreInfoSideResourceReference extends BaseDependentResourceReference {+public class SideInfoResourceReference extends BaseDependentResourceReference {private static final long serialVersionUID = 1L;- public MoreInfoSideResourceReference() {- super(MoreInfoSideResourceReference.class, "more-info-side.js");+ public SideInfoResourceReference() {+ super(SideInfoResourceReference.class, "side-info.js");}@Override@@ -25,7 +25,7 @@ public class MoreInfoSideResourceReference extends BaseDependentResourceReferencdependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(- MoreInfoSidePanel.class, "more-info-side.css")));+ SideInfoPanel.class, "side-info.css")));return dependencies;}diff --git a/core/src/main/java/io/onedev/server/web/component/moreinfoside/more-info-side.css b/core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.csssimilarity index 88%rename from core/src/main/java/io/onedev/server/web/component/moreinfoside/more-info-side.cssrename to core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.cssindex a50e6a2d1c..b1bd9310c8 100644--- a/core/src/main/java/io/onedev/server/web/component/moreinfoside/more-info-side.css+++ b/core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.css@@ -1,4 +1,4 @@-.more-info-side {+.side-info {position: fixed;top: 51px;width: 360px;@@ -12,7 +12,7 @@display: none;overflow: auto;}-.more-info-side>.close {+.side-info>.close {position: absolute;top: 20px;right: 20px;diff --git a/core/src/main/java/io/onedev/server/web/component/moreinfoside/more-info-side.js b/core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.jssimilarity index 88%rename from core/src/main/java/io/onedev/server/web/component/moreinfoside/more-info-side.jsrename to core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.jsindex 3edf12d5f0..7deeb645ce 100644--- a/core/src/main/java/io/onedev/server/web/component/moreinfoside/more-info-side.js+++ b/core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.js@@ -1,4 +1,4 @@-onedev.server.moreInfoSide = {+onedev.server.sideInfo = {onDomReady: function(containerId) {var $container = $("#" + containerId);if (!onedev.server.util.isDevice()) {diff --git a/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java b/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.javaindex b2fd46b850..01042c8f30 100644--- a/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java@@ -153,7 +153,7 @@ public abstract class SymbolTooltipPanel extends Panel {.build();try {SearchManager searchManager = OneDev.getInstance(SearchManager.class);- ObjectId commit = projectModel.getObject().getRevCommit(revision);+ ObjectId commit = projectModel.getObject().getRevCommit(revision, true);hits = searchManager.search(projectModel.getObject(), commit, query);} catch (InterruptedException e) {throw new RuntimeException(e);@@ -207,7 +207,7 @@ public abstract class SymbolTooltipPanel extends Panel {// do this check to avoid TooGeneralQueryExceptionif (symbolName.length() != 0 && symbolName.indexOf('?') == -1 && symbolName.indexOf('*') == -1) {BlobIdent blobIdent = new BlobIdent(revision, getBlobPath(), FileMode.TYPE_FILE);- Blob blob = projectModel.getObject().getBlob(blobIdent);+ Blob blob = projectModel.getObject().getBlob(blobIdent, true);if (symbolHits.size() < QUERY_ENTRIES) {// first find in current file for matched symbols@@ -237,7 +237,7 @@ public abstract class SymbolTooltipPanel extends Panel {// then find in other files for public symbolstry {SearchManager searchManager = OneDev.getInstance(SearchManager.class);- ObjectId commit = projectModel.getObject().getRevCommit(revision);+ ObjectId commit = projectModel.getObject().getRevCommit(revision, true);BlobQuery query;if (symbolHits.size() < QUERY_ENTRIES) {query = new SymbolQuery.Builder().term(symbolName)diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/PageTabLink.java b/core/src/main/java/io/onedev/server/web/component/tabbable/PageTabLink.javaindex ee949ed061..f5d3340c19 100644--- a/core/src/main/java/io/onedev/server/web/component/tabbable/PageTabLink.java+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/PageTabLink.java@@ -10,9 +10,17 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;public class PageTabLink extends Panel {private static final long serialVersionUID = 1L;++ private final PageTab tab;public PageTabLink(String id, PageTab tab) {super(id);+ this.tab = tab;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();Link<?> pageLink = newLink("link", tab.getMainPageClass());add(pageLink);diff --git a/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.htmlindex f1c90cbe9e..3817227265 100644--- a/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.html@@ -1,3 +1,3 @@<wicket:panel>- <input wicket:id="input" type="hidden"></input>+ <input wicket:id="input" type="hidden"></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/editable.js b/core/src/main/java/io/onedev/server/web/editable/editable.jsindex b816992832..734d47d7c7 100644--- a/core/src/main/java/io/onedev/server/web/editable/editable.js+++ b/core/src/main/java/io/onedev/server/web/editable/editable.js@@ -5,7 +5,7 @@ onedev.server.editable = {$group.children("a").click(function() {$(this).parent().toggleClass("expanded");});- $(".feedbackPanelERROR").closest(".group.bean-properties").addClass("expanded");+ $container.find(".feedbackPanelERROR").closest(".group.bean-properties").addClass("expanded");},onBeanViewerDomReady: function(containerId) {var $container = $("#" + containerId);diff --git a/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobMultiChoiceEditor.javaindex 24cc530243..49aa86fcc3 100644--- a/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobMultiChoiceEditor.java@@ -8,7 +8,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import io.onedev.server.web.component.jobchoice.JobMultiChoice;+import io.onedev.server.web.component.job.JobMultiChoice;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;diff --git a/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobSingleChoiceEditor.javaindex 375969a260..3c53a840c1 100644--- a/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobSingleChoiceEditor.java@@ -4,7 +4,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import io.onedev.server.web.component.jobchoice.JobSingleChoice;+import io.onedev.server.web.component.job.JobSingleChoice;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex f759f2f946..aa330474bf 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -44,8 +44,8 @@ import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.branches.ProjectBranchesPage;-import io.onedev.server.web.page.project.builds.BuildListPage;-import io.onedev.server.web.page.project.builds2.detail.BuildDetailPage;+import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;+import io.onedev.server.web.page.project.builds.list.BuildListPage;import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;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 117e59c4bb..cab6232e94 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@@ -166,7 +166,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {if (modeStr != null)state.mode = Mode.valueOf(modeStr.toUpperCase());- resolvedRevision = getProject().getObjectId(state.blobIdent.revision);+ resolvedRevision = getProject().getObjectId(state.blobIdent.revision, true);state.mark = TextRange.of(params.get(PARAM_MARK).toString());@@ -216,7 +216,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {protected void onConfigure() {super.onConfigure();- RevCommit commit = getProject().getRevCommit(resolvedRevision);+ RevCommit commit = getProject().getRevCommit(resolvedRevision, true);IndexManager indexManager = OneDev.getInstance(IndexManager.class);if (!indexManager.isIndexed(getProject(), commit)) {OneDev.getInstance(IndexManager.class).indexAsync(getProject(), commit);@@ -242,7 +242,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {.build();try {SearchManager searchManager = OneDev.getInstance(SearchManager.class);- queryHits = searchManager.search(projectModel.getObject(), getProject().getRevCommit(resolvedRevision),+ queryHits = searchManager.search(projectModel.getObject(), getProject().getRevCommit(resolvedRevision, true),query);} catch (InterruptedException e) {throw new RuntimeException(e);@@ -699,7 +699,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {* resolved to existing value of resolvedRevision*/resolvedRevision = null;- resolvedRevision = getProject().getObjectId(state.blobIdent.revision);+ resolvedRevision = getProject().getObjectId(state.blobIdent.revision, true);OneDev.getInstance(WebSocketManager.class).notifyObserverChange(this);newRevisionPicker(target);@@ -926,13 +926,13 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {@Overridepublic RevCommit getCommit() {- return getProject().getRevCommit(resolvedRevision);+ return getProject().getRevCommit(resolvedRevision, true);}@Overridepublic Collection<String> getWebSocketObservables() {Collection<String> observables = super.getWebSocketObservables();- observables.add(CommitIndexed.getWebSocketObservable(getProject().getRevCommit(resolvedRevision).name()));+ observables.add(CommitIndexed.getWebSocketObservable(getProject().getRevCommit(resolvedRevision, true).name()));if (state.requestId != null)observables.add(PullRequest.getWebSocketObservable(state.requestId));if (state.commentId != null)@@ -1000,7 +1000,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {if (state.mode == Mode.DELETE) {try (RevWalk revWalk = new RevWalk(getProject().getRepository())) {- RevTree revTree = getProject().getRevCommit(refUpdated.getNewCommitId()).getTree();+ RevTree revTree = getProject().getRevCommit(refUpdated.getNewCommitId(), true).getTree();String parentPath = StringUtils.substringBeforeLast(state.blobIdent.path, "/");while (TreeWalk.forPath(getProject().getRepository(), parentPath, revTree) == null) {if (parentPath.contains("/")) {@@ -1129,7 +1129,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {} else if (state.mode == Mode.EDIT) {return String.format("autosave:editBlob:%d:%s:%s:%s",getProject().getId(), state.blobIdent.revision,- state.blobIdent.path, getProject().getBlob(state.blobIdent).getBlobId());+ state.blobIdent.path, getProject().getBlob(state.blobIdent, true).getBlobId());} else {throw new IllegalStateException();}@@ -1180,7 +1180,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {User user = Preconditions.checkNotNull(OneDev.getInstance(UserManager.class).getCurrent());- ObjectId prevCommitId = getProject().getObjectId(blobIdent.revision);+ ObjectId prevCommitId = getProject().getObjectId(blobIdent.revision, true);while (true) {try {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java b/core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.javaindex 0d96810620..35af6b7b1f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java@@ -42,7 +42,7 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.BlobIdentFilter;import io.onedev.server.git.GitUtils;-import io.onedev.server.web.component.BlobIcon;+import io.onedev.server.web.component.blob.BlobIcon;import io.onedev.server.web.component.floating.AlignPlacement;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.javaindex 67107129ee..65b576334f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java@@ -311,7 +311,7 @@ public class CommitOptionPanel extends Panel {User user = Preconditions.checkNotNull(OneDev.getInstance(UserManager.class).getCurrent());String refName = GitUtils.branch2ref(context.getBlobIdent().revision);- ObjectId prevCommitId = context.getProject().getObjectId(context.getBlobIdent().revision);+ ObjectId prevCommitId = context.getProject().getObjectId(context.getBlobIdent().revision, true);Repository repository = context.getProject().getRepository();ObjectId newCommitId = null;@@ -427,7 +427,7 @@ public class CommitOptionPanel extends Panel {@Overridepublic Blob getBlob(BlobIdent blobIdent) {- return context.getProject().getBlob(blobIdent);+ return context.getProject().getBlob(blobIdent, true);}};@@ -445,7 +445,7 @@ public class CommitOptionPanel extends Panel {if (context.getMode() == Mode.EDIT) {contentModified = !Arrays.equals(newContentProvider.get(),- context.getProject().getBlob(context.getBlobIdent()).getBytes());+ context.getProject().getBlob(context.getBlobIdent(), true).getBytes());} else {contentModified = newContentProvider.get().length != 0;}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 0ce2dd9277..0d37c97293 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@@ -177,7 +177,7 @@ public abstract class BlobEditPanel extends Panel {byte[] content;if (context.getMode() == Mode.EDIT)- content = context.getProject().getBlob(context.getBlobIdent()).getBytes();+ content = context.getProject().getBlob(context.getBlobIdent(), true).getBytes();elsecontent = new byte[0];add(editor = newEditor("editor", content));diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.javaindex fa9330644e..d9b38c1e6b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java@@ -1,7 +1,5 @@package io.onedev.server.web.page.project.blob.render.renderers.cispec;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.html.form.FormComponentPanel;import io.onedev.server.ci.CISpec;@@ -17,12 +15,6 @@ public class CISpecBlobEditPanel extends BlobEditPanel implements PlainEditSupposuper(id, context);}- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new CISpecResourceReference()));- }-@Overrideprotected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {return new CISpecEditPanel(componentId, context, initialContent);diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.htmlindex 2d5cb10e7b..351491758a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.html@@ -17,7 +17,11 @@</div></wicket:fragment><wicket:fragment wicket:id="hasJobsFrag">- <ul wicket:id="navs" class="navs list-unstyled"></ul>- <div wicket:id="content" class="content"></div>+ <div class="side"><div class="navs"><div wicket:id="navs" class="nav">+ <a class="select"><span wicket:id="jobName"></span></a>+ </div></div></div>+ <div class="contents">+ <div wicket:id="contents" class="content"></div>+ </div></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.javaindex 399467a562..2476f383be 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java@@ -1,15 +1,13 @@package io.onedev.server.web.page.project.blob.render.renderers.cispec;-import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.head.CssHeaderItem;+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.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.Model;+import org.apache.wicket.markup.repeater.RepeatingView;import com.google.common.base.Throwables;@@ -17,9 +15,6 @@ import io.onedev.server.ci.CISpec;import io.onedev.server.ci.job.Job;import io.onedev.server.git.Blob;import io.onedev.server.web.component.MultilineLabel;-import io.onedev.server.web.component.tabbable.AjaxActionTab;-import io.onedev.server.web.component.tabbable.Tab;-import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;@@ -35,32 +30,26 @@ public class CISpecBlobViewPanel extends BlobViewPanel {protected void onInitialize() {super.onInitialize();- Blob blob = context.getProject().getBlob(context.getBlobIdent());+ Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);try {CISpec ciSpec = CISpec.parse(blob.getBytes());if (ciSpec != null) {Fragment validFrag = new Fragment("content", "validFrag", this);if (!ciSpec.getJobs().isEmpty()) {Fragment hasJobsFrag = new Fragment("body", "hasJobsFrag", this);- List<Tab> tabs = new ArrayList<>();-++ RepeatingView navsView = new RepeatingView("navs");+ RepeatingView jobsView = new RepeatingView("contents");for (Job job: ciSpec.getJobs()) {- tabs.add(new AjaxActionTab(Model.of(job.getName()) ) {-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component content = BeanContext.viewBean("content", job);- hasJobsFrag.replace(content.setOutputMarkupId(true));- target.add(content);- }-- });+ WebMarkupContainer nav = new WebMarkupContainer(navsView.newChildId());+ nav.add(new Label("jobName", job.getName()));+ nav.add(AttributeAppender.append("data-name", job.getName()));+ navsView.add(nav);+ jobsView.add(BeanContext.viewBean(jobsView.newChildId(), job));}+ hasJobsFrag.add(navsView);+ hasJobsFrag.add(jobsView);- hasJobsFrag.add(new Tabbable("navs", tabs));-- Component content = BeanContext.viewBean("content", ciSpec.getJobs().iterator().next());- hasJobsFrag.add(content.setOutputMarkupId(true));validFrag.add(hasJobsFrag);} else {validFrag.add(new Label("body", "No jobs defined"));@@ -79,7 +68,8 @@ public class CISpecBlobViewPanel extends BlobViewPanel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new CISpecResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new CISpecResourceReference()));+ response.render(OnDomReadyHeaderItem.forScript("onedev.ciSpec.onDomReady();"));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.htmlindex 93f8c70664..1a8e9f7c22 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html@@ -11,7 +11,7 @@<!-- do not leave white space between navs and nav element as we are using .navs:not(:empty)in css --><div class="navs"><div wicket:id="navs" class="nav">- <a wicket:id="select" class="select">+ <a class="select"><span class="drag-indicator"><i class="fa fa-reorder"></i></span><span class="name"></span></a>diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.javaindex 79c521fec7..1883c48f26 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java@@ -9,8 +9,10 @@ import javax.validation.Validator;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.behavior.Behavior;import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.FormComponentPanel;@@ -68,22 +70,6 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {private Component newJobNav(Job job) {WebMarkupContainer nav = new WebMarkupContainer(jobNavs.newChildId());- nav.add(new AjaxLink<Void>("select") {-- @Override- public void onClick(AjaxRequestTarget target) {- String script = String.format("onedev.ciSpec.edit.showJob(%d);",- WicketUtils.getChildIndex(jobNavs, nav));- target.appendJavaScript(script);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- }-- });-nav.add(new AjaxLink<Void>("delete") {@SuppressWarnings("deprecation")@@ -96,6 +82,8 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {}});+ nav.add(AttributeAppender.append("data-name", job.getName()));+jobNavs.add(nav.setOutputMarkupId(true));return nav;@@ -126,25 +114,7 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {if (parseResult instanceof CISpec) {CISpec ciSpec = (CISpec) parseResult;- validFrag = new Fragment("content", "validFrag", this) {-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- int index = 0;- for (Component child: jobContents) {- if (((BeanEditor) child).hasErrors(true)) {- index = WicketUtils.getChildIndex(jobContents, child);- break;- }- }-- String script = String.format("onedev.ciSpec.edit.showJob(%d);", index);- response.render(OnDomReadyHeaderItem.forScript(script));- }-- };+ validFrag = new Fragment("content", "validFrag", this);jobNavs = new RepeatingView("navs");jobContents = new RepeatingView("contents");@@ -173,7 +143,7 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {target.prependJavaScript(script);target.add(content);- script = String.format("onedev.ciSpec.edit.showJob(%d);", jobNavs.size() - 1);+ script = String.format("onedev.ciSpec.showJob(%d);", jobNavs.size() - 1);target.appendJavaScript(script);}@@ -261,6 +231,13 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {}}+ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new CISpecResourceReference()));+ response.render(OnDomReadyHeaderItem.forScript("onedev.ciSpec.onDomReady();"));+ }+@Nullablepublic CISpec getEditingCISpec() {if (parseResult instanceof CISpec) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecResourceReference.javaindex 5cf3f7b42c..d1fef31c89 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecResourceReference.java@@ -4,7 +4,9 @@ import java.util.List;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import io.onedev.server.web.asset.uri.URIResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;@@ -19,6 +21,7 @@ public class CISpecResourceReference extends BaseDependentResourceReference {@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(JavaScriptHeaderItem.forReference(new URIResourceReference()));dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(CISpecResourceReference.class, "ci-spec.css")));return dependencies;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.cssindex ef95172cda..18c575be36 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css@@ -34,48 +34,39 @@margin-left: 240px;}-.ci-spec-edit>.valid>div>.body>.side>.navs:not(:empty) {+.ci-spec>.valid>div>.body>.side>.navs:not(:empty) {margin-bottom: 20px;}-.ci-spec-view>.valid>div>.body>.navs li,-.ci-spec-edit>.valid>div>.body>.side>.navs>.nav {+.ci-spec>.valid>div>.body>.side>.navs>.nav {position: relative;background: #444;}-.ci-spec-view>.valid>div>.body>.navs li a,-.ci-spec-edit>.valid>div>.body>.side>.navs>.nav a {+.ci-spec>.valid>div>.body>.side>.navs>.nav a {color: #BBB;}-.ci-spec-edit>.valid>div>.body>.side>.navs>.nav .drag-indicator {+.ci-spec>.valid>div>.body>.side>.navs>.nav .drag-indicator {color: inherit;margin-right: 4px;}-.ci-spec-view>.valid>div>.body>.navs>li:hover a,-.ci-spec-view>.valid>div>.body>.navs>li.active a,-.ci-spec-edit>.valid>div>.body>.side>.navs>.nav:hover a,-.ci-spec-edit>.valid>div>.body>.side>.navs>.nav.active a {+.ci-spec>.valid>div>.body>.side>.navs>.nav:hover a,+.ci-spec>.valid>div>.body>.side>.navs>.nav.active a {color: white;font-weight: bold;}-.ci-spec-view>.valid>div>.body>.navs>li.active,-.ci-spec-edit>.valid>div>.body>.side>.navs>.nav.active {+.ci-spec>.valid>div>.body>.side>.navs>.nav.active {background: #080808;}-.ci-spec-view>.valid>div>.body>.navs>li.first,-.ci-spec-edit>.valid>div>.body>.side>.navs>.nav:first-child {+.ci-spec>.valid>div>.body>.side>.navs>.nav:first-child {border-radius: 4px 4px 0 0;}-.ci-spec-view>.valid>div>.body>.navs>li.last,-.ci-spec-edit>.valid>div>.body>.side>.navs>.nav:last-child {+.ci-spec>.valid>div>.body>.side>.navs>.nav:last-child {border-radius: 0 0 4px 4px;}-.ci-spec-view>.valid>div>.body>.navs>li.first.last,-.ci-spec-edit>.valid>div>.body>.side>.navs>.nav:first-child:last-child {+.ci-spec>.valid>div>.body>.side>.navs>.nav:first-child:last-child {border-radius: 4px;}-.ci-spec-view>.valid>div>.body>.navs>li>a,-.ci-spec-edit>.valid>div>.body>.side>.navs>.nav>.select {+.ci-spec>.valid>div>.body>.side>.navs>.nav>.select {padding: 8px 28px 8px 8px;text-decoration: none;display: block;@@ -83,7 +74,7 @@text-overflow: ellipsis;white-space: nowrap;}-.ci-spec-edit>.valid>div>.body>.side>.navs>.nav>.delete {+.ci-spec>.valid>div>.body>.side>.navs>.nav>.delete {right: 0;top: 0;position: absolute;@@ -91,8 +82,7 @@padding: 8px 8px;display: block;}-.ci-spec-view>.valid>div>.body>.content,-.ci-spec-edit>.valid>div>.body>.contents>.content {+.ci-spec>.valid>div>.body>.contents>.content {border-radius: 4px;border: 2px solid #666;padding: 20px;@@ -112,6 +102,3 @@min-width: 150px;}-.trigger-list>.body>table>thead, .trigger-list>table>thead {- display: none;-}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.jsindex b4a814913c..d66568cfcb 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js@@ -1,16 +1,44 @@onedev.ciSpec = {+ onDomReady: function() {+ var activeJobIndex = -1;+ var $body = $(".ci-spec>.valid>.jobs>.body");+ $body.find(">.contents>.content").each(function() {+ var $this = $(this);+ if ($this.find(".feedbackPanelERROR").length != 0) {+ activeJobIndex = $this.index();+ return false;+ }+ });+ if (activeJobIndex == -1) {+ var uri = URI(window.location.href);+ var fragment = uri.fragment();+ if (fragment.startsWith("jobs/")) {+ var activeJobName = decodeURIComponent(fragment.substring("jobs/".length));+ activeJobIndex = $body.find(">.side>.navs>.nav[data-name='" + activeJobName.escape() + "']").index();+ }+ }+ if (activeJobIndex == -1)+ activeJobIndex = 0;++ onedev.ciSpec.showJob(activeJobIndex);++ $body.find(".side>.navs>.nav>.select").click(function() {+ onedev.ciSpec.showJob($(this).parent().index());+ });+ },+ showJob: function(index) {+ var $body = $(".ci-spec>.valid>.jobs>.body");+ var $navs = $body.find(">.side>.navs");+ $navs.children().removeClass("active");+ var $nav = $navs.children().eq(index);+ $nav.addClass("active");+ var $contents = $body.children(".contents");+ $contents.children().hide();+ var $content = $contents.children().eq(index);+ $content.show();+ onedev.server.focus.doFocus($content);+ },edit: {- showJob: function(index) {- var $body = $(".ci-spec-edit .jobs>.body");- var $navs = $body.find(">.side>.navs");- $navs.children().removeClass("active");- $navs.children().eq(index).addClass("active");- var $contents = $body.children(".contents");- $contents.children().hide();- var $content = $contents.children().eq(index);- $content.show();- onedev.server.focus.doFocus($content);- },deleteJob: function(index) {var $body = $(".ci-spec-edit .jobs>.body");var $navs = $body.find(">.side>.navs");@@ -21,7 +49,7 @@ onedev.ciSpec = {$contents.children().eq(index).remove();if ($nav.hasClass("active"))- onedev.ciSpec.edit.showJob(0);+ onedev.ciSpec.showJob(0);},swapJobs: function(index1, index2) {var $contents = $(".ci-spec-edit .jobs>.body>.contents");diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeBean.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeBean.javaindex 7ecf274cb4..511e786563 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeBean.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeBean.java@@ -4,7 +4,7 @@ import java.io.Serializable;import javax.validation.constraints.NotNull;-import io.onedev.server.ci.job.outcome.JobOutcome;+import io.onedev.server.ci.job.JobOutcome;import io.onedev.server.web.editable.annotation.Editable;@Editablediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeEditPanel.javaindex 86aed1fe0a..3bc94f476d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeEditPanel.java@@ -10,7 +10,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;-import io.onedev.server.ci.job.outcome.JobOutcome;+import io.onedev.server.ci.job.JobOutcome;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditPanel.javaindex 70fcc06d24..44f9d34128 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditPanel.java@@ -24,7 +24,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import io.onedev.server.ci.job.outcome.JobOutcome;+import io.onedev.server.ci.job.JobOutcome;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.component.modal.ModalLink;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditSupport.javaindex 31d150b84d..f845e9d486 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListEditSupport.java@@ -8,7 +8,7 @@ import org.apache.wicket.model.IModel;import io.onedev.commons.utils.ReflectionUtils;import io.onedev.server.ci.job.Job;-import io.onedev.server.ci.job.outcome.JobOutcome;+import io.onedev.server.ci.job.JobOutcome;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListViewPanel.javaindex 1edc442f48..f6ff533f63 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeListViewPanel.java@@ -23,7 +23,7 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import io.onedev.server.ci.job.outcome.JobOutcome;+import io.onedev.server.ci.job.JobOutcome;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.layout.SideFloating;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.javaindex 903687d3f6..0c91d2e295 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java@@ -243,7 +243,7 @@ public class FolderViewPanel extends Panel {@Overrideprotected String load() {- Blob blob = context.getProject().getBlob(readmeModel.getObject());+ Blob blob = context.getProject().getBlob(readmeModel.getObject(), true);Blob.Text text = blob.getText();if (text != null)return text.getContent();diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.javaindex 92cadea4ea..ba916111ff 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java@@ -26,7 +26,7 @@ public class GitLinkPanel extends BlobViewPanel {protected void onInitialize() {super.onInitialize();- Blob blob = context.getProject().getBlob(context.getBlobIdent());+ Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);Submodule submodule = Submodule.fromString(blob.getText().getContent());WebMarkupContainer link;SettingManager configManager = OneDev.getInstance(SettingManager.class);diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRendererProvider.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRendererProvider.javaindex ce4ffbffa1..e64b3c7943 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRendererProvider.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRendererProvider.java@@ -14,7 +14,7 @@ public class ImageRendererProvider implements BlobRendererContribution {@Overridepublic PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {if (context.getMode() == Mode.VIEW && context.getBlobIdent().isFile()) {- if (context.getProject().getBlob(context.getBlobIdent()).getMediaType().getType().equalsIgnoreCase("image")) {+ if (context.getProject().getBlob(context.getBlobIdent(), true).getMediaType().getType().equalsIgnoreCase("image")) {return new PrioritizedComponentRenderer() {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.javaindex e54cb1185c..788839a75e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java@@ -20,7 +20,7 @@ public class MarkdownBlobViewPanel extends BlobViewPanel {protected void onInitialize() {super.onInitialize();- Blob blob = context.getProject().getBlob(context.getBlobIdent());+ Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);add(new MarkdownViewer("markdown", Model.of(blob.getText().getContent()), null) {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.javaindex 8dab920466..54b3a29894 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.java@@ -22,7 +22,7 @@ public class MarkdownRendererProvider implements BlobRendererContribution {if (context.getMode() == Mode.ADD && isMarkdown(context.getNewPath())|| context.getMode() == Mode.EDIT&& isMarkdown(context.getBlobIdent().path)- && context.getProject().getBlob(context.getBlobIdent()).getText() != null) {+ && context.getProject().getBlob(context.getBlobIdent(), true).getText() != null) {return new PrioritizedComponentRenderer() {private static final long serialVersionUID = 1L;@@ -40,7 +40,7 @@ public class MarkdownRendererProvider implements BlobRendererContribution {} else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.BLAME)&& context.getBlobIdent().isFile()&& isMarkdown(context.getBlobIdent().path)- && context.getProject().getBlob(context.getBlobIdent()).getText() != null) {+ && context.getProject().getBlob(context.getBlobIdent(), true).getText() != null) {return new PrioritizedComponentRenderer() {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.javaindex ee5d188006..14569728cb 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java@@ -15,7 +15,7 @@ public class SourceRendererProvider implements BlobRendererContribution {public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {if (context.getMode() == Mode.ADD|| context.getMode() == Mode.EDIT- && context.getProject().getBlob(context.getBlobIdent()).getText() != null) {+ && context.getProject().getBlob(context.getBlobIdent(), true).getText() != null) {return new PrioritizedComponentRenderer() {private static final long serialVersionUID = 1L;@@ -32,7 +32,7 @@ public class SourceRendererProvider implements BlobRendererContribution {};} else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.BLAME)&& context.getBlobIdent().isFile()- && context.getProject().getBlob(context.getBlobIdent()).getText() != null) {+ && context.getProject().getBlob(context.getBlobIdent(), true).getText() != null) {return new PrioritizedComponentRenderer() {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex b2058c3e96..509fa273b2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -157,7 +157,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMethis.viewPlainMode = viewPlainMode;- Blob blob = context.getProject().getBlob(context.getBlobIdent());+ Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);String blobName = context.getBlobIdent().getName();SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);@@ -869,7 +869,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMeresponse.render(JavaScriptHeaderItem.forReference(new SourceViewResourceReference()));- Blob blob = context.getProject().getBlob(context.getBlobIdent());+ Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);String jsonOfBlameInfos = getJsonOfBlameInfos(context.getMode() == Mode.BLAME);Map<Integer, List<CommentInfo>> commentInfos = new HashMap<>();diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.javaindex 288bf6d0b9..0a0ab98c00 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java@@ -33,7 +33,7 @@ public class SymbolLinkPanel extends BlobViewPanel {protected void onInitialize() {super.onInitialize();- Blob blob = context.getProject().getBlob(context.getBlobIdent());+ Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);String targetPath = PathUtils.normalizeDots(PathUtils.resolveSibling(context.getBlobIdent().path, blob.getText().getContent()));if (targetPath != null && (targetPath.startsWith("/") || new File(targetPath).isAbsolute()))@@ -43,7 +43,7 @@ public class SymbolLinkPanel extends BlobViewPanel {if (targetPath != null) {Repository repository = context.getProject().getRepository();try (RevWalk revWalk = new RevWalk(repository)) {- ObjectId commitId = context.getProject().getObjectId(context.getBlobIdent().revision);+ ObjectId commitId = context.getProject().getObjectId(context.getBlobIdent().revision, true);RevTree revTree = revWalk.parseCommit(commitId).getTree();TreeWalk treeWalk = TreeWalk.forPath(repository, targetPath, revTree);if (treeWalk != null) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRendererProvider.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRendererProvider.javaindex 9451f42ab3..ad195a177d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRendererProvider.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRendererProvider.java@@ -14,7 +14,7 @@ public class VideoRendererProvider implements BlobRendererContribution {@Overridepublic PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {if (context.getMode() == Mode.VIEW && context.getBlobIdent().isFile()) {- if (context.getProject().getBlob(context.getBlobIdent()).getMediaType().getType().equalsIgnoreCase("video")) {+ if (context.getProject().getBlob(context.getBlobIdent(), true).getMediaType().getType().equalsIgnoreCase("video")) {return new PrioritizedComponentRenderer() {private static final long serialVersionUID = 1L;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 080e62dc0d..13d877f372 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@@ -163,7 +163,7 @@ public abstract class BlobViewPanel extends Panel {@Overridepublic String getObject() {- return context.getProject().getBlob(context.getBlobIdent()).getText().getLines().size() + " lines";+ return context.getProject().getBlob(context.getBlobIdent(), true).getText().getLines().size() + " lines";}}) {@@ -172,7 +172,7 @@ public abstract class BlobViewPanel extends Panel {protected void onConfigure() {super.onConfigure();- setVisible(context.getProject().getBlob(context.getBlobIdent()).getText() != null);+ setVisible(context.getProject().getBlob(context.getBlobIdent(), true).getText() != null);}});@@ -181,7 +181,7 @@ public abstract class BlobViewPanel extends Panel {@Overridepublic String getObject() {- return context.getProject().getBlob(context.getBlobIdent()).getText().getCharset().displayName();+ return context.getProject().getBlob(context.getBlobIdent(), true).getText().getCharset().displayName();}}) {@@ -190,12 +190,12 @@ public abstract class BlobViewPanel extends Panel {protected void onConfigure() {super.onConfigure();- setVisible(context.getProject().getBlob(context.getBlobIdent()).getText() != null);+ setVisible(context.getProject().getBlob(context.getBlobIdent(), true).getText() != null);}});- add(new Label("size", FileUtils.byteCountToDisplaySize(context.getProject().getBlob(context.getBlobIdent()).getSize())));+ add(new Label("size", FileUtils.byteCountToDisplaySize(context.getProject().getBlob(context.getBlobIdent(), true).getSize())));add(newOptions("options"));@@ -234,7 +234,7 @@ public abstract class BlobViewPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(context.getProject().getBlob(context.getBlobIdent()).getText() != null);+ setVisible(context.getProject().getBlob(context.getBlobIdent(), true).getText() != null);}}.add(new OnChangeAjaxBehavior() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.javaindex e80443337c..d0ac7413be 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java@@ -545,7 +545,7 @@ public abstract class AdvancedSearchPanel extends Panel {.fileNames(fileNames).count(SearchResultPanel.MAX_QUERY_ENTRIES).build();- ObjectId commit = context.projectModel.getObject().getRevCommit(context.revisionModel.getObject());+ ObjectId commit = context.projectModel.getObject().getRevCommit(context.revisionModel.getObject(), true);hits = searchManager.search(context.projectModel.getObject(), commit, query);if (hits.size() < SearchResultPanel.MAX_QUERY_ENTRIES) {@@ -582,7 +582,7 @@ public abstract class AdvancedSearchPanel extends Panel {.directory(context.getDirectory(insideCurrentDir)).count(SearchResultPanel.MAX_QUERY_ENTRIES).build();- ObjectId commit = context.projectModel.getObject().getRevCommit(context.revisionModel.getObject());+ ObjectId commit = context.projectModel.getObject().getRevCommit(context.revisionModel.getObject(), true);return searchManager.search(context.projectModel.getObject(), commit, query);}@@ -613,7 +613,7 @@ public abstract class AdvancedSearchPanel extends Panel {.fileNames(fileNames).count(SearchResultPanel.MAX_QUERY_ENTRIES).build();- ObjectId commit = context.projectModel.getObject().getRevCommit(context.revisionModel.getObject());+ ObjectId commit = context.projectModel.getObject().getRevCommit(context.revisionModel.getObject(), true);return searchManager.search(context.projectModel.getObject(), commit, query);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.javaindex 4c33a1a267..b49f1a97f3 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java@@ -74,7 +74,7 @@ public abstract class QuickSearchPanel extends Panel {private List<QueryHit> querySymbols(String searchInput, int count) {SearchManager searchManager = OneDev.getInstance(SearchManager.class);- ObjectId commit = projectModel.getObject().getRevCommit(revisionModel.getObject());+ ObjectId commit = projectModel.getObject().getRevCommit(revisionModel.getObject(), true);List<QueryHit> symbolHits = new ArrayList<>();try {// first try an exact search against primary symbol to make sure the resultdiff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex eb3dbb834a..b9a29f2b9e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -454,7 +454,7 @@ public class ProjectBranchesPage extends ProjectPage {link.add(new Label("name", branch));item.add(link);- RevCommit lastCommit = getProject().getRevCommit(ref.getRef().getObjectId());+ RevCommit lastCommit = getProject().getRevCommit(ref.getRef().getObjectId(), true);String lastCommitHash = lastCommit.name();item.add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {@@ -492,8 +492,7 @@ public class ProjectBranchesPage extends ProjectPage {});- item.add(new ContributorPanel("contributor", lastCommit.getAuthorIdent(),- lastCommit.getCommitterIdent(), true));+ item.add(new ContributorPanel("contributor", lastCommit.getAuthorIdent(), lastCommit.getCommitterIdent()));PageParameters params = CommitDetailPage.paramsOf(getProject(), lastCommit.name());link = new ViewStateAwarePageLink<Void>("messageLink", CommitDetailPage.class, params);diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.html b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.htmlnew file mode 100644index 0000000000..9f340ecba2--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.html@@ -0,0 +1,3 @@+<wicket:extend>+ This is build changes+</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.javanew file mode 100644index 0000000000..7094794b11--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.java@@ -0,0 +1,12 @@+package io.onedev.server.web.page.project.builds.detail;++import org.apache.wicket.request.mapper.parameter.PageParameters;++@SuppressWarnings("serial")+public class BuildChangesPage extends BuildDetailPage {++ public BuildChangesPage(PageParameters params) {+ super(params);+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.htmlnew file mode 100644index 0000000000..cd9cf1683f--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html@@ -0,0 +1,33 @@+<wicket:extend>+ <div id="build-detail">+ <div class="main">+ <div wicket:id="summary" class="summary clearfix">+ <div wicket:id="title" class="title pull-left"></div>+ <div class="status pull-left">+ <span wicket:id="statusIcon"></span>+ <span wicket:id="statusLabel"></span>+ </div>+ <div class="actions pull-left">+ <a wicket:id="rebuild" class="btn btn-warning btn-sm"><i class="fa fa-undo"></i> Rebuild</a>+ <a wicket:id="cancel" class="btn btn-danger btn-sm"><i class="fa fa-ban"></i> Cancel</a>+ </div>+ <a wicket:id="moreInfo" class="more-info pull-right" title="More info"><span class="glyphicon glyphicon-open"></span></a>+ </div>+ <pre wicket:id="statusMessage" class="status-message alert"></pre>+ <div class="commit-info clearfix">+ <div class="pull-left"><i class="fa fa-ext fa-commit"></i> Commit: </div>+ <div class="pull-left">+ <a wicket:id="commitHash" class="hash"><span wicket:id="label"></span></a>+ <a wicket:id="copyCommitHash" class="copy"><i class="fa fa-clipboard"></i></a>+ </div>+ <a wicket:id="commitMessage" class="message pull-left"><span wicket:id="label"></span></a>+ <div class="contribution pull-right">+ <span wicket:id="commitAvatars"></span> <span wicket:id="commitNames"></span>+ </div>+ </div>+ <ul wicket:id="buildTabs" class="tabs nav nav-tabs"></ul>+ <wicket:child></wicket:child>+ </div>+ <div wicket:id="side"></div>+ </div>+</wicket:extend>\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..49bfb8534b--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -0,0 +1,356 @@+package io.onedev.server.web.page.project.builds.detail;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Comparator;+import java.util.List;++import javax.annotation.Nullable;+import javax.persistence.EntityNotFoundException;++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.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.event.Broadcast;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.revwalk.RevCommit;++import com.google.common.collect.Sets;++import io.onedev.server.OneDev;+import io.onedev.server.OneException;+import io.onedev.server.ci.job.JobScheduler;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Build;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.behavior.WebSocketObserver;+import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;+import io.onedev.server.web.component.build.BuildTitleLabel;+import io.onedev.server.web.component.build.side.BuildSidePanel;+import io.onedev.server.web.component.build.status.BuildStatusIcon;+import io.onedev.server.web.component.build.status.BuildStatusLabel;+import io.onedev.server.web.component.contributorpanel.ContributorPanel;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.sideinfo.SideInfoClosed;+import io.onedev.server.web.component.sideinfo.SideInfoOpened;+import io.onedev.server.web.component.sideinfo.SideInfoPanel;+import io.onedev.server.web.component.tabbable.Tab;+import io.onedev.server.web.component.tabbable.Tabbable;+import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.builds.list.BuildListPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.issues.list.IssueListPage;+import io.onedev.server.web.util.ConfirmOnClick;+import io.onedev.server.web.util.QueryPosition;+import io.onedev.server.web.util.QueryPositionSupport;++@SuppressWarnings("serial")+public abstract class BuildDetailPage extends ProjectPage {++ public static final String PARAM_BUILD = "build";++ protected final IModel<Build> buildModel;++ final QueryPosition position;++ public BuildDetailPage(PageParameters params) {+ super(params);++ buildModel = new LoadableDetachableModel<Build>() {++ @Override+ protected Build load() {+ Long buildNumber = params.get(PARAM_BUILD).toLong();+ Build build = OneDev.getInstance(BuildManager.class).find(getProject(), buildNumber);+ if (build == null)+ throw new EntityNotFoundException("Unable to find build #" + buildNumber + " in project " + getProject());+ return build;+ }++ };++ position = QueryPosition.from(params);+ }++ protected Build getBuild() {+ return buildModel.getObject();+ }++ private WebSocketObserver newBuildObserver(Long buildId) {+ return new WebSocketObserver() {++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler, String observable) {+ handler.add(component);+ }++ @Override+ public void onConnectionOpened(IPartialPageRequestHandler handler) {+ handler.add(component);+ }++ @Override+ public Collection<String> getObservables() {+ return Sets.newHashSet(Build.getWebSocketObservable(buildId));+ }++ };+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ WebMarkupContainer summary = new WebMarkupContainer("summary");+ summary.add(newBuildObserver(getBuild().getId()));+ summary.setOutputMarkupId(true);+ add(summary);++ summary.add(new BuildTitleLabel("title", buildModel));++ summary.add(new BuildStatusIcon("statusIcon", buildModel));+ summary.add(new BuildStatusLabel("statusLabel", buildModel));++ summary.add(new Link<Void>("rebuild") {++ @Override+ public void onClick() {+ OneDev.getInstance(JobScheduler.class).resubmit(getBuild());+ getSession().success("Rebuild request submitted");+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getBuild().isFinished());+ }++ }.add(new ConfirmOnClick("Do you really want to rebuild?")));++ summary.add(new Link<Void>("cancel") {++ @Override+ public void onClick() {+ OneDev.getInstance(JobScheduler.class).cancel(getBuild());+ getSession().success("Cancel request submitted");+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getBuild().isFinished());+ }++ }.add(new ConfirmOnClick("Do you really want to cancel this build?")));++ summary.add(new AjaxLink<Void>("moreInfo") {++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);+ if (event.getPayload() instanceof SideInfoClosed) {+ SideInfoClosed moreInfoSideClosed = (SideInfoClosed) event.getPayload();+ setVisible(true);+ moreInfoSideClosed.getHandler().add(this);+ }+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ setVisible(false);+ target.add(this);+ send(getPage(), Broadcast.BREADTH, new SideInfoOpened(target));+ }++ }.setOutputMarkupPlaceholderTag(true));++ add(new Label("statusMessage", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return getBuild().getStatusMessage();+ }++ }) {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(newBuildObserver(getBuild().getId()));+ add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ switch (getBuild().getStatus()) {+ case FAILED:+ case IN_ERROR:+ case TIMED_OUT:+ case CANCELLED:+ return "alert-danger";+ case SUCCESSFUL:+ return "alert-success";+ case WAITING:+ case QUEUEING:+ case RUNNING:+ return "alert-warning";+ default:+ throw new OneException("Unexpected build status: " + getBuild().getStatus());+ }+ }++ }));++ setOutputMarkupPlaceholderTag(true);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.buildDetail.onStatusMessageDomReady();"));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getBuild().getStatusMessage() != null);+ }++ });++ RevCommit commit = getProject().getRevCommit(getBuild().getCommitHash(), true);++ CommitDetailPage.State commitState = new CommitDetailPage.State();+ commitState.revision = commit.name();+ PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);+ Link<Void> messageLink = new ViewStateAwarePageLink<Void>("commitMessage", CommitDetailPage.class, params);+ add(messageLink);+ messageLink.add(new Label("label", commit.getShortMessage()));++ add(new ContributorAvatars("commitAvatars", commit.getAuthorIdent(), commit.getCommitterIdent()));+ add(new ContributorPanel("commitNames", commit.getAuthorIdent(), commit.getCommitterIdent()));++ Link<Void> hashLink = new ViewStateAwarePageLink<Void>("commitHash", CommitDetailPage.class, params);+ hashLink.add(new Label("label", GitUtils.abbreviateSHA(commit.name())));+ add(hashLink);++ add(new WebMarkupContainer("copyCommitHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));++ List<Tab> tabs = new ArrayList<>();++ tabs.add(new BuildTab("Log", BuildLogPage.class) {++ @Override+ protected Component renderOptions(String componentId) {+ BuildLogPage page = (BuildLogPage) getPage();+ return page.renderOptions(componentId);+ }++ });+ tabs.add(new BuildTab("Fixed Issues", FixedIssuesPage.class));+ tabs.add(new BuildTab("Changes", BuildChangesPage.class));++ List<BuildTabContribution> contributions = new ArrayList<>(OneDev.getExtensions(BuildTabContribution.class));+ contributions.sort(Comparator.comparing(BuildTabContribution::getOrder));++ for (BuildTabContribution contribution: contributions)+ tabs.addAll(contribution.getTabs(getBuild()));++ add(new Tabbable("buildTabs", tabs).setOutputMarkupId(true));++ add(new SideInfoPanel("side") {++ @Override+ protected Component newContent(String componentId) {+ return new BuildSidePanel(componentId) {++ @Override+ protected Build getBuild() {+ return BuildDetailPage.this.getBuild();+ }++ @Override+ protected QueryPositionSupport<Build> getQueryPositionSupport() {+ return new QueryPositionSupport<Build>() {++ @Override+ public QueryPosition getPosition() {+ return position;+ }++ @Override+ public void navTo(AjaxRequestTarget target, Build entity, QueryPosition position) {+ PageParameters params = BuildDetailPage.paramsOf(entity, position);+ setResponsePage(getPageClass(), params);+ }++ };+ }++ @Override+ protected Component newDeleteLink(String componentId) {+ Link<Void> deleteLink = new Link<Void>(componentId) {++ @Override+ public void onClick() {+ OneDev.getInstance(BuildManager.class).delete(getBuild());+ PageParameters params = IssueListPage.paramsOf(+ getProject(),+ QueryPosition.getQuery(position),+ QueryPosition.getPage(position) + 1);+ setResponsePage(BuildListPage.class, params);+ }++ };+ deleteLink.add(new ConfirmOnClick("Do you really want to delete this build?"));+ deleteLink.setVisible(SecurityUtils.canAdministrate(getBuild().getProject().getFacade()));+ return deleteLink;+ }++ };+ }++ });++ }++ public QueryPosition getPosition() {+ return position;+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new BuildDetailResourceReference()));+ }++ @Override+ protected void onDetach() {+ buildModel.detach();+ super.onDetach();+ }++ public static PageParameters paramsOf(Build build, @Nullable QueryPosition position) {+ PageParameters params = ProjectPage.paramsOf(build.getProject());+ params.add(PARAM_BUILD, build.getNumber());+ if (position != null)+ position.fill(params);+ return params;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailResourceReference.javanew file mode 100644index 0000000000..02563dc06e--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailResourceReference.java@@ -0,0 +1,30 @@+package io.onedev.server.web.page.project.builds.detail;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;++import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class BuildDetailResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public BuildDetailResourceReference() {+ super(BuildDetailResourceReference.class, "build-detail.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(+ BuildDetailResourceReference.class, "build-detail.css")));+ dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));+ return dependencies;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildLogPage.html b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildLogPage.htmlnew file mode 100644index 0000000000..cf8b0f1684--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildLogPage.html@@ -0,0 +1,8 @@+<wicket:extend>+ <div wicket:id="log"></div>+ <wicket:fragment wicket:id="optionsFrag">+ <div>+ <a wicket:id="download" class="btn btn-default btn-sm" title="Download full log"><i class="fa fa-download"></i></a>+ </div>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..cf023c218f--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildLogPage.java@@ -0,0 +1,40 @@+package io.onedev.server.web.page.project.builds.detail;++import org.apache.wicket.Component;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.link.ResourceLink;+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;++@SuppressWarnings("serial")+public class BuildLogPage extends BuildDetailPage {++ public BuildLogPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new BuildLogPanel("log", buildModel));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.buildDetail.onLogDomReady();"));+ }++ 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())));+ 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.javanew file mode 100644index 0000000000..1a794cda9e--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java@@ -0,0 +1,33 @@+package io.onedev.server.web.page.project.builds.detail;++import org.apache.wicket.Component;+import org.apache.wicket.Page;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.model.Model;++import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.tabbable.PageTab;+import io.onedev.server.web.component.tabbable.PageTabLink;++@SuppressWarnings("serial")+public class BuildTab extends PageTab {++ public BuildTab(String title, Class<? extends BuildDetailPage> pageClass) {+ super(Model.of(title), pageClass);+ }++ @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();+ return new ViewStateAwarePageLink<Void>(linkId, pageClass,+ BuildDetailPage.paramsOf(page.getBuild(), page.position));+ }++ };+ }++}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTabContribution.java b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTabContribution.javanew file mode 100644index 0000000000..791981bd68--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTabContribution.java@@ -0,0 +1,15 @@+package io.onedev.server.web.page.project.builds.detail;++import java.util.List;++import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.server.model.Build;++@ExtensionPoint+public interface BuildTabContribution {++ List<BuildTab> getTabs(Build build);++ int getOrder();++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.html b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.htmlnew file mode 100644index 0000000000..ac45d500cc--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.html@@ -0,0 +1,3 @@+<wicket:extend>+ This is fixed issues+</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.javanew file mode 100644index 0000000000..625b469ffb--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.java@@ -0,0 +1,12 @@+package io.onedev.server.web.page.project.builds.detail;++import org.apache.wicket.request.mapper.parameter.PageParameters;++@SuppressWarnings("serial")+public class FixedIssuesPage extends BuildDetailPage {++ public FixedIssuesPage(PageParameters params) {+ super(params);+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.cssnew file mode 100644index 0000000000..e58a3bc632--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css@@ -0,0 +1,78 @@+#build-detail>.main>div {+ margin-bottom: 20px;+}+#build-detail>.main>div:last-child {+ margin-bottom: 0;+}+#build-detail>.main>.summary {+ position: relative;+ font-size: 24px;+}+#build-detail>.main>.summary>* {+ margin-right: 20px;+}+#build-detail>.main>.summary .btn {+ margin-top: -4px;+}+#build-detail>.main>.summary .more-info {+ position: absolute;+ right: 0;+ font-size: 24px;+ margin: 0;+ color: #666;+ transform: rotate(-90deg);+}++#build-detail>.main>.status-message {+ font-size: 13px;+ max-height: 100px;+ overflow: auto;+ position: relative;+}+#build-detail>.main>.commit-info {+ border: 2px dotted #BBB;+ padding: 12px;+ border-radius: 4px;+ background: #F9F9F9;+ display: none;+}+#build-detail>.main>.commit-info>* {+ margin-right: 16px;+}+#build-detail>.main>.commit-info img {+ width: 20px;+ height: 20px;+}++#build-detail .build-side>.nav {+ padding-right: 20px;+ border-right: 1px solid #D8D8D8;+ margin-right: 30px;+}++@media(min-height: 800px) {+ #build-detail>.main>.commit-info {+ display: block;+ }+ #build-detail .side-info .commit {+ display: none;+ }+}+@media(min-width: 1150px) {+ #build-detail>.main {+ padding-right: 360px;+ }+ #build-detail .side-info {+ box-shadow: none;+ border-left-width: 2px;+ display: block !important;+ }+ #build-detail a.more-info, #build-detail .side-info>a.close {+ display: none;+ }+ #build-detail .build-side .nav {+ padding-right: 0;+ border-right: none;+ margin-right: 0;+ }+}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.jsnew file mode 100644index 0000000000..86df43dee0--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.js@@ -0,0 +1,16 @@+onedev.server.buildDetail = {+ onStatusMessageDomReady: function() {+ var ps = new PerfectScrollbar($("#build-detail>.main>.status-message")[0]);+ $(window).resize(function() {+ ps.update();+ });+ },+ onLogDomReady: function() {+ var $log = $("#build-detail>.main>div>.build-log");+ function calcLogHeight() {+ $log.height($(window).height() - $log.offset().top - 40);+ }+ $(window).resize(calcLogHeight);+ calcLogHeight();+ }+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.html b/core/src/main/java/io/onedev/server/web/page/project/builds/list/BuildListPage.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.htmlrename to core/src/main/java/io/onedev/server/web/page/project/builds/list/BuildListPage.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds/list/BuildListPage.javasimilarity index 99%rename from core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.javarename to core/src/main/java/io/onedev/server/web/page/project/builds/list/BuildListPage.javaindex 264db3309e..d08916d10e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/list/BuildListPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.builds;+package io.onedev.server.web.page.project.builds.list;import java.util.ArrayList;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/NamedBuildQueriesBean.java b/core/src/main/java/io/onedev/server/web/page/project/builds/list/NamedBuildQueriesBean.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/web/page/project/builds/NamedBuildQueriesBean.javarename to core/src/main/java/io/onedev/server/web/page/project/builds/list/NamedBuildQueriesBean.javaindex d5db3feb5e..de255de0ea 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/NamedBuildQueriesBean.java+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/list/NamedBuildQueriesBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.builds;+package io.onedev.server.web.page.project.builds.list;import java.util.ArrayList;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds2/detail/BuildDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/builds2/detail/BuildDetailPage.htmldeleted file mode 100644index 4d2dbeee40..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/builds2/detail/BuildDetailPage.html+++ /dev/null@@ -1,6 +0,0 @@-<wicket:extend>- <div id="build-detail">- <h2 wicket:id="number"></h2>- <div wicket:id="log"></div>- </div>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/builds2/detail/BuildDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds2/detail/BuildDetailPage.javadeleted file mode 100644index 333e61f6df..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/builds2/detail/BuildDetailPage.java+++ /dev/null@@ -1,64 +0,0 @@-package io.onedev.server.web.page.project.builds2.detail;--import javax.persistence.EntityNotFoundException;--import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.model.Build;-import io.onedev.server.web.component.build.log.BuildLogPanel;-import io.onedev.server.web.page.project.ProjectPage;--@SuppressWarnings("serial")-public class BuildDetailPage extends ProjectPage {-- public static final String PARAM_BUILD = "build";-- private final IModel<Build> buildModel;-- public BuildDetailPage(PageParameters params) {- super(params);-- buildModel = new LoadableDetachableModel<Build>() {-- @Override- protected Build load() {- Long buildNumber = params.get(PARAM_BUILD).toLong();- Build build = OneDev.getInstance(BuildManager.class).find(getProject(), buildNumber);- if (build == null)- throw new EntityNotFoundException("Unable to find build #" + buildNumber + " in project " + getProject());- return build;- }-- };- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new Label("number", "#" + getBuild().getNumber()));- add(new BuildLogPanel("log", buildModel));- }-- private Build getBuild() {- return buildModel.getObject();- }-- @Override- protected void onDetach() {- buildModel.detach();- super.onDetach();- }-- public static PageParameters paramsOf(Build build) {- PageParameters params = ProjectPage.paramsOf(build.getProject());- params.add(PARAM_BUILD, build.getNumber());- return params;- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex a04b6ead0e..c509fbcb24 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -98,13 +98,13 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {super(params);state = new State(params);- resolvedRevision = getProject().getRevCommit(state.revision).copy();+ resolvedRevision = getProject().getRevCommit(state.revision, true).copy();if (state.compareWith != null)- resolvedCompareWith = getProject().getRevCommit(state.compareWith).copy();+ resolvedCompareWith = getProject().getRevCommit(state.compareWith, true).copy();}private RevCommit getCommit() {- return getProject().getRevCommit(state.revision);+ return getProject().getRevCommit(state.revision, true);}private List<RevCommit> getParents() {@@ -218,7 +218,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {});add(new ContributorAvatars("contributorAvatars", getCommit().getAuthorIdent(), getCommit().getCommitterIdent()));- add(new ContributorPanel("contribution", getCommit().getAuthorIdent(), getCommit().getCommitterIdent(), true));+ add(new ContributorPanel("contribution", getCommit().getAuthorIdent(), getCommit().getCommitterIdent()));add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.javaindex 0312a52bcf..492c644396 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java@@ -571,8 +571,7 @@ public class ProjectCommitsPage extends ProjectPage {labelsView.add(new Label(labelsView.newChildId(), label));item.add(labelsView);- item.add(new ContributorPanel("contribution",- commit.getAuthorIdent(), commit.getCommitterIdent(), true));+ item.add(new ContributorPanel("contribution", commit.getAuthorIdent(), commit.getCommitterIdent()));/** If we query a single definitive path, let's record it to be used fordiff --git a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex ed4d6a4d06..c74109a0b3 100644--- a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -247,7 +247,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {* note that we can not get merge commit object in current revWalk as* it has been marked and this will make the commit object incomplete*/- commits.add(getProject().getRevCommit(mergeBase));+ commits.add(getProject().getRevCommit(mergeBase, true));} else {revWalk.markStart(revWalk.parseCommit(rightCommitId));revWalk.markUninteresting(revWalk.parseCommit(mergeBase));diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex 75929a681c..7ee5fc3d40 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -43,9 +43,9 @@ import io.onedev.server.web.component.commit.list.CommitListPanel;import io.onedev.server.web.component.issue.activities.IssueActivitiesPanel;import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;import io.onedev.server.web.component.issue.pullrequests.IssuePullRequestsPanel;-import io.onedev.server.web.component.issue.side.IssueInfoPanel;+import io.onedev.server.web.component.issue.side.IssueSidePanel;import io.onedev.server.web.component.issue.title.IssueTitlePanel;-import io.onedev.server.web.component.moreinfoside.MoreInfoSidePanel;+import io.onedev.server.web.component.sideinfo.SideInfoPanel;import io.onedev.server.web.component.tabbable.AjaxActionTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;@@ -235,11 +235,11 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConteaddOrReplace(new Tabbable("tabs", tabs).setOutputMarkupId(true));- addOrReplace(new MoreInfoSidePanel("moreInfo") {+ addOrReplace(new SideInfoPanel("moreInfo") {@Overrideprotected Component newContent(String componentId) {- return new IssueInfoPanel(componentId) {+ return new IssueSidePanel(componentId) {@Overrideprotected Issue getIssue() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.cssindex b58051cb7f..0f81c71ffa 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css@@ -207,7 +207,7 @@.board-card-detail>.body>.main .commits {margin-bottom: 20px;}-.board-card-detail>.body>.more-info-side {+.board-card-detail>.body>.side-info {position: absolute;top: 0;width: 320px;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 15329db226..d20960966a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -36,10 +36,10 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;-import io.onedev.server.web.component.issue.side.IssueInfoPanel;+import io.onedev.server.web.component.issue.side.IssueSidePanel;import io.onedev.server.web.component.issue.title.IssueTitlePanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.moreinfoside.MoreInfoSidePanel;+import io.onedev.server.web.component.sideinfo.SideInfoPanel;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.PageTabLink;import io.onedev.server.web.component.tabbable.Tab;@@ -153,11 +153,11 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexadd(new Tabbable("issueTabs", tabs).setOutputMarkupId(true));- add(new MoreInfoSidePanel("moreInfo") {+ add(new SideInfoPanel("moreInfo") {@Overrideprotected Component newContent(String componentId) {- return new IssueInfoPanel(componentId) {+ return new IssueSidePanel(componentId) {@Overrideprotected Issue getIssue() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.cssindex e2f399e699..3f3f677895 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css@@ -14,12 +14,12 @@#issue-detail>.main {padding-right: 360px;}- #issue-detail .more-info-side {+ #issue-detail .side-info {box-shadow: none;border-left-width: 2px;display: block !important;}- #issue-detail .issue-operations a.more-info, #issue-detail .more-info-side>a.close {+ #issue-detail .issue-operations a.more-info, #issue-detail .side-info>a.close {display: none;}#issue-detail .issue-info .nav {diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex a7790c6ab2..5e3e652fc7 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -94,11 +94,11 @@ import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.markdown.AttachmentSupport;-import io.onedev.server.web.component.moreinfoside.MoreInfoSideClosed;-import io.onedev.server.web.component.moreinfoside.MoreInfoSideOpened;-import io.onedev.server.web.component.moreinfoside.MoreInfoSidePanel;import io.onedev.server.web.component.project.comment.CommentInput;import io.onedev.server.web.component.review.ReviewListPanel;+import io.onedev.server.web.component.sideinfo.SideInfoClosed;+import io.onedev.server.web.component.sideinfo.SideInfoOpened;+import io.onedev.server.web.component.sideinfo.SideInfoPanel;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.PageTabLink;import io.onedev.server.web.component.tabbable.Tab;@@ -393,7 +393,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {});- add(new MoreInfoSidePanel("moreInfo") {+ add(new SideInfoPanel("moreInfo") {@Overrideprotected Component newContent(String componentId) {@@ -670,8 +670,8 @@ public abstract class PullRequestDetailPage extends ProjectPage {@Overridepublic void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof MoreInfoSideClosed) {- MoreInfoSideClosed moreInfoSideClosed = (MoreInfoSideClosed) event.getPayload();+ if (event.getPayload() instanceof SideInfoClosed) {+ SideInfoClosed moreInfoSideClosed = (SideInfoClosed) event.getPayload();setVisible(true);moreInfoSideClosed.getHandler().add(this);}@@ -681,7 +681,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {public void onClick(AjaxRequestTarget target) {setVisible(false);target.add(this);- send(getPage(), Broadcast.BREADTH, new MoreInfoSideOpened(target));+ send(getPage(), Broadcast.BREADTH, new SideInfoOpened(target));}}.setOutputMarkupPlaceholderTag(true));diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.cssindex ce0e6a5bc6..518c63eaa7 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css@@ -93,7 +93,7 @@ ul>li>a.code-comments.new .fa-circle {display: inline;}-#request-detail>.more-info-side>.content>.nav {+#request-detail>.side-info>.content>.nav {font-size: 16px;position: relative;text-align: center;@@ -101,35 +101,35 @@ ul>li>a.code-comments.new .fa-circle {border-right: 1px solid #D8D8D8;margin-right: 30px;}-#request-detail>.more-info-side>.content>.nav a {+#request-detail>.side-info>.content>.nav a {position: absolute;color: #666;top: 0;}-#request-detail>.more-info-side>.content>.nav .prev {+#request-detail>.side-info>.content>.nav .prev {left: 0;}-#request-detail>.more-info-side>.content>.nav .next {+#request-detail>.side-info>.content>.nav .next {right: 0;}-#request-detail>.more-info-side>.content>div>.head {+#request-detail>.side-info>.content>div>.head {font-weight: bold;margin-bottom: 12px;}-#request-detail>.more-info-side {+#request-detail>.side-info {width: 360px;padding: 20px;background: #F9F9F9;}-#request-detail>.more-info-side>.content>* {+#request-detail>.side-info>.content>* {margin-bottom: 20px;border-top: 1px solid #E8E8E8;padding-top: 20px;}-#request-detail>.more-info-side>.content>div:first-child {+#request-detail>.side-info>.content>div:first-child {border-top: none;padding-top: 0;}@@ -161,18 +161,18 @@ ul>li>a.code-comments.new .fa-circle {#request-detail>.main {padding-right: 360px;}- #request-detail .more-info-side {+ #request-detail .side-info {box-shadow: none;border-left-width: 2px;display: block !important;}- #request-detail .more-info-side.closed {+ #request-detail .side-info.closed {display: block;}- #request-detail .status-and-branches a.more-info, #request-detail .more-info-side>a.close {+ #request-detail .status-and-branches a.more-info, #request-detail .side-info>a.close {display: none;}- #request-detail>.more-info-side>.content>.nav {+ #request-detail>.side-info>.content>.nav {padding-right: 0;border-right: none;margin-right: 0;diff --git a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex 5ce439c7bc..2beb2b6762 100644--- a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -326,7 +326,7 @@ public class ProjectTagsPage extends ProjectPage {link.add(new Label("message", commit.getShortMessage()));item.add(link);- item.add(new ContributorPanel("contributor", commit.getAuthorIdent(), commit.getCommitterIdent(), true));+ item.add(new ContributorPanel("contributor", commit.getAuthorIdent(), commit.getCommitterIdent()));item.add(new ArchiveMenuLink("download", projectModel) {diff --git a/core/src/main/java/io/onedev/server/web/stream/ArchiveStreamResource.java b/core/src/main/java/io/onedev/server/web/stream/ArchiveStreamResource.javaindex 71581ed7cd..7b67da8089 100644--- a/core/src/main/java/io/onedev/server/web/stream/ArchiveStreamResource.java+++ b/core/src/main/java/io/onedev/server/web/stream/ArchiveStreamResource.java@@ -89,7 +89,7 @@ public class ArchiveStreamResource extends AbstractResource {try {ArchiveCommand archive = Git.wrap(project.getRepository()).archive();archive.setFormat(format);- archive.setTree(project.getRevCommit(revision).getId());+ archive.setTree(project.getRevCommit(revision, true).getId());archive.setOutputStream(attributes.getResponse().getOutputStream());archive.call();} catch (GitAPIException e) {diff --git a/core/src/main/java/io/onedev/server/web/stream/RawBlobStreamResource.java b/core/src/main/java/io/onedev/server/web/stream/RawBlobStreamResource.javaindex 506f3ad842..93b83756cf 100644--- a/core/src/main/java/io/onedev/server/web/stream/RawBlobStreamResource.java+++ b/core/src/main/java/io/onedev/server/web/stream/RawBlobStreamResource.java@@ -77,7 +77,7 @@ public class RawBlobStreamResource extends AbstractResource {if (!SecurityUtils.canReadCode(project.getFacade()))throw new UnauthorizedException();- final Blob blob = project.getBlob(new BlobIdent(revision, path, 0));+ final Blob blob = project.getBlob(new BlobIdent(revision, path, 0), true);ResourceResponse response = new ResourceResponse();response.setAcceptRange(ContentRangeType.BYTES);diff --git a/plugin/artifact/pom.xml b/plugin/artifact/pom.xmlnew file mode 100644index 0000000000..fef379c711--- /dev/null+++ b/plugin/artifact/pom.xml@@ -0,0 +1,14 @@+<?xml version="1.0" encoding="UTF-8"?>+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">+ <modelVersion>4.0.0</modelVersion>+ <artifactId>server-plugin-artifact</artifactId>+ <parent>+ <groupId>io.onedev</groupId>+ <artifactId>server-plugin</artifactId>+ <version>2.1.4</version>+ </parent>+ <properties>+ <moduleClass>io.onedev.server.plugin.artifact.ArtifactModule</moduleClass>+ </properties>+</project>\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..08a42899b3--- /dev/null+++ b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactModule.java@@ -0,0 +1,83 @@+package io.onedev.server.plugin.artifact;++import java.io.File;+import java.util.ArrayList;+import java.util.Collection;+import java.util.List;+import java.util.concurrent.Callable;++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.LockUtils;+import io.onedev.server.ci.job.DependencyPopulator;+import io.onedev.server.ci.job.JobOutcome;+import io.onedev.server.model.Build;+import io.onedev.server.web.WebApplicationConfigurator;+import io.onedev.server.web.page.project.builds.detail.BuildTab;+import io.onedev.server.web.page.project.builds.detail.BuildTabContribution;+import io.onedev.server.web.util.mapper.OnePageMapper;++public class ArtifactModule extends AbstractPluginModule {++ @Override+ protected void configure() {+ super.configure();++ contribute(ImplementationProvider.class, new ImplementationProvider() {++ @Override+ public Class<?> getAbstractClass() {+ return JobOutcome.class;+ }++ @Override+ public Collection<Class<?>> getImplementations() {+ return Sets.newHashSet(JobArtifacts.class);+ }++ });++ contribute(DependencyPopulator.class, ArtifactsPopulator.class);++ contribute(BuildTabContribution.class, new BuildTabContribution() {++ @Override+ public List<BuildTab> getTabs(Build build) {+ List<BuildTab> tabs = new ArrayList<>();+ File artifactsDir = JobOutcome.getOutcomeDir(build, JobArtifacts.DIR);+ LockUtils.read(JobOutcome.getLockKey(build, JobArtifacts.DIR), new Callable<Void>() {++ @Override+ public Void call() throws Exception {+ if (artifactsDir.exists())+ tabs.add(new BuildTab("Artifacts", BuildArtifactsPage.class));+ return null;+ }++ });+ return tabs;+ }++ @Override+ public int getOrder() {+ return 100;+ }++ });++ contribute(WebApplicationConfigurator.class, new WebApplicationConfigurator() {++ @Override+ public void configure(WebApplication application) {+ application.mount(new OnePageMapper("projects/${project}/builds/${build}/artifacts", BuildArtifactsPage.class));+ }++ });++ }++}diff --git a/core/src/main/java/io/onedev/server/ci/job/outcome/artifact/ArtifactsPopulator.java b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactsPopulator.javasimilarity index 78%rename from core/src/main/java/io/onedev/server/ci/job/outcome/artifact/ArtifactsPopulator.javarename to plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactsPopulator.javaindex dd69e7490d..4a4626c008 100644--- a/core/src/main/java/io/onedev/server/ci/job/outcome/artifact/ArtifactsPopulator.java+++ b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactsPopulator.java@@ -1,4 +1,4 @@-package io.onedev.server.ci.job.outcome.artifact;+package io.onedev.server.plugin.artifact;import java.io.File;import java.util.concurrent.Callable;@@ -7,8 +7,8 @@ import org.apache.commons.io.FileUtils;import org.slf4j.Logger;import io.onedev.commons.utils.LockUtils;-import io.onedev.server.ci.job.outcome.DependencyPopulator;-import io.onedev.server.ci.job.outcome.JobOutcome;+import io.onedev.server.ci.job.DependencyPopulator;+import io.onedev.server.ci.job.JobOutcome;import io.onedev.server.model.Build;public class ArtifactsPopulator implements DependencyPopulator {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.htmlnew file mode 100644index 0000000000..4dc78b2f67--- /dev/null+++ b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.html@@ -0,0 +1,3 @@+<wicket:extend>+ Build artifacts+</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.javanew file mode 100644index 0000000000..6f7c94ee82--- /dev/null+++ b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java@@ -0,0 +1,14 @@+package io.onedev.server.plugin.artifact;++import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;++@SuppressWarnings("serial")+public class BuildArtifactsPage extends BuildDetailPage {++ public BuildArtifactsPage(PageParameters params) {+ super(params);+ }++}diff --git a/core/src/main/java/io/onedev/server/ci/job/outcome/artifact/JobArtifacts.java b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/JobArtifacts.javasimilarity index 88%rename from core/src/main/java/io/onedev/server/ci/job/outcome/artifact/JobArtifacts.javarename to plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/JobArtifacts.javaindex 9e1124ccf0..29842c7bc1 100644--- a/core/src/main/java/io/onedev/server/ci/job/outcome/artifact/JobArtifacts.java+++ b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/JobArtifacts.java@@ -1,4 +1,4 @@-package io.onedev.server.ci.job.outcome.artifact;+package io.onedev.server.plugin.artifact;import java.io.File;import java.io.IOException;@@ -8,7 +8,7 @@ import org.slf4j.Logger;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;-import io.onedev.server.ci.job.outcome.JobOutcome;+import io.onedev.server.ci.job.JobOutcome;import io.onedev.server.model.Build;import io.onedev.server.web.editable.annotation.Editable;diff --git a/plugin/htmlreport/pom.xml b/plugin/htmlreport/pom.xmlnew file mode 100644index 0000000000..0920ffd2e3--- /dev/null+++ b/plugin/htmlreport/pom.xml@@ -0,0 +1,14 @@+<?xml version="1.0" encoding="UTF-8"?>+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">+ <modelVersion>4.0.0</modelVersion>+ <artifactId>server-plugin-htmlreport</artifactId>+ <parent>+ <groupId>io.onedev</groupId>+ <artifactId>server-plugin</artifactId>+ <version>2.1.4</version>+ </parent>+ <properties>+ <moduleClass>io.onedev.server.plugin.htmlreport.HtmlReportModule</moduleClass>+ </properties>+</project>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/ci/job/outcome/htmlreport/HtmlReportInfo.java b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportInfo.javasimilarity index 85%rename from core/src/main/java/io/onedev/server/ci/job/outcome/htmlreport/HtmlReportInfo.javarename to plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportInfo.javaindex 5937891490..d5a9b00026 100644--- a/core/src/main/java/io/onedev/server/ci/job/outcome/htmlreport/HtmlReportInfo.java+++ b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportInfo.java@@ -1,4 +1,4 @@-package io.onedev.server.ci.job.outcome.htmlreport;+package io.onedev.server.plugin.htmlreport;import java.io.Serializable;diff --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.javanew file mode 100644index 0000000000..dc194b8d30--- /dev/null+++ b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportModule.java@@ -0,0 +1,32 @@+package io.onedev.server.plugin.htmlreport;++import java.util.Collection;++import com.google.common.collect.Sets;++import io.onedev.commons.launcher.loader.AbstractPluginModule;+import io.onedev.commons.launcher.loader.ImplementationProvider;+import io.onedev.server.ci.job.JobOutcome;++public class HtmlReportModule extends AbstractPluginModule {++ @Override+ protected void configure() {+ super.configure();++ contribute(ImplementationProvider.class, new ImplementationProvider() {++ @Override+ public Class<?> getAbstractClass() {+ return JobOutcome.class;+ }++ @Override+ public Collection<Class<?>> getImplementations() {+ return Sets.newHashSet(JobHtmlReport.class);+ }++ });+ }++}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.htmlnew file mode 100644index 0000000000..1eb4168096--- /dev/null+++ b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.html@@ -0,0 +1,3 @@+<wicket:extend>+ Html report+</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.javanew file mode 100644index 0000000000..a4bb703cdc--- /dev/null+++ b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.java@@ -0,0 +1,14 @@+package io.onedev.server.plugin.htmlreport;++import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;++@SuppressWarnings("serial")+public class HtmlReportPage extends BuildDetailPage {++ public HtmlReportPage(PageParameters params) {+ super(params);+ }++}diff --git a/core/src/main/java/io/onedev/server/ci/job/outcome/htmlreport/JobHtmlReport.java b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/JobHtmlReport.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/ci/job/outcome/htmlreport/JobHtmlReport.javarename to plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/JobHtmlReport.javaindex 3a3ba0bdc3..76efb4c108 100644--- a/core/src/main/java/io/onedev/server/ci/job/outcome/htmlreport/JobHtmlReport.java+++ b/plugin/htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/JobHtmlReport.java@@ -1,4 +1,4 @@-package io.onedev.server.ci.job.outcome.htmlreport;+package io.onedev.server.plugin.htmlreport;import java.io.File;import java.io.IOException;@@ -11,7 +11,7 @@ import org.slf4j.Logger;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;-import io.onedev.server.ci.job.outcome.JobOutcome;+import io.onedev.server.ci.job.JobOutcome;import io.onedev.server.model.Build;import io.onedev.server.web.editable.annotation.Editable;diff --git a/plugin/pom.xml b/plugin/pom.xmlnew file mode 100644index 0000000000..d46dbe1f6c--- /dev/null+++ b/plugin/pom.xml@@ -0,0 +1,31 @@+<?xml version="1.0" encoding="UTF-8"?>+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">+ <modelVersion>4.0.0</modelVersion>+ <artifactId>server-plugin</artifactId>+ <packaging>pom</packaging>+ <parent>+ <groupId>io.onedev</groupId>+ <artifactId>server</artifactId>+ <version>2.1.4</version>+ </parent>+ <modules>+ <module>artifact</module>+ <module>htmlreport</module>+ </modules>+ <build>+ <plugins>+ <plugin>+ <groupId>io.onedev</groupId>+ <artifactId>plugin-maven</artifactId>+ </plugin>+ </plugins>+ </build>+ <dependencies>+ <dependency>+ <groupId>io.onedev</groupId>+ <artifactId>server-core</artifactId>+ <version>${project.version}</version>+ </dependency>+ </dependencies>+</project>\ No newline at end of filediff --git a/pom.xml b/pom.xmlindex dee0b7f49f..1f3cc90c3f 100644--- a/pom.xml+++ b/pom.xml@@ -161,6 +161,7 @@</build><modules><module>core</module>+ <module>plugin</module><module>product</module></modules><dependencyManagement>diff --git a/product/pom.xml b/product/pom.xmlindex 15dddf5d5c..92089a53e3 100644--- a/product/pom.xml+++ b/product/pom.xml@@ -96,6 +96,16 @@<artifactId>server-core</artifactId><version>${project.version}</version></dependency>+ <dependency>+ <groupId>io.onedev</groupId>+ <artifactId>server-plugin-artifact</artifactId>+ <version>${project.version}</version>+ </dependency>+ <dependency>+ <groupId>io.onedev</groupId>+ <artifactId>server-plugin-htmlreport</artifactId>+ <version>${project.version}</version>+ </dependency></dependencies><properties><executables>bin/*.sh, boot/wrapper-*</executables>