From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/guice/WebModule.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/guice/WebModule.java b/src/main/java/com/gitblit/guice/WebModule.java
index c6172c3..7c83e45 100644
--- a/src/main/java/com/gitblit/guice/WebModule.java
+++ b/src/main/java/com/gitblit/guice/WebModule.java
@@ -18,6 +18,7 @@
import java.util.HashMap;
import java.util.Map;
+import com.gitblit.AvatarGenerator;
import com.gitblit.Constants;
import com.gitblit.servlet.AccessDeniedServlet;
import com.gitblit.servlet.BranchGraphServlet;
@@ -25,6 +26,7 @@
import com.gitblit.servlet.DownloadZipServlet;
import com.gitblit.servlet.EnforceAuthenticationFilter;
import com.gitblit.servlet.FederationServlet;
+import com.gitblit.servlet.FilestoreServlet;
import com.gitblit.servlet.GitFilter;
import com.gitblit.servlet.GitServlet;
import com.gitblit.servlet.LogoServlet;
@@ -56,13 +58,19 @@
@Override
protected void configureServlets() {
+
+ // bind web component providers
+ bind(AvatarGenerator.class).toProvider(AvatarGeneratorProvider.class);
+
// servlets
+ serveRegex(FilestoreServlet.REGEX_PATH).with(FilestoreServlet.class);
serve(fuzzy(Constants.R_PATH), fuzzy(Constants.GIT_PATH)).with(GitServlet.class);
serve(fuzzy(Constants.RAW_PATH)).with(RawServlet.class);
serve(fuzzy(Constants.PAGES)).with(PagesServlet.class);
serve(fuzzy(Constants.RPC_PATH)).with(RpcServlet.class);
serve(fuzzy(Constants.ZIP_PATH)).with(DownloadZipServlet.class);
serve(fuzzy(Constants.SYNDICATION_PATH)).with(SyndicationServlet.class);
+
serve(fuzzy(Constants.FEDERATION_PATH)).with(FederationServlet.class);
serve(fuzzy(Constants.SPARKLESHARE_INVITE_PATH)).with(SparkleShareInviteServlet.class);
@@ -93,7 +101,8 @@
filter(fuzzy(Constants.RPC_PATH)).through(RpcFilter.class);
filter(fuzzy(Constants.ZIP_PATH)).through(DownloadZipFilter.class);
filter(fuzzy(Constants.SYNDICATION_PATH)).through(SyndicationFilter.class);
-
+
+
// Wicket
String toIgnore = Joiner.on(",").join(Constants.R_PATH, Constants.GIT_PATH, Constants.RAW_PATH,
Constants.PAGES, Constants.RPC_PATH, Constants.ZIP_PATH, Constants.SYNDICATION_PATH,
--
Gitblit v1.9.1