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/09/12 03:55:01 UTC
svn commit: r280235 - in /maven/components/trunk/maven-mboot2/src/main/java:
MBoot.java download/ArtifactDownloader.java download/RepositoryMetadata.java
Author: brett
Date: Sun Sep 11 18:54:55 2005
New Revision: 280235
URL: http://svn.apache.org/viewcvs?rev=280235&view=rev
Log:
handle flag in mboot
Modified:
maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java
maven/components/trunk/maven-mboot2/src/main/java/download/RepositoryMetadata.java
Modified: maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/MBoot.java?rev=280235&r1=280234&r2=280235&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/MBoot.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/MBoot.java Sun Sep 11 18:54:55 2005
@@ -819,6 +819,11 @@
metadata.setReleaseVersion( version );
file = localRepository.getMetadataFile( groupId, artifactId, null, type, "maven-metadata-local.xml" );
metadata.write( file );
+
+ metadata = new RepositoryMetadata();
+ metadata.setLocalCopy( true );
+ file = localRepository.getMetadataFile( groupId, artifactId, version, type, "maven-metadata-local.xml" );
+ metadata.write( file );
}
private void runTests( String basedir, String classes, String testClasses, ModelReader reader,
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=280235&r1=280234&r2=280235&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 Sun Sep 11 18:54:55 2005
@@ -75,14 +75,14 @@
// not exists so create it if missing.
File directory = destinationFile.getParentFile();
- if ( directory.exists() == false )
+ if ( !directory.exists() )
{
directory.mkdirs();
}
boolean snapshot = isSnapshot( dep );
- if ( dep.getGroupId().equals( "org.apache.maven" ) && snapshot )
+ if ( "org.apache.maven".equals( dep.getGroupId() ) && snapshot )
{
//skip our own
continue;
@@ -143,7 +143,8 @@
File remoteFile = localRepository.getMetadataFile( dep.getGroupId(), dep.getArtifactId(),
dep.getVersion(), dep.getType(), filename );
String metadataPath = remoteRepo.getMetadataPath( dep.getGroupId(), dep.getArtifactId(),
- dep.getVersion(), dep.getType(), "maven-metadata.xml" );
+ dep.getVersion(), dep.getType(),
+ "maven-metadata.xml" );
String metaUrl = remoteRepo.getBasedir() + "/" + metadataPath;
log( "Downloading " + metaUrl );
try
Modified: maven/components/trunk/maven-mboot2/src/main/java/download/RepositoryMetadata.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/download/RepositoryMetadata.java?rev=280235&r1=280234&r2=280235&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/download/RepositoryMetadata.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/download/RepositoryMetadata.java Sun Sep 11 18:54:55 2005
@@ -31,7 +31,7 @@
import java.util.List;
/**
- * TODO: describe
+ * I/O for repository metadata.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id$
@@ -54,6 +54,8 @@
private String latestVersion;
+ private boolean localCopy;
+
public String getSnapshotTimestamp()
{
return snapshotTimestamp;
@@ -139,6 +141,16 @@
versions.add( version );
}
+ public boolean isLocalCopy()
+ {
+ return localCopy;
+ }
+
+ public void setLocalCopy( boolean localCopy )
+ {
+ this.localCopy = localCopy;
+ }
+
public static RepositoryMetadata read( File file )
throws IOException, ParserConfigurationException, SAXException
{
@@ -194,6 +206,10 @@
{
metadata.setSnapshotTimestamp( getBodyText() );
}
+ else if ( "localCopy".equals( rawName ) )
+ {
+ metadata.setLocalCopy( Boolean.valueOf( getBodyText() ).booleanValue() );
+ }
}
else if ( insideVersions )
{
@@ -301,6 +317,7 @@
writeLine( w, " ", "latest", metadata.getLatestVersion() );
writeLine( w, " ", "release", metadata.getReleaseVersion() );
w.println( " <snapshot>" );
+ writeLine( w, " ", "localCopy", String.valueOf( metadata.isLocalCopy() ) );
writeLine( w, " ", "buildNumber", String.valueOf( metadata.getSnapshotBuildNumber() ) );
writeLine( w, " ", "timestamp", metadata.getSnapshotTimestamp() );
w.println( " </snapshot>" );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org