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

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

gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java

@@ -16,6 +16,7 @@ package com.google.gerrit.server.args4j;
 
 import com.google.gerrit.reviewdb.client.AccountGroup;
 import com.google.gerrit.server.account.GroupCache;
+import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 
 import org.kohsuke.args4j.CmdLineException;
@@ -25,8 +26,6 @@ import org.kohsuke.args4j.spi.OptionHandler;
 import org.kohsuke.args4j.spi.Parameters;
 import org.kohsuke.args4j.spi.Setter;
 
-import javax.inject.Inject;
-
 public class AccountGroupIdHandler extends OptionHandler<AccountGroup.Id> {
   private final GroupCache groupCache;
 

gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java

@@ -18,6 +18,7 @@ import com.google.gerrit.common.data.GroupReference;
 import com.google.gerrit.reviewdb.client.AccountGroup;
 import com.google.gerrit.server.account.GroupBackend;
 import com.google.gerrit.server.account.GroupBackends;
+import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 
 import org.kohsuke.args4j.CmdLineException;
@@ -27,8 +28,6 @@ import org.kohsuke.args4j.spi.OptionHandler;
 import org.kohsuke.args4j.spi.Parameters;
 import org.kohsuke.args4j.spi.Setter;
 
-import javax.inject.Inject;
-
 public class AccountGroupUUIDHandler extends OptionHandler<AccountGroup.UUID> {
   private final GroupBackend groupBackend;
 

gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountIdHandler.java

@@ -22,6 +22,7 @@ import com.google.gerrit.server.account.AccountResolver;
 import com.google.gerrit.server.account.AuthRequest;
 import com.google.gerrit.server.config.AuthConfig;
 import com.google.gwtorm.server.OrmException;
+import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 
 import org.kohsuke.args4j.CmdLineException;
@@ -31,8 +32,6 @@ import org.kohsuke.args4j.spi.OptionHandler;
 import org.kohsuke.args4j.spi.Parameters;
 import org.kohsuke.args4j.spi.Setter;
 
-import javax.inject.Inject;
-
 public class AccountIdHandler extends OptionHandler<Account.Id> {
   private final AccountResolver accountResolver;
   private final AccountManager accountManager;

gerrit-server/src/main/java/com/google/gerrit/server/args4j/ChangeIdHandler.java

@@ -19,6 +19,7 @@ import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.reviewdb.server.ReviewDb;
 import com.google.gwtorm.server.OrmException;
+import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 
 import org.kohsuke.args4j.CmdLineException;
@@ -28,8 +29,6 @@ import org.kohsuke.args4j.spi.OptionHandler;
 import org.kohsuke.args4j.spi.Parameters;
 import org.kohsuke.args4j.spi.Setter;
 
-import javax.inject.Inject;
-
 public class ChangeIdHandler extends OptionHandler<Change.Id> {
 
   @Inject

gerrit-server/src/main/java/com/google/gerrit/server/args4j/ObjectIdHandler.java

@@ -14,6 +14,7 @@
 
 package com.google.gerrit.server.args4j;
 
+import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 
 import org.eclipse.jgit.lib.ObjectId;
@@ -24,8 +25,6 @@ import org.kohsuke.args4j.spi.OptionHandler;
 import org.kohsuke.args4j.spi.Parameters;
 import org.kohsuke.args4j.spi.Setter;
 
-import javax.inject.Inject;
-
 public class ObjectIdHandler extends OptionHandler<ObjectId> {
 
   @Inject

gerrit-server/src/main/java/com/google/gerrit/server/args4j/PatchSetIdHandler.java

@@ -15,6 +15,7 @@
 package com.google.gerrit.server.args4j;
 
 import com.google.gerrit.reviewdb.client.PatchSet;
+import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 
 import org.kohsuke.args4j.CmdLineException;
@@ -24,8 +25,6 @@ import org.kohsuke.args4j.spi.OptionHandler;
 import org.kohsuke.args4j.spi.Parameters;
 import org.kohsuke.args4j.spi.Setter;
 
-import javax.inject.Inject;
-
 public class PatchSetIdHandler extends OptionHandler<PatchSet.Id> {
 
   @Inject

gerrit-server/src/main/java/com/google/gerrit/server/args4j/ProjectControlHandler.java

@@ -19,6 +19,7 @@ import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.project.NoSuchProjectException;
 import com.google.gerrit.server.project.ProjectControl;
+import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.assistedinject.Assisted;
 
@@ -33,8 +34,6 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
-import javax.inject.Inject;
-
 public class ProjectControlHandler extends OptionHandler<ProjectControl> {
   private static final Logger log = LoggerFactory
       .getLogger(ProjectControlHandler.class);

gerrit-server/src/main/java/com/google/gerrit/server/args4j/SocketAddressHandler.java

@@ -15,6 +15,7 @@
 package com.google.gerrit.server.args4j;
 
 import com.google.gerrit.server.util.SocketUtil;
+import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 
 import org.kohsuke.args4j.CmdLineException;
@@ -26,8 +27,6 @@ import org.kohsuke.args4j.spi.Setter;
 
 import java.net.SocketAddress;
 
-import javax.inject.Inject;
-
 public class SocketAddressHandler extends OptionHandler<SocketAddress> {
 
   @Inject

gerrit-server/src/main/java/com/google/gerrit/server/args4j/SubcommandHandler.java

@@ -14,6 +14,7 @@
 
 package com.google.gerrit.server.args4j;
 
+import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 
 import org.kohsuke.args4j.CmdLineException;
@@ -23,8 +24,6 @@ import org.kohsuke.args4j.spi.OptionHandler;
 import org.kohsuke.args4j.spi.Parameters;
 import org.kohsuke.args4j.spi.Setter;
 
-import javax.inject.Inject;
-
 public class SubcommandHandler extends OptionHandler<String> {
 
   @Inject

gerrit-server/src/main/java/com/google/gerrit/server/args4j/TimestampHandler.java

@@ -14,6 +14,7 @@
 
 package com.google.gerrit.server.args4j;
 
+import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 
 import org.kohsuke.args4j.CmdLineException;
@@ -29,8 +30,6 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.TimeZone;
 
-import javax.inject.Inject;
-
 public class TimestampHandler extends OptionHandler<Timestamp> {
   public final static String TIMESTAMP_FORMAT = "yyyyMMdd_HHmm";