opendev/gerrit
Code Issues Proposed changes

Consistently use com.google.inject.Inject instead of javax.inject.Inject

Browse Source 
JEE containers intercept JSR330 annotations and are failing to deploy
gerrit.war, here example of Wildfly 8: [1]. This change rectifies it
by using consistently Guice's own annotations to prevent it. Here is
fixed deployment on Wildfly [2], note that weld service was started
successfully.

[1] http://paste.openstack.org/show/117008
[2] http://paste.openstack.org/show/117014

Change-Id: Idedd9e44352ced5166b62fa09c4b42971e666aaa
This commit is contained in:
David Ostrovsky
2014-09-30 10:17:08 +02:00
parent 554fc4baee
commit 4c02f6b049
9 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-sshd/src/main/java/com/google/gerrit/sshd/SingleCommandPluginModule.java
View File

@@ -16,12 +16,11 @@ package com.google.gerrit.sshd;
import com.google.common.base.Preconditions;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.inject.Inject;
import com.google.inject.binder.LinkedBindingBuilder;
import org.apache.sshd.server.Command;
import javax.inject.Inject;
/**
* Binds one SSH command to the plugin name itself.
* <p>