Author: olamy
Date: Mon Mar 12 08:11:08 2012
New Revision: 1299575
URL: http://svn.apache.org/viewvc?rev=1299575&view=rev
Log:
cleanup duplicated classes used classes from model
Removed:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
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=1299575&r1=1299574&r2=1299575&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
Mon Mar 12 08:11:08 2012
@@ -31,6 +31,7 @@ import org.apache.archiva.admin.model.re
import org.apache.archiva.checksum.ChecksumAlgorithm;
import org.apache.archiva.checksum.ChecksummedFile;
import org.apache.archiva.common.utils.VersionUtil;
+import org.apache.archiva.maven2.metadata.MavenMetadataReader;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.model.ProjectMetadata;
import org.apache.archiva.metadata.model.ProjectVersionMetadata;
@@ -40,10 +41,11 @@ import org.apache.archiva.metadata.repos
import
org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataInvalidException;
import
org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataNotFoundException;
import
org.apache.archiva.metadata.repository.storage.RepositoryStorageRuntimeException;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.SnapshotVersion;
import org.apache.archiva.proxy.common.WagonFactory;
import org.apache.archiva.reports.RepositoryProblemFacet;
import org.apache.archiva.xml.XMLException;
-import org.apache.commons.lang.StringUtils;
import org.apache.maven.model.CiManagement;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.IssueManagement;
@@ -159,10 +161,10 @@ public class Maven2RepositoryStorage
pathTranslator.toFile( basedir, namespace, projectId,
projectVersion, METADATA_FILENAME );
try
{
- MavenRepositoryMetadata metadata =
MavenRepositoryMetadataReader.read( metadataFile );
+ ArchivaRepositoryMetadata metadata =
MavenMetadataReader.read( metadataFile );
// re-adjust to timestamp if present, otherwise retain the
original -SNAPSHOT filename
- MavenRepositoryMetadata.Snapshot snapshotVersion =
metadata.getSnapshotVersion();
+ SnapshotVersion snapshotVersion =
metadata.getSnapshotVersion();
if ( snapshotVersion != null )
{
artifactVersion =
@@ -220,22 +222,16 @@ public class Maven2RepositoryStorage
}
ModelBuildingRequest req =
- new DefaultModelBuildingRequest()
- .setProcessPlugins( false )
- .setPomFile( file )
- .setTwoPhaseBuilding( false )
- .setValidationLevel(
ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
-
+ new DefaultModelBuildingRequest().setProcessPlugins( false
).setPomFile( file ).setTwoPhaseBuilding(
+ false ).setValidationLevel(
ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
//MRM-1607. olamy this will resolve jdk profiles on the current
running archiva jvm
req.setSystemProperties( System.getProperties() );
-
-
// MRM-1411
req.setModelResolver(
- new RepositoryModelResolver( managedRepository,
pathTranslator, wagonFactory, remoteRepositories, networkProxies,
- managedRepository ) );
+ new RepositoryModelResolver( managedRepository,
pathTranslator, wagonFactory, remoteRepositories,
+ networkProxies, managedRepository
) );
Model model;
try
@@ -255,7 +251,7 @@ public class Maven2RepositoryStorage
// || ( StringUtils.startsWith( problem.getMessage(),
"Failed to determine Java version for profile" ) )
// but setTwoPhaseBuilding(true) fix that
if ( ( problem.getException() instanceof
FileNotFoundException && e.getModelId() != null &&
- !e.getModelId().equals( problem.getModelId() ) ) )
+ !e.getModelId().equals( problem.getModelId() ) ) )
{
log.warn( "The artifact's parent POM file '" + file +
"' cannot be resolved. " +
"Using defaults for project version
metadata.." );
@@ -631,7 +627,7 @@ public class Maven2RepositoryStorage
}
// if a metadata file is present, check if this is the "artifactId"
directory, marking it as a project
- MavenRepositoryMetadata metadata = readMetadata( dir );
+ ArchivaRepositoryMetadata metadata = readMetadata( dir );
if ( metadata != null && dir.getName().equals(
metadata.getArtifactId() ) )
{
return true;
@@ -683,7 +679,7 @@ public class Maven2RepositoryStorage
}
// if a metadata file is present, check if this is the "version"
directory, marking it as a project version
- MavenRepositoryMetadata metadata = readMetadata( dir );
+ ArchivaRepositoryMetadata metadata = readMetadata( dir );
if ( metadata != null && projectVersion.equals( metadata.getVersion()
) )
{
return true;
@@ -692,15 +688,15 @@ public class Maven2RepositoryStorage
return false;
}
- private MavenRepositoryMetadata readMetadata( File directory )
+ private ArchivaRepositoryMetadata readMetadata( File directory )
{
- MavenRepositoryMetadata metadata = null;
+ ArchivaRepositoryMetadata metadata = null;
File metadataFile = new File( directory, METADATA_FILENAME );
if ( metadataFile.exists() )
{
try
{
- metadata = MavenRepositoryMetadataReader.read( metadataFile );
+ metadata = MavenMetadataReader.read( metadataFile );
}
catch ( XMLException e )
{
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java?rev=1299575&r1=1299574&r2=1299575&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
Mon Mar 12 08:11:08 2012
@@ -229,10 +229,10 @@ public class RepositoryModelResolver
log.debug( "Successfully downloaded metadata." );
- MavenRepositoryMetadata metadata =
MavenRepositoryMetadataReader.read( tmpMetadataResource );
+ ArchivaRepositoryMetadata metadata =
MavenMetadataReader.read( tmpMetadataResource );
// re-adjust to timestamp if present, otherwise retain
the original -SNAPSHOT filename
- MavenRepositoryMetadata.Snapshot snapshotVersion =
metadata.getSnapshotVersion();
+ SnapshotVersion snapshotVersion =
metadata.getSnapshotVersion();
String timestampVersion = version;
if ( snapshotVersion != null )
{
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java?rev=1299575&r1=1299574&r2=1299575&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
Mon Mar 12 08:11:08 2012
@@ -20,6 +20,9 @@ package org.apache.archiva.metadata.repo
*/
import junit.framework.TestCase;
+import org.apache.archiva.maven2.metadata.MavenMetadataReader;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.Plugin;
import org.apache.archiva.xml.XMLException;
import org.junit.Before;
import org.junit.Test;
@@ -46,7 +49,7 @@ public class MavenRepositoryMetadataRead
{
File metadataFile = new File( defaultRepoDir,
"org/apache/maven/plugins/maven-metadata.xml" );
- MavenRepositoryMetadata metadata = MavenRepositoryMetadataReader.read(
metadataFile );
+ ArchivaRepositoryMetadata metadata = MavenMetadataReader.read(
metadataFile );
assertNotNull( metadata );
assertEquals( "org.apache.maven.plugins", metadata.getGroupId() );
@@ -57,17 +60,17 @@ public class MavenRepositoryMetadataRead
assertNull( metadata.getSnapshotVersion() );
assertNull( metadata.getLastUpdated() );
- MavenRepositoryMetadata.Plugin cleanPlugin = new
MavenRepositoryMetadata.Plugin();
+ Plugin cleanPlugin = new Plugin();
cleanPlugin.setPrefix( "clean" );
cleanPlugin.setArtifactId( "maven-clean-plugin" );
cleanPlugin.setName( "Maven Clean Plugin" );
- MavenRepositoryMetadata.Plugin compilerPlugin = new
MavenRepositoryMetadata.Plugin();
+ Plugin compilerPlugin = new Plugin();
compilerPlugin.setPrefix( "compiler" );
compilerPlugin.setArtifactId( "maven-compiler-plugin" );
compilerPlugin.setName( "Maven Compiler Plugin" );
- MavenRepositoryMetadata.Plugin surefirePlugin = new
MavenRepositoryMetadata.Plugin();
+ Plugin surefirePlugin = new Plugin();
surefirePlugin.setPrefix( "surefire" );
surefirePlugin.setArtifactId( "maven-surefire-plugin" );
surefirePlugin.setName( "Maven Surefire Plugin" );
@@ -81,7 +84,7 @@ public class MavenRepositoryMetadataRead
{
File metadataFile = new File( defaultRepoDir,
"org/apache/maven/shared/maven-downloader/maven-metadata.xml" );
- MavenRepositoryMetadata metadata = MavenRepositoryMetadataReader.read(
metadataFile );
+ ArchivaRepositoryMetadata metadata = MavenMetadataReader.read(
metadataFile );
assertNotNull( metadata );
assertEquals( "org.apache.maven.shared", metadata.getGroupId() );
@@ -99,7 +102,7 @@ public class MavenRepositoryMetadataRead
{
File metadataFile = new File( defaultRepoDir,
"org/apache/apache/5-SNAPSHOT/maven-metadata.xml" );
- MavenRepositoryMetadata metadata = MavenRepositoryMetadataReader.read(
metadataFile );
+ ArchivaRepositoryMetadata metadata = MavenMetadataReader.read(
metadataFile );
assertNotNull( metadata );
assertEquals( "org.apache", metadata.getGroupId() );
