clarify comments

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@574886 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java
index 2149906a312ecece9a0ce5b153c190e496d53aa6..a670a1619617918458c241d1b70c3a476d1ec499 100644 (file)
--- a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java
+++ b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java
@@ -182,7 +182,7 @@ public abstract class AbstractIndexerTestCase
 
         filename.append( "." );
 
-        // TODO: use the ArtifactExtensionMapping object!
+        // TODO: use the ArtifactExtensionMapping object
         if ( "maven-plugin".equals( artifact.getType() ) || "maven-archetype".equals( artifact.getType() ) )
         {
             filename.append( "jar" );

diff --git a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/BytecodeIndexPopulator.java b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/BytecodeIndexPopulator.java
index fc00e60f68f6f86ab1abf1e74d711927bce6c546..eec1a08d5eb9c44c99803ea402315b1d749fd23a 100644 (file)
--- a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/BytecodeIndexPopulator.java
+++ b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/BytecodeIndexPopulator.java
@@ -19,6 +19,7 @@ package org.apache.maven.archiva.indexer.search;
  * under the License.
  */
 
+import junit.framework.AssertionFailedError;
 import org.apache.maven.archiva.indexer.bytecode.BytecodeRecord;
 import org.apache.maven.archiva.indexer.bytecode.BytecodeRecordLoader;
 import org.apache.maven.archiva.model.ArchivaArtifact;
@@ -28,10 +29,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import junit.framework.AssertionFailedError;
-
 /**
- * BytecodeIndexPopulator 
+ * BytecodeIndexPopulator
  *
  * @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
  * @version $Id$
@@ -46,8 +45,8 @@ public class BytecodeIndexPopulator
         Map dumps = new HashMap();
 
         // archiva-common-1.0.jar.txt
-        dumps.put( "archiva-common", createArchivaArtifact( "org.apache.maven.archiva", "archiva-common", "1.0", "",
-                                                            "jar" ) );
+        dumps.put( "archiva-common",
+                   createArchivaArtifact( "org.apache.maven.archiva", "archiva-common", "1.0", "", "jar" ) );
 
         // continuum-webapp-1.0.3-SNAPSHOT.war.txt
         dumps.put( "continuum-webapp", createArchivaArtifact( "org.apache.maven.continuum", "continuum-webapp",
@@ -80,8 +79,8 @@ public class BytecodeIndexPopulator
 
     }
 
-    private ArchivaArtifact createArchivaArtifact( String groupId, String artifactId, String version,
-                                                   String classifier, String type )
+    private ArchivaArtifact createArchivaArtifact( String groupId, String artifactId, String version, String classifier,
+                                                   String type )
     {
         ArchivaArtifact artifact = new ArchivaArtifact( groupId, artifactId, version, classifier, type );
         return artifact;
@@ -119,7 +118,7 @@ public class BytecodeIndexPopulator
 
         filename.append( "." );
 
-        // TODO: use the ArtifactExtensionMapping object!
+        // TODO: use the ArtifactExtensionMapping object
         if ( "maven-plugin".equals( artifact.getType() ) || "maven-archetype".equals( artifact.getType() ) )
         {
             filename.append( "jar" );
@@ -134,7 +133,8 @@ public class BytecodeIndexPopulator
 
         if ( !dumpFile.exists() )
         {
-            throw new AssertionFailedError( "Dump file " + dumpFile.getAbsolutePath() + " does not exist (should it?)." );
+            throw new AssertionFailedError(
+                "Dump file " + dumpFile.getAbsolutePath() + " does not exist (should it?)." );
         }
 
         return dumpFile;

diff --git a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/HashcodesIndexPopulator.java b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/HashcodesIndexPopulator.java
index 686d6d838e50710dd86c8fe6304a9cb71d234102..4fa9f6034acb54d4c96e7dd6b493e9c8f855eb1f 100644 (file)
--- a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/HashcodesIndexPopulator.java
+++ b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/HashcodesIndexPopulator.java
@@ -1,5 +1,6 @@
 package org.apache.maven.archiva.indexer.search;
 
+import junit.framework.AssertionFailedError;
 import org.apache.maven.archiva.indexer.hashcodes.HashcodesRecord;
 import org.apache.maven.archiva.indexer.hashcodes.HashcodesRecordLoader;
 import org.apache.maven.archiva.model.ArchivaArtifact;
@@ -9,8 +10,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import junit.framework.AssertionFailedError;
-
 public class HashcodesIndexPopulator
     implements IndexPopulator
 {
@@ -20,8 +19,8 @@ public class HashcodesIndexPopulator
         Map dumps = new HashMap();
 
         // archiva-common-1.0.jar.txt
-        dumps.put( "archiva-common", createArchivaArtifact( "org.apache.maven.archiva", "archiva-common", "1.0", "",
-                                                            "jar" ) );
+        dumps.put( "archiva-common",
+                   createArchivaArtifact( "org.apache.maven.archiva", "archiva-common", "1.0", "", "jar" ) );
 
         // continuum-webapp-1.0.3-SNAPSHOT.war.txt
         dumps.put( "continuum-webapp", createArchivaArtifact( "org.apache.maven.continuum", "continuum-webapp",
@@ -85,7 +84,7 @@ public class HashcodesIndexPopulator
 
         filename.append( "." );
 
-        // TODO: use the ArtifactExtensionMapping object!
+        // TODO: use the ArtifactExtensionMapping object
         if ( "maven-plugin".equals( artifact.getType() ) || "maven-archetype".equals( artifact.getType() ) )
         {
             filename.append( "jar" );
@@ -100,14 +99,15 @@ public class HashcodesIndexPopulator
 
         if ( !dumpFile.exists() )
         {
-            throw new AssertionFailedError( "Dump file " + dumpFile.getAbsolutePath() + " does not exist (should it?)." );
+            throw new AssertionFailedError(
+                "Dump file " + dumpFile.getAbsolutePath() + " does not exist (should it?)." );
         }
 
         return dumpFile;
     }
 
-    private ArchivaArtifact createArchivaArtifact( String groupId, String artifactId, String version,
-                                                   String classifier, String type )
+    private ArchivaArtifact createArchivaArtifact( String groupId, String artifactId, String version, String classifier,
+                                                   String type )
     {
         ArchivaArtifact artifact = new ArchivaArtifact( groupId, artifactId, version, classifier, type );
         return artifact;

diff --git a/archiva-web/archiva-webapp/src/main/resources/xwork.xml b/archiva-web/archiva-webapp/src/main/resources/xwork.xml
index b993d7dfb7d45f1db50f6cae106927989686b935..556120b192c58e53ca0a5123f3b35b2a1347bbb0 100644 (file)
--- a/archiva-web/archiva-webapp/src/main/resources/xwork.xml
+++ b/archiva-web/archiva-webapp/src/main/resources/xwork.xml
@@ -22,7 +22,7 @@
     "http://www.opensymphony.com/xwork/xwork-1.1.dtd">
 
 <xwork>
-  <!-- TODO: better error handling for exceptions needed! -->
+  <!-- TODO: better error handling for exceptions needed [MRM-490] -->
   <include file="webwork-default.xml"/>
 
   <!-- Include plexus-security xwork configurations. -->

diff --git a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf
index fb89f1b56d01212862598f81206b8ad4b44f1dfe..a92f9cc4ff71e19acabe82b45896507839e10da3 100644 (file)
--- a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf
+++ b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf
@@ -21,7 +21,7 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
 
-<%-- TODO: paginate! --%>
+<%-- TODO: paginate [MRM-491] --%>
 <c:forEach items="${dependencies}" var="dependency">
   <h3 class="artifact-title">
     <my:showArtifactTitle groupId="${dependency.groupId}" artifactId="${dependency.artifactId}"

diff --git a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectDependees.jspf b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectDependees.jspf
index 7690d183dfbc03a2740b89eac23ba38032b2dce8..fcaa38bb6b0eb3da63b8f7ebf0d503c99f06431d 100644 (file)
--- a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectDependees.jspf
+++ b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectDependees.jspf
@@ -21,7 +21,7 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
 
-<%-- TODO: paginate! --%>
+<%-- TODO: paginate [MRM-491] --%>
 <c:forEach items="${dependees}" var="project">
   <h3 class="artifact-title">
     <my:showArtifactTitle groupId="${project.groupId}" artifactId="${project.artifactId}"

diff --git a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
index 3ba975c725054a5a74aca36edf4baf337223a857..71ac3988a927596f5e53d8b2825d67c451e5dc9b 100644 (file)
--- a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
+++ b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
@@ -21,7 +21,7 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="archiva" uri="http://maven.apache.org/archiva" %>
-<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0"  %>
+<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
 
 <html>
 <head>
@@ -96,7 +96,7 @@
         <ww:url action="showArtifactDependencyTree">
           <ww:param name="groupId" value="%{groupId}"/>
           <ww:param name="artifactId" value="%{artifactId}"/>
-          <ww:param name="version" value="%{version}"/>          
+          <ww:param name="version" value="%{version}"/>
         </ww:url>
       </c:set>
       <my:currentWWUrl url="${url}">Dependency Tree</my:currentWWUrl>
@@ -132,12 +132,12 @@
     </span>
   </div>
 
-<div class="sidebar3">  
-  <archiva:downloadArtifact groupId="${model.groupId}" artifactId="${model.artifactId}" version="${model.version}" />
-</div>
+  <div class="sidebar3">
+    <archiva:downloadArtifact groupId="${model.groupId}" artifactId="${model.artifactId}" version="${model.version}"/>
+  </div>
 
   <%-- TODO: perhaps using ajax? --%>
-  <%-- TODO: panels? this is ugly as is! --%>
+  <%-- TODO: panels? this is ugly as is --%>
   <div id="tabArea">
     <c:choose>
       <c:when test="${dependencies != null}">

diff --git a/pom.xml b/pom.xml
index 67e4ed3d86dc736d48ae59ffccf67deb95bc8a60..4a6c1f1413d3422b2742e043aeb40dc69c35929d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -761,7 +761,7 @@
             <version>2.0</version>
             <configuration>
               <check>
-                <!-- TODO! raise to 85/100 -->
+                <!-- TODO: raise to 85/100 -->
                 <totalLineRate>77</totalLineRate>
                 <totalBranchRate>95</totalBranchRate>
               </check>