Author: brett
Date: Mon Aug 28 00:16:16 2006
New Revision: 437583
URL: http://svn.apache.org/viewvc?rev=437583&view=rev
Log:
[MRM-144] clarify TODO items
Modified:
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscovererTest.java
maven/archiva/trunk/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessor.java
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayer.java
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessorTest.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAction.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml
Modified:
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java
(original)
+++
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java
Mon Aug 28 00:16:16 2006
@@ -170,7 +170,7 @@
new ProxiedRepositoryGroup( proxiedRepositories,
managedRepository, wagonProxy ) );
}
- // TODO: ability to configure default proxy separately
+ // TODO: ability to configure default proxy separately!
if ( groups.size() == 1 )
{
Modified:
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java
(original)
+++
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/DefaultRepositoryTaskScheduler.java
Mon Aug 28 00:16:16 2006
@@ -109,7 +109,7 @@
new CronTrigger( INDEXER_JOB + "Trigger", DISCOVERER_GROUP,
configuration.getIndexerCronExpression() );
scheduler.scheduleJob( jobDetail, trigger );
- // TODO: run as a job so it doesn't block startup/configuration
saving
+ // TODO: run as a job so it doesn't block startup/configuration
saving!
try
{
indexerTask.executeNowIfNeeded();
@@ -123,8 +123,6 @@
{
getLogger().info( "Not scheduling indexer - index path is not
configured" );
}
-
- // TODO: wire in the converter
}
public void stop()
Modified:
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscovererTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscovererTest.java?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscovererTest.java
(original)
+++
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscovererTest.java
Mon Aug 28 00:16:16 2006
@@ -32,13 +32,11 @@
* Test the default artifact discoverer.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
- * @version $Id$
- * @todo test location of poms, checksums
+ * @version $Id:DefaultArtifactDiscovererTest.java 437105 2006-08-26 17:22:22
+1000 (Sat, 26 Aug 2006) brett $
*/
public class DefaultArtifactDiscovererTest
extends AbstractArtifactDiscovererTest
{
-
protected String getLayout()
{
return "default";
Modified:
maven/archiva/trunk/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java
(original)
+++
maven/archiva/trunk/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java
Mon Aug 28 00:16:16 2006
@@ -329,7 +329,7 @@
assertTrue( "Check failure",
proxiedArtifactRepository1.isCachedFailure( path ) );
assertTrue( "Check failure",
proxiedArtifactRepository2.isCachedFailure( path ) );
- // TODO: do we really want failures to present as a not found?
+ // TODO: do not want failures to present as a not found!
// TODO: How much information on each failure should we pass back
to the user vs. logging in the proxy?
}
}
@@ -528,8 +528,6 @@
assertEquals( "Check file matches", expectedFile, file );
assertTrue( "Check file created", file.exists() );
assertEquals( "Check file contents", expectedContents,
FileUtils.fileRead( file ) );
-
- // TODO: is this the correct behaviour, or should it be considered
removed too?
}
public void testGetAlwaysWithCachedFailure()
Modified:
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessor.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessor.java?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessor.java
(original)
+++
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessor.java
Mon Aug 28 00:16:16 2006
@@ -152,12 +152,12 @@
}
catch ( IOException e )
{
- // TODO: should just warn and continue?
+ // TODO: should just warn and continue!
throw new ReportProcessorException( "Unable to read artifact to
extract model", e );
}
catch ( XmlPullParserException e )
{
- // TODO: should just warn and continue?
+ // TODO: should just warn and continue!
throw new ReportProcessorException( "Unable to read artifact to
extract model", e );
}
finally
Modified:
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayer.java?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayer.java
(original)
+++
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayer.java
Mon Aug 28 00:16:16 2006
@@ -31,7 +31,7 @@
boolean containsArtifact( Artifact artifact );
/**
- * @todo I believe we can remove this [BP] - artifact should contain all
the necessary version info
+ * @todo I believe we can remove this [BP] - artifact should contain all
the necessary version info!
*/
boolean containsArtifact( Artifact artifact, Snapshot snapshot );
Modified:
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessorTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessorTest.java?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessorTest.java
(original)
+++
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessorTest.java
Mon Aug 28 00:16:16 2006
@@ -28,9 +28,6 @@
import java.util.Iterator;
-/**
- * @todo??? should use MetadataXpp3Reader instead ?
- */
public class BadMetadataReportProcessorTest
extends AbstractRepositoryReportsTestCase
{
Modified:
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
Mon Aug 28 00:16:16 2006
@@ -51,7 +51,7 @@
/**
* Browse the repository.
*
- * @todo the tree part probably belongs in a browsing component, and the
indexer could optimize how it retrieves the terms rather than querying
everything
+ * @todo the tree part probably belongs in a browsing component, and the
indexer could optimize how it retrieves the terms rather than querying
everything!
* @plexus.component role="com.opensymphony.xwork.Action"
role-hint="browseAction"
*/
public class BrowseAction
@@ -208,7 +208,7 @@
{
// TODO: give action message if indexing is in progress
- // TODO: this will be inefficient over a very large number of
artifacts, should be cached
+ // TODO: this will be inefficient over a very large number of
artifacts, should be cached!
List records = index.search( new LuceneQuery( new MatchAllDocsQuery()
) );
Modified:
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java
Mon Aug 28 00:16:16 2006
@@ -58,7 +58,7 @@
artifactStream = new FileInputStream( file );
- // TODO: could be better
+ // TODO: could be better!
contentType = "application/octet-stream";
filename = file.getName();
Modified:
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAction.java?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAction.java
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAction.java
Mon Aug 28 00:16:16 2006
@@ -62,7 +62,7 @@
if ( !file.exists() )
{
file.mkdirs();
- // TODO: error handling when this fails, or is not a directory
+ // TODO: error handling when this fails, or is not a directory!
}
// Just double checking that our validation routines line up with what
is expected in the configuration
@@ -70,7 +70,7 @@
configurationStore.storeConfiguration( configuration );
- // TODO: if the repository has changed, we need to check if indexing
is needed
+ // TODO: if the repository has changed, we need to check if indexing
is needed!
addActionMessage( "Successfully saved configuration" );
Modified:
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java
Mon Aug 28 00:16:16 2006
@@ -51,7 +51,7 @@
if ( !file.exists() )
{
file.mkdirs();
- // TODO: error handling when this fails, or is not a directory
+ // TODO: error handling when this fails, or is not a directory!
}
configuration.addRepository( repository );
Modified:
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java
Mon Aug 28 00:16:16 2006
@@ -26,7 +26,6 @@
* An interceptor that makes the application configuration available
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
- * @todo might be a generally useful thing in plexus-xwork-integration
* @plexus.component role="com.opensymphony.xwork.interceptor.Interceptor"
role-hint="configurationInterceptor"
*/
public class ConfigurationInterceptor
Modified:
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml
Mon Aug 28 00:16:16 2006
@@ -17,6 +17,7 @@
<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+<!-- TODO! see MRM-150 for progress on these -->
<validators>
<!-- TODO: constrain more -->
<field name="id">
Modified:
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml
Mon Aug 28 00:16:16 2006
@@ -17,6 +17,7 @@
<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+<!-- TODO! see MRM-150 for progress on these -->
<validators>
<!-- TODO: constrain more -->
<field name="id">
Modified:
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml
Mon Aug 28 00:16:16 2006
@@ -17,6 +17,7 @@
<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+<!-- TODO! see MRM-150 for progress on these -->
<validators>
<field name="id">
<field-validator type="requiredstring">
Modified:
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml
Mon Aug 28 00:16:16 2006
@@ -17,6 +17,7 @@
<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+<!-- TODO! see MRM-150 for progress on these -->
<validators>
<!-- TODO: constrain more -->
<field name="method">
Modified: maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml?rev=437583&r1=437582&r2=437583&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml Mon Aug 28
00:16:16 2006
@@ -18,7 +18,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! -->
<!-- Include webwork defaults (from WebWork JAR). -->
<include file="webwork-default.xml"/>
@@ -40,7 +40,7 @@
<default-interceptor-ref name="configuredStack"/>
<global-results>
- <!-- TODO: might want an extra message on the configure page when this
first happens -->
+ <!-- TODO: want an extra message on the configure page when this first
happens! -->
<!-- TODO: can we send them back to the original location afterwards? -->
<result name="config-needed" type="redirect-action">
<param name="namespace">/admin</param>
@@ -48,8 +48,8 @@
</result>
<result name="config-repository-needed" type="redirect-action">
<param name="namespace">/admin</param>
- <!-- TODO should use param name=method, but WW 2.2.2 doesn't recognise
it -->
- <param name="actionName">addRepository!input</param>
+ <param name="actionName">addRepository</param>
+ <param name="method">input</param>
</result>
<result name="error">/WEB-INF/jsp/generalError.jsp</result>
</global-results>
