You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2009/02/25 19:28:30 UTC
svn commit: r747887 - in /maven/mercury/trunk: mercury-ant-tasks/
mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/
mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/
mercury-repo/mercury-repo-api/src...
Author: ogusakov
Date: Wed Feb 25 18:28:29 2009
New Revision: 747887
URL: http://svn.apache.org/viewvc?rev=747887&view=rev
Log:
[MERCURY-93] - added UTs for repository id hash
Modified:
maven/mercury/trunk/mercury-ant-tasks/build.xml
maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryAntTest.java
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/test/java/org/apache/maven/mercury/repository/api/AbstractRepositoryTest.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
Modified: maven/mercury/trunk/mercury-ant-tasks/build.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/build.xml?rev=747887&r1=747886&r2=747887&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/build.xml (original)
+++ maven/mercury/trunk/mercury-ant-tasks/build.xml Wed Feb 25 18:28:29 2009
@@ -159,10 +159,7 @@
</target>
<target name="deploy" depends="compile">
- <merc:write repoid="localRepo"
- name="t:t:1.0"
- file="${jar.target}/t.jar"
- />
+ <merc:write repoid="localRepo" name="t:t:1.0" file="${jar.target}/t.jar"/>
</target>
<target name="deploy-verify" depends="compile">
Modified: maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryAntTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryAntTest.java?rev=747887&r1=747886&r2=747887&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryAntTest.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryAntTest.java Wed Feb 25 18:28:29 2009
@@ -369,7 +369,7 @@
// -----------------------------------
public void testWriteToRepository()
{
- String title = "write";
+ String title = "deploy";
System.out.println( "========> start " + title );
System.out.flush();
@@ -379,7 +379,7 @@
File ap = new File( _writeRepoDirFile, "/t/t/1.0/t-1.0.pom" );
assertFalse( ap.exists() );
- executeTarget( "deploy" );
+ executeTarget( title );
assertTrue( af.exists() );
assertTrue( ap.exists() );
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java?rev=747887&r1=747886&r2=747887&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java Wed Feb 25 18:28:29 2009
@@ -88,6 +88,9 @@
{
try
{
+ if( id == null || (id.indexOf('/') == -1 && id.indexOf('\\') == -1) )
+ return id;
+
MessageDigest digest = MessageDigest.getInstance( "SHA-1" );
digest.update( id.getBytes() );
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-api/src/test/java/org/apache/maven/mercury/repository/api/AbstractRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/src/test/java/org/apache/maven/mercury/repository/api/AbstractRepositoryTest.java?rev=747887&r1=747886&r2=747887&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-api/src/test/java/org/apache/maven/mercury/repository/api/AbstractRepositoryTest.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-api/src/test/java/org/apache/maven/mercury/repository/api/AbstractRepositoryTest.java Wed Feb 25 18:28:29 2009
@@ -35,6 +35,10 @@
{
String res = AbstractRepository.hashId( "central" );
- assertEquals( "233ec5bda5fa468329234788b4ee61711ea3041e", res );
+ assertEquals( "central", res );
+
+ res = AbstractRepository.hashId( "http://central" );
+
+ assertEquals( "3e447f03cb543932ff37403fe937841ff58ff788", res );
}
}
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java?rev=747887&r1=747886&r2=747887&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java Wed Feb 25 18:28:29 2009
@@ -77,6 +77,7 @@
import org.apache.maven.mercury.util.Util;
import org.codehaus.plexus.lang.DefaultLanguage;
import org.codehaus.plexus.lang.Language;
+import org.mortbay.log.Log;
/**
* implementation of M2 remote repository reader. Actual Transport (protocol, URL) [should] come from RemoteRepository
@@ -424,6 +425,9 @@
}
else
{
+ if( LOG.isInfoEnabled() )
+ Log.info( loc.getAbsPath() );
+
da.setFile( binFile );
da.setPomBlob( FileUtil.readRawData( isPom ? binFile : pomFile ) );
res.add( bmd, da );
@@ -936,9 +940,14 @@
if ( response.hasExceptions() )
{
- LOG.info( LANG.getMessage( "read.raw.exceptions", path, response.getExceptions().toString() ) );
+ if( LOG.isWarnEnabled() )
+ LOG.warn( LANG.getMessage( "read.raw.exceptions", path, response.getExceptions().toString() ) );
+
return null;
}
+
+ if( LOG.isInfoEnabled() )
+ Log.info( url );
return baos.toByteArray();
}