Merge release 1.6.0

James Moger

2014-06-16 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c

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

@@ -30,12 +30,8 @@
   </env-entry>

   

   <!-- Gitblit Displayname -->

   <display-name>

      Gitblit - @gb.version@

   </display-name>

   <display-name>Gitblit - @gb.version@</display-name>



   <!-- PARAMS --> 
	 
    

<!-- Gitblit Context Listener --><!-- STRIP    

   <listener>

@@ -134,6 +130,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

@@ -199,6 +210,15 @@
      <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: 

         * GitServlet

@@ -263,7 +283,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

@@ -310,10 +345,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/,pt,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>

@@ -321,4 +358,4 @@
        <url-pattern>/*</url-pattern>

    </filter-mapping>

    

</web-app>

</web-app>