Use Guice annotations, not javax.inject annotations

20 files changed, 40 insertions, 40 deletions

diff --git a/src/main/java/com/gitblit/servlet/BranchGraphServlet.java b/src/main/java/com/gitblit/servlet/BranchGraphServlet.java
index c1ad0806..2c77553a 100644
--- a/src/main/java/com/gitblit/servlet/BranchGraphServlet.java
+++ b/src/main/java/com/gitblit/servlet/BranchGraphServlet.java
@@ -36,8 +36,8 @@ import java.util.Set;
 import java.util.TreeSet;

 

 import javax.imageio.ImageIO;

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 import javax.servlet.ServletException;

 import javax.servlet.http.HttpServlet;

 import javax.servlet.http.HttpServletRequest;

diff --git a/src/main/java/com/gitblit/servlet/DownloadZipFilter.java b/src/main/java/com/gitblit/servlet/DownloadZipFilter.java
index 3f20c2b7..13703a81 100644
--- a/src/main/java/com/gitblit/servlet/DownloadZipFilter.java
+++ b/src/main/java/com/gitblit/servlet/DownloadZipFilter.java
@@ -15,8 +15,8 @@
  */

 package com.gitblit.servlet;

 

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 

 import com.gitblit.Constants.AccessRestrictionType;

 import com.gitblit.manager.IAuthenticationManager;

diff --git a/src/main/java/com/gitblit/servlet/DownloadZipServlet.java b/src/main/java/com/gitblit/servlet/DownloadZipServlet.java
index 4b0e3bf5..07562561 100644
--- a/src/main/java/com/gitblit/servlet/DownloadZipServlet.java
+++ b/src/main/java/com/gitblit/servlet/DownloadZipServlet.java
@@ -20,8 +20,8 @@ import java.text.MessageFormat;
 import java.text.ParseException;

 import java.util.Date;

 

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 import javax.servlet.ServletException;

 import javax.servlet.http.HttpServlet;

 import javax.servlet.http.HttpServletResponse;

diff --git a/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java b/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java
index a9e6554e..8a3f782a 100644
--- a/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java
+++ b/src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java
@@ -18,8 +18,8 @@
 import java.io.IOException;
 import java.text.MessageFormat;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
diff --git a/src/main/java/com/gitblit/servlet/FederationServlet.java b/src/main/java/com/gitblit/servlet/FederationServlet.java
index 8a03f089..89ff2312 100644
--- a/src/main/java/com/gitblit/servlet/FederationServlet.java
+++ b/src/main/java/com/gitblit/servlet/FederationServlet.java
@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.Map;

 import java.util.Set;

 

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 import javax.servlet.http.HttpServletResponse;

 

 import com.gitblit.Constants.FederationRequest;

diff --git a/src/main/java/com/gitblit/servlet/GitFilter.java b/src/main/java/com/gitblit/servlet/GitFilter.java
index e2c45898..b29fdb6a 100644
--- a/src/main/java/com/gitblit/servlet/GitFilter.java
+++ b/src/main/java/com/gitblit/servlet/GitFilter.java
@@ -17,8 +17,8 @@ package com.gitblit.servlet;
 

 import java.text.MessageFormat;

 

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 import javax.servlet.http.HttpServletRequest;

 

 import com.gitblit.Constants.AccessRestrictionType;

diff --git a/src/main/java/com/gitblit/servlet/GitServlet.java b/src/main/java/com/gitblit/servlet/GitServlet.java
index e9c5242f..941b4c5e 100644
--- a/src/main/java/com/gitblit/servlet/GitServlet.java
+++ b/src/main/java/com/gitblit/servlet/GitServlet.java
@@ -20,8 +20,8 @@ import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
 import java.io.IOException;

 import java.util.Enumeration;

 

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 import javax.servlet.FilterChain;

 import javax.servlet.FilterConfig;

 import javax.servlet.ServletConfig;

diff --git a/src/main/java/com/gitblit/servlet/LogoServlet.java b/src/main/java/com/gitblit/servlet/LogoServlet.java
index 489e98b2..d5d298b1 100644
--- a/src/main/java/com/gitblit/servlet/LogoServlet.java
+++ b/src/main/java/com/gitblit/servlet/LogoServlet.java
@@ -21,8 +21,8 @@ import java.io.IOException;
 import java.io.InputStream;

 import java.io.OutputStream;

 

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 import javax.servlet.ServletContext;

 import javax.servlet.ServletException;

 import javax.servlet.http.HttpServlet;

diff --git a/src/main/java/com/gitblit/servlet/PagesFilter.java b/src/main/java/com/gitblit/servlet/PagesFilter.java
index fa8c9abe..1d6c3db9 100644
--- a/src/main/java/com/gitblit/servlet/PagesFilter.java
+++ b/src/main/java/com/gitblit/servlet/PagesFilter.java
@@ -15,8 +15,8 @@
  */

 package com.gitblit.servlet;

 

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 

 import com.gitblit.manager.IAuthenticationManager;

 import com.gitblit.manager.IRepositoryManager;

diff --git a/src/main/java/com/gitblit/servlet/PagesServlet.java b/src/main/java/com/gitblit/servlet/PagesServlet.java
index 4cf43024..ad34b3ca 100644
--- a/src/main/java/com/gitblit/servlet/PagesServlet.java
+++ b/src/main/java/com/gitblit/servlet/PagesServlet.java
@@ -15,8 +15,8 @@
  */

 package com.gitblit.servlet;

 

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

 

