archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1215120 [2/2] - in /archiva/trunk: archiva-cli/ archiva-docs/src/site/ archiva-docs/src/site/apt/adminguide/ archiva-jetty/src/main/conf/ archiva-modules/archiva-base/archiva-configuration/src/main/mdo/ archiva-modules/archiva-base/archiva...
Date Fri, 16 Dec 2011 13:13:11 GMT
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp Fri Dec 16 13:13:10 2011
@@ -36,35 +36,35 @@
 <c:url var="imgPrevPageDisabledUrl" value="/images/icon_prev_page_disabled.gif"/>
 <c:url var="imgNextPageDisabledUrl" value="/images/icon_next_page_disabled.gif"/>
 
-<div id="contentArea">  		
+<div id="contentArea">
 
   <%-- TODO: fix problem in date format! --%>
 
-  <%-- Pagination - start --%>  
+  <%-- Pagination - start --%>
   <p>
-    
+
     <%-- Set Prev & Next icons --%>
   <c:set var="prevPageUrl">
-    <s:url action="generateStatisticsReport" namespace="/report">    
+    <s:url action="generateStatisticsReport" namespace="/report">
       <s:param name="selectedRepositories" value="%{#attr.selectedRepositories}"/>
       <s:param name="rowCount" value="%{#attr.rowCount}"/>
-      <s:param name="startDate" value="%{#attr.startDate}"/>                      
+      <s:param name="startDate" value="%{#attr.startDate}"/>
       <s:param name="endDate" value="%{#attr.endDate}"/>
       <s:param name="page" value="%{#attr.page - 1}"/>
     </s:url>
   </c:set>
   <c:set var="nextPageUrl">
-    <s:url action="generateStatisticsReport" namespace="/report">    
+    <s:url action="generateStatisticsReport" namespace="/report">
       <s:param name="selectedRepositories" value="%{#attr.selectedRepositories}"/>
       <s:param name="rowCount" value="%{#attr.rowCount}"/>
-      <s:param name="startDate" value="%{#attr.startDate}"/>                      
-      <s:param name="endDate" value="%{#attr.endDate}"/>                
+      <s:param name="startDate" value="%{#attr.startDate}"/>
+      <s:param name="endDate" value="%{#attr.endDate}"/>
       <s:param name="page" value="%{#attr.page + 1}"/>
     </s:url>
   </c:set>
-    
+
   <c:choose>
-    <c:when test="${page == 1}">                               
+    <c:when test="${page == 1}">
       <img src="${imgPrevPageDisabledUrl}"/>
     </c:when>
     <c:otherwise>
@@ -73,15 +73,15 @@
       </a>
     </c:otherwise>
   </c:choose>
-    
+
   <%-- Google-style pagination --%>
   <c:choose>
     <c:when test="${numPages > 11}">
       <c:choose>
         <c:when test="${(page - 5) < 0}">
           <c:set var="beginVal">0</c:set>
-          <c:set var="endVal">10</c:set> 
-        </c:when>			        
+          <c:set var="endVal">10</c:set>
+        </c:when>
         <c:when test="${(page + 5) > (numPages - 1)}">
           <c:set var="beginVal">${(numPages - 1) - 10}</c:set>
           <c:set var="endVal">${numPages - 1}</c:set>
@@ -90,34 +90,34 @@
           <c:set var="beginVal">${page - 5}</c:set>
           <c:set var="endVal">${page + 5}</c:set>
         </c:otherwise>
-      </c:choose>  
+      </c:choose>
     </c:when>
     <c:otherwise>
       <c:set var="beginVal">0</c:set>
       <c:set var="endVal">${numPages - 1}</c:set>
     </c:otherwise>
   </c:choose>
-    
-  <c:forEach var="i" begin="${beginVal}" end="${endVal}">      
-    <c:choose>                   			    
+
+  <c:forEach var="i" begin="${beginVal}" end="${endVal}">
+    <c:choose>
       <c:when test="${i != (page - 1)}">
         <c:set var="specificPageUrl">
           <s:url action="generateStatisticsReport" namespace="/report">
             <s:param name="selectedRepositories" value="%{#attr.selectedRepositories}"/>
             <s:param name="rowCount" value="%{#attr.rowCount}"/>
-            <s:param name="startDate" value="%{#attr.startDate}"/>                      
+            <s:param name="startDate" value="%{#attr.startDate}"/>
             <s:param name="endDate" value="%{#attr.endDate}"/>
             <s:param name="page" value="%{#attr.page + 1}"/>
           </s:url>
         </c:set>
         <a href="${specificPageUrl}">${i + 1}</a>
       </c:when>
-      <c:otherwise>		
-        <b>${i + 1}</b>   
-      </c:otherwise>				  			    
-    </c:choose>      
+      <c:otherwise>
+        <b>${i + 1}</b>
+      </c:otherwise>
+    </c:choose>
   </c:forEach>
-     
+
   <c:choose>
     <c:when test="${page == numPages}">
       <img src="${imgNextPageDisabledUrl}"/>
@@ -126,23 +126,23 @@
       <a href="${nextPageUrl}">
         <img src="${imgNextPageUrl}"/>
       </a>
-    </c:otherwise>   
-  </c:choose> 
-  </p>   
+    </c:otherwise>
+  </c:choose>
+  </p>
   <%-- Pagination - end --%>
-  
+
   <%-- Export to CSV link --%>
   <s:url id="downloadStatsReportUrl" action="downloadStatsReport" namespace="/report">
     <s:param name="selectedRepositories" value="%{#attr.selectedRepositories}"/>
-    <s:param name="startDate" value="%{#attr.startDate}"/>                      
+    <s:param name="startDate" value="%{#attr.startDate}"/>
     <s:param name="endDate" value="%{#attr.endDate}"/>
   </s:url>
   <s:a href="%{downloadStatsReportUrl}">Export to CSV</s:a>
-            
+
   <c:choose>
     <c:when test="${repositoryId == null}">
-  	
-      <h1>Latest Statistics Comparison Report</h1>  	    
+
+      <h1>Latest Statistics Comparison Report</h1>
       <table class="infoTable" border="1">
         <tr>
           <th>Repository</th>
