You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2007/09/12 13:04:49 UTC
svn commit: r574886 - in /maven/archiva/trunk: ./
archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/
archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/
archiva-web/archiva-webapp/src/main/resou...
Author: brett
Date: Wed Sep 12 04:04:48 2007
New Revision: 574886
URL: http://svn.apache.org/viewvc?rev=574886&view=rev
Log:
clarify comments
Modified:
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/BytecodeIndexPopulator.java
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/HashcodesIndexPopulator.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectDependees.jspf
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
maven/archiva/trunk/pom.xml
Modified: maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java?rev=574886&r1=574885&r2=574886&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java Wed Sep 12 04:04:48 2007
@@ -182,7 +182,7 @@
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" );
Modified: maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/BytecodeIndexPopulator.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/BytecodeIndexPopulator.java?rev=574886&r1=574885&r2=574886&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/BytecodeIndexPopulator.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/BytecodeIndexPopulator.java Wed Sep 12 04:04:48 2007
@@ -19,6 +19,7 @@
* 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.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 @@
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 @@
}
- 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 @@
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 @@
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;
Modified: maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/HashcodesIndexPopulator.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/HashcodesIndexPopulator.java?rev=574886&r1=574885&r2=574886&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/HashcodesIndexPopulator.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/HashcodesIndexPopulator.java Wed Sep 12 04:04:48 2007
@@ -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.Iterator;
import java.util.Map;
-import junit.framework.AssertionFailedError;
-
public class HashcodesIndexPopulator
implements IndexPopulator
{
@@ -20,8 +19,8 @@
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 @@
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 @@
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;
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml?rev=574886&r1=574885&r2=574886&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml Wed Sep 12 04:04:48 2007
@@ -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. -->
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf?rev=574886&r1=574885&r2=574886&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf Wed Sep 12 04:04:48 2007
@@ -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}"
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectDependees.jspf
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectDependees.jspf?rev=574886&r1=574885&r2=574886&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectDependees.jspf (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectDependees.jspf Wed Sep 12 04:04:48 2007
@@ -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}"
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp?rev=574886&r1=574885&r2=574886&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp Wed Sep 12 04:04:48 2007
@@ -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}">
Modified: maven/archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?rev=574886&r1=574885&r2=574886&view=diff
==============================================================================
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Wed Sep 12 04:04:48 2007
@@ -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>