Skip to content
This repository was archived by the owner on Jan 18, 2021. It is now read-only.

Add support for Bitbucket 4.0.0 #16

Open
mithun wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add support for Bitbucket 4.0.0 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0fc3382
Implement user project exclusion
nwatson Dec 9, 2014
0cbc0ac
Set UTF-8 encoding
gliptak Jul 11, 2015
c65043b
Support earliest 3.x Stash version
gliptak Jul 11, 2015
1f24c90
Bump elasticsearch to current version
gliptak Jul 11, 2015
51d9d5c
Change the logfile path to ${stash.home}/log
Aug 22, 2015
9a76a3d
Merge commit '0fc338230426d22775a6750d33520d81430ab05a' into bitbucket
Oct 14, 2015
3070de4
update to bitbucket 4.0.0
Oct 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/install-elasticsearch-instance.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# 1.3.3
DOWNLOAD_URL="https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.3.tar.gz"
# 1.6.0
DOWNLOAD_URL="https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.6.0.tar.gz"

# To find new URLs, see: http://www.elasticsearch.org/download/

Expand Down
175 changes: 81 additions & 94 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,102 +1,84 @@
<?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">
<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>

<groupId>com.palantir.stash</groupId>
<artifactId>stash-code-search</artifactId>
<version>${domainVersion}</version>
<version>4.0.0</version>
<packaging>atlassian-plugin</packaging>

<name>Stash Codesearch</name>
<description>Provides global repository, commit, and file content search for Stash instances</description>
<packaging>atlassian-plugin</packaging>
<organization>
<name>Palantir Technologies</name>
<url>http://palantir.com</url>
</organization>
<build>
<plugins>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-stash-plugin</artifactId>
<version>${amps.version}</version>
<extensions>true</extensions>
<configuration>
<products>
<product>
<id>stash</id>
<instanceId>stash</instanceId>
<version>${stash.version}</version>
<dataVersion>${stash.data.version}</dataVersion>
<containerId>${stash.containerId}</containerId>
</product>
</products>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>net.sf.alchim</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<version>0.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.4</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>