@@ -159,8 +159,8 @@
           <th>Exes</th>
           <th>Dlls</th>
           <th>Zips</th>
-        </tr>			
-		
+        </tr>
+
         <c:forEach var="stats" items="${repositoryStatistics}" varStatus="i">
         <tr>
           <td>${selectedRepositories[i.count-1]}</td>
@@ -179,10 +179,10 @@
           <td align="right">${stats.totalCountForType['zip']}</td>
         </tr>
         </c:forEach>
-      </table>  		
+      </table>
     </c:when>
     <c:otherwise>
-  	
+
       <h1>Statistics for Repository '${repositoryId}'</h1>
       <table class="infoTable" border="1">
         <tr>
@@ -201,7 +201,7 @@
           <th>Dlls</th>
           <th>Zips</th>
         </tr>
-	  		
+
         <c:forEach var="stats" items="${repositoryStatistics}">
         <tr>
           <td align="right">${stats.scanStartTime}</td>
@@ -221,10 +221,10 @@
         </tr>
         </c:forEach>
       </table>
-        		  		
+
     </c:otherwise>
   </c:choose>
- 
+
 </div>
 </body>
 </html>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp Fri Dec 16 13:13:10 2011
@@ -27,9 +27,9 @@
 <head>
   <title>Search Results</title>
   <s:head/>
-  <script type="text/javascript">  
+  <script type="text/javascript">
     function addSearchField(fieldText, field, divName)
