You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/08/01 10:17:17 UTC
svn commit: r226760 - in /maven/components/trunk/maven-mboot2/src/main/java:
download/ArtifactDownloader.java model/ModelReader.java model/Repository.java
Author: brett
Date: Mon Aug 1 01:17:12 2005
New Revision: 226760
URL: http://svn.apache.org/viewcvs?rev=226760&view=rev
Log:
snapshot repo separation for mboot
Modified:
maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java
maven/components/trunk/maven-mboot2/src/main/java/model/ModelReader.java
maven/components/trunk/maven-mboot2/src/main/java/model/Repository.java
Modified: maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java?rev=226760&r1=226759&r2=226760&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java Mon Aug 1 01:17:12 2005
@@ -116,6 +116,16 @@
{
Repository remoteRepo = (Repository) i.next();
+ boolean snapshot = isSnapshot( dep );
+ if ( snapshot && !remoteRepo.isSnapshots() )
+ {
+ continue;
+ }
+ if ( !snapshot && !remoteRepo.isReleases() )
+ {
+ continue;
+ }
+
// The username and password parameters are not being used here.
String url = remoteRepo.getBasedir() + "/" + remoteRepo.getArtifactPath( dep );
@@ -124,7 +134,7 @@
try
{
String version = dep.getVersion();
- if ( isSnapshot( dep ) )
+ if ( snapshot )
{
String filename = getSnapshotMetadataFile( destinationFile.getName(), "SNAPSHOT.version.txt" );
File file = localRepository.getMetadataFile( dep.getGroupId(), dep.getArtifactId(),
@@ -255,7 +265,7 @@
if ( remoteRepositories.isEmpty() )
{
// TODO: use super POM?
- remoteRepositories.add( new Repository( "central", REPO_URL, Repository.LAYOUT_DEFAULT ) );
+ remoteRepositories.add( new Repository( "central", REPO_URL, Repository.LAYOUT_DEFAULT, false, true ) );
}
return remoteRepositories;
Modified: maven/components/trunk/maven-mboot2/src/main/java/model/ModelReader.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/model/ModelReader.java?rev=226760&r1=226759&r2=226760&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/model/ModelReader.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/model/ModelReader.java Mon Aug 1 01:17:12 2005
@@ -94,6 +94,10 @@
private boolean insideDependencyManagement = false;
+ private boolean insideReleases;
+
+ private boolean insideSnapshots;
+
public ModelReader( ArtifactDownloader downloader, boolean resolveTransitiveDependencies )
{
this.downloader = downloader;
@@ -157,6 +161,14 @@
insideResource = true;
}
+ else if ( rawName.equals( "snapshots" ) && insideRepository )
+ {
+ insideSnapshots = true;
+ }
+ else if ( rawName.equals( "releases" ) && insideRepository )
+ {
+ insideReleases = true;
+ }
depth++;
}
@@ -324,6 +336,25 @@
{
currentRepository.setLayout( getBodyText() );
}
+ else if ( rawName.equals( "enabled" ) )
+ {
+ if ( insideSnapshots )
+ {
+ currentRepository.setSnapshots( Boolean.valueOf( getBodyText() ).booleanValue() );
+ }
+ else if ( insideReleases )
+ {
+ currentRepository.setReleases( Boolean.valueOf( getBodyText() ).booleanValue() );
+ }
+ }
+ else if ( rawName.equals( "snapshots" ) )
+ {
+ insideSnapshots = false;
+ }
+ else if ( rawName.equals( "releases" ) )
+ {
+ insideReleases = false;
+ }
}
else if ( depth == 2 )
{
@@ -409,9 +440,8 @@
downloader.downloadDependencies( Collections.singletonList( pom ) );
Repository localRepository = downloader.getLocalRepository();
- p.parse(
- localRepository.getMetadataFile( groupId, artifactId, version, type,
- artifactId + "-" + pom.getResolvedVersion() + ".pom" ) );
+ p.parse( localRepository.getMetadataFile( groupId, artifactId, version, type,
+ artifactId + "-" + pom.getResolvedVersion() + ".pom" ) );
}
catch ( IOException e )
{
Modified: maven/components/trunk/maven-mboot2/src/main/java/model/Repository.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/model/Repository.java?rev=226760&r1=226759&r2=226760&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/model/Repository.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/model/Repository.java Mon Aug 1 01:17:12 2005
@@ -36,15 +36,21 @@
private String id;
+ private boolean releases;
+
+ private boolean snapshots;
+
public Repository()
{
}
- public Repository( String id, String basedir, String layout )
+ public Repository( String id, String basedir, String layout, boolean snapshots, boolean releases )
{
this.id = id;
this.basedir = basedir;
this.layout = layout;
+ this.snapshots = snapshots;
+ this.releases = releases;
}
public File getArtifactFile( String groupId, String artifactId, String version, String type )
@@ -155,5 +161,25 @@
public String getLayout()
{
return layout;
+ }
+
+ public void setReleases( boolean releases )
+ {
+ this.releases = releases;
+ }
+
+ public void setSnapshots( boolean snapshots )
+ {
+ this.snapshots = snapshots;
+ }
+
+ public boolean isReleases()
+ {
+ return releases;
+ }
+
+ public boolean isSnapshots()
+ {
+ return snapshots;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org