Merge branch 'master' of https://github.com/gitblit/gitblit

Mrbytes

2012-09-13 db71db17c90fd93bcf38cdf87e16a371c39708e0

 src/WEB-INF/web.xml

@@ -15,23 +15,15 @@
       <url-pattern> MUST match: 

         * GitFilter

         * com.gitblit.Constants.GIT_PATH

         * Wicket Filter ignorePaths parameter --><!-- STRIP

         * Wicket Filter ignorePaths parameter -->

   <servlet>

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

      <servlet-class>org.jgit.http.transport.GitServlet</servlet-class>

      <init-param>

         <param-name>base-path</param-name>

         <param-value>c:/git</param-value>

      </init-param>

      <init-param>

         <param-name>export-all</param-name>

         <param-value>1</param-value>

      </init-param>

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

   </servlet>

   <servlet-mapping>

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

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

   </servlet-mapping>STRIP -->

   </servlet-mapping>

   

   

   <!-- Syndication Servlet

@@ -63,7 +55,63 @@
      <url-pattern>/zip/*</url-pattern>

   </servlet-mapping>

   

	
   <!-- Federation Servlet

       <url-pattern> MUST match: 
          * com.gitblit.Constants.FEDERATION_PATH		 
         * Wicket Filter ignorePaths parameter -->

   <servlet>

      <servlet-name>FederationServlet</servlet-name>

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

   <servlet-mapping>

      <servlet-name>FederationServlet</servlet-name>

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

   </servlet-mapping>	
	
	
   <!-- Rpc Servlet

       <url-pattern> MUST match: 
          * com.gitblit.Constants.RPC_PATH		 
         * Wicket Filter ignorePaths parameter -->

   <servlet>

      <servlet-name>RpcServlet</servlet-name>

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

   <servlet-mapping>

      <servlet-name>RpcServlet</servlet-name>

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

   </servlet-mapping>	




   <!-- Pages Servlet

       <url-pattern> MUST match: 
         * PagesFilter

         * com.gitblit.Constants.PAGES_PATH

         * Wicket Filter ignorePaths parameter -->

   <servlet>

      <servlet-name>PagesServlet</servlet-name>

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

   </servlet>

   <servlet-mapping>

      <servlet-name>PagesServlet</servlet-name>		
      <url-pattern>/pages/*</url-pattern>

   </servlet-mapping>	
	


   <!-- Robots.txt Servlet

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

   <servlet>

      <servlet-name>RobotsTxtServlet</servlet-name>

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

   </servlet>

   <servlet-mapping>

      <servlet-name>RobotsTxtServlet</servlet-name>		
      <url-pattern>/robots.txt</url-pattern>

   </servlet-mapping>



	
   <!-- Git Access Restriction Filter

       <url-pattern> MUST match: 

         * GitServlet

@@ -92,8 +140,53 @@
      <filter-name>SyndicationFilter</filter-name>

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

   </filter-mapping>

	
	
   <!-- Download Zip Restriction Filter

       <url-pattern> MUST match: 
         * DownloadZipServlet

         * com.gitblit.Constants.ZIP_PATH

         * Wicket Filter ignorePaths parameter -->

   <filter>

      <filter-name>ZipFilter</filter-name>

      <filter-class>com.gitblit.DownloadZipFilter</filter-class>

   </filter>

   <filter-mapping>

      <filter-name>ZipFilter</filter-name>

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

   </filter-mapping>



      

   <!-- Rpc Restriction Filter

       <url-pattern> MUST match: 
         * RpcServlet

         * com.gitblit.Constants.RPC_PATH

         * Wicket Filter ignorePaths parameter -->

   <filter>

      <filter-name>RpcFilter</filter-name>

      <filter-class>com.gitblit.RpcFilter</filter-class>

   </filter>

   <filter-mapping>

      <filter-name>RpcFilter</filter-name>

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

   </filter-mapping>





   <!-- Pges Restriction Filter

       <url-pattern> MUST match: 
         * PagesServlet

         * com.gitblit.Constants.PAGES_PATH

         * Wicket Filter ignorePaths parameter -->

   <filter>

      <filter-name>PagesFilter</filter-name>

      <filter-class>com.gitblit.PagesFilter</filter-class>

   </filter>

   <filter-mapping>

      <filter-name>PagesFilter</filter-name>

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

   </filter-mapping>





   <!-- Wicket Filter -->

    <filter>

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

@@ -113,9 +206,16 @@
                * GitFilter <url-pattern>

                * GitServlet <url-pattern>

                * com.gitblit.Constants.GIT_PATH

                * Zipfilter <url-pattern>

                * ZipServlet <url-pattern>

                * com.gitblit.Constants.ZIP_PATH -->

            <param-value>git/,feed/,zip/</param-value>

                * com.gitblit.Constants.ZIP_PATH

                * FederationServlet <url-pattern>

                * RpcFilter <url-pattern>

                * RpcServlet <url-pattern>

                * PagesFilter <url-pattern>

                * PagesServlet <url-pattern>

                * com.gitblit.Constants.PAGES_PATH -->

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

        </init-param>

    </filter>

    <filter-mapping>