diff --git a/src/main/java/com/gitblit/servlet/ProxyFilter.java b/src/main/java/com/gitblit/servlet/ProxyFilter.java
index 778c8187..d7f096ac 100644
--- a/src/main/java/com/gitblit/servlet/ProxyFilter.java
+++ b/src/main/java/com/gitblit/servlet/ProxyFilter.java
@@ -20,8 +20,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
diff --git a/src/main/java/com/gitblit/servlet/PtServlet.java b/src/main/java/com/gitblit/servlet/PtServlet.java
index 65d3de17..313b284c 100644
--- a/src/main/java/com/gitblit/servlet/PtServlet.java
+++ b/src/main/java/com/gitblit/servlet/PtServlet.java
@@ -21,8 +21,8 @@ import java.io.IOException;
 import java.io.InputStream;

 import java.io.OutputStream;

 

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 import javax.servlet.ServletException;

 import javax.servlet.http.HttpServlet;

 import javax.servlet.http.HttpServletRequest;

diff --git a/src/main/java/com/gitblit/servlet/RawFilter.java b/src/main/java/com/gitblit/servlet/RawFilter.java
index 7dddd9b7..fe4af040 100644
--- a/src/main/java/com/gitblit/servlet/RawFilter.java
+++ b/src/main/java/com/gitblit/servlet/RawFilter.java
@@ -15,8 +15,8 @@
  */

 package com.gitblit.servlet;

 

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 

 import org.eclipse.jgit.lib.Repository;

 

diff --git a/src/main/java/com/gitblit/servlet/RawServlet.java b/src/main/java/com/gitblit/servlet/RawServlet.java
index d856ef89..7731a95f 100644
--- a/src/main/java/com/gitblit/servlet/RawServlet.java
+++ b/src/main/java/com/gitblit/servlet/RawServlet.java
@@ -28,8 +28,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
diff --git a/src/main/java/com/gitblit/servlet/RobotsTxtServlet.java b/src/main/java/com/gitblit/servlet/RobotsTxtServlet.java
index e08c6bbd..4e58d4de 100644
--- a/src/main/java/com/gitblit/servlet/RobotsTxtServlet.java
+++ b/src/main/java/com/gitblit/servlet/RobotsTxtServlet.java
@@ -18,8 +18,8 @@ package com.gitblit.servlet;
 import java.io.File;

 import java.io.IOException;

 

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 import javax.servlet.ServletException;

 import javax.servlet.http.HttpServlet;

 import javax.servlet.http.HttpServletRequest;

diff --git a/src/main/java/com/gitblit/servlet/RpcFilter.java b/src/main/java/com/gitblit/servlet/RpcFilter.java
index 73f9dcb3..34474d55 100644
--- a/src/main/java/com/gitblit/servlet/RpcFilter.java
+++ b/src/main/java/com/gitblit/servlet/RpcFilter.java
@@ -18,8 +18,8 @@ package com.gitblit.servlet;
 import java.io.IOException;

 import java.text.MessageFormat;

 

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 import javax.servlet.FilterChain;

 import javax.servlet.ServletException;

 import javax.servlet.ServletRequest;

diff --git a/src/main/java/com/gitblit/servlet/RpcServlet.java b/src/main/java/com/gitblit/servlet/RpcServlet.java
index aaf7d5fb..9809a252 100644
--- a/src/main/java/com/gitblit/servlet/RpcServlet.java
+++ b/src/main/java/com/gitblit/servlet/RpcServlet.java
@@ -23,8 +23,8 @@ import java.util.HashMap;
 import java.util.List;

 import java.util.Map;

 

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 import javax.servlet.ServletException;

 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

diff --git a/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java b/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
index e596cfd3..69c254cb 100644
--- a/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
+++ b/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
@@ -19,8 +19,8 @@ import java.io.IOException;
 import java.net.URL;

 import java.text.MessageFormat;

 

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 import javax.servlet.ServletException;

 import javax.servlet.http.HttpServlet;

 import javax.servlet.http.HttpServletRequest;

diff --git a/src/main/java/com/gitblit/servlet/SyndicationFilter.java b/src/main/java/com/gitblit/servlet/SyndicationFilter.java
index 3b9753fa..49348d0d 100644
--- a/src/main/java/com/gitblit/servlet/SyndicationFilter.java
+++ b/src/main/java/com/gitblit/servlet/SyndicationFilter.java
@@ -18,8 +18,8 @@ package com.gitblit.servlet;
 import java.io.IOException;

 import java.text.MessageFormat;

 

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 import javax.servlet.FilterChain;

 import javax.servlet.ServletException;

 import javax.servlet.ServletRequest;

diff --git a/src/main/java/com/gitblit/servlet/SyndicationServlet.java b/src/main/java/com/gitblit/servlet/SyndicationServlet.java
index c48f25f9..29db54d4 100644
--- a/src/main/java/com/gitblit/servlet/SyndicationServlet.java
+++ b/src/main/java/com/gitblit/servlet/SyndicationServlet.java
@@ -22,8 +22,8 @@ import java.util.Collections;
 import java.util.List;

 import java.util.Map;

 

-import javax.inject.Inject;

-import javax.inject.Singleton;

+import com.google.inject.Inject;

+import com.google.inject.Singleton;

 import javax.servlet.http.HttpServlet;

 

 import org.eclipse.jgit.lib.ObjectId;