From 7bf6e183ff8abd0c35eeb29f399da12389562ecb Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:51 -0500
Subject: [PATCH] Moved servlets and services to separate packages
---
src/main/java/com/gitblit/servlet/GitblitContext.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/servlet/GitblitContext.java
similarity index 96%
rename from src/main/java/com/gitblit/GitBlit.java
rename to src/main/java/com/gitblit/servlet/GitblitContext.java
index ca676ff..7325012 100644
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/servlet/GitblitContext.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.gitblit;
+package com.gitblit.servlet;
import java.io.File;
import java.io.FileNotFoundException;
@@ -33,6 +33,12 @@
import javax.servlet.ServletContext;
import javax.servlet.annotation.WebListener;
+import com.gitblit.Constants;
+import com.gitblit.DaggerModule;
+import com.gitblit.FileSettings;
+import com.gitblit.IStoredSettings;
+import com.gitblit.Keys;
+import com.gitblit.WebXmlSettings;
import com.gitblit.dagger.DaggerContextListener;
import com.gitblit.git.GitServlet;
import com.gitblit.manager.IFederationManager;
@@ -65,9 +71,9 @@
*
*/
@WebListener
-public class GitBlit extends DaggerContextListener {
+public class GitblitContext extends DaggerContextListener {
- private static GitBlit gitblit;
+ private static GitblitContext gitblit;
private final List<IManager> managers = new ArrayList<IManager>();
@@ -78,7 +84,7 @@
/**
* Construct a Gitblit WAR/Express context.
*/
- public GitBlit() {
+ public GitblitContext() {
this.goSettings = null;
this.goBaseFolder = null;
gitblit = this;
@@ -90,7 +96,7 @@
* @param settings
* @param baseFolder
*/
- public GitBlit(IStoredSettings settings, File baseFolder) {
+ public GitblitContext(IStoredSettings settings, File baseFolder) {
this.goSettings = settings;
this.goBaseFolder = baseFolder;
gitblit = this;
--
Gitblit v1.9.1