Author: olamy
Date: Thu Dec 20 15:34:51 2012
New Revision: 1424533
URL: http://svn.apache.org/viewvc?rev=1424533&view=rev
Log:
review/comment/delete some FIXME
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java?rev=1424533&r1=1424532&r2=1424533&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
Thu Dec 20 15:34:51 2012
@@ -81,7 +81,6 @@ public abstract class AbstractRepository
{
File artifactFile = repository.toFile( reference );
- // FIXME: looks incomplete, might not delete related metadata?
for ( RepositoryListener listener : listeners )
{
listener.deleteArtifact( metadataRepository,
repository.getId(), reference.getGroupId(),
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java?rev=1424533&r1=1424532&r2=1424533&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java
Thu Dec 20 15:34:51 2012
@@ -114,7 +114,7 @@ public class DefaultProxyConnectorAdmin
}
- // FIXME take of proxyConnectorRules !
+ // FIXME take care of proxyConnectorRules !
public Boolean deleteProxyConnector( ProxyConnector proxyConnector,
AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -134,7 +134,7 @@ public class DefaultProxyConnectorAdmin
return Boolean.TRUE;
}
- // FIXME take of proxyConnectorRules !
+ // FIXME care take of proxyConnectorRules !
public Boolean updateProxyConnector( ProxyConnector proxyConnector,
AuditInformation auditInformation )
throws RepositoryAdminException
{
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java?rev=1424533&r1=1424532&r2=1424533&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
Thu Dec 20 15:34:51 2012
@@ -1022,7 +1022,6 @@ public class DefaultBrowseService
if ( CollectionUtils.isEmpty( selectedRepos ) )
{
- // FIXME 403 ???
return Collections.emptyList();
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java?rev=1424533&r1=1424532&r2=1424533&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
Thu Dec 20 15:34:51 2012
@@ -400,8 +400,6 @@ public class DefaultRepositoriesService
String filename = artifactPath.substring( lastIndex + 1 );
- // FIXME some dupe with uploadaction
-
boolean fixChecksums =
!( archivaAdministration.getKnownContentConsumers().contains(
"create-missing-checksums" ) );
@@ -471,8 +469,6 @@ public class DefaultRepositoriesService
return true;
}
- //FIXME some duplicate with UploadAction
-
private void queueRepositoryTask( String repositoryId, File localFile )
{
RepositoryTask task = new RepositoryTask();
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java?rev=1424533&r1=1424532&r2=1424533&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
Thu Dec 20 15:34:51 2012
@@ -188,7 +188,10 @@ public class DefaultSystemStatusService
private List<ConsumerScanningStatistics> mapConsumerScanningStatistics(
RepositoryScannerInstance instance )
{
DecimalFormat decimalFormat = new DecimalFormat( "###.##" );
- // FIXME take care of NPE here !!!
+ if ( instance.getConsumerCounts() == null )
+ {
+ return Collections.emptyList();
+ }
List<ConsumerScanningStatistics> ret =
new ArrayList<ConsumerScanningStatistics>(
instance.getConsumerCounts().size() );
for ( Map.Entry<String, Long> entry :
instance.getConsumerCounts().entrySet() )
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java?rev=1424533&r1=1424532&r2=1424533&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
Thu Dec 20 15:34:51 2012
@@ -96,7 +96,6 @@ import java.util.Map;
* Maven 2 repository format storage implementation. This class currently
takes parameters to indicate the repository to
* deal with rather than being instantiated per-repository.
* FIXME: instantiate one per repository and allocate permanently from a
factory (which can be obtained within the session).
- * TODO: finish Maven 1 implementation to prove this API
* <p/>
* The session is passed in as an argument to obtain any necessary resources,
rather than the class being instantiated
* within the session in the context of a single managed repository's
resolution needs.