<properties>
<amps.version>6.1.0</amps.version>
<bitbucket.version>4.0.0</bitbucket.version>
<bitbucket.data.version>4.0.0</bitbucket.data.version>
<bitbucket.containerId>tomcat8x</bitbucket.containerId>
<ao.version>0.21.2</ao.version>
<elasticsearch.version>1.6.0</elasticsearch.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.atlassian.stash</groupId>
<artifactId>stash-parent</artifactId>
<version>${stash.version}</version>
<groupId>com.atlassian.bitbucket.server</groupId>
<artifactId>bitbucket-parent</artifactId>
<version>4.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.atlassian.stash</groupId>
<artifactId>stash-api</artifactId>
<groupId>com.atlassian.bitbucket.server</groupId>
<artifactId>bitbucket-api</artifactId>
<version>${bitbucket.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.atlassian.stash</groupId>
<artifactId>stash-spi</artifactId>
<groupId>com.atlassian.bitbucket.server</groupId>
<artifactId>bitbucket-spi</artifactId>
<version>${bitbucket.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.atlassian.stash</groupId>
<artifactId>stash-scm-git-api</artifactId>
<groupId>com.atlassian.bitbucket.server</groupId>
<artifactId>bitbucket-git-api</artifactId>
<version>${bitbucket.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.atlassian.stash</groupId>
<artifactId>stash-scm-common</artifactId>
<groupId>com.atlassian.bitbucket.server</groupId>
<artifactId>bitbucket-scm-common</artifactId>
<version>${bitbucket.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.atlassian.stash</groupId>
<artifactId>stash-page-objects</artifactId>
<groupId>com.atlassian.bitbucket.server</groupId>
<artifactId>bitbucket-page-objects</artifactId>
<version>${bitbucket.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.atlassian.soy</groupId>
<artifactId>soy-template-renderer-api</artifactId>
<version>${bitbucket.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.atlassian.plugins</groupId>
<artifactId>atlassian-plugins-webresource</artifactId>
<version>3.4.7</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -118,12 +100,13 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>1.1.0</version>
<version>${elasticsearch.version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
Expand All @@ -141,57 +124,61 @@
<version>1.8.5</version>
<scope>test</scope>
</dependency>
<!-- needed for base64 encode -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.9</version>
</dependency>
<!-- needed for logger -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<!-- <version>1.0.11</version> version from stash-parent/pom.xml -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.atlassian.sal</groupId>
<artifactId>sal-api</artifactId>
<!-- <version>2.10.9</version> version from stash-parent/pom.xml -->
<scope>provided</scope>
</dependency>
</dependencies>
<properties>
<amps.version>5.0.4</amps.version>
<stash.version>3.6.0</stash.version>
<stash.data.version>3.6.0</stash.data.version>
<stash.containerId>tomcat7x</stash.containerId>
<ao.version>0.21.2</ao.version>
</properties>
<profiles>
<profile>
<id>gitversion</id>

<properties>
<domainVersion>${env.DOMAIN_VERSION}</domainVersion>
</properties>
<activation>
<property>
<name>env.DOMAIN_VERSION</name>
</property>
</activation>
</profile>
<profile>
<id>defaultversion</id>

<properties>
<domainVersion>0.0.1-DEV</domainVersion>
</properties>
<activation>
<property>
<name>!env.DOMAIN_VERSION</name>
</property>
</activation>
</profile>
</profiles>
<build>
<plugins>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>bitbucket-maven-plugin</artifactId>
<version>6.1.0</version>
<extensions>true</extensions>
<configuration>
<products>
<product>
<id>bitbucket</id>
<instanceId>bitbucket</instanceId>
<version>${bitbucket.version}</version>
<dataVersion>${bitbucket.data.version}</dataVersion>
<containerId>${bitbucket.containerId}</containerId>
</product>
</products>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>net.sf.alchim</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<version>0.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.4</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
18 changes: 9 additions & 9 deletions src/main/java/com/palantir/stash/codesearch/admin/GlobalSettingsServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@
import org.slf4j.LoggerFactory;

import com.atlassian.soy.renderer.SoyTemplateRenderer;
import com.atlassian.stash.exception.AuthorisationException;
import com.atlassian.stash.server.ApplicationPropertiesService;
import com.atlassian.stash.user.EscalatedSecurityContext;
import com.atlassian.stash.user.Permission;
import com.atlassian.stash.user.PermissionValidationService;
import com.atlassian.stash.user.SecurityService;
import com.atlassian.stash.util.Operation;
import com.atlassian.bitbucket.AuthorisationException;
import com.atlassian.bitbucket.server.ApplicationPropertiesService;
import com.atlassian.bitbucket.user.EscalatedSecurityContext;
import com.atlassian.bitbucket.permission.Permission;
import com.atlassian.bitbucket.permission.PermissionValidationService;
import com.atlassian.bitbucket.user.SecurityService;
import com.atlassian.bitbucket.util.Operation;
import com.google.common.collect.ImmutableMap;
import com.palantir.stash.codesearch.updater.SearchUpdater;

public class GlobalSettingsServlet extends HttpServlet {

/**
*
*
*/
private static final long serialVersionUID = 1L;

Expand Down Expand Up @@ -141,7 +141,7 @@ private boolean verifySysAdmin(HttpServletRequest req, HttpServletResponse resp)
}
try {
validationService.validateForGlobal(Permission.SYS_ADMIN);
} catch (AuthorisationException notSysAdminException) {
} catch ( AuthorisationException notSysAdminException) {
log.warn("User {} is not a system administrator", req.getRemoteUser());
resp.sendError(HttpServletResponse.SC_UNAUTHORIZED, "You do not have permission to access this page.");
return false;
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/com/palantir/stash/codesearch/admin/RepositorySettingsServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@
import org.slf4j.LoggerFactory;

import com.atlassian.soy.renderer.SoyTemplateRenderer;
import com.atlassian.stash.exception.AuthorisationException;
import com.atlassian.stash.repository.Repository;
import com.atlassian.stash.repository.RepositoryService;
import com.atlassian.stash.server.ApplicationPropertiesService;
import com.atlassian.stash.user.EscalatedSecurityContext;
import com.atlassian.stash.user.Permission;
import com.atlassian.stash.user.PermissionValidationService;
import com.atlassian.stash.user.SecurityService;
import com.atlassian.stash.util.Operation;
import com.atlassian.bitbucket.AuthorisationException;
import com.atlassian.bitbucket.repository.Repository;
import com.atlassian.bitbucket.repository.RepositoryService;
import com.atlassian.bitbucket.server.ApplicationPropertiesService;
import com.atlassian.bitbucket.user.EscalatedSecurityContext;
import com.atlassian.bitbucket.permission.Permission;
import com.atlassian.bitbucket.permission.PermissionValidationService;
import com.atlassian.bitbucket.user.SecurityService;
import com.atlassian.bitbucket.util.Operation;
import com.google.common.collect.ImmutableMap;
import com.palantir.stash.codesearch.updater.SearchUpdater;

public class RepositorySettingsServlet extends HttpServlet {

/**
*
*
*/
private static final long serialVersionUID = 1L;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/palantir/stash/codesearch/admin/SettingsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

package com.palantir.stash.codesearch.admin;
import com.atlassian.stash.repository.Repository;
import com.atlassian.bitbucket.repository.Repository;
import com.palantir.stash.codesearch.updater.SearchUpdater;

public interface SettingsManager {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/palantir/stash/codesearch/admin/SettingsManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package com.palantir.stash.codesearch.admin;

import com.atlassian.activeobjects.external.ActiveObjects;
import com.atlassian.stash.repository.Repository;
import com.atlassian.bitbucket.repository.Repository;
import com.palantir.stash.codesearch.updater.SearchUpdater;
import java.util.ArrayList;
import java.util.List;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/palantir/stash/codesearch/event/IndexerEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
package com.palantir.stash.codesearch.event;

import com.atlassian.event.api.EventListener;
import com.atlassian.stash.event.RepositoryDeletedEvent;
import com.atlassian.stash.event.RepositoryRefsChangedEvent;
import com.atlassian.stash.repository.RefChange;
import com.atlassian.stash.repository.RefChangeType;
import com.atlassian.stash.repository.Repository;
import com.atlassian.bitbucket.event.repository.RepositoryDeletedEvent;
import com.atlassian.bitbucket.event.repository.RepositoryRefsChangedEvent;
import com.atlassian.bitbucket.repository.RefChange;
import com.atlassian.bitbucket.repository.RefChangeType;
import com.atlassian.bitbucket.repository.Repository;
import com.palantir.stash.codesearch.repository.RepositoryServiceManager;
import com.palantir.stash.codesearch.updater.SearchUpdater;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/palantir/stash/codesearch/repository/RepositoryServiceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

package com.palantir.stash.codesearch.repository;

import com.atlassian.stash.repository.*;
import com.atlassian.stash.user.PermissionValidationService;
import com.atlassian.bitbucket.repository.*;
import com.atlassian.bitbucket.permission.PermissionValidationService;
import com.google.common.collect.ImmutableMap;

public interface RepositoryServiceManager {
Expand All @@ -20,6 +20,6 @@ ImmutableMap<String, Repository> getRepositoryMap (

RepositoryService getRepositoryService ();

RepositoryMetadataService getRepositoryMetadataService ();
RefService getRefService ();

}
Loading