You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2008/12/15 15:49:53 UTC
svn commit: r726706 [1/2] - in /maven/mercury/trunk:
mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/
mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/
mercury-crypto/mercury-crypto-basic/src/main/...
Author: hboutemy
Date: Mon Dec 15 06:49:51 2008
New Revision: 726706
URL: http://svn.apache.org/viewvc?rev=726706&view=rev
Log:
o renamed _lang constants to LANG
o renamed _log constants to LOG
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MetadataVersionComparator.java
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionComparator.java
maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpHelper.java
maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifier.java
maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierFactory.java
maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventManager.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/SatContext.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.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/main/java/org/apache/maven/mercury/repository/api/RepositoryGAMetadata.java
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAVMetadata.java
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryUpdateIntervalPolicy.java
maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedMetadata.java
maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlat.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlatFactory.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Factory.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2Factory.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2Factory.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2Factory.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RepositoryUtilM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java
maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Binding.java
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/DestinationRealmResolver.java
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/MercuryWagon.java
maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/StupidWagonObserverAdapter.java
maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/TransferEventDebugger.java
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java Mon Dec 15 06:49:51 2008
@@ -6,7 +6,6 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Map;
import org.apache.maven.mercury.MavenDependencyProcessor;
import org.apache.maven.mercury.builder.api.DependencyProcessor;
@@ -31,7 +30,7 @@
public class Config
extends AbstractDataType
{
- private static final Language _lang = new DefaultLanguage( Config.class );
+ private static final Language LANG = new DefaultLanguage( Config.class );
Collection<Repo> _repos;
@@ -56,7 +55,7 @@
{
DependencyProcessor dp = new MavenDependencyProcessor();
- LocalRepositoryM2 r = new LocalRepositoryM2( repo.getId(), new File( repo._dir ), dp );
+ LocalRepositoryM2 r = new LocalRepositoryM2( repo.getId(), new File( repo._dir ), dp );
_repositories.add( r );
}
@@ -79,14 +78,14 @@
Auth au = null;
if( _auths == null )
- throw new BuildException( _lang.getMessage( "config.no.auths", repo._authid ) );
+ throw new BuildException( LANG.getMessage( "config.no.auths", repo._authid ) );
for( Auth a : _auths )
if( repo._authid.equals( a.getId() ) )
au = a;
if( au == null )
- throw new BuildException( _lang.getMessage( "config.no.auth.for.id", repo._authid ) );
+ throw new BuildException( LANG.getMessage( "config.no.auth.for.id", repo._authid ) );
Credentials serverCred = createCredentials( au );
@@ -98,21 +97,21 @@
Auth au = null;
if( _auths == null )
- throw new BuildException( _lang.getMessage( "config.no.proxy.auths", repo._proxyauthid ) );
+ throw new BuildException( LANG.getMessage( "config.no.proxy.auths", repo._proxyauthid ) );
for( Auth a : _auths )
if( repo._proxyauthid.equals( a.getId() ) )
au = a;
if( au == null )
- throw new BuildException( _lang.getMessage( "config.no.proxy.auth.for.id", repo._proxyauthid ) );
+ throw new BuildException( LANG.getMessage( "config.no.proxy.auth.for.id", repo._proxyauthid ) );
Credentials proxyCred = createCredentials( au );
server.setProxyCredentials( proxyCred );
}
- RemoteRepositoryM2 r = new RemoteRepositoryM2( server, dp );
+ RemoteRepositoryM2 r = new RemoteRepositoryM2( server, dp );
_repositories.add( r );
}
@@ -129,7 +128,7 @@
{
File cf = new File( a._certfile );
if( ! cf.exists() )
- throw new BuildException( _lang.getMessage( "config.no.cert.file", a._certfile ) );
+ throw new BuildException( LANG.getMessage( "config.no.cert.file", a._certfile ) );
try
{
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java Mon Dec 15 06:49:51 2008
@@ -18,7 +18,7 @@
public class Dep
extends AbstractDataType
{
- private static final Language _lang = new DefaultLanguage( Dep.class );
+ private static final Language LANG = new DefaultLanguage( Dep.class );
private List<Dependency> _dependencies;
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java Mon Dec 15 06:49:51 2008
@@ -31,10 +31,10 @@
public class ResolveTask
extends AbstractAntTask
{
- private static final Language _lang = new DefaultLanguage( ResolveTask.class );
+ private static final Language LANG = new DefaultLanguage( ResolveTask.class );
- public static final String TASK_NAME = _lang.getMessage( "resolve.task.name" );
- public static final String TASK_DESC = _lang.getMessage( "resolve.task.desc" );
+ public static final String TASK_NAME = LANG.getMessage( "resolve.task.name" );
+ public static final String TASK_DESC = LANG.getMessage( "resolve.task.desc" );
private boolean _transitive = true;
@@ -69,7 +69,7 @@
{
if( _configId == null )
{
- throwIfEnabled( _lang.getMessage( "config.id.mandatory" ) );
+ throwIfEnabled( LANG.getMessage( "config.id.mandatory" ) );
return;
}
@@ -77,13 +77,13 @@
if( so == null )
{
- throwIfEnabled( _lang.getMessage( "config.id.object.null", _configId ) );
+ throwIfEnabled( LANG.getMessage( "config.id.object.null", _configId ) );
return;
}
if( ! Config.class.isAssignableFrom( so.getClass() ) )
{
- throwIfEnabled( _lang.getMessage( "config.id.object.wrong", _configId, so.getClass().getName() ) );
+ throwIfEnabled( LANG.getMessage( "config.id.object.wrong", _configId, so.getClass().getName() ) );
return;
}
@@ -91,7 +91,7 @@
if( Util.isEmpty( _pathId ) && Util.isEmpty( _pathId ) )
{
- throwIfEnabled( _lang.getMessage("no.path.ref") );
+ throwIfEnabled( LANG.getMessage("no.path.ref") );
return;
}
@@ -99,7 +99,7 @@
if( _depId == null )
{
- throwIfEnabled( _lang.getMessage( "no.dep.id" ) );
+ throwIfEnabled( LANG.getMessage( "no.dep.id" ) );
return;
}
@@ -107,13 +107,13 @@
if( d == null )
{
- throwIfEnabled( _lang.getMessage( "no.dep", _depId ) );
+ throwIfEnabled( LANG.getMessage( "no.dep", _depId ) );
return;
}
- if( ! Dep.class.isAssignableFrom( d.getClass() ) )
+ if( ! Dep.class.isAssignableFrom( d.getClass() ) )
{
- throwIfEnabled( _lang.getMessage( "bad.dep", _depId, d.getClass().getName(), Dep.class.getName() ) );
+ throwIfEnabled( LANG.getMessage( "bad.dep", _depId, d.getClass().getName(), Dep.class.getName() ) );
return;
}
@@ -125,7 +125,7 @@
{
if( getProject().getReference( _pathId ) != null )
{
- throwIfEnabled( _lang.getMessage( "path.exists", _pathId ) );
+ throwIfEnabled( LANG.getMessage( "path.exists", _pathId ) );
return;
}
}
@@ -135,7 +135,7 @@
if( p == null )
{
- throwIfEnabled( _lang.getMessage( "no.path.ref", _refPathId ) );
+ throwIfEnabled( LANG.getMessage( "no.path.ref", _refPathId ) );
return;
}
@@ -163,7 +163,7 @@
if( aRes.hasExceptions() )
{
- throwIfEnabled( _lang.getMessage( "vr.error", aRes.getExceptions().toString() ) );
+ throwIfEnabled( LANG.getMessage( "vr.error", aRes.getExceptions().toString() ) );
return;
}
@@ -180,7 +180,7 @@
{
List<Artifact> artifacts = resMap.get( key );
- if( !Util.isEmpty( artifacts ) )
+ if( !Util.isEmpty( artifacts ) )
for( Artifact a : artifacts )
{
if( dir == null )
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java Mon Dec 15 06:49:51 2008
@@ -41,10 +41,10 @@
public class WriteTask
extends AbstractAntTask
{
- private static final Language _lang = new DefaultLanguage( WriteTask.class );
+ private static final Language LANG = new DefaultLanguage( WriteTask.class );
- public static final String TASK_NAME = _lang.getMessage( "write.task.name" );
- public static final String TASK_DESC = _lang.getMessage( "write.task.desc" );
+ public static final String TASK_NAME = LANG.getMessage( "write.task.name" );
+ public static final String TASK_DESC = LANG.getMessage( "write.task.desc" );
private String _repoid;
private String _file;
@@ -99,7 +99,7 @@
{
if( _repoid == null )
{
- throwIfEnabled( _lang.getMessage( "write.repo.id.mandatory" ) );
+ throwIfEnabled( LANG.getMessage( "write.repo.id.mandatory" ) );
return;
}
@@ -107,13 +107,13 @@
if( repo == null )
{
- throwIfEnabled( _lang.getMessage( "write.repo.not.found", _repoid ) );
+ throwIfEnabled( LANG.getMessage( "write.repo.not.found", _repoid ) );
return;
}
if( _file == null )
{
- throwIfEnabled( _lang.getMessage( "write.file.mandatory" ) );
+ throwIfEnabled( LANG.getMessage( "write.file.mandatory" ) );
return;
}
@@ -121,25 +121,25 @@
if( !file.exists() )
{
- throwIfEnabled( _lang.getMessage( "write.file.not.found", _file, _repoid ) );
+ throwIfEnabled( LANG.getMessage( "write.file.not.found", _file, _repoid ) );
return;
}
if( Util.isEmpty( _name ) && Util.isEmpty( _pom ) )
{
- throwIfEnabled( _lang.getMessage( "write.no.name.no.pom", _file, _repoid ) );
+ throwIfEnabled( LANG.getMessage( "write.no.name.no.pom", _file, _repoid ) );
return;
}
if( !Util.isEmpty( _name ) && !Util.isEmpty( _pom ) )
{
- throwIfEnabled( _lang.getMessage( "write.no.name.no.pom", _file, _repoid ) );
+ throwIfEnabled( LANG.getMessage( "write.no.name.no.pom", _file, _repoid ) );
return;
}
if( !Util.isEmpty( _pom ) )
{
- throwIfEnabled( _lang.getMessage( "write.pom.not.supported", _file, _repoid ) );
+ throwIfEnabled( LANG.getMessage( "write.pom.not.supported", _file, _repoid ) );
return;
}
@@ -176,7 +176,7 @@
}
else
{
- throwIfEnabled( _lang.getMessage( "write.pom.not.supported", _file, _repoid ) );
+ throwIfEnabled( LANG.getMessage( "write.pom.not.supported", _file, _repoid ) );
return;
}
Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java Mon Dec 15 06:49:51 2008
@@ -44,7 +44,7 @@
private boolean _osgiVersion = Boolean.parseBoolean( System.getProperty( SYSTEM_PARAMETER_OSGI_VERSION, SYSTEM_PARAMETER_OSGI_VERSION_DEFAULT ) );
private static final DefaultArtifactVersion ZERO_VERSION = new DefaultArtifactVersion("0.0.0");
- private static final Language _lang = new DefaultLanguage( MavenVersionRange.class );
+ private static final Language LANG = new DefaultLanguage( MavenVersionRange.class );
QualityRange _toQualityRange = QualityRange.ALL;
@@ -79,14 +79,14 @@
else if( range.startsWith("(") )
_fromInclusive = false;
else
- throw new VersionException( _lang.getMessage( "invalid.maven.version.range", range ) );
+ throw new VersionException( LANG.getMessage( "invalid.maven.version.range", range ) );
if( range.endsWith("]") )
_toInclusive = true;
else if( range.endsWith(")") )
_toInclusive = false;
else
- throw new VersionException( _lang.getMessage( "invalid.maven.version.range", range ) );
+ throw new VersionException( LANG.getMessage( "invalid.maven.version.range", range ) );
int ind = range.indexOf(',');
@@ -102,7 +102,7 @@
if( vq.getQuality().equals( QualityEnum.snapshot )
|| vq.getQuality().equals( QualityEnum.unknown )
)
- throw new VersionException( _lang.getMessage( "bad.version.sn", sFromT ) );
+ throw new VersionException( LANG.getMessage( "bad.version.sn", sFromT ) );
_fromVersion = new DefaultArtifactVersion( sFromT );
}
@@ -120,10 +120,10 @@
}
if( _fromVersion == null && _fromInclusive )
- throw new VersionException( _lang.getMessage( "invalid.maven.version.range.bad.from", range ) );
+ throw new VersionException( LANG.getMessage( "invalid.maven.version.range.bad.from", range ) );
if( _toVersion == null && _toInclusive )
- throw new VersionException( _lang.getMessage( "invalid.maven.version.range.bad.to", range ) );
+ throw new VersionException( LANG.getMessage( "invalid.maven.version.range.bad.to", range ) );
}
else
@@ -173,7 +173,7 @@
if( c == '-' || c == '_' )
continue;
- throw new VersionException( _lang.getMessage( "invalid.character", ""+c, v ) );
+ throw new VersionException( LANG.getMessage( "invalid.character", ""+c, v ) );
}
}
//--------------------------------------------------------------------------------------------
Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MetadataVersionComparator.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MetadataVersionComparator.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MetadataVersionComparator.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MetadataVersionComparator.java Mon Dec 15 06:49:51 2008
@@ -34,12 +34,12 @@
public class MetadataVersionComparator
implements Comparator<ArtifactBasicMetadata>
{
- private static final Language _lang = new DefaultLanguage( MetadataVersionComparator.class );
+ private static final Language LANG = new DefaultLanguage( MetadataVersionComparator.class );
public int compare( ArtifactBasicMetadata v1, ArtifactBasicMetadata v2 )
{
if( v1 == null || v2 == null )
- throw new IllegalArgumentException( _lang.getMessage( "null.version.to.compare", v1 == null ? "null" : v1.toString(), v2 == null ? "null" : v2.toString() ) );
+ throw new IllegalArgumentException( LANG.getMessage( "null.version.to.compare", v1 == null ? "null" : v1.toString(), v2 == null ? "null" : v2.toString() ) );
DefaultArtifactVersion av1 = new DefaultArtifactVersion( v1.getVersion() );
DefaultArtifactVersion av2 = new DefaultArtifactVersion( v2.getVersion() );
Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionComparator.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionComparator.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionComparator.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionComparator.java Mon Dec 15 06:49:51 2008
@@ -33,12 +33,12 @@
public class VersionComparator
implements Comparator<String>
{
- private static final Language _lang = new DefaultLanguage( VersionComparator.class );
+ private static final Language LANG = new DefaultLanguage( VersionComparator.class );
public int compare( String v1, String v2 )
{
if( v1 == null || v2 == null )
- throw new IllegalArgumentException( _lang.getMessage( "null.version.to.compare", v1,v2 ) );
+ throw new IllegalArgumentException( LANG.getMessage( "null.version.to.compare", v1,v2 ) );
DefaultArtifactVersion av1 = new DefaultArtifactVersion( v1 );
DefaultArtifactVersion av2 = new DefaultArtifactVersion( v2 );
Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpHelper.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpHelper.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpHelper.java (original)
+++ maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpHelper.java Mon Dec 15 06:49:51 2008
@@ -49,7 +49,7 @@
public static final String PROVIDER = "BC";
public static final String EXTENSION = "asc";
- private static final Language lang = new DefaultLanguage( PgpHelper.class );
+ private static final Language LANG = new DefaultLanguage( PgpHelper.class );
//---------------------------------------------------------------------------------
static
{
@@ -69,10 +69,10 @@
throws IOException, PGPException
{
if( in == null )
- throw new IllegalArgumentException( lang.getMessage( "null.input.stream" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "null.input.stream" ) );
if( hexId == null || hexId.length() < 16 )
- throw new IllegalArgumentException( lang.getMessage( "bad.key.id", hexId ) );
+ throw new IllegalArgumentException( LANG.getMessage( "bad.key.id", hexId ) );
long id = hexToId( hexId );
@@ -90,7 +90,7 @@
return keyRing;
}
- throw new IllegalArgumentException( lang.getMessage( "no.secret.key", hexId ) );
+ throw new IllegalArgumentException( LANG.getMessage( "no.secret.key", hexId ) );
}
//---------------------------------------------------------------------------------
public static long hexToId( String hexId )
@@ -114,7 +114,7 @@
Object pgpObject = pgpObjectFactory.nextObject();
if( pgpObject == null )
- throw new PGPException( lang.getMessage( "no.objects.in.stream" ) );
+ throw new PGPException( LANG.getMessage( "no.objects.in.stream" ) );
if( pgpObject instanceof PGPCompressedData )
{
@@ -130,7 +130,7 @@
}
if( sigList.size() < 1 )
- throw new PGPException( lang.getMessage( "no.signatures.in.stream" ) );
+ throw new PGPException( LANG.getMessage( "no.signatures.in.stream" ) );
PGPSignature sig = sigList.get(0);
Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifier.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifier.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifier.java (original)
+++ maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifier.java Mon Dec 15 06:49:51 2008
@@ -47,7 +47,7 @@
extends AbstractStreamVerifier
implements StreamVerifier
{
- private static final Language lang = new DefaultLanguage( PgpStreamVerifier.class );
+ private static final Language LANG = new DefaultLanguage( PgpStreamVerifier.class );
private PGPPublicKeyRingCollection trustedPublicKeyRing;
@@ -76,7 +76,7 @@
throws StreamVerifierException
{
if( privateKey == null )
- throw new IllegalArgumentException( lang.getMessage( "null.private.key" ));
+ throw new IllegalArgumentException( LANG.getMessage( "null.private.key" ));
try
{
@@ -103,7 +103,7 @@
if( signature == null )
{
if( signatureGenerator == null )
- throw new StreamVerifierException( lang.getMessage( "no.stream.processor" ) );
+ throw new StreamVerifierException( LANG.getMessage( "no.stream.processor" ) );
signatureGenerator.update( (byte)b );
}
else
@@ -124,7 +124,7 @@
if( signature == null )
{
if( signatureGenerator == null )
- throw new StreamVerifierException( lang.getMessage( "no.stream.processor" ) );
+ throw new StreamVerifierException( LANG.getMessage( "no.stream.processor" ) );
signatureGenerator.update( b, off, len );
}
else
@@ -142,10 +142,10 @@
try
{
if( trustedPublicKeyRing == null )
- throw new StreamVerifierException( lang.getMessage( "no.trusted.ring" ) );
+ throw new StreamVerifierException( LANG.getMessage( "no.trusted.ring" ) );
if( signatureString == null || signatureString.length() < 1 )
- throw new StreamVerifierException( lang.getMessage( "no.signature.string" ) );
+ throw new StreamVerifierException( LANG.getMessage( "no.signature.string" ) );
signature = PgpHelper.readSignature( new ByteArrayInputStream( signatureString.getBytes() ) );
@@ -169,7 +169,7 @@
{
if( signature == null )
- throw new StreamVerifierException( lang.getMessage( "null.verify.signature" ));
+ throw new StreamVerifierException( LANG.getMessage( "null.verify.signature" ));
try
{
Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierFactory.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierFactory.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierFactory.java (original)
+++ maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierFactory.java Mon Dec 15 06:49:51 2008
@@ -47,7 +47,7 @@
public static final String DEFAULT_EXTENSION = PgpHelper.EXTENSION;
- private static final Language lang = new DefaultLanguage( PgpStreamVerifierFactory.class );
+ private static final Language LANG = new DefaultLanguage( PgpStreamVerifierFactory.class );
private PGPPublicKeyRingCollection trustedPublicKeyRing;
@@ -88,10 +88,10 @@
{
trustedPublicKeyRing = new PGPPublicKeyRingCollection(PGPUtil.getDecoderStream(trustedPublicKeyRingStream));
if( trustedPublicKeyRing == null )
- throw new StreamVerifierException( lang.getMessage( "bad.factory.init.verify.empty" ) );
+ throw new StreamVerifierException( LANG.getMessage( "bad.factory.init.verify.empty" ) );
}
else
- throw new StreamVerifierException( lang.getMessage( "bad.factory.init.verify" ) );
+ throw new StreamVerifierException( LANG.getMessage( "bad.factory.init.verify" ) );
}
catch( Exception e )
{
@@ -115,7 +115,7 @@
algorithm = secKey.getPublicKey().getAlgorithm();
}
else
- throw new StreamVerifierException( lang.getMessage( "bad.factory.init.generate" ) );
+ throw new StreamVerifierException( LANG.getMessage( "bad.factory.init.generate" ) );
}
catch( Exception e )
{
Modified: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventManager.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventManager.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventManager.java (original)
+++ maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventManager.java Mon Dec 15 06:49:51 2008
@@ -48,8 +48,8 @@
public static final String SYSTEM_PROPERTY_EVENT_MASK = "maven.mercury.events";
public static final String systemPropertyEventMask = System.getProperty( SYSTEM_PROPERTY_EVENT_MASK, null );
- private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( EventManager.class );
- private static final Language _lang = new DefaultLanguage( EventManager.class );
+ private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( EventManager.class );
+ private static final Language LANG = new DefaultLanguage( EventManager.class );
final List<MercuryEventListener> _listeners = new ArrayList<MercuryEventListener>(8);
@@ -171,7 +171,7 @@
}
catch( Throwable th )
{
- _log.error( _lang.getMessage( "listener.error", th.getMessage() ) );
+ LOG.error( LANG.getMessage( "listener.error", th.getMessage() ) );
}
}
}
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java Mon Dec 15 06:49:51 2008
@@ -41,7 +41,7 @@
public static final String JAVA_DEPENDENCY_MODEL = "java";
public static final String OSGI_DEPENDENCY_MODEL = "osgi";
- private static final Language _lang = new DefaultLanguage( DependencyBuilderFactory.class) ;
+ private static final Language LANG = new DefaultLanguage( DependencyBuilderFactory.class) ;
public static final DependencyBuilder create(
final String dependencyModel
@@ -55,7 +55,7 @@
if( JAVA_DEPENDENCY_MODEL.equals( dependencyModel ) )
return new DependencyTreeBuilder( repositories, filters, comparators, processors );
- throw new IllegalArgumentException( _lang.getMessage( "dependency.model.not.implemented", dependencyModel ) );
+ throw new IllegalArgumentException( LANG.getMessage( "dependency.model.not.implemented", dependencyModel ) );
}
}
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java Mon Dec 15 06:49:51 2008
@@ -62,8 +62,8 @@
{
public static final ArtifactMetadata DUMMY_ROOT = new ArtifactMetadata("__fake:__fake:1.0");
- private static final Language _lang = new DefaultLanguage(DependencyTreeBuilder.class);
- private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( DependencyTreeBuilder.class );
+ private static final Language LANG = new DefaultLanguage(DependencyTreeBuilder.class);
+ private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( DependencyTreeBuilder.class );
private Collection<MetadataTreeArtifactFilter> _filters;
private List<Comparator<MetadataTreeNode>> _comparators;
@@ -161,7 +161,7 @@
throws MetadataTreeException
{
if( Util.isEmpty( startMDs ) )
- throw new MetadataTreeException( _lang.getMessage( "empty.md.collection") );
+ throw new MetadataTreeException( LANG.getMessage( "empty.md.collection") );
List<MetadataTreeNode> deps = new ArrayList<MetadataTreeNode>( startMDs.size() );
@@ -206,7 +206,7 @@
mr = _reader.readDependencies( nodeMD );
if( mr == null )
- throw new MetadataTreeException( _lang.getMessage( "artifact.md.not.found", nodeMD.toString() ) );
+ throw new MetadataTreeException( LANG.getMessage( "artifact.md.not.found", nodeMD.toString() ) );
MetadataTreeNode node = new MetadataTreeNode( mr, parent, nodeQuery );
@@ -236,8 +236,8 @@
for( ArtifactBasicMetadata md : dependencies )
{
-if( _log.isDebugEnabled() )
- _log.debug("node "+nodeQuery+", dep "+md );
+if( LOG.isDebugEnabled() )
+ LOG.debug("node "+nodeQuery+", dep "+md );
List<ArtifactBasicMetadata> versions = expandedDeps.get( md );
if( versions == null || versions.size() < 1 )
@@ -373,7 +373,7 @@
throws MetadataTreeException
{
if( root == null )
- throw new MetadataTreeException(_lang.getMessage( "empty.tree" ));
+ throw new MetadataTreeException(LANG.getMessage( "empty.tree" ));
try
{
@@ -396,7 +396,7 @@
throws MetadataTreeException
{
if( root == null )
- throw new MetadataTreeException(_lang.getMessage( "empty.tree" ));
+ throw new MetadataTreeException(LANG.getMessage( "empty.tree" ));
try
{
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java Mon Dec 15 06:49:51 2008
@@ -42,8 +42,8 @@
{
private static final int DEFAULT_CHILDREN_COUNT = 8;
- private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( MetadataTreeNode.class );
- private static final Language _lang = new DefaultLanguage( MetadataTreeNode.class );
+ private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( MetadataTreeNode.class );
+ private static final Language LANG = new DefaultLanguage( MetadataTreeNode.class );
/**
* this node's artifact MD
@@ -105,10 +105,10 @@
TreeSet<String> nodes = new TreeSet<String>();
getDistinctNodes( this, nodes );
-if( _log.isDebugEnabled() )
+if( LOG.isDebugEnabled() )
{
- _log.debug( "tree distinct nodes count" );
- _log.debug( nodes.toString() );
+ LOG.debug( "tree distinct nodes count" );
+ LOG.debug( nodes.toString() );
}
return nodes.size();
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java Mon Dec 15 06:49:51 2008
@@ -60,8 +60,8 @@
public class DefaultSatSolver
implements SatSolver
{
- private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( DefaultSatSolver.class );
- private static final Language _lang = new DefaultLanguage( DefaultSatSolver.class );
+ private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( DefaultSatSolver.class );
+ private static final Language LANG = new DefaultLanguage( DefaultSatSolver.class );
protected SatContext _context;
protected IPBSolver _solver = SolverFactory.newEclipseP2();
@@ -102,7 +102,7 @@
int nNodes = tree.countDistinctNodes();
- _log.debug( "SatContext: # of variables: "+nNodes );
+ LOG.debug( "SatContext: # of variables: "+nNodes );
_context = new SatContext( nNodes );
_solver.newVar( tree.countNodes() );
@@ -172,8 +172,8 @@
boolean bigBucket = bucketSize > 1;
-if( _log.isDebugEnabled() )
- _log.debug( "\n\nBucket "+key );
+if( LOG.isDebugEnabled() )
+ LOG.debug( "\n\nBucket "+key );
IVecInt bucketVars = new VecInt( bucketSize );
@@ -181,8 +181,8 @@
{
MetadataTreeNode n = bucket.get(i);
-if( _log.isDebugEnabled() )
- _log.debug( n.toString() );
+if( LOG.isDebugEnabled() )
+ LOG.debug( n.toString() );
SatVar var = _context.findOrAdd(n);
int varLiteral = var.getLiteral();
@@ -197,8 +197,8 @@
coeffs.push( BigInteger.valueOf( cf ) );
- if( _log.isDebugEnabled() )
- _log.debug( " "+cf+" x"+var.getLiteral() );
+ if( LOG.isDebugEnabled() )
+ LOG.debug( " "+cf+" x"+var.getLiteral() );
}
}
@@ -216,8 +216,8 @@
throw new SatException(e);
}
-if( _log.isDebugEnabled() )
- _log.debug( "\n" );
+if( LOG.isDebugEnabled() )
+ LOG.debug( "\n" );
}
if( vars.isEmpty() )
@@ -391,8 +391,8 @@
{
_solver.addPseudoBoolean( lits, coeff, ge, cardinality );
-if( _log.isDebugEnabled() )
- _log.debug("PB: ");
+if( LOG.isDebugEnabled() )
+ LOG.debug("PB: ");
for( int i=0; i<lits.size(); i++ )
{
@@ -401,11 +401,11 @@
int val = Math.abs(co);
String space = val == 1 ? "" : " ";
-if( _log.isDebugEnabled() )
- _log.debug( " " + sign + (val==1?"":val) + space + "x"+lits.get(i) );
+if( LOG.isDebugEnabled() )
+ LOG.debug( " " + sign + (val==1?"":val) + space + "x"+lits.get(i) );
}
-if( _log.isDebugEnabled() )
- _log.debug(( ge ? " >= " : " < ")+" "+cardinality );
+if( LOG.isDebugEnabled() )
+ LOG.debug(( ge ? " >= " : " < ")+" "+cardinality );
}
//-----------------------------------------------------------------------
private final Map<ArtifactBasicMetadata, List<MetadataTreeNode>> processChildren(
@@ -527,23 +527,23 @@
if( optional ) // Sxi >= 0
{
-if( _log.isDebugEnabled() )
- _log.debug( "optional range: atMost 1: "+ SatHelper.vectorToString( rangeVector) );
+if( LOG.isDebugEnabled() )
+ LOG.debug( "optional range: atMost 1: "+ SatHelper.vectorToString( rangeVector) );
_solver.addAtMost( rangeVector, 1 );
}
else // Sxi = 1
{
-if( _log.isDebugEnabled() )
- _log.debug( "range: " + SatHelper.vectorToString( rangeVector) );
+if( LOG.isDebugEnabled() )
+ LOG.debug( "range: " + SatHelper.vectorToString( rangeVector) );
IConstr atLeast = _solver.addAtLeast( rangeVector, 1 );
- if( _log.isDebugEnabled() )
- _log.debug( "atLeast: " + SatHelper.vectorToString( atLeast) );
+ if( LOG.isDebugEnabled() )
+ LOG.debug( "atLeast: " + SatHelper.vectorToString( atLeast) );
IConstr atMost = _solver.addAtMost( rangeVector, 1 );
- if( _log.isDebugEnabled() )
- _log.debug( "atMost: " + SatHelper.vectorToString( atMost) );
+ if( LOG.isDebugEnabled() )
+ LOG.debug( "atMost: " + SatHelper.vectorToString( atMost) );
}
@@ -567,7 +567,7 @@
int [] model = _solver.model();
-if( _log.isDebugEnabled() )
+if( LOG.isDebugEnabled() )
if( model != null )
{
StringBuilder sb = new StringBuilder();
@@ -577,10 +577,10 @@
sb.append( comma+m );
comma = ", ";
}
- _log.debug( '['+sb.toString()+']' );
+ LOG.debug( '['+sb.toString()+']' );
}
else
- _log.debug( "model is null" );
+ LOG.debug( "model is null" );
for( int i : model )
if( i > 0 )
@@ -611,7 +611,7 @@
{
int [] model = _solver.model();
-if( _log.isDebugEnabled() )
+if( LOG.isDebugEnabled() )
if( model != null )
{
StringBuilder sb = new StringBuilder();
@@ -621,10 +621,10 @@
sb.append( comma+m );
comma = ", ";
}
- _log.debug( '['+sb.toString()+']' );
+ LOG.debug( '['+sb.toString()+']' );
}
else
- _log.debug( "model is null" );
+ LOG.debug( "model is null" );
return _context.getSolutionSubtree( _root, model );
}
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/SatContext.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/SatContext.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/SatContext.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/SatContext.java Mon Dec 15 06:49:51 2008
@@ -38,8 +38,8 @@
*/
class SatContext
{
- private static final Language _lang = new DefaultLanguage(SatContext.class);
- private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( SatContext.class );
+ private static final Language LANG = new DefaultLanguage(SatContext.class);
+ private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( SatContext.class );
Map<MetadataTreeNode,SatVar> variables;
//-----------------------------------------------------------------------
@@ -58,16 +58,16 @@
if( var != null )
{
- if( _log.isDebugEnabled() )
- _log.debug( var.toString() );
+ if( LOG.isDebugEnabled() )
+ LOG.debug( var.toString() );
return var;
}
var = new SatVar( n );
variables.put( n, var );
- if( _log.isDebugEnabled() )
- _log.debug( var.toString() );
+ if( LOG.isDebugEnabled() )
+ LOG.debug( var.toString() );
return var;
}
@@ -93,16 +93,16 @@
public MetadataTreeNode getSolutionSubtree( MetadataTreeNode tree, int [] model )
{
if( tree == null )
- throw new IllegalArgumentException( _lang.getMessage( "null.tree" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "null.tree" ) );
if( tree.getMd() == null )
- throw new IllegalArgumentException( _lang.getMessage( "null.tree.md" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "null.tree.md" ) );
if( model == null )
- throw new IllegalArgumentException( _lang.getMessage( "null.model" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "null.model" ) );
if( model.length < 1 )
- throw new IllegalArgumentException( _lang.getMessage( "empty.model" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "empty.model" ) );
int sz = 0;
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java Mon Dec 15 06:49:51 2008
@@ -43,7 +43,7 @@
public class DependencyTreeBuilderTest
extends TestCase
{
- private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( DependencyTreeBuilderTest.class );
+ private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( DependencyTreeBuilderTest.class );
// ArtifactMetadata md = new ArtifactMetadata( "pmd:pmd:3.9" );
// File repo = new File("./target/test-classes/localRepo");
Modified: maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java Mon Dec 15 06:49:51 2008
@@ -77,8 +77,8 @@
extends AbstractLogEnabled
implements PlexusMercury
{
- private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( DefaultPlexusMercury.class );
- private static final Language _lang = new DefaultLanguage( DefaultPlexusMercury.class );
+ private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( DefaultPlexusMercury.class );
+ private static final Language LANG = new DefaultLanguage( DefaultPlexusMercury.class );
@Requirement( hint="maven" )
DependencyProcessor dependencyProcessor;
@@ -94,7 +94,7 @@
return dependencyProcessor;
if( plexus == null )
- throw new RepositoryException( _lang.getMessage( "no.plexus.injected" ) );
+ throw new RepositoryException( LANG.getMessage( "no.plexus.injected" ) );
DependencyProcessor dp = null;
@@ -106,7 +106,7 @@
}
catch( ComponentLookupException e )
{
- throw new RepositoryException( _lang.getMessage( "no.dep.processor.injected", hint, e.getMessage() ) );
+ throw new RepositoryException( LANG.getMessage( "no.dep.processor.injected", hint, e.getMessage() ) );
}
}
//---------------------------------------------------------------
@@ -199,7 +199,7 @@
throws RepositoryException
{
if( repo == null )
- throw new RepositoryException( _lang.getMessage( "null.repo" ) );
+ throw new RepositoryException( LANG.getMessage( "null.repo" ) );
RepositoryWriter wr = repo.getWriter();
@@ -211,7 +211,7 @@
throws RepositoryException
{
if( Util.isEmpty( repos ) )
- throw new RepositoryException( _lang.getMessage( "null.repo" ) );
+ throw new RepositoryException( LANG.getMessage( "null.repo" ) );
VirtualRepositoryReader vr = new VirtualRepositoryReader( repos );
@@ -281,7 +281,7 @@
throws RepositoryException
{
if( Util.isEmpty( artifacts ) || artifacts.isEmpty() )
- throw new IllegalArgumentException( _lang.getMessage( "no.artifacts" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "no.artifacts" ) );
if( artifacts.size() > 1 )
throw new RepositoryException( "I dont support more'n 1 artifact now" );
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=726706&r1=726705&r2=726706&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 Mon Dec 15 06:49:51 2008
@@ -53,7 +53,7 @@
public abstract class AbstractRepository
implements Repository
{
- private static final Language lang = new DefaultLanguage( AbstractRepository.class );
+ private static final Language LANG = new DefaultLanguage( AbstractRepository.class );
//---------------------------------------------------------------------------
public static final String DEFAULT_REMOTE_READ_PROTOCOL = "http";
public static final String DEFAULT_REMOTE_WRITE_PROTOCOL = "http";
@@ -138,10 +138,10 @@
throws IllegalArgumentException
{
if( type == null || type.length() < 1 )
- throw new IllegalArgumentException( lang.getMessage( "null.reader.type" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "null.reader.type" ) );
if( readerFactory == null )
- throw new IllegalArgumentException( lang.getMessage( "null.reader.factory" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "null.reader.factory" ) );
readerRegistry.put( type, readerFactory );
}
@@ -150,10 +150,10 @@
throws IllegalArgumentException
{
if( type == null || type.length() < 1 )
- throw new IllegalArgumentException( lang.getMessage( "null.writer.type" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "null.writer.type" ) );
if( writerFactory == null )
- throw new IllegalArgumentException( lang.getMessage( "null.writer.factory" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "null.writer.factory" ) );
writerRegistry.put( type, writerFactory );
}
@@ -162,7 +162,7 @@
throws IllegalArgumentException
{
if( type == null || type.length() < 1 )
- throw new IllegalArgumentException( lang.getMessage( "null.reader.type" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "null.reader.type" ) );
readerRegistry.remove( type );
}
@@ -171,7 +171,7 @@
throws IllegalArgumentException
{
if( type == null || type.length() < 1 )
- throw new IllegalArgumentException( lang.getMessage( "null.writer.type" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "null.writer.type" ) );
writerRegistry.remove( type );
}
@@ -180,15 +180,15 @@
throws IllegalArgumentException, RepositoryException
{
if( type == null || type.length() < 1 )
- throw new IllegalArgumentException( lang.getMessage( "null.reader.type" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "null.reader.type" ) );
if( repo == null )
- throw new IllegalArgumentException( lang.getMessage( "null.reader.repo" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "null.reader.repo" ) );
RepositoryReaderFactory rf = readerRegistry.get( type );
if( rf == null )
- throw new RepositoryException( lang.getMessage( "null.reader.factory.found" ) );
+ throw new RepositoryException( LANG.getMessage( "null.reader.factory.found" ) );
return rf.getReader( repo, mdProcessor );
}
@@ -197,15 +197,15 @@
throws IllegalArgumentException, RepositoryException
{
if( type == null || type.length() < 1 )
- throw new IllegalArgumentException( lang.getMessage( "null.writer.type" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "null.writer.type" ) );
if( repo == null )
- throw new IllegalArgumentException( lang.getMessage( "null.writer.repo" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "null.writer.repo" ) );
RepositoryWriterFactory wf = writerRegistry.get( type );
if( wf == null )
- throw new RepositoryException( lang.getMessage( "null.writer.factory.found" ) );
+ throw new RepositoryException( LANG.getMessage( "null.writer.factory.found" ) );
return wf.getWriter( repo );
}
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAMetadata.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAMetadata.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAMetadata.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAMetadata.java Mon Dec 15 06:49:51 2008
@@ -24,7 +24,7 @@
*/
public class RepositoryGAMetadata
{
- private static final Language _lang = new DefaultLanguage( RepositoryGAVMetadata.class );
+ private static final Language LANG = new DefaultLanguage( RepositoryGAVMetadata.class );
protected ArtifactCoordinates ga;
@@ -65,7 +65,7 @@
throws MetadataException
{
if( md == null )
- throw new IllegalArgumentException( _lang.getMessage( "empty.md" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "empty.md" ) );
this.ga = new ArtifactCoordinates( md.getGroupId(), md.getArtifactId(), md.getVersion() );
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAVMetadata.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAVMetadata.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAVMetadata.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAVMetadata.java Mon Dec 15 06:49:51 2008
@@ -42,7 +42,7 @@
*/
public class RepositoryGAVMetadata
{
- private static final Language _lang = new DefaultLanguage( RepositoryGAVMetadata.class );
+ private static final Language LANG = new DefaultLanguage( RepositoryGAVMetadata.class );
protected ArtifactCoordinates gav;
@@ -89,7 +89,7 @@
throws MetadataException
{
if( md == null )
- throw new IllegalArgumentException( _lang.getMessage( "empty.mdbytes" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "empty.mdbytes" ) );
this.gav = new ArtifactCoordinates( md.getGroupId(), md.getArtifactId(), md.getVersion() );
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryUpdateIntervalPolicy.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryUpdateIntervalPolicy.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryUpdateIntervalPolicy.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryUpdateIntervalPolicy.java Mon Dec 15 06:49:51 2008
@@ -35,7 +35,7 @@
public class RepositoryUpdateIntervalPolicy
implements RepositoryUpdatePolicy
{
- private static final Language _lang = new DefaultLanguage( RepositoryUpdateIntervalPolicy.class );
+ private static final Language LANG = new DefaultLanguage( RepositoryUpdateIntervalPolicy.class );
public static final String UPDATE_POLICY_NAME_NEVER = "never";
@@ -81,7 +81,7 @@
public void init( String policy )
{
if( Util.isEmpty( policy ) )
- throw new IllegalArgumentException( _lang.getMessage( "empty.policy", policy ));
+ throw new IllegalArgumentException( LANG.getMessage( "empty.policy", policy ));
if( policy.startsWith( UPDATE_POLICY_NAME_ALWAYS ) )
interval = 0L;
@@ -93,12 +93,12 @@
{
int len = policy.length();
if( len <= UPDATE_POLICY_INTERVAL_LENGTH )
- throw new IllegalArgumentException( _lang.getMessage( "bad.interval.policy", policy ));
+ throw new IllegalArgumentException( LANG.getMessage( "bad.interval.policy", policy ));
interval = Integer.parseInt( policy.substring( len-1 ) ) * 60000L;
}
else
- throw new IllegalArgumentException( _lang.getMessage( "bad.policy", policy ));
+ throw new IllegalArgumentException( LANG.getMessage( "bad.policy", policy ));
}
public boolean timestampExpired( long lastUpdateMillis )
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedMetadata.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedMetadata.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedMetadata.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedMetadata.java Mon Dec 15 06:49:51 2008
@@ -47,7 +47,7 @@
*/
class CachedMetadata
{
- private static final Language _lang = new DefaultLanguage( CachedMetadata.class );
+ private static final Language LANG = new DefaultLanguage( CachedMetadata.class );
private CachedRawMetadata crm;
@@ -173,7 +173,7 @@
if( Util.isEmpty( a ) )
if( mandatory )
- throw new MetadataCorruptionException( _lang.getMessage( "no.mandatory.attribute", elem, attr ) );
+ throw new MetadataCorruptionException( LANG.getMessage( "no.mandatory.attribute", elem, attr ) );
else
return null;
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java Mon Dec 15 06:49:51 2008
@@ -63,7 +63,7 @@
public static final String EVENT_UPDATE_GAV = "update.gav";
public static final String EVENT_SAVE_RAW = "save.raw";
- private static final Language _lang = new DefaultLanguage( RepositoryGAVMetadata.class );
+ private static final Language LANG = new DefaultLanguage( RepositoryGAVMetadata.class );
static volatile Map<String, MetadataCacheFs> fsCaches = Collections.synchronizedMap( new HashMap<String, MetadataCacheFs>(2) );
@@ -94,7 +94,7 @@
if( root == null
|| ( root.exists() && root.isFile() )
)
- throw new IllegalArgumentException( _lang.getMessage( "bad.root.file", root == null ? "null" : root.getAbsolutePath() ) );
+ throw new IllegalArgumentException( LANG.getMessage( "bad.root.file", root == null ? "null" : root.getAbsolutePath() ) );
String key = root.getCanonicalPath();
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlat.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlat.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlat.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlat.java Mon Dec 15 06:49:51 2008
@@ -58,8 +58,8 @@
public static final long SLEEP_FOR_LOCK_TICK = 5l;
- private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( LocalRepositoryWriterFlat.class );
- private static final Language _lang = new DefaultLanguage( LocalRepositoryWriterFlat.class );
+ private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( LocalRepositoryWriterFlat.class );
+ private static final Language LANG = new DefaultLanguage( LocalRepositoryWriterFlat.class );
//---------------------------------------------------------------------------------------------------------------
private static final String [] _protocols = new String [] { "file" };
@@ -202,7 +202,7 @@
File aFile = artifact.getFile();
if( aFile == null && !isPom )
{
- throw new RepositoryException( _lang.getMessage( "artifact.no.stream", artifact.toString() ) );
+ throw new RepositoryException( LANG.getMessage( "artifact.no.stream", artifact.toString() ) );
}
try
@@ -228,7 +228,7 @@
if( isPom )
{
if( in == null && !hasPomBlob )
- throw new RepositoryException( _lang.getMessage( "pom.artifact.no.stream", artifact.toString() ) );
+ throw new RepositoryException( LANG.getMessage( "pom.artifact.no.stream", artifact.toString() ) );
if( in != null )
{
@@ -247,7 +247,7 @@
fLock = FileUtil.lockDir( lockDir, SLEEP_FOR_LOCK, SLEEP_FOR_LOCK_TICK );
if( fLock == null )
- throw new RepositoryException( _lang.getMessage( "cannot.lock.gav", lockDir, ""+SLEEP_FOR_LOCK ) );
+ throw new RepositoryException( LANG.getMessage( "cannot.lock.gav", lockDir, ""+SLEEP_FOR_LOCK ) );
String fName = versionPath+'/'+artifact.getBaseName()+'.'+artifact.getType();
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlatFactory.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlatFactory.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlatFactory.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlatFactory.java Mon Dec 15 06:49:51 2008
@@ -30,19 +30,19 @@
public class LocalRepositoryWriterFlatFactory
implements RepositoryWriterFactory
{
- private static final Language lang = new DefaultLanguage( LocalRepositoryWriterFlatFactory.class );
- private static final LocalRepositoryWriterFlatFactory factory = new LocalRepositoryWriterFlatFactory();
+ private static final Language LANG = new DefaultLanguage( LocalRepositoryWriterFlatFactory.class );
+ private static final LocalRepositoryWriterFlatFactory FACTORY = new LocalRepositoryWriterFlatFactory();
static
{
- AbstractRepository.register( LocalRepositoryFlat.FLAT_REPOSITORY_TYPE, factory );
+ AbstractRepository.register( LocalRepositoryFlat.FLAT_REPOSITORY_TYPE, FACTORY );
}
public RepositoryWriter getWriter( Repository repo )
throws RepositoryException
{
if( repo == null || !(repo instanceof LocalRepository) )
- throw new RepositoryException( lang.getMessage( "bad.repository.type", repo == null ? "null" : repo.getClass().getName() ) );
+ throw new RepositoryException( LANG.getMessage( "bad.repository.type", repo == null ? "null" : repo.getClass().getName() ) );
return new LocalRepositoryWriterFlat( (LocalRepository)repo );
}
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java Mon Dec 15 06:49:51 2008
@@ -43,7 +43,7 @@
public class LocalRepositoryFlatTest
extends TestCase
{
- private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( LocalRepositoryFlatTest.class );
+ private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( LocalRepositoryFlatTest.class );
File _dir;
LocalRepositoryFlat _repo;
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java Mon Dec 15 06:49:51 2008
@@ -60,8 +60,8 @@
extends AbstracRepositoryReader
implements RepositoryReader, MetadataReader
{
- private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( LocalRepositoryReaderM2.class );
- private static final Language _lang = new DefaultLanguage( LocalRepositoryReaderM2.class );
+ private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( LocalRepositoryReaderM2.class );
+ private static final Language LANG = new DefaultLanguage( LocalRepositoryReaderM2.class );
//---------------------------------------------------------------------------------------------------------------
private static final String [] _protocols = new String [] { "file" };
@@ -101,7 +101,7 @@
if( !gaDir.exists() )
{
- res.addError( bmd, new RepositoryException( _lang.getMessage( "ga.not.found", bmd.toString(), loc.getGaPath() ) ) );
+ res.addError( bmd, new RepositoryException( LANG.getMessage( "ga.not.found", bmd.toString(), loc.getGaPath() ) ) );
return null;
}
@@ -150,7 +150,7 @@
if( loc.getVersion() == null )
{
- res.addError( bmd, new RepositoryException( _lang.getMessage( "gav.not.found", bmd.toString(), loc.getGaPath() ) ) );
+ res.addError( bmd, new RepositoryException( LANG.getMessage( "gav.not.found", bmd.toString(), loc.getGaPath() ) ) );
return null;
}
@@ -172,7 +172,7 @@
File gavDir = new File( gaDir, loc.getVersion() );
if( !gavDir.exists() )
{
- res.addError( bmd, new RepositoryException( _lang.getMessage( "gavdir.not.found", bmd.toString(), gavDir.getAbsolutePath() ) ) );
+ res.addError( bmd, new RepositoryException( LANG.getMessage( "gavdir.not.found", bmd.toString(), gavDir.getAbsolutePath() ) ) );
return null;
}
@@ -194,7 +194,7 @@
IllegalArgumentException
{
if( query == null || query.isEmpty() )
- throw new IllegalArgumentException( _lang.getMessage( "empty.query", query==null?"null":"empty" ) );
+ throw new IllegalArgumentException( LANG.getMessage( "empty.query", query==null?"null":"empty" ) );
ArtifactResults res = new ArtifactResults();
@@ -217,7 +217,7 @@
// binary calculated
if( ! binary.exists() )
{
- res.addError( bmd, new RepositoryException( _lang.getMessage( "binary.not.found", bmd.toString(), binary.getAbsolutePath() ) ) );
+ res.addError( bmd, new RepositoryException( LANG.getMessage( "binary.not.found", bmd.toString(), binary.getAbsolutePath() ) ) );
continue;
}
@@ -243,7 +243,7 @@
da.setPomBlob( FileUtil.readRawData( pomFile ) );
}
else
- _log.warn( _lang.getMessage( "pom.not.found", bmd.toString()) );
+ LOG.warn( LANG.getMessage( "pom.not.found", bmd.toString()) );
}
da.setVersion( loc.getVersion() );
@@ -280,13 +280,13 @@
}
catch( IOException e )
{
- throw new RepositoryException( _lang.getMessage( "cannot.read.signature.file", sigFileName, e.getMessage() ) );
+ throw new RepositoryException( LANG.getMessage( "cannot.read.signature.file", sigFileName, e.getMessage() ) );
}
vs.add( sv );
}
else if( ! sv.getAttributes().isLenient() )
{
- throw new RepositoryException( _lang.getMessage( "no.signature.file", ext, sigFileName ) );
+ throw new RepositoryException( LANG.getMessage( "no.signature.file", ext, sigFileName ) );
}
// otherwise ignore absence of signature file, if verifier is lenient
}
@@ -321,7 +321,7 @@
else
{
if( !sv.getAttributes().isLenient() )
- throw new RepositoryException( _lang.getMessage( "signature.failed", sv.getAttributes().getExtension(), fileName ) );
+ throw new RepositoryException( LANG.getMessage( "signature.failed", sv.getAttributes().getExtension(), fileName ) );
}
}
}
@@ -362,7 +362,7 @@
pomFile = new File( _repoDir, pomPath );
if( ! pomFile.exists() )
{
- _log.warn( "file \""+pomPath+"\" does not exist in local repo" );
+ LOG.warn( "file \""+pomPath+"\" does not exist in local repo" );
continue;
}
@@ -382,7 +382,7 @@
}
catch( Exception e )
{
- _log.warn( "error reading "+bmd.toString()+" dependencies", e );
+ LOG.warn( "error reading "+bmd.toString()+" dependencies", e );
continue;
}
@@ -437,7 +437,7 @@
if( loc.getVersion() == null )
{
- res.addError( bmd, new RepositoryException( _lang.getMessage( "snapshot.not.found", bmd.toString(), gavDir.getAbsolutePath() ) ) );
+ res.addError( bmd, new RepositoryException( LANG.getMessage( "snapshot.not.found", bmd.toString(), gavDir.getAbsolutePath() ) ) );
return false;
}
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Factory.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Factory.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Factory.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Factory.java Mon Dec 15 06:49:51 2008
@@ -31,19 +31,19 @@
public class LocalRepositoryReaderM2Factory
implements RepositoryReaderFactory
{
- private static final Language lang = new DefaultLanguage( LocalRepositoryReaderM2Factory.class );
- private static final LocalRepositoryReaderM2Factory factory = new LocalRepositoryReaderM2Factory();
+ private static final Language LANG = new DefaultLanguage( LocalRepositoryReaderM2Factory.class );
+ private static final LocalRepositoryReaderM2Factory FACTORY = new LocalRepositoryReaderM2Factory();
static
{
- AbstractRepository.register( AbstractRepository.DEFAULT_REPOSITORY_TYPE, factory );
+ AbstractRepository.register( AbstractRepository.DEFAULT_REPOSITORY_TYPE, FACTORY );
}
public RepositoryReader getReader( Repository repo, DependencyProcessor mdProcessor)
throws RepositoryException
{
if( repo == null || !(repo instanceof LocalRepository) )
- throw new RepositoryException( lang.getMessage( "bad.repository.type", repo == null ? "null" : repo.getClass().getName() ) );
+ throw new RepositoryException( LANG.getMessage( "bad.repository.type", repo == null ? "null" : repo.getClass().getName() ) );
return new LocalRepositoryReaderM2( (LocalRepository)repo, mdProcessor );
}
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java Mon Dec 15 06:49:51 2008
@@ -73,8 +73,8 @@
public static final long SLEEP_FOR_LOCK_TICK = 5l;
- private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( LocalRepositoryWriterM2.class );
- private static final Language _lang = new DefaultLanguage( LocalRepositoryWriterM2.class );
+ private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( LocalRepositoryWriterM2.class );
+ private static final Language LANG = new DefaultLanguage( LocalRepositoryWriterM2.class );
//---------------------------------------------------------------------------------------------------------------
private static final String [] _protocols = new String [] { "file" };
@@ -216,7 +216,7 @@
File aFile = artifact.getFile();
if( aFile == null && !isPom )
{
- throw new RepositoryException( _lang.getMessage( "artifact.no.stream", artifact.toString() ) );
+ throw new RepositoryException( LANG.getMessage( "artifact.no.stream", artifact.toString() ) );
}
try
@@ -246,7 +246,7 @@
if( isPom )
{
if( in == null && !hasPomBlob )
- throw new RepositoryException( _lang.getMessage( "pom.artifact.no.stream", artifact.toString() ) );
+ throw new RepositoryException( LANG.getMessage( "pom.artifact.no.stream", artifact.toString() ) );
if( in != null )
{
@@ -268,7 +268,7 @@
// throw new RepositoryException( _lang.getMessage( "cannot.lock.gav", lockDir, ""+SLEEP_FOR_LOCK ) );
fLock = FileUtil.lockDir( lockDir, SLEEP_FOR_LOCK, SLEEP_FOR_LOCK_TICK );
if( fLock == null )
- throw new RepositoryException( _lang.getMessage( "cannot.lock.gav", lockDir, ""+SLEEP_FOR_LOCK ) );
+ throw new RepositoryException( LANG.getMessage( "cannot.lock.gav", lockDir, ""+SLEEP_FOR_LOCK ) );
String fName = _repoDir.getAbsolutePath()+'/'+relVersionPath+'/'+artifact.getBaseName()+'.'+artifact.getType();
@@ -327,7 +327,7 @@
byte [] mdBytes = FileUtil.readRawData( mdFile );
if( mdBytes == null )
- throw new MetadataException( _lang.getMessage( "file.is.empty", mdFile.getAbsolutePath() ));
+ throw new MetadataException( LANG.getMessage( "file.is.empty", mdFile.getAbsolutePath() ));
md = MetadataBuilder.read( new ByteArrayInputStream(mdBytes) );
}
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2Factory.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2Factory.java?rev=726706&r1=726705&r2=726706&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2Factory.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2Factory.java Mon Dec 15 06:49:51 2008
@@ -30,19 +30,19 @@
public class LocalRepositoryWriterM2Factory
implements RepositoryWriterFactory
{
- private static final Language lang = new DefaultLanguage( LocalRepositoryWriterM2Factory.class );
- private static final LocalRepositoryWriterM2Factory factory = new LocalRepositoryWriterM2Factory();
+ private static final Language LANG = new DefaultLanguage( LocalRepositoryWriterM2Factory.class );
+ private static final LocalRepositoryWriterM2Factory FACTORY = new LocalRepositoryWriterM2Factory();
static
{
- AbstractRepository.register( AbstractRepository.DEFAULT_REPOSITORY_TYPE, factory );
+ AbstractRepository.register( AbstractRepository.DEFAULT_REPOSITORY_TYPE, FACTORY );
}
public RepositoryWriter getWriter( Repository repo )
throws RepositoryException
{
if( repo == null || !(repo instanceof LocalRepository) )
- throw new RepositoryException( lang.getMessage( "bad.repository.type", repo == null ? "null" : repo.getClass().getName() ) );
+ throw new RepositoryException( LANG.getMessage( "bad.repository.type", repo == null ? "null" : repo.getClass().getName() ) );
return new LocalRepositoryWriterM2( (LocalRepository)repo );
}