Fixed email problem (misuse of API); fixed digest generation and handling; updated the plexus-container-default dependency version to 1.0-alpha-3-SNAPSHOT

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164943 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2005-04-27 04:00:29 +00:00
parent e771f3f56d
commit e7d6dcf398
6 changed files with 30 additions and 16 deletions

View File

@ -38,27 +38,28 @@ ret=$?; if [ $ret != 0 ]; then exit $ret; fi
cp -f target/repoclean-1.0-SNAPSHOT.jar $1/lib
cp -f $2/plexus/plexus-container-default/1.0-alpha-2/plexus-container-default-1.0-alpha-2.jar $1/lib
version=`cat $2/plexus/plexus-container-default/1.0-alpha-3-SNAPSHOT/plexus-container-default-1.0-alpha-3-SNAPSHOT.version.txt`
cp -f $2/plexus/plexus-container-default/1.0-alpha-3-SNAPSHOT/plexus-container-default-$version.jar $1/lib
version="ERROR-IN-SCRIPT"
cp -f $2/plexus/plexus-utils/1.0-alpha-2/plexus-utils-1.0-alpha-2.jar $1/lib
version=`cat $2/plexus/plexus-mail-sender-api/1.0-alpha-1-SNAPSHOT/plexus-mail-sender-api-1.0-alpha-1-SNAPSHOT.version.txt`
cp -f $2/plexus/plexus-mail-sender-api/1.0-alpha-1-SNAPSHOT/plexus-mail-sender-api-$version.jar $1/lib
version="ERROR-IN-SCRIPT"
version="ERROR-IN-SCRIPT"
version=`cat $2/plexus/plexus-mail-sender-simple/1.0-alpha-1-SNAPSHOT/plexus-mail-sender-simple-1.0-alpha-1-SNAPSHOT.version.txt`
cp -f $2/plexus/plexus-mail-sender-simple/1.0-alpha-1-SNAPSHOT/plexus-mail-sender-simple-$version.jar $1/lib
version="ERROR-IN-SCRIPT"
version="ERROR-IN-SCRIPT"
cp -f $2/classworlds/classworlds/1.1-alpha-1/classworlds-1.1-alpha-1.jar $1/lib
version=`cat $2/org/apache/maven/maven-artifact/2.0-SNAPSHOT/maven-artifact-2.0-SNAPSHOT.version.txt`
cp -f $2/org/apache/maven/maven-artifact/2.0-SNAPSHOT/maven-artifact-$version.jar $1/lib
version="ERROR-IN-SCRIPT"
version="ERROR-IN-SCRIPT"
version=`cat $2/org/apache/maven/maven-model/2.0-SNAPSHOT/maven-model-2.0-SNAPSHOT.version.txt`
cp -f $2/org/apache/maven/maven-model/2.0-SNAPSHOT/maven-model-$version.jar $1/lib
version="ERROR-IN-SCRIPT"
version="ERROR-IN-SCRIPT"
cp -f $2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-2/wagon-provider-api-1.0-alpha-2.jar $1/lib

View File

@ -9,7 +9,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-2</version>
<version>1.0-alpha-3-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -24,12 +24,12 @@
<version>1.0-alpha-1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<!-- dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0-alpha-2</version>
<scope>compile</scope>
</dependency>
</dependency -->
<dependency>
<groupId>classworlds</groupId>
<artifactId>classworlds</artifactId>

View File

@ -229,9 +229,9 @@ public void cleanRepository( RepositoryCleanerConfiguration configuration )
message.setContent( contentBuffer.toString() );
message.setSubject( configuration.getErrorReportSubject() );
message.setFrom( configuration.getErrorReportFromName(), configuration.getErrorReportFromAddress() );
message.setFrom( configuration.getErrorReportFromAddress(), configuration.getErrorReportFromName() );
message.setSendDate( new Date() );
message.addTo( configuration.getErrorReportToName(), configuration.getErrorReportToAddress() );
message.addTo( configuration.getErrorReportToAddress(), configuration.getErrorReportToName() );
try
{

View File

@ -131,7 +131,14 @@ private void writeDigestFile( File digestFile, byte[] digestData )
out = new FileWriter( digestFile );
for ( int i = 0; i < digestData.length; i++ )
{
out.write( Integer.toHexString( digestData[i] ) );
String t = Integer.toHexString( digestData[i] & 0xff );
if ( t.length() == 1 )
{
t = "0" + t;
}
out.write( t );
}
}
finally

View File

@ -73,10 +73,10 @@ public static String getRepositoryPath( String relativePath )
public static File getResource( String relativePath )
{
ClassLoader cloader = Thread.currentThread().getContextClassLoader();
ClassLoader cloader = TestSupport.class.getClassLoader();
URL resource = cloader.getResource( relativePath );
return new File( resource.getPath() ).getAbsoluteFile();
}

View File

@ -41,7 +41,13 @@ public void testShouldWriteDigestFileInHexNotBinary() throws Exception
StringBuffer rawConverted = new StringBuffer(rawDigest.length * 2);
for ( int i = 0; i < rawDigest.length; i++ )
{
rawConverted.append(Integer.toHexString(rawDigest[i]));
String encoded = Integer.toHexString(rawDigest[i] & 0xff);
if(encoded.length() < 2)
{
encoded = "0" + encoded;
}
rawConverted.append(encoded);
}
File digestFile = File.createTempFile("repoclean-artifactDigest-formatTest", ".md5");