opendev/gerrit
Code Issues Proposed changes

Remove launcher dependency from httpd

Browse Source 
Allow httpd to build without the launcher by writing the generated
gitweb config to $site_path/tmp.  This location was added when plugins
came about and therefore was not available when gitweb support started
writing a generated configuration file.

Change-Id: Id9bbb615c233f3426395972e5c049587a9956fbd
This commit is contained in:
Shawn Pearce
2013-04-29 17:38:45 -07:00
parent f22460e8a8
commit e31f406600
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-httpd/pom.xml
View File

@@ -64,12 +64,6 @@ limitations under the License.
<artifactId>gwtjsonrpc</artifactId> <artifactId>gwtjsonrpc</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.google.gerrit</groupId>
<artifactId>gerrit-launcher</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.google.gerrit</groupId> <groupId>com.google.gerrit</groupId>
<artifactId>gerrit-server</artifactId> <artifactId>gerrit-server</artifactId>

6
gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java
View File

@@ -32,7 +32,6 @@ package com.google.gerrit.httpd.gitweb;
import com.google.gerrit.common.data.GerritConfig; import com.google.gerrit.common.data.GerritConfig;
import com.google.gerrit.extensions.restapi.Url; import com.google.gerrit.extensions.restapi.Url;
import com.google.gerrit.httpd.GitWebConfig; import com.google.gerrit.httpd.GitWebConfig;
import com.google.gerrit.launcher.GerritLauncher;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.AnonymousUser; import com.google.gerrit.server.AnonymousUser;
import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.IdentifiedUser;
@@ -140,7 +139,10 @@ class GitWebServlet extends HttpServlet {
private void makeSiteConfig(final SitePaths site, private void makeSiteConfig(final SitePaths site,
final GerritConfig gerritConfig) throws IOException { final GerritConfig gerritConfig) throws IOException {
final File myconf = GerritLauncher.createTempFile("gitweb_config", ".perl"); if (!site.tmp_dir.exists()) {
site.tmp_dir.mkdirs();
}
File myconf = File.createTempFile("gitweb_config", ".perl", site.tmp_dir);
// To make our configuration file only readable or writable by us; // To make our configuration file only readable or writable by us;
// this reduces the chances of someone tampering with the file. // this reduces the chances of someone tampering with the file.