-    {     
+    {
       var element = document.getElementById( field );
       if( element != null )
       {
@@ -40,8 +40,8 @@
       var table = document.getElementById( "dynamicTable" );
       var row = document.createElement( "TR" );
       var label = document.createElement("TD");
-      label.innerHTML = fieldText + ": ";	
-     
+      label.innerHTML = fieldText + ": ";
+
       var textfield = document.createElement( "TD" );
       var inp1 =  document.createElement( "INPUT" );
       inp1.setAttribute( "type", "text" );
@@ -50,11 +50,11 @@
       inp1.setAttribute( "name", field );
       textfield.appendChild( inp1 );
 
-      row.appendChild( label ); 
+      row.appendChild( label );
       row.appendChild( textfield );
       table.appendChild( row );
     }
-  </script>  
+  </script>
 </head>
 
 <body>
@@ -66,7 +66,7 @@
 </c:if>
 <c:if test="${fromFilterSearch == false}">
   <h1>Search</h1>
-</c:if> 
+</c:if>
 
 <c:url var="imgNextPageUrl" value="/images/icon_next_page.gif"/>
 <c:url var="imgPrevPageUrl" value="/images/icon_prev_page.gif"/>
@@ -86,23 +86,23 @@
         <tr>
           <td>
           <s:form id="filteredSearch" method="get" action="filteredSearch" validate="true">
-            <s:hidden name="fromFilterSearch" value="%{#attr.fromFilterSearch}" theme="simple"/>  
-            <label><strong>Advanced Search Fields: </strong></label><s:select name="searchField" list="searchFields" theme="simple"/> 
+            <s:hidden name="fromFilterSearch" value="%{#attr.fromFilterSearch}" theme="simple"/>
+            <label><strong>Advanced Search Fields: </strong></label><s:select name="searchField" list="searchFields" theme="simple"/>
             <s:a href="#" title="Add Search Field" onclick="addSearchField( document.filteredSearch.searchField.options[document.filteredSearch.searchField.selectedIndex].text, document.filteredSearch.searchField.value, 'dynamicFields' )" theme="simple">
               <img src="${iconCreateUrl}" />
             </s:a>
             <table id="dynamicTable">
               <tr>
                 <td><label>Repository: </td>
-                <td><s:select name="repositoryId" list="managedRepositoryList" theme="simple"/></td> 
-              </tr>          
+                <td><s:select name="repositoryId" list="managedRepositoryList" theme="simple"/></td>
+              </tr>
               <tr>
                 <td/>
-                <td/>  
+                <td/>
               </tr>
-            </table> 
-            <s:submit value="Search" theme="simple"/>  
-          </s:form>  
+            </table>
+            <s:submit value="Search" theme="simple"/>
+          </s:form>
           </td>
         </tr>
       </table>
@@ -110,10 +110,10 @@
     <c:if test="${fromFilterSearch == false}">
       <s:form method="get" action="quickSearch" validate="true">
         <s:textfield label="Search for" size="50" name="q"/>
-        <s:checkbox label="Search within results" name="searchResultsOnly"/>        
-        <s:hidden name="completeQueryString" value="%{#attr.completeQueryString}"/>        
+        <s:checkbox label="Search within results" name="searchResultsOnly"/>
+        <s:hidden name="completeQueryString" value="%{#attr.completeQueryString}"/>
         <s:submit label="Go!"/>
-      </s:form> 
+      </s:form>
       <script type="text/javascript">
         document.getElementById("quickSearchValue").focus();
       </script>
@@ -145,160 +145,160 @@
           </c:when>
           <c:otherwise>
             <p>Hits: 1 to ${hitsNum} of ${results.totalHits}</p>
-          </c:otherwise>        
+          </c:otherwise>
         </c:choose>
         <c:choose>
           <c:when test="${empty results.hits}">
             <p>No results</p>
           </c:when>
           <c:otherwise>
-      	      	    
-      	  <%-- Pagination start --%>
-      	    <p>                       
-            <%-- Prev & Next icons --%>
-              <c:if test="${fromFilterSearch == false}">
-               <c:set var="prevPageUrl">
-                 <s:url action="quickSearch" namespace="/">
-                   <s:param name="q" value="%{#attr.q}"/>                
-                   <s:param name="currentPage" value="%{#attr.currentPage - 1}"/>
-                 </s:url>
-       	      </c:set>
-       	      <c:set var="nextPageUrl">
-                 <s:url action="quickSearch" namespace="/">
-                   <s:param name="q" value="%{#attr.q}"/>                
-                   <s:param name="currentPage" value="%{#attr.currentPage + 1}"/>
-                 </s:url>
-       	      </c:set>    
-              </c:if>
 
-              <c:if test="${fromFilterSearch == true}">
-               <c:set var="prevPageUrl">
-                 <s:url action="filteredSearch" namespace="/">
-                   <s:param name="rowCount" value="%{#attr.rowCount}"/>
-                   <s:param name="groupId" value="%{#attr.groupId}"/>
-                   <s:param name="artifactId" value="%{#attr.artifactId}"/>
-                   <s:param name="version" value="%{#attr.version}"/>
-                   <s:param name="className" value="%{#attr.className}"/>
-                   <s:param name="repositoryId" value="%{#attr.repositoryId}"/>
-                   <s:param name="filterSearch" value="%{#attr.filterSearch}"/>
-                   <s:param name="fromResultsPage" value="true"/>
-                   <s:param name="currentPage" value="%{#attr.currentPage - 1}"/>
-                   <s:param name="searchResultsOnly" value="%{#attr.searchResultsOnly}"/>
-                   <s:param name="completeQueryString" value="%{#attr.completeQueryString}"/>
-                 </s:url>
-       	      </c:set>
-       	      <c:set var="nextPageUrl">
-                <s:url action="filteredSearch" namespace="/">
-                  <s:param name="rowCount" value="%{#attr.rowCount}"/>
-                  <s:param name="groupId" value="%{#attr.groupId}"/>
-                  <s:param name="artifactId" value="%{#attr.artifactId}"/>
-                  <s:param name="version" value="%{#attr.version}"/>
-                  <s:param name="className" value="%{#attr.className}"/>
-                  <s:param name="repositoryId" value="%{#attr.repositoryId}"/>
-                  <s:param name="filterSearch" value="%{#attr.filterSearch}"/>
-  		          <s:param name="fromResultsPage" value="true"/>
-                  <s:param name="currentPage" value="%{#attr.currentPage + 1}"/>
- 		          <s:param name="searchResultsOnly" value="%{#attr.searchResultsOnly}"/>
-		          <s:param name="completeQueryString" value="%{#attr.completeQueryString}"/>
-                </s:url>
-      	      </c:set>    
-             </c:if>
-            
-            <c:choose>
-              <c:when test="${currentPage == 0}">                               
-	            <img src="${imgPrevPageDisabledUrl}"/>
-	          </c:when>
-	          <c:otherwise>
-	            <a href="${prevPageUrl}">
-	              <img src="${imgPrevPageUrl}"/>
-	            </a>      
-	          </c:otherwise>
-            </c:choose>
-			
-			<%-- Google-style pagination --%>
-			<c:choose>
-			  <c:when test="${totalPages > 11}">
-			    <c:choose>
-			      <c:when test="${(currentPage - 5) < 0}">
-			        <c:set var="beginVal">0</c:set>
-			        <c:set var="endVal">10</c:set> 
-			      </c:when>			        
-			      <c:when test="${(currentPage + 5) > (totalPages - 1)}">
-			        <c:set var="beginVal">${(totalPages -1) - 10}</c:set>
-			        <c:set var="endVal">${totalPages - 1}</c:set>
-			      </c:when>
-			      <c:otherwise>
-			        <c:set var="beginVal">${currentPage - 5}</c:set>
-			        <c:set var="endVal">${currentPage + 5}</c:set>
-			      </c:otherwise>
-			    </c:choose>  
-			  </c:when>
-			  <c:otherwise>
-			    <c:set var="beginVal">0</c:set>
-			    <c:set var="endVal">${totalPages - 1}</c:set> 
-			  </c:otherwise>
-			</c:choose>
-						
-			<c:forEach var="i" begin="${beginVal}" end="${endVal}">
+            <%-- Pagination start --%>
+            <p>
+              <%-- Prev & Next icons --%>
               <c:if test="${fromFilterSearch == false}">
-                <c:choose>                   			    
-		          <c:when test="${i != currentPage}">
-		            <c:set var="specificPageUrl">
-		              <s:url action="quickSearch" namespace="/">
-		                <s:param name="q" value="%{#attr.q}"/>
-		                <s:param name="currentPage" value="%{#attr.i}"/>
-		                <s:param name="searchResultsOnly" value="%{#attr.searchResultsOnly}"/>
-		                <s:param name="completeQueryString" value="%{#attr.completeQueryString}"/>
-  		              </s:url>
-		      	    </c:set>
-			        <a href="${specificPageUrl}">${i + 1}</a>
-			      </c:when>
-			      <c:otherwise>		
-		       	    <b>${i + 1}</b>   
-		          </c:otherwise>				  			    
-                </c:choose>
+                <c:set var="prevPageUrl">
+                  <s:url action="quickSearch" namespace="/">
+                    <s:param name="q" value="%{#attr.q}"/>
+                    <s:param name="currentPage" value="%{#attr.currentPage - 1}"/>
+                  </s:url>
+                </c:set>
+                <c:set var="nextPageUrl">
+                  <s:url action="quickSearch" namespace="/">
+                    <s:param name="q" value="%{#attr.q}"/>
+                    <s:param name="currentPage" value="%{#attr.currentPage + 1}"/>
+                  </s:url>
+                </c:set>
               </c:if>
 
               <c:if test="${fromFilterSearch == true}">
-                <c:choose>                  			    
-		          <c:when test="${i != currentPage}">
-		            <c:set var="specificPageUrl">
-		              <s:url action="filteredSearch" namespace="/">
-                        <s:param name="rowCount" value="%{#attr.rowCount}"/>
-                        <s:param name="groupId" value="%{#attr.groupId}"/>
-                        <s:param name="artifactId" value="%{#attr.artifactId}"/>
-                        <s:param name="version" value="%{#attr.version}"/>
-                        <s:param name="className" value="%{#attr.className}"/>
-                        <s:param name="repositoryId" value="%{#attr.repositoryId}"/>
-                        <s:param name="filterSearch" value="%{#attr.filterSearch}"/>
-		                <s:param name="fromResultsPage" value="true"/>
-		                <s:param name="currentPage" value="%{#attr.i}"/>
-		                <s:param name="searchResultsOnly" value="%{#attr.searchResultsOnly}"/>
-		                <s:param name="completeQueryString" value="%{#attr.completeQueryString}"/>
-		              </s:url>
-		      	    </c:set>
-				    <a href="${specificPageUrl}">${i + 1}</a>
-			      </c:when>
-			      <c:otherwise>		
-		            <b>${i + 1}</b>   
-			      </c:otherwise>
-                </c:choose>
+                <c:set var="prevPageUrl">
+                  <s:url action="filteredSearch" namespace="/">
+                    <s:param name="rowCount" value="%{#attr.rowCount}"/>
+                    <s:param name="groupId" value="%{#attr.groupId}"/>
+                    <s:param name="artifactId" value="%{#attr.artifactId}"/>
+                    <s:param name="version" value="%{#attr.version}"/>
+                    <s:param name="className" value="%{#attr.className}"/>
+                    <s:param name="repositoryId" value="%{#attr.repositoryId}"/>
+                    <s:param name="filterSearch" value="%{#attr.filterSearch}"/>
+                    <s:param name="fromResultsPage" value="true"/>
+                    <s:param name="currentPage" value="%{#attr.currentPage - 1}"/>
+                    <s:param name="searchResultsOnly" value="%{#attr.searchResultsOnly}"/>
+                    <s:param name="completeQueryString" value="%{#attr.completeQueryString}"/>
+                  </s:url>
+                </c:set>
+                <c:set var="nextPageUrl">
+                  <s:url action="filteredSearch" namespace="/">
+                    <s:param name="rowCount" value="%{#attr.rowCount}"/>
+                    <s:param name="groupId" value="%{#attr.groupId}"/>
+                    <s:param name="artifactId" value="%{#attr.artifactId}"/>
+                    <s:param name="version" value="%{#attr.version}"/>
+                    <s:param name="className" value="%{#attr.className}"/>
+                    <s:param name="repositoryId" value="%{#attr.repositoryId}"/>
+                    <s:param name="filterSearch" value="%{#attr.filterSearch}"/>
+                    <s:param name="fromResultsPage" value="true"/>
+                    <s:param name="currentPage" value="%{#attr.currentPage + 1}"/>
+                    <s:param name="searchResultsOnly" value="%{#attr.searchResultsOnly}"/>
+                    <s:param name="completeQueryString" value="%{#attr.completeQueryString}"/>
+                  </s:url>
+                </c:set>
               </c:if>
-			</c:forEach>
-			
-            <c:choose>
-			  <c:when test="${currentPage == (totalPages - 1)}">
-			    <img src="${imgNextPageDisabledUrl}"/>
-              </c:when>
-              <c:otherwise>
-	            <a href="${nextPageUrl}">
-	              <img src="${imgNextPageUrl}"/>
-	            </a>
-	          </c:otherwise>   
-            </c:choose>
-            </p>    
-          <%-- Pagination end --%>
-            
+
+              <c:choose>
+                <c:when test="${currentPage == 0}">
+                  <img src="${imgPrevPageDisabledUrl}"/>
+                </c:when>
+                <c:otherwise>
+                  <a href="${prevPageUrl}">
+                    <img src="${imgPrevPageUrl}"/>
+                  </a>
+                </c:otherwise>
+              </c:choose>
+
+              <%-- Google-style pagination --%>
+              <c:choose>
+                <c:when test="${totalPages > 11}">
+                  <c:choose>
+                    <c:when test="${(currentPage - 5) < 0}">
+                      <c:set var="beginVal">0</c:set>
+                      <c:set var="endVal">10</c:set>
+                    </c:when>
+                    <c:when test="${(currentPage + 5) > (totalPages - 1)}">
+                      <c:set var="beginVal">${(totalPages -1) - 10}</c:set>
+                      <c:set var="endVal">${totalPages - 1}</c:set>
+                    </c:when>
+                    <c:otherwise>
+                      <c:set var="beginVal">${currentPage - 5}</c:set>
+                      <c:set var="endVal">${currentPage + 5}</c:set>
+                    </c:otherwise>
+                  </c:choose>
+                </c:when>
+                <c:otherwise>
+                  <c:set var="beginVal">0</c:set>
+                  <c:set var="endVal">${totalPages - 1}</c:set>
+                </c:otherwise>
+              </c:choose>
+
+              <c:forEach var="i" begin="${beginVal}" end="${endVal}">
+                <c:if test="${fromFilterSearch == false}">
+                  <c:choose>
+                    <c:when test="${i != currentPage}">
+                      <c:set var="specificPageUrl">
+                        <s:url action="quickSearch" namespace="/">
+                          <s:param name="q" value="%{#attr.q}"/>
+                          <s:param name="currentPage" value="%{#attr.i}"/>
+                          <s:param name="searchResultsOnly" value="%{#attr.searchResultsOnly}"/>
+                          <s:param name="completeQueryString" value="%{#attr.completeQueryString}"/>
+                        </s:url>
+                      </c:set>
+                      <a href="${specificPageUrl}">${i + 1}</a>
+                    </c:when>
+                    <c:otherwise>
+                      <b>${i + 1}</b>
+                    </c:otherwise>
+                  </c:choose>
+                </c:if>
+
+                <c:if test="${fromFilterSearch == true}">
+                  <c:choose>
+                    <c:when test="${i != currentPage}">
+                      <c:set var="specificPageUrl">
+                        <s:url action="filteredSearch" namespace="/">
+                          <s:param name="rowCount" value="%{#attr.rowCount}"/>
+                          <s:param name="groupId" value="%{#attr.groupId}"/>
+                          <s:param name="artifactId" value="%{#attr.artifactId}"/>
+                          <s:param name="version" value="%{#attr.version}"/>
+                          <s:param name="className" value="%{#attr.className}"/>
+                          <s:param name="repositoryId" value="%{#attr.repositoryId}"/>
+                          <s:param name="filterSearch" value="%{#attr.filterSearch}"/>
+                          <s:param name="fromResultsPage" value="true"/>
+                          <s:param name="currentPage" value="%{#attr.i}"/>
+                          <s:param name="searchResultsOnly" value="%{#attr.searchResultsOnly}"/>
+                          <s:param name="completeQueryString" value="%{#attr.completeQueryString}"/>
+                        </s:url>
+                      </c:set>
+                      <a href="${specificPageUrl}">${i + 1}</a>
+                    </c:when>
+                    <c:otherwise>
+                      <b>${i + 1}</b>
+                    </c:otherwise>
+                  </c:choose>
+                </c:if>
+              </c:forEach>
+
+              <c:choose>
+                <c:when test="${currentPage == (totalPages - 1)}">
+                  <img src="${imgNextPageDisabledUrl}"/>
+                </c:when>
+                <c:otherwise>
+                  <a href="${nextPageUrl}">
+                    <img src="${imgNextPageUrl}"/>
+                  </a>
+                </c:otherwise>
+              </c:choose>
+            </p>
+            <%-- Pagination end --%>
+
             <c:forEach items="${results.hits}" var="record" varStatus="i">
               <c:choose>
                 <c:when test="${not empty (record.groupId)}">
@@ -363,4 +363,4 @@
   </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp Fri Dec 16 13:13:10 2011
@@ -31,10 +31,10 @@
   <script type="text/javascript" src="<c:url value='/js/jquery-1.6.1.min.js'/>"></script>
   <script type="text/javascript" src="<c:url value='/js/jquery-ui-1.8.14.custom.min.js'/>"></script>
   <script type="text/javascript">
-	$(function() {
-		$("#accordion").accordion({autoHeight:false});
-	});
-	</script>
+    $(function() {
+      $("#accordion").accordion({autoHeight:false});
+    });
+  </script>
   <link rel="stylesheet" href="<c:url value='/css/no-theme/jquery.ui-1.8.14.theme.css'/>" type="text/css" media="all"/>
 </head>
 

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml Fri Dec 16 13:13:10 2011
@@ -19,20 +19,20 @@
   -->
 
 <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
-	<display-name>Apache Archiva</display-name>
+  <display-name>Apache Archiva</display-name>
 
   <filter>
     <filter-name>webwork-cleanup</filter-name>
     <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class>
   </filter>
 
-	<filter>
-		<filter-name>sitemesh</filter-name>
-		<filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
-	</filter>
+  <filter>
+    <filter-name>sitemesh</filter-name>
+    <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
+  </filter>
 
   <filter>
     <filter-name>struts2</filter-name>
@@ -52,38 +52,38 @@
     </init-param>
   </filter>
   
-	<filter-mapping>
-		<filter-name>encodingFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<!-- this must be before the sitemesh filter -->
-	<filter-mapping>
-		<filter-name>webwork-cleanup</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<filter-mapping>
-		<filter-name>sitemesh</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<filter-mapping>
-		<filter-name>struts2</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<listener>
-		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
-		</listener-class>
-	</listener>
-	<listener>
-		<!-- TODO: some Spring technique for this? -->
-		<listener-class>
+  <filter-mapping>
+    <filter-name>encodingFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <!-- this must be before the sitemesh filter -->
+  <filter-mapping>
+    <filter-name>webwork-cleanup</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>sitemesh</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>struts2</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <listener>
+    <listener-class>
+      org.springframework.web.context.ContextLoaderListener
+    </listener-class>
+  </listener>
+  <listener>
+    <!-- TODO: some Spring technique for this? -->
+    <listener-class>
       org.apache.archiva.web.startup.ArchivaStartup
     </listener-class>
-	</listener>
+  </listener>
 
   <listener>
     <listener-class>net.sf.ehcache.constructs.web.ShutdownListener</listener-class>
@@ -94,42 +94,42 @@
     <listener-class>org.apache.archiva.webdav.util.TemporaryGroupIndexSessionCleaner</listener-class>
   </listener>
 
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			classpath*:META-INF/spring-context.xml
-			/WEB-INF/applicationContext.xml
-		</param-value>
-	</context-param>
-
-	<servlet>
-		<servlet-name>RepositoryServlet</servlet-name>
-		<servlet-class>
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>
+      classpath*:META-INF/spring-context.xml
+      /WEB-INF/applicationContext.xml
+    </param-value>
+  </context-param>
+
+  <servlet>
+    <servlet-name>RepositoryServlet</servlet-name>
+    <servlet-class>
       org.apache.archiva.webdav.RepositoryServlet
     </servlet-class>
-		<!-- Loading this on startup so as to take advantage of configuration listeners -->
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>XmlRpcServlet</servlet-name>
-		<servlet-class>
-			com.atlassian.xmlrpc.spring.BinderSpringXmlRpcServlet
-		</servlet-class>
-		<init-param>
-			<param-name>serviceListBeanName</param-name>
-			<param-value>xmlrpcServicesList</param-value>
-		</init-param>
-		<init-param>
-			<param-name>authHandlerBeanName</param-name>
-			<param-value>xmlRpcAuthenticator</param-value>
-		</init-param>
-		<init-param>
-		  <param-name>enabledForExtensions</param-name>
-		  <param-value>true</param-value>
-		</init-param>
-		<load-on-startup>2</load-on-startup>
-	</servlet>
+    <!-- Loading this on startup so as to take advantage of configuration listeners -->
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet>
+    <servlet-name>XmlRpcServlet</servlet-name>
+    <servlet-class>
+      com.atlassian.xmlrpc.spring.BinderSpringXmlRpcServlet
+    </servlet-class>
+    <init-param>
+      <param-name>serviceListBeanName</param-name>
+      <param-value>xmlrpcServicesList</param-value>
+    </init-param>
+    <init-param>
+      <param-name>authHandlerBeanName</param-name>
+      <param-value>xmlRpcAuthenticator</param-value>
+    </init-param>
+    <init-param>
+      <param-name>enabledForExtensions</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <load-on-startup>2</load-on-startup>
+  </servlet>
 
   <servlet>
     <servlet-name>RedbackXmlRpcServlet</servlet-name>
@@ -148,45 +148,45 @@
     </init-param>
   </servlet>
 
-	<servlet>
-		<servlet-name>RssFeedServlet</servlet-name>
-		<servlet-class>
+  <servlet>
+    <servlet-name>RssFeedServlet</servlet-name>
+    <servlet-class>
       org.apache.archiva.web.rss.RssFeedServlet
     </servlet-class>
-	</servlet>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>RssFeedServlet</servlet-name>
+    <url-pattern>/feeds/*</url-pattern>
+  </servlet-mapping>
 
-	<servlet-mapping>
-		<servlet-name>RssFeedServlet</servlet-name>
-		<url-pattern>/feeds/*</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>RepositoryServlet</servlet-name>
-		<url-pattern>/repository/*</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>XmlRpcServlet</servlet-name>
-		<url-pattern>/xmlrpc</url-pattern>
-	</servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>RepositoryServlet</servlet-name>
+    <url-pattern>/repository/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>XmlRpcServlet</servlet-name>
+    <url-pattern>/xmlrpc</url-pattern>
+  </servlet-mapping>
 
   <servlet-mapping>
     <servlet-name>RedbackXmlRpcServlet</servlet-name>
     <url-pattern>/redback-xmlrpc</url-pattern>
   </servlet-mapping>
 
-	<resource-ref>
-		<res-ref-name>jdbc/users</res-ref-name>
-		<res-type>javax.sql.DataSource</res-type>
-		<res-auth>Container</res-auth>
-		<res-sharing-scope>Shareable</res-sharing-scope>
-	</resource-ref>
-	<resource-ref>
-		<res-ref-name>mail/Session</res-ref-name>
-		<res-type>javax.mail.Session</res-type>
-		<res-auth>Container</res-auth>
-		<res-sharing-scope>Shareable</res-sharing-scope>
-	</resource-ref>
+  <resource-ref>
+    <res-ref-name>jdbc/users</res-ref-name>
+    <res-type>javax.sql.DataSource</res-type>
+    <res-auth>Container</res-auth>
+    <res-sharing-scope>Shareable</res-sharing-scope>
+  </resource-ref>
+  <resource-ref>
+    <res-ref-name>mail/Session</res-ref-name>
+    <res-type>javax.mail.Session</res-type>
+    <res-auth>Container</res-auth>
+    <res-sharing-scope>Shareable</res-sharing-scope>
+  </resource-ref>
 
   <servlet>
     <servlet-name>CXFServlet</servlet-name>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css Fri Dec 16 13:13:10 2011
@@ -85,7 +85,7 @@ div.clear hr {
 }
 
 #leftColumn {
-	width: 170px;
+    width: 170px;
     float: left;
     overflow: auto;
 }

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css Fri Dec 16 13:13:10 2011
@@ -33,8 +33,8 @@ select, input {
 
 select {
     padding-left: 3px;
-	height: auto;
-	width: auto;	
+    height: auto;
+    width: auto;
 }
 
 input {
@@ -42,8 +42,8 @@ input {
 }
 
 label .required {
-	color: red;
-	font-weight: bold;
+    color: red;
+    font-weight: bold;
 }
 
 th {
@@ -305,7 +305,7 @@ pre.pom code {
 #footer {
     border-top: 1px solid #CCCCCC;
     padding: 14px 4px 12px 4px;
-	color: #333333;
+    color: #333333;
     margin-top: 2em;
 }
 
@@ -327,21 +327,21 @@ blockquote {
 }
 
 .missing {
-	background-color: red;
-	color: white;
-	font-weight: bold;
-	padding: 4px;
-	margin-left: 20px;
-	margin-right: 20px;
-	
+    background-color: red;
+    color: white;
+    font-weight: bold;
+    padding: 4px;
+    margin-left: 20px;
+    margin-right: 20px;
+    
 }
 
 #searchBox {
-	margin: 5%;
+    margin: 5%;
 }
 
 #searchHint {
-	margin: 5%;
+    margin: 5%;
 }
 
 #topSearchBox {

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css Fri Dec 16 13:13:10 2011
@@ -22,7 +22,7 @@
 }
 
 #download a {
-	text-decoration: none;
+    text-decoration: none;
 }
 
 #download td.type {
@@ -35,215 +35,215 @@
 }
 
 #contentArea {
-	/* margin-right: 15em; */
-	padding: 1em;
+    /* margin-right: 15em; */
+    padding: 1em;
 }
 
 #tabs b {
-	border: 1px #DFDEDE solid;
-	padding-left: 1em;
-	padding-right: 1em;
+    border: 1px #DFDEDE solid;
+    padding-left: 1em;
+    padding-right: 1em;
 }
 
 #tabs a {
