opendev/gerrit
Code Issues Proposed changes

Revert "Use javax.inject.Inject instead of com.google.inject.Inject"

Browse Source 
This reverts commit 5db3bba3e2.

I was too fast to submit 5db3bba. Besides forgetting to submit the
referenced changes in some submodules some people reported issues
with the interception of the javax.inject.Inject in some JEE containers.

Change-Id: I931ad329d2e7be6f6ce804b8395489a021c8240b
This commit is contained in:
Saša Živkov
2014-09-30 08:50:58 +00:00
committed by Saša Živkov
parent 27543f9656
commit 1c48a7ee1c
638 changed files with 638 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/rules/PrologCompiler.java
View File

@@ -19,6 +19,7 @@ import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.util.TimeUtil;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import com.googlecode.prolog_cafe.compiler.CompileException;
@@ -45,7 +46,6 @@ import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
import javax.inject.Inject;
import javax.tools.Diagnostic;
import javax.tools.DiagnosticCollector;
import javax.tools.JavaCompiler;

3
gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java
View File

@@ -20,6 +20,7 @@ import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.patch.PatchListCache;
import com.google.gerrit.server.patch.PatchSetInfoFactory;
import com.google.gerrit.server.project.ProjectCache;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import com.google.inject.assistedinject.Assisted;
@@ -38,8 +39,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import javax.inject.Inject;
/**
* Per-thread Prolog interpreter.
* <p>

3
gerrit-server/src/main/java/com/google/gerrit/rules/RulesCache.java
View File

@@ -24,6 +24,7 @@ import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.googlecode.prolog_cafe.compiler.CompileException;
@@ -61,8 +62,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.inject.Inject;
/**
* Manages a cache of compiled Prolog rules.
* <p>