diff options
Diffstat (limited to 'archiva-modules/plugins')
5 files changed, 19 insertions, 20 deletions
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java index a56f0befd..e092a257a 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java @@ -19,18 +19,17 @@ package org.apache.archiva.metadata.repository.storage.maven2; * under the License. */ -import java.io.File; - import org.apache.commons.lang.math.NumberUtils; import org.apache.maven.archiva.xml.XMLException; import org.apache.maven.archiva.xml.XMLReader; import org.dom4j.Element; +import java.io.File; + /** * RepositoryMetadataReader - read maven-metadata.xml files. * - * TODO: we should improve on this, ideally using the Maven standard libraries (which are unfortunately baked into - * maven-core now) + * TODO: we should improve on this, ideally using the Maven standard library */ public final class MavenRepositoryMetadataReader { @@ -44,6 +43,7 @@ public final class MavenRepositoryMetadataReader * @param metadataFile the maven-metadata.xml file to read. * @return the archiva repository metadata object that represents the provided file contents. * @throws org.apache.maven.archiva.xml.XMLException + * */ public static MavenRepositoryMetadata read( File metadataFile ) throws XMLException diff --git a/archiva-modules/plugins/metadata-repository-file/pom.xml b/archiva-modules/plugins/metadata-repository-file/pom.xml index cb640e4fc..6c5cd5b63 100644 --- a/archiva-modules/plugins/metadata-repository-file/pom.xml +++ b/archiva-modules/plugins/metadata-repository-file/pom.xml @@ -18,14 +18,14 @@ ~ 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"> + 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> <artifactId>plugins</artifactId> <groupId>org.apache.archiva</groupId> <version>1.4-SNAPSHOT</version> </parent> - <!-- TODO: Rename to metadata-store-file --> + <!-- FIXME: Rename to metadata-store-file --> <artifactId>metadata-repository-file</artifactId> <name>File System Backed Metadata Repository</name> <dependencies> diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml index 20df6c76f..7b3003a2b 100644 --- a/archiva-modules/plugins/metadata-store-jcr/pom.xml +++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml @@ -50,7 +50,7 @@ <artifactId>plexus-spring</artifactId> <scope>test</scope> </dependency> - <!-- TODO: dependency management --> + <!-- FIXME: dependency management --> <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java index 013bfbab9..044a6895c 100644 --- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java +++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java @@ -102,11 +102,11 @@ public class JcrMetadataRepository public void login() { - // TODO: need to close this at the end - do we need to add it in the API? + // FIXME: need to close this at the end - do we need to add it in the API? try { - // TODO: shouldn't do this in constructor since it's a singleton + // FIXME: shouldn't do this in constructor since it's a singleton session = repository.login( new SimpleCredentials( "username", "password".toCharArray() ) ); Workspace workspace = session.getWorkspace(); @@ -118,12 +118,12 @@ public class JcrMetadataRepository } catch ( LoginException e ) { - // TODO + // FIXME throw new RuntimeException( e ); } catch ( RepositoryException e ) { - // TODO + // FIXME throw new RuntimeException( e ); } } @@ -199,7 +199,7 @@ public class JcrMetadataRepository n.setProperty( entry.getKey(), entry.getValue() ); } } - // TODO: need some context around this so it can be done only when needed + // FIXME: need some context around this so it can be done only when needed session.save(); } catch ( RepositoryException e ) @@ -224,7 +224,7 @@ public class JcrMetadataRepository versionNode.setProperty( "url", versionMetadata.getUrl() ); versionNode.setProperty( "incomplete", versionMetadata.isIncomplete() ); - // TODO: decide how to treat these in the content repo + // FIXME: decide how to treat these in the content repo if ( versionMetadata.getScm() != null ) { versionNode.setProperty( "scm.connection", versionMetadata.getScm().getConnection() ); @@ -703,7 +703,7 @@ public class JcrMetadataRepository versionMetadata.setIncomplete( node.hasProperty( "incomplete" ) && node.getProperty( "incomplete" ).getBoolean() ); - // TODO: decide how to treat these in the content repo + // FIXME: decide how to treat these in the content repo String scmConnection = getPropertyString( node, "scm.connection" ); String scmDeveloperConnection = getPropertyString( node, "scm.developerConnection" ); String scmUrl = getPropertyString( node, "scm.url" ); @@ -1001,12 +1001,12 @@ public class JcrMetadataRepository { try { - // TODO: this shouldn't be here! Repository may need a context + // FIXME: this shouldn't be here! Repository may need a context session.save(); } catch ( RepositoryException e ) { - // TODO + // FIXME throw new RuntimeException( e ); } session.logout(); @@ -1016,9 +1016,8 @@ public class JcrMetadataRepository { this.metadataFacetFactories = metadataFacetFactories; - // TODO: check if actually called by normal injection - // TODO: consider using namespaces for facets instead of the current approach: + // (if used, check if actually called by normal injection) // for ( String facetId : metadataFacetFactories.keySet() ) // { // session.getWorkspace().getNamespaceRegistry().registerNamespace( facetId, facetId ); diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java index 82bbc2b13..5ba9abb12 100644 --- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java +++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java @@ -205,9 +205,9 @@ public class DuplicateArtifactsConsumer problem.setProject( originalArtifact.getProject() ); problem.setVersion( originalArtifact.getVersion() ); problem.setId( id ); - // TODO: need to get the right storage resolver for the repository the dupe artifact is in, it might be + // FIXME: need to get the right storage resolver for the repository the dupe artifact is in, it might be // a different type - // TODO: we need the project version here, not the artifact version + // FIXME: we need the project version here, not the artifact version problem.setMessage( "Duplicate Artifact Detected: " + path + " <--> " + pathTranslator.toPath( dupArtifact.getNamespace(), dupArtifact.getProject(), dupArtifact.getVersion(), dupArtifact.getId() ) ); |