-	border: 1px #DFDEDE solid;
-	padding-left: 1em;
-	padding-right: 1em;
-	text-decoration: none;
+    border: 1px #DFDEDE solid;
+    padding-left: 1em;
+    padding-right: 1em;
+    text-decoration: none;
 }
 
 #tabArea {
-	border-top: 1px solid #DFDEDE;
-	padding: 1em;
+    border-top: 1px solid #DFDEDE;
+    padding: 1em;
 }
 
 #searchTypes {
-	text-align: right;
-	font-size: xx-small;
+    text-align: right;
+    font-size: xx-small;
 }
 
 .statusFailed {
-	color: red;
-	font-weight: bold;
+    color: red;
+    font-weight: bold;
 }
 
 /* WebWork validation failures */
 .errorMessage {
-	color: red;
-	font-weight: bold;
+    color: red;
+    font-weight: bold;
 }
 
 .actionMessage {
-	font-size: 1.0em;
-	font-weight: bold;
-	color: blue;
+    font-size: 1.0em;
+    font-weight: bold;
+    color: blue;
 }
 
 .errorBullet {
-	list-style-image: url( "../images/icon_error_sml.gif" );
+    list-style-image: url( "../images/icon_error_sml.gif" );
 }
 
 .warningBullet {
-	list-style-image: url( "../images/icon_warning_sml.gif" );
+    list-style-image: url( "../images/icon_warning_sml.gif" );
 }
 
 .infoBullet {
-	list-style-image: url( "../images/icon_info_sml.gif" );
+    list-style-image: url( "../images/icon_info_sml.gif" );
 }
 
 .artifact-link {
-	font-size: x-small;
-	padding-left: 5em;
+    font-size: x-small;
+    padding-left: 5em;
 }
 
 .artifact-title {
-	
+
 }
 
 ul.dependencyTree {
-	margin-left: 50px;
+    margin-left: 50px;
 }
 
 ul.dependencyTree span.artifact-link {
-	padding-left: 0px;
+    padding-left: 0px;
 }
 
 .eXtremeTable tr.filter {
-	padding: 1px;
+    padding: 1px;
 }
 
 .eXtremeTable .tableRegion,.eXtremeTable .statusBar {
-	width: 100%;
+    width: 100%;
 }
 
 .eXtremeTable .tableRegion .tableHeader {
-	background-color: None;
-	background-image: url(../images/breadcrumbs.jpg);
-	color: gray;
+    background-color: None;
+    background-image: url(../images/breadcrumbs.jpg);
+    color: gray;
 }
 
 .eXtremeTable .tableRegion .tableHeaderSort {
-	background-color: #FFBF5F;
+    background-color: #FFBF5F;
 }
 
 .eXtremeTable .compactToolbar td {
-	white-space: nowrap;
+    white-space: nowrap;
 }
 
 .tools {
-	border-color: gray !important;	
+    border-color: gray !important;
 }
 
 table.tools th.toolHeading
 {
-	color: gray;
+    color: gray;
 }
 
 .tools .toolHeading {
-	padding: 0px 3px 0px 3px;
-	margin: 0px !important;
-	font-size: 11px !important;
-	background-color: red;
-	background-image: url(../images/breadcrumbs.jpg);
+    padding: 0px 3px 0px 3px;
+    margin: 0px !important;
+    font-size: 11px !important;
+    background-color: red;
+    background-image: url(../images/breadcrumbs.jpg);
 }
 
 div.repository h3 {
-	border-bottom: 0px !important;
-	padding-left: 15px !important;
+    border-bottom: 0px !important;
+    padding-left: 15px !important;
 }
 
 div.repository {
-	border-bottom: 1px solid #DFDEDE;
+    border-bottom: 1px solid #DFDEDE;
 }
 
 div.proxyConfig,
 div.repoGroup {
-	border: 1px dashed #DFDEDE;
-	margin-bottom: 15px;
-	padding: 5px;
+    border: 1px dashed #DFDEDE;
+    margin-bottom: 15px;
+    padding: 5px;
 }
 
 div.proxyConfig div.managedRepo,
 div.proxyConfig div.remoteRepo,
 div.repoGroup div.managedRepo {
     border: 1px dotted gray;
-	padding: 5px;
-	background-color: white;
+    padding: 5px;
+    background-color: white;
 }
 
 div.proxyConfig div.remoteRepo {
-	margin: 5px;
+    margin: 5px;
 }
 
 div.proxyConfig div.managedRepo img,
 div.proxyConfig div.remoteRepo img,
 div.repoGroup div.managedRepo img {
-	float: left;
-	border: 0px;
+    float: left;
+    border: 0px;
 }
 
 div.proxyConfig div.managedRepo p,
 div.proxyConfig div.remoteRepo p {
-	margin: 0px;
-	margin-left: 40px;
-	padding: 0px;
+    margin: 0px;
+    margin-left: 40px;
+    padding: 0px;
 }
 
 div.repoGroup div.managedRepo p {
     margin: 8px;
-	margin-left: 40px;
-	padding: 0px;
+    margin-left: 40px;
+    padding: 0px;
 }
 
 div.proxyConfig div.managedRepo p.id,
 div.proxyConfig div.remoteRepo p.id,
 div.repoGroup div.managedRepo p.id {
-	font-family: monospace;
+    font-family: monospace;
 }
 
 div.proxyConfig div.connector,
 div.repoGroup div.connector {
-	border: 1px solid #aaaaff;
-	margin-top: 10px;
-	margin-left: 40px !important;
+    border: 1px solid #aaaaff;
+    margin-top: 10px;
+    margin-left: 40px !important;
 }
 
 div.proxyConfig a.expand {
-	font-size: 7pt;
-	color: gray;	
+    font-size: 7pt;
+    color: gray;
 }
 
 div.proxyConfig div.controls,
 div.repoGroup div.controls {
-	float: right;
+    float: right;
 }
 
 div.proxyConfig div.connector h4,
 div.repoGroup div.connector h4 {
-	padding: 3px;
-	font-size: 8pt;
-	margin: 0px;
+    padding: 3px;
+    font-size: 8pt;
+    margin: 0px;
 }
 
 div.proxyConfig div.connector table.settings {
-	border: 0px;
-	background-color: transparent;
-	font-size: 8pt;
-	margin-left: 10px;
+    border: 0px;
+    background-color: transparent;
+    font-size: 8pt;
+    margin-left: 10px;
 }
 
 div.proxyConfig div.connector table.settings th,
 div.proxyConfig div.connector table.settings td {
-	font-size: 8pt;
+    font-size: 8pt;
 }
 
 div.proxyConfig div.connector table.settings table.policies {
-	border: 1px dotted gray;
+    border: 1px dotted gray;
 }
 
 div.proxyConfig div.connector table p {
-	margin: 0px;
-	padding: 0px;
+    margin: 0px;
+    padding: 0px;
 }
 
 div.repoGroup div.repos {
@@ -253,91 +253,91 @@ div.repoGroup div.repos {
 
 div.admin div.dark,
 div.admin div.lite {
-	border: 1px solid #aaaaaa;	
-	font-size: 11pt;
-	margin-left: 15px;
-	margin-right: 15px;
-	margin-bottom: 5px;
-	padding: 5px;
+    border: 1px solid #aaaaaa;
+    font-size: 11pt;
+    margin-left: 15px;
+    margin-right: 15px;
+    margin-bottom: 5px;
+    padding: 5px;
 }
 
 div.admin div.lite {
-	background-color: white;
+    background-color: white;
 }
 
 div.admin div.dark {
-	background-color: #eeeeee;
+    background-color: #eeeeee;
 }
 
 div.admin div.controls {
-	float: right;
-	font-size: 8pt !important;
+    float: right;
+    font-size: 8pt !important;
 }
 
 div.admin div.filetype table {
-	margin-left: 25px;
-	border: 1px solid gray;
+    margin-left: 25px;
+    border: 1px solid gray;
 }
 
 div.filetype table td.controls {
-	width: 5%;
+    width: 5%;
 }
 
 div.filetype table td.odd,
 div.admin table.consumers td.odd {
-	background-color: #dddddd;	
+    background-color: #dddddd;
 }
 
 div.filetype table td.even,
 div.admin table.consumers td.even {
-	background-color: white;	
+    background-color: white;
 }
 
 div.admin table.consumers {
-	margin-left: 15px;
-	border: 1px solid gray;
+    margin-left: 15px;
+    border: 1px solid gray;
 }
 
 div.admin table.consumers th {
-	font-size: 1.0em;
-	background-color: #cccccc;
-	text-align: left;
+    font-size: 1.0em;
+    background-color: #cccccc;
+    text-align: left;
 }
 
 div.admin table.consumers td strong {
-	font-size: 0.8em;
+    font-size: 0.8em;
 }
 
 div.warningbox {
-	margin: 20px 40px 20px 40px;
-	border: 1px solid #CC0000;
-	background-color: #FFCCCC;
-	color: #000000;
-	font-size: 15pt;
-	padding: 20px;
+    margin: 20px 40px 20px 40px;
+    border: 1px solid #CC0000;
+    background-color: #FFCCCC;
+    color: #000000;
+    font-size: 15pt;
+    padding: 20px;
 }
 
 div.infobox {
-	margin: 20px 40px 20px 40px;
-	border: 1px solid #0000CC;
-	background-color: #EEEEFF;
-	font-size: 9pt;
-	padding: 20px;
+    margin: 20px 40px 20px 40px;
+    border: 1px solid #0000CC;
+    background-color: #EEEEFF;
+    font-size: 9pt;
+    padding: 20px;
 }
 
 div.buttons {
-	text-align: center;
+    text-align: center;
 }
 
 div.versions {
     border: 1px dashed #DFDEDE;
-	margin-bottom: 15px;
-	padding: 5px;
+    margin-bottom: 15px;
+    padding: 5px;
 }
 
 div.versions a.expand {
     font-size: 7pt;
-	color: gray;	
+    color: gray;
 }
 
 #messages {
@@ -361,39 +361,39 @@ div.versions a.expand {
 }
 
 table.auditlogs {
-	text-align: center;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif ;
-	font-weight: normal;
-	font-size: 11px;
-	color: #fff;
-	width: 100%;
-	background-color: #666;
-	border: 0px;
-	border-collapse: collapse;
-	border-spacing: 0px;
+    text-align: center;
+    font-family: Verdana, Geneva, Arial, Helvetica, sans-serif ;
+    font-weight: normal;
+    font-size: 11px;
+    color: #fff;
+    width: 100%;
+    background-color: #666;
+    border: 0px;
+    border-collapse: collapse;
+    border-spacing: 0px;
 }
 
 table.auditlogs th {
-	background-color: #666;
-	color: #fff;
-	padding: 4px;
-	text-align: center;
-	border-bottom: 2px #fff solid;
-	font-size: 12px;
-	font-weight: bold;
+    background-color: #666;
+    color: #fff;
+    padding: 4px;
+    text-align: center;
+    border-bottom: 2px #fff solid;
+    font-size: 12px;
+    font-weight: bold;
 }
 
 table.auditlogs td {
-	background-color: #CCC;
-	color: #000;
-	padding: 4px;
-	text-align: center;
-	border: 1px #fff solid;
+    background-color: #CCC;
+    color: #000;
+    padding: 4px;
+    text-align: center;
+    border: 1px #fff solid;
 }
 
 div.auditLogReportResults {
-	border: 1px dashed #DFDEDE;
-	margin-bottom: 15px;
-	margin-left: 2px;
-	padding: 5px;
+    border: 1px dashed #DFDEDE;
+    margin-bottom: 15px;
+    margin-left: 2px;
+    padding: 5px;
 }

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/resources/org/apache/archiva/webdav/util/mime.types
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/resources/org/apache/archiva/webdav/util/mime.types?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/resources/org/apache/archiva/webdav/util/mime.types (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/resources/org/apache/archiva/webdav/util/mime.types Fri Dec 16 13:13:10 2011
@@ -10,7 +10,7 @@
 
 application/andrew-inset                 ez
 application/atom+xml                     atom
-application/java-archive				 jar
+application/java-archive                 jar
 application/mac-binhex40                 hqx
 application/mac-compactpro               cpt
 application/mathml+xml                   mathml
@@ -19,7 +19,7 @@ application/octet-stream                
 application/oda                          oda
 application/ogg                          ogg
 application/pdf                          pdf
-application/pgp-encrypted				 pgp
+application/pgp-encrypted                pgp
 application/postscript                   ai eps ps
 application/rdf+xml                      rdf
 application/smil                         smi smil

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml Fri Dec 16 13:13:10 2011
@@ -31,8 +31,8 @@
     <listener-class>org.apache.archiva.webdav.util.MavenIndexerCleaner</listener-class>
   </listener>
   <context-param>
-	  <param-name>contextClass</param-name>
-	  <param-value>org.codehaus.redback.components.springutils.CachingWebApplicationContext</param-value>
+    <param-name>contextClass</param-name>
+    <param-value>org.codehaus.redback.components.springutils.CachingWebApplicationContext</param-value>
   </context-param>
 
    <context-param>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml Fri Dec 16 13:13:10 2011
@@ -31,8 +31,8 @@
     <listener-class>org.apache.archiva.webdav.util.MavenIndexerCleaner</listener-class>
   </listener>
   <context-param>
-	  <param-name>contextClass</param-name>
-	  <param-value>org.codehaus.redback.components.springutils.CachingWebApplicationContext</param-value>
+    <param-name>contextClass</param-name>
+    <param-value>org.codehaus.redback.components.springutils.CachingWebApplicationContext</param-value>
   </context-param>
   <context-param>
     <param-name>contextConfigLocation</param-name>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/archiva-mime-types.txt
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/archiva-mime-types.txt?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/archiva-mime-types.txt (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/archiva-mime-types.txt Fri Dec 16 13:13:10 2011
@@ -19,7 +19,7 @@ application/octet-stream                
 application/oda                          oda
 application/ogg                          ogg
 application/pdf                          pdf
-application/pgp-encrypted				 pgp
+application/pgp-encrypted                pgp
 application/postscript                   ai eps ps
 application/rdf+xml                      rdf
 application/smil                         smi smil

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml Fri Dec 16 13:13:10 2011
@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	
+
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.archiva</groupId>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml?rev=1215120&r1=1215119&r2=1215120&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml Fri Dec 16 13:13:10 2011
@@ -17,7 +17,7 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">	
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.archiva</groupId>



Mime
View raw message