Merge branch 'ticket/91' into develop

James Moger

2014-05-29 38ba369972fe7e01a8ef6a950fd9bd403ef97eb6

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

@@ -134,6 +134,21 @@
   </servlet-mapping>   





   <!-- Raw Servlet

       <url-pattern> MUST match: 
         * RawFilter

         * com.gitblit.Constants.RAW_PATH

         * Wicket Filter ignorePaths parameter -->

   <servlet>

      <servlet-name>RawServlet</servlet-name>

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

   </servlet>

   <servlet-mapping>

      <servlet-name>RawServlet</servlet-name>		
      <url-pattern>/raw/*</url-pattern>

   </servlet-mapping>	




   <!-- Pages Servlet

       <url-pattern> MUST match: 

         * PagesFilter

@@ -161,6 +176,20 @@
      <url-pattern>/logo.png</url-pattern>

   </servlet-mapping>





   <!-- PT Servlet

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

   <servlet>

      <servlet-name>PtServlet</servlet-name>

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

   </servlet>

   <servlet-mapping>

      <servlet-name>PtServlet</servlet-name>		
      <url-pattern>/pt</url-pattern>

   </servlet-mapping>





   <!-- Branch Graph Servlet

       <url-pattern> MUST match: 

         * Wicket Filter ignorePaths parameter -->

@@ -185,6 +214,14 @@
      <url-pattern>/robots.txt</url-pattern>

   </servlet-mapping>



    <filter>

      <filter-name>ProxyFilter</filter-name>

      <filter-class>com.gitblit.servlet.ProxyFilter</filter-class>

   </filter>

   <filter-mapping>

      <filter-name>ProxyFilter</filter-name>

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

   </filter-mapping>

   

   <!-- Git Access Restriction Filter

       <url-pattern> MUST match: 

@@ -250,7 +287,22 @@
   </filter-mapping>





   <!-- Pges Restriction Filter

   <!-- Branch Restriction Filter

       <url-pattern> MUST match: 
         * RawServlet

         * com.gitblit.Constants.BRANCH_PATH

         * Wicket Filter ignorePaths parameter -->

   <filter>

      <filter-name>RawFilter</filter-name>

      <filter-class>com.gitblit.servlet.RawFilter</filter-class>

   </filter>

   <filter-mapping>

      <filter-name>RawFilter</filter-name>

      <url-pattern>/raw/*</url-pattern>

   </filter-mapping>

	


   <!-- Pages Restriction Filter

       <url-pattern> MUST match: 

         * PagesServlet

         * com.gitblit.Constants.PAGES_PATH

@@ -297,10 +349,12 @@
                * FederationServlet <url-pattern>

                * RpcFilter <url-pattern>

                * RpcServlet <url-pattern>

                * RawFilter <url-pattern>

                * RawServlet <url-pattern>

                * PagesFilter <url-pattern>

                * PagesServlet <url-pattern>

                * com.gitblit.Constants.PAGES_PATH -->

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

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

        </init-param>

    </filter>

    <filter-mapping>