Merge pull request #111 from atdt/master

James Moger

2013-08-12 13208e8c3b34c321b470aa181b705f78fcc09c5f

 src/main/java/WEB-INF/web.xml

@@ -47,13 +47,27 @@
         * Wicket Filter ignorePaths parameter -->

   <servlet>

      <servlet-name>GitServlet</servlet-name>

      <servlet-class>com.gitblit.GitServlet</servlet-class>

      <servlet-class>com.gitblit.git.GitServlet</servlet-class>

   </servlet>

   <servlet-mapping>

      <servlet-name>GitServlet</servlet-name>      

      <url-pattern>/git/*</url-pattern>

   </servlet-mapping>



   

   <!-- SparkleShare Invite Servlet

       <url-pattern> MUST match: 
         * com.gitblit.Constants.SPARKLESHARE_INVITE_PATH

         * Wicket Filter ignorePaths parameter -->

   <servlet>

      <servlet-name>SparkleShareInviteServlet</servlet-name>

      <servlet-class>com.gitblit.SparkleShareInviteServlet</servlet-class>

   </servlet>

   <servlet-mapping>

      <servlet-name>SparkleShareInviteServlet</servlet-name>		
      <url-pattern>/sparkleshare/*</url-pattern>

   </servlet-mapping>



   

   <!-- Syndication Servlet

       <url-pattern> MUST match: 

@@ -126,7 +140,20 @@
      <servlet-name>PagesServlet</servlet-name>      

      <url-pattern>/pages/*</url-pattern>

   </servlet-mapping>   



   

   <!-- Logo Servlet

       <url-pattern> MUST match: 
         * Wicket Filter ignorePaths parameter -->

   <servlet>

      <servlet-name>LogoServlet</servlet-name>

      <servlet-class>com.gitblit.LogoServlet</servlet-class>

   </servlet>

   <servlet-mapping>

      <servlet-name>LogoServlet</servlet-name>		
      <url-pattern>/logo.png</url-pattern>

   </servlet-mapping>





   <!-- Robots.txt Servlet

       <url-pattern> MUST match: 

@@ -229,7 +256,7 @@
    <filter>

        <filter-name>wicketFilter</filter-name>

        <filter-class>

            org.apache.wicket.protocol.http.WicketFilter

            com.gitblit.wicket.GitblitWicketFilter

        </filter-class>

        <init-param>

            <param-name>applicationClassName</param-name>

@@ -244,6 +271,8 @@
                * GitFilter <url-pattern>

                * GitServlet <url-pattern>

                * com.gitblit.Constants.GIT_PATH

                * SparkleshareInviteServlet <url-pattern>

                * com.gitblit.Constants.SPARKLESHARE_INVITE_PATH

                * Zipfilter <url-pattern>

                * ZipServlet <url-pattern>

                * com.gitblit.Constants.ZIP_PATH

@@ -253,7 +282,7 @@
                * PagesFilter <url-pattern>

                * PagesServlet <url-pattern>

                * com.gitblit.Constants.PAGES_PATH -->

            <param-value>git/,feed/,zip/,federation/,rpc/,pages/,robots.txt</param-value>

            <param-value>git/,feed/,zip/,federation/,rpc/,pages/,robots.txt,logo.png,sparkleshare/</param-value>

        </init-param>

    </filter>

    <filter-mapping>