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=726706&r1=726705&r2=726706&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 Mon Dec 15 06:49:51 2008 @@ -87,8 +87,8 @@ extends AbstracRepositoryReader implements RepositoryReader, MetadataReader { - private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( RemoteRepositoryReaderM2.class ); - private static final Language _lang = new DefaultLanguage( RemoteRepositoryReaderM2.class ); + private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( RemoteRepositoryReaderM2.class ); + private static final Language LANG = new DefaultLanguage( RemoteRepositoryReaderM2.class ); // TODO - replace with known Transport's protocols. Should be similar to RepositoryReader/Writer registration private static final String [] _protocols = new String [] { "http", "https", "dav", "webdav" }; @@ -111,13 +111,13 @@ throws RepositoryException { if( repo == null ) - throw new IllegalArgumentException( _lang.getMessage( "bad.repository.null") ); + throw new IllegalArgumentException( LANG.getMessage( "bad.repository.null") ); if( repo.getServer() == null ) - throw new IllegalArgumentException( _lang.getMessage( "bad.repository.server.null") ); + throw new IllegalArgumentException( LANG.getMessage( "bad.repository.server.null") ); if( repo.getServer().getURL() == null ) - throw new IllegalArgumentException( _lang.getMessage( "bad.repository.server.url.null") ); + throw new IllegalArgumentException( LANG.getMessage( "bad.repository.server.url.null") ); _repo = repo; @@ -131,7 +131,7 @@ File temp = File.createTempFile( "temp-", "-locator" ); _defaultRoot = new File( temp.getParentFile(), "repo" ); _defaultRoot.mkdirs(); - _log.info( "temporary repository folder set to "+_defaultRoot.getCanonicalPath() ); + LOG.info( "temporary repository folder set to "+_defaultRoot.getCanonicalPath() ); } catch( IOException e ) { @@ -182,7 +182,7 @@ } if( Util.isEmpty( versions ) ) - throw new RepositoryException( _lang.getMessage( "group.md.no.versions", _repo.getServer().getURL().toString(), loc.getGaPath() ) ); + throw new RepositoryException( LANG.getMessage( "group.md.no.versions", _repo.getServer().getURL().toString(), loc.getGaPath() ) ); Quality vq = new Quality( loc.getVersion() ); @@ -197,7 +197,7 @@ if( ver == 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; } @@ -249,7 +249,7 @@ catch( MetadataCorruptionException e ) { // bad cached data - let's overwrite it - _log.error( _lang.getMessage( "cached.data.problem", e.getMessage(), bmd.toString() ) ); + LOG.error( LANG.getMessage( "cached.data.problem", e.getMessage(), bmd.toString() ) ); } } @@ -258,13 +258,13 @@ byte [] mdBytes = readRawData( mdPath ); if( mdBytes == null ) { - throw new RepositoryException( _lang.getMessage( "no.gav.md", _repo.getServer().getURL().toString(), mdPath ) ) ; + throw new RepositoryException( LANG.getMessage( "no.gav.md", _repo.getServer().getURL().toString(), mdPath ) ) ; } Metadata gavMd = MetadataBuilder.read( new ByteArrayInputStream(mdBytes) ); if( gavMd == null ) { - throw new RepositoryException( _lang.getMessage( "gav.md.no.versions", _repo.getServer().getURL().toString(), mdPath ) ); + throw new RepositoryException( LANG.getMessage( "gav.md.no.versions", _repo.getServer().getURL().toString(), mdPath ) ); } gavm = new RepositoryGAVMetadata( gavMd ); @@ -276,7 +276,7 @@ if( Util.isEmpty( gavm.getSnapshots() ) ) { - throw new RepositoryException( _lang.getMessage( "gav.md.no.versions", _repo.getServer().getURL().toString(), mdPath ) ); + throw new RepositoryException( LANG.getMessage( "gav.md.no.versions", _repo.getServer().getURL().toString(), mdPath ) ); } return gavm.getSnapshots(); @@ -297,7 +297,7 @@ } catch( Exception e ) { - res.addError( bmd, new RepositoryException( _lang.getMessage( "cached.metadata.reading.exception", e.getMessage(), bmd.toString(), _repo.getServer().getURL().toString() ) ) ); + res.addError( bmd, new RepositoryException( LANG.getMessage( "cached.metadata.reading.exception", e.getMessage(), bmd.toString(), _repo.getServer().getURL().toString() ) ) ); return false; } @@ -312,7 +312,7 @@ if( ver == null ) { - res.addError( bmd, new RepositoryException( _lang.getMessage( "snapshot.not.found", _repo.getServer().getURL().toString(), bmd.toString() ) ) ); + res.addError( bmd, new RepositoryException( LANG.getMessage( "snapshot.not.found", _repo.getServer().getURL().toString(), bmd.toString() ) ) ); return false; } @@ -423,7 +423,7 @@ } catch( Exception e ) { - _log.warn( "error reading "+bmd.toString()+" dependencies", e ); + LOG.warn( "error reading "+bmd.toString()+" dependencies", e ); continue; } @@ -453,25 +453,25 @@ catch( MetadataCorruptionException e ) { // bad cached data - let's overwrite it - _log.error( _lang.getMessage( "cached.data.problem", e.getMessage(), bmd.toString() ) ); + LOG.error( LANG.getMessage( "cached.data.problem", e.getMessage(), bmd.toString() ) ); } } - if( _log.isDebugEnabled() ) - _log.debug( _repo.getId()+": did not find in the cache - go out for "+bmd ); + if( LOG.isDebugEnabled() ) + LOG.debug( _repo.getId()+": did not find in the cache - go out for "+bmd ); // no cached data, or it has expired - read from repository String mdPath = loc.getGaPath()+FileUtil.SEP+_repo.getMetadataName(); byte[] mavenMetadata = readRawData( mdPath ); if( mavenMetadata == null ) - throw new MetadataReaderException( _lang.getMessage( "no.group.md", _repo.getServer().getURL().toString(), mdPath ) ); + throw new MetadataReaderException( LANG.getMessage( "no.group.md", _repo.getServer().getURL().toString(), mdPath ) ); Metadata mmd = MetadataBuilder.getMetadata( mavenMetadata ); if( mmd == null || mmd.getVersioning() == null ) { - _log.warn( _lang.getMessage( "maven.bad.metadata", loc.getGaPath()+FileUtil.SEP+_repo.getMetadataName(), _repo.getId() ) ); + LOG.warn( LANG.getMessage( "maven.bad.metadata", loc.getGaPath()+FileUtil.SEP+_repo.getMetadataName(), _repo.getId() ) ); return null; } @@ -479,7 +479,7 @@ if( gam == null || Util.isEmpty( gam.getVersions() ) ) { - _log.warn( _lang.getMessage( "maven.metadata.no.versions", loc.getGaPath()+FileUtil.SEP+_repo.getMetadataName(), _repo.getId() ) ); + LOG.warn( LANG.getMessage( "maven.metadata.no.versions", loc.getGaPath()+FileUtil.SEP+_repo.getMetadataName(), _repo.getId() ) ); return null; } @@ -625,7 +625,7 @@ catch( MetadataCacheException e ) { // problems with the cache - move on - _log.error( _lang.getMessage( "cached.data.problem", e.getMessage(), bmd.toString() ) ); + LOG.error( LANG.getMessage( "cached.data.problem", e.getMessage(), bmd.toString() ) ); } } @@ -678,7 +678,7 @@ if( response.hasExceptions() ) { - _log.info( _lang.getMessage( "read.raw.exceptions", path, response.getExceptions().toString() ) ); + LOG.info( LANG.getMessage( "read.raw.exceptions", path, response.getExceptions().toString() ) ); return null; }
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2Factory.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/RemoteRepositoryReaderM2Factory.java?rev=726706&r1=726705&r2=726706&view=diff ============================================================================== --- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2Factory.java (original) +++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2Factory.java Mon Dec 15 06:49:51 2008 @@ -31,19 +31,19 @@ public class RemoteRepositoryReaderM2Factory implements RepositoryReaderFactory { - private static final Language lang = new DefaultLanguage( RemoteRepositoryReaderM2Factory.class ); - private static final RemoteRepositoryReaderM2Factory factory = new RemoteRepositoryReaderM2Factory(); + private static final Language LANG = new DefaultLanguage( RemoteRepositoryReaderM2Factory.class ); + private static final RemoteRepositoryReaderM2Factory FACTORY = new RemoteRepositoryReaderM2Factory(); 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 RemoteRepository) ) - 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 RemoteRepositoryReaderM2( (RemoteRepository)repo, mdProcessor ); } Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.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/RemoteRepositoryWriterM2.java?rev=726706&r1=726705&r2=726706&view=diff ============================================================================== --- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java (original) +++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java Mon Dec 15 06:49:51 2008 @@ -66,8 +66,8 @@ extends AbstractRepositoryWriter implements RepositoryWriter { - private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( RemoteRepositoryWriterM2.class ); - private static final Language _lang = new DefaultLanguage( RemoteRepositoryWriterM2.class ); + private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( RemoteRepositoryWriterM2.class ); + private static final Language LANG = new DefaultLanguage( RemoteRepositoryWriterM2.class ); //--------------------------------------------------------------------------------------------------------------- private static final String [] _protocols = new String [] { "http", "https", "dav", "webdav" }; @@ -86,10 +86,10 @@ _server = repo.getServer(); if( _server == null ) - throw new IllegalArgumentException( _lang.getMessage( "bad.repository.server.null" ) ); + throw new IllegalArgumentException( LANG.getMessage( "bad.repository.server.null" ) ); if( _server.getURL() == null ) - throw new IllegalArgumentException(_lang.getMessage( "bad.repository.server.url.null" )); + throw new IllegalArgumentException(LANG.getMessage( "bad.repository.server.url.null" )); _repo = repo; @@ -151,10 +151,10 @@ throws RepositoryException { if( artifact == null ) - throw new RepositoryException( _lang.getMessage( "null.artifact") ); + throw new RepositoryException( LANG.getMessage( "null.artifact") ); if( artifact.getFile() == null || !artifact.getFile().exists() ) - throw new RepositoryException( _lang.getMessage( "bad.artifact.file", artifact.toString(), (artifact.getFile() == null ? "null" : artifact.getFile().getAbsolutePath()) ) ); + throw new RepositoryException( LANG.getMessage( "bad.artifact.file", artifact.toString(), (artifact.getFile() == null ? "null" : artifact.getFile().getAbsolutePath()) ) ); boolean isPom = "pom".equals( artifact.getType() ); @@ -162,7 +162,7 @@ boolean hasPomBlob = pomBlob != null && pomBlob.length > 0; if( !artifact.hasClassifier() && !hasPomBlob ) - throw new RepositoryException( _lang.getMessage( "no.pom.in.primary.artifact", artifact.toString() ) ); + throw new RepositoryException( LANG.getMessage( "no.pom.in.primary.artifact", artifact.toString() ) ); InputStream in = artifact.getStream(); if( in == null ) @@ -170,7 +170,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 @@ -180,7 +180,7 @@ catch( FileNotFoundException e ) { if( !isPom ) - throw new RepositoryException( _lang.getMessage( "artifact.no.file", artifact.toString(), aFile.getAbsolutePath(), e.getMessage() ) ); + throw new RepositoryException( LANG.getMessage( "artifact.no.file", artifact.toString(), aFile.getAbsolutePath(), e.getMessage() ) ); } } DefaultArtifactVersion dav = new DefaultArtifactVersion( artifact.getVersion() ); @@ -195,7 +195,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 ) { Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2Factory.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/RemoteRepositoryWriterM2Factory.java?rev=726706&r1=726705&r2=726706&view=diff ============================================================================== --- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2Factory.java (original) +++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2Factory.java Mon Dec 15 06:49:51 2008 @@ -31,19 +31,19 @@ public class RemoteRepositoryWriterM2Factory implements RepositoryWriterFactory { - private static final Language lang = new DefaultLanguage( RemoteRepositoryWriterM2Factory.class ); - private static final RemoteRepositoryWriterM2Factory factory = new RemoteRepositoryWriterM2Factory(); + private static final Language LANG = new DefaultLanguage( RemoteRepositoryWriterM2Factory.class ); + private static final RemoteRepositoryWriterM2Factory FACTORY = new RemoteRepositoryWriterM2Factory(); 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 RemoteRepositoryWriterM2( (RemoteRepository)repo ); } Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RepositoryUtilM2.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/RepositoryUtilM2.java?rev=726706&r1=726705&r2=726706&view=diff ============================================================================== --- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RepositoryUtilM2.java (original) +++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RepositoryUtilM2.java Mon Dec 15 06:49:51 2008 @@ -48,24 +48,24 @@ */ public class RepositoryUtilM2 { - private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( RepositoryUtilM2.class ); - private static final Language _lang = new DefaultLanguage( RepositoryUtilM2.class ); + private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( RepositoryUtilM2.class ); + private static final Language LANG = new DefaultLanguage( RepositoryUtilM2.class ); //---------------------------------------------------------------------------------- public static void flip( LocalRepositoryM2 repo, File dest ) { if( repo == null ) - throw new IllegalArgumentException( _lang.getMessage( "lrepo.null" ) ); + throw new IllegalArgumentException( LANG.getMessage( "lrepo.null" ) ); File lDir = repo.getDirectory(); if( lDir == null ) - throw new IllegalArgumentException( _lang.getMessage( "lrepo.no.dir" ) ); + throw new IllegalArgumentException( LANG.getMessage( "lrepo.no.dir" ) ); if( !lDir.exists() || !lDir.isDirectory() ) - throw new IllegalArgumentException( _lang.getMessage( "lrepo.dir.not.exists", lDir.toString() ) ); + throw new IllegalArgumentException( LANG.getMessage( "lrepo.dir.not.exists", lDir.toString() ) ); if( dest.exists() && !dest.isFile() ) - throw new IllegalArgumentException( _lang.getMessage( "dest.is.file", dest.toString() ) ); + throw new IllegalArgumentException( LANG.getMessage( "dest.is.file", dest.toString() ) ); } @@ -74,7 +74,7 @@ { if( !repoDir.exists() || !repoDir.isDirectory() ) - throw new IllegalArgumentException( _lang.getMessage( "lrepo.dir.not.exists", repoDir.toString() ) ); + throw new IllegalArgumentException( LANG.getMessage( "lrepo.dir.not.exists", repoDir.toString() ) ); // temporary solution: just rename metadata, hoping it is correct // ideally - will use metadata correction utility Modified: maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java?rev=726706&r1=726705&r2=726706&view=diff ============================================================================== --- maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java (original) +++ maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java Mon Dec 15 06:49:51 2008 @@ -92,8 +92,8 @@ /** minimum # of queue elements to consider parallelization */ private static int MIN_PARALLEL = 5; - private static final Language _lang = new DefaultLanguage( VirtualRepositoryReader.class ); - private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( VirtualRepositoryReader.class ); + private static final Language LANG = new DefaultLanguage( VirtualRepositoryReader.class ); + private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( VirtualRepositoryReader.class ); //---------------------------------------------------------------------------------------------------------------------------- private List<Repository> _repositories = new ArrayList<Repository>(8); @@ -311,7 +311,7 @@ } catch( VersionException e ) { - throw new RepositoryException( _lang.getMessage( "query.element.bad.version", key.toString(), e.getMessage() ) ); + throw new RepositoryException( LANG.getMessage( "query.element.bad.version", key.toString(), e.getMessage() ) ); } if( keyVersionRange.isSingleton() ) @@ -499,7 +499,7 @@ List<ArtifactBasicMetadata> rejects = buckets == null ? null : buckets.get( RepositoryReader.NULL_READER ); if( buckets == null ) - throw new RepositoryException( _lang.getMessage( "internal.error.sorting.query", query.toString() ) ); + throw new RepositoryException( LANG.getMessage( "internal.error.sorting.query", query.toString() ) ); init(); @@ -523,7 +523,7 @@ ArtifactResults rrRes = rr.readArtifacts( rrQuery ); if( rrRes.hasExceptions() ) - throw new RepositoryException( _lang.getMessage( "error.reading.existing.artifact", rrRes.getExceptions().toString(), rr.getRepository().getId() ) ); + throw new RepositoryException( LANG.getMessage( "error.reading.existing.artifact", rrRes.getExceptions().toString(), rr.getRepository().getId() ) ); if( rrRes.hasResults() ) for( ArtifactBasicMetadata bm : rrRes.getResults().keySet() ) @@ -621,8 +621,8 @@ public byte[] readMetadata( ArtifactBasicMetadata bmd ) throws MetadataReaderException { - if( _log.isDebugEnabled() ) - _log.debug( "Asking for pom: "+bmd); + if( LOG.isDebugEnabled() ) + LOG.debug( "Asking for pom: "+bmd); return readRawData( bmd, "", "pom" ); } @@ -636,8 +636,8 @@ GenericEvent event = null; String eventTag = null; - if( _log.isDebugEnabled() ) - _log.debug( "request for "+bmd+", classifier="+classifier+", type="+type ); + if( LOG.isDebugEnabled() ) + LOG.debug( "request for "+bmd+", classifier="+classifier+", type="+type ); if( bmd == null ) throw new IllegalArgumentException("null bmd supplied"); @@ -667,8 +667,8 @@ byte [] res = null; Quality vq = new Quality( bmd.getVersion() ); - if( _log.isDebugEnabled() ) - _log.debug( "quality calculated as "+vq.getQuality() == null ? "null" :vq.getQuality().name() ); + if( LOG.isDebugEnabled() ) + LOG.debug( "quality calculated as "+vq.getQuality() == null ? "null" :vq.getQuality().name() ); if( Quality.SNAPSHOT_QUALITY.equals( vq ) ) { @@ -680,10 +680,10 @@ ArtifactBasicResults vRes = readVersions( query ); if( Util.isEmpty( vRes ) ) { - if( _log.isDebugEnabled() ) - _log.debug( "no snapshots found - throw exception" ); + if( LOG.isDebugEnabled() ) + LOG.debug( "no snapshots found - throw exception" ); - throw new MetadataReaderException( _lang.getMessage( "no.snapshots", bmd.toString(), classifier, type ) ); + throw new MetadataReaderException( LANG.getMessage( "no.snapshots", bmd.toString(), classifier, type ) ); } @@ -698,10 +698,10 @@ } else { - if( _log.isDebugEnabled() ) - _log.debug( "no snapshots found - throw exception" ); + if( LOG.isDebugEnabled() ) + LOG.debug( "no snapshots found - throw exception" ); - throw new MetadataReaderException( _lang.getMessage( "no.snapshots", bmd.toString(), classifier, type ) ); + throw new MetadataReaderException( LANG.getMessage( "no.snapshots", bmd.toString(), classifier, type ) ); } } catch( Exception e ) @@ -722,8 +722,8 @@ res = rr.readRawData( bmdQuery, classifier, type ); if( res != null ) { - if( _log.isDebugEnabled() ) - _log.debug( bmdQuery+" found in "+rr.getRepository().getServer() ); + if( LOG.isDebugEnabled() ) + LOG.debug( bmdQuery+" found in "+rr.getRepository().getServer() ); if( _eventManager != null ) eventRead.setInfo( eventRead.getInfo() ); @@ -744,8 +744,8 @@ } } - if( _log.isDebugEnabled() ) - _log.debug( "no data found, returning null" ); + if( LOG.isDebugEnabled() ) + LOG.debug( "no data found, returning null" ); return null; } Modified: maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Binding.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Binding.java?rev=726706&r1=726705&r2=726706&view=diff ============================================================================== --- maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Binding.java (original) +++ maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Binding.java Mon Dec 15 06:49:51 2008 @@ -35,7 +35,7 @@ */ public class Binding { - private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( Binding.class ); + private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( Binding.class ); protected URL remoteResource; protected File localFile; Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/DestinationRealmResolver.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/DestinationRealmResolver.java?rev=726706&r1=726705&r2=726706&view=diff ============================================================================== --- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/DestinationRealmResolver.java (original) +++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/DestinationRealmResolver.java Mon Dec 15 06:49:51 2008 @@ -39,7 +39,7 @@ */ public class DestinationRealmResolver implements RealmResolver { - private static final IMercuryLogger _log = MercuryLoggerManager.getLogger(DestinationRealmResolver.class); + private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger(DestinationRealmResolver.class); protected Set<Server> _servers = new HashSet<Server>(); @@ -56,10 +56,10 @@ Address address = dest.getAddress(); boolean secure = dest.isSecure(); - if( _log.isDebugEnabled() ) + if( LOG.isDebugEnabled() ) { - _log.debug("Dest "+address.getHost()+":"+address.getPort()+"(secure="+secure+")" ); - _log.debug("Server list: "+_servers ); + LOG.debug("Dest "+address.getHost()+":"+address.getPort()+"(secure="+secure+")" ); + LOG.debug("Server list: "+_servers ); } @@ -80,8 +80,8 @@ port = "https".equalsIgnoreCase( protocol ) ? 443 : 80; } - if( _log.isDebugEnabled() ) - _log.debug("Trying dest "+address.getHost()+":"+address.getPort()+"(secure="+dest.isSecure() + if( LOG.isDebugEnabled() ) + LOG.debug("Trying dest "+address.getHost()+":"+address.getPort()+"(secure="+dest.isSecure() +") against server "+protocol+"://"+host+":"+port ); if (((secure && "https".equalsIgnoreCase(protocol)) || (!secure && "http".equalsIgnoreCase(protocol))) @@ -91,8 +91,8 @@ if (address.getHost().equalsIgnoreCase(host) || address.getHost().equalsIgnoreCase(host)) { server = s; - if (_log.isDebugEnabled()) - _log.debug("Matched server "+address.getHost()+":"+address.getPort()); + if (LOG.isDebugEnabled()) + LOG.debug("Matched server "+address.getHost()+":"+address.getPort()); } } } @@ -100,8 +100,8 @@ if (server == null || server.getServerCredentials() == null) { - if (_log.isDebugEnabled()) - _log.debug("No server matching "+address.getHost()+":"+address.getPort()+" or no credentials"); + if (LOG.isDebugEnabled()) + LOG.debug("No server matching "+address.getHost()+":"+address.getPort()+" or no credentials"); return null; } Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java?rev=726706&r1=726705&r2=726706&view=diff ============================================================================== --- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java (original) +++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java Mon Dec 15 06:49:51 2008 @@ -44,7 +44,7 @@ */ public class SecureSender { - private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( SecureSender.class ); + private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( SecureSender.class ); public static void send (Server server, HttpClient httpClient, HttpExchange exchange) throws Exception @@ -66,13 +66,13 @@ Address proxyAddress = new Address(host,port); HttpDestination destination = httpClient.getDestination(exchange.getAddress(), ssl); - if( _log.isDebugEnabled() ) - _log.debug("Matched destination "+destination); + if( LOG.isDebugEnabled() ) + LOG.debug("Matched destination "+destination); destination.setProxy(proxyAddress); - if( _log.isDebugEnabled() ) - _log.debug("Set proxy "+host+":"+port+" on destination"); - _log.info("Set proxy "+host+":"+port+" on destination"); + if( LOG.isDebugEnabled() ) + LOG.debug("Set proxy "+host+":"+port+" on destination"); + LOG.info("Set proxy "+host+":"+port+" on destination"); //set up authentication for the proxy Credentials proxyCredentials = server.getProxyCredentials(); @@ -84,8 +84,8 @@ else { destination.setProxyAuthentication(new ProxyAuthorization (proxyCredentials.getUser(), proxyCredentials.getPass())); - if( _log.isDebugEnabled() ) - _log.debug( "Set proxy authentication: "+proxyCredentials.getUser()+":"+proxyCredentials.getPass()); + if( LOG.isDebugEnabled() ) + LOG.debug( "Set proxy authentication: "+proxyCredentials.getUser()+":"+proxyCredentials.getPass()); } } destination.send(exchange); Modified: maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java?rev=726706&r1=726705&r2=726706&view=diff ============================================================================== --- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java (original) +++ maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java Mon Dec 15 06:49:51 2008 @@ -81,8 +81,8 @@ public static final int K = 1024; public static final int DEFAULT_BUFFER_SIZE = 10 * K; //--------------------------------------------------------------------------------------------------------------- - private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( FileUtil.class ); - private static final Language _lang = new DefaultLanguage( FileUtil.class ); + private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( FileUtil.class ); + private static final Language LANG = new DefaultLanguage( FileUtil.class ); private static final OverlappingFileLockException FILE_LOCKED = new OverlappingFileLockException(); //--------------------------------------------------------------------------------------------------------------- @@ -167,7 +167,7 @@ int len = (int)file.length(); if( len == 0 ) { - _log.info( _lang.getMessage( "reading.empty.file", file.getAbsolutePath() ) ); + LOG.info( LANG.getMessage( "reading.empty.file", file.getAbsolutePath() ) ); return null; } @@ -215,13 +215,13 @@ } catch( IOException e ) { - throw new FileUtilException( _lang.getMessage( "cannot.read.signature.file", sigFileName, e.getMessage() ) ); + throw new FileUtilException( LANG.getMessage( "cannot.read.signature.file", sigFileName, e.getMessage() ) ); } vs.add( sv ); } else if( ! sv.getAttributes().isLenient() ) { - throw new FileUtilException( _lang.getMessage( "no.signature.file", ext, sigFileName ) ); + throw new FileUtilException( LANG.getMessage( "no.signature.file", ext, sigFileName ) ); } // otherwise ignore absence of signature file, if verifier is lenient } @@ -265,7 +265,7 @@ else { if( !sv.getAttributes().isLenient() ) - throw new StreamVerifierException( _lang.getMessage( "signature.failed", sv.getAttributes().getExtension(), fileName ) ); + throw new StreamVerifierException( LANG.getMessage( "signature.failed", sv.getAttributes().getExtension(), fileName ) ); } } } @@ -535,7 +535,7 @@ if( !sf.exists() ) { if( force ) - throw new StreamVerifierException( _lang.getMessage( "no.mandatory.signature", f.getAbsolutePath(), sf.getAbsolutePath() ) ); + throw new StreamVerifierException( LANG.getMessage( "no.mandatory.signature", f.getAbsolutePath(), sf.getAbsolutePath() ) ); else continue; } @@ -579,7 +579,7 @@ if( fl != null ) { - throw new StreamVerifierException( _lang.getMessage( "file.failed.verification", f.getAbsolutePath(), fl.toString() ) ); + throw new StreamVerifierException( LANG.getMessage( "file.failed.verification", f.getAbsolutePath(), fl.toString() ) ); } } finally @@ -593,35 +593,35 @@ public static void main( String[] args ) throws IOException, StreamObserverException { - Option sign = new Option( "sign", _lang.getMessage( "option.sign" ) ); - Option verify = new Option( "verify", _lang.getMessage( "option.verify" ) ); + Option sign = new Option( "sign", LANG.getMessage( "option.sign" ) ); + Option verify = new Option( "verify", LANG.getMessage( "option.verify" ) ); OptionGroup cmd = new OptionGroup(); cmd.addOption( sign ); cmd.addOption( verify ); - Option recurce = new Option( "r", _lang.getMessage( "option.r" ) ); - Option force = new Option( "force", _lang.getMessage( "option.force" ) ); + Option recurce = new Option( "r", LANG.getMessage( "option.r" ) ); + Option force = new Option( "force", LANG.getMessage( "option.force" ) ); OptionGroup sig = new OptionGroup(); - Option sha1 = new Option( "sha1", _lang.getMessage( "option.sha1" ) ); - Option pgp = new Option( "pgp", _lang.getMessage( "option.pgp" ) ); + Option sha1 = new Option( "sha1", LANG.getMessage( "option.sha1" ) ); + Option pgp = new Option( "pgp", LANG.getMessage( "option.pgp" ) ); sig.addOption( sha1 ); sig.addOption( pgp ); Option keyring = OptionBuilder.withArgName( "file" ) .hasArg() .withType( java.io.File.class ) - .withDescription( _lang.getMessage( "option.keyring" ) ) + .withDescription( LANG.getMessage( "option.keyring" ) ) .create( "keyring" ) ; Option keyid = OptionBuilder.withArgName( "hexstring" ) .hasArg() - .withDescription( _lang.getMessage( "option.keyid" ) ) + .withDescription( LANG.getMessage( "option.keyid" ) ) .create( "keyid" ) ; Option keypass = OptionBuilder.withArgName( "string" ) .hasArg() - .withDescription( _lang.getMessage( "option.keypass" ) ) + .withDescription( LANG.getMessage( "option.keypass" ) ) .create( "keypass" ) ; @@ -686,7 +686,7 @@ } else { - System.err.println( _lang.getMessage( "bad.pgp.args" ) ); + System.err.println( LANG.getMessage( "bad.pgp.args" ) ); return; } } @@ -725,12 +725,12 @@ f = new File( fName ); if( ! f.exists() ) { - System.out.println( _lang.getMessage( "file.not.exists", fName ) ); + System.out.println( LANG.getMessage( "file.not.exists", fName ) ); continue; } if( f.isDirectory() && ! recurse ) { - System.out.println( _lang.getMessage( "file.is.directory", fName ) ); + System.out.println( LANG.getMessage( "file.is.directory", fName ) ); continue; } if( sign ) @@ -763,14 +763,14 @@ try{ Thread.sleep( 1l ); } catch( InterruptedException e ){} df.mkdirs(); exists = df.exists(); - _log.info( _lang.getMessage( "had.to.create.directory", dir, exists + "" ) ); + LOG.info( LANG.getMessage( "had.to.create.directory", dir, exists + "" ) ); } if( !exists ) - throw new IOException( _lang.getMessage( "cannot.create.directory", dir ) ); + throw new IOException( LANG.getMessage( "cannot.create.directory", dir ) ); if( !df.isDirectory() ) - throw new IOException( _lang.getMessage( "file.is.not.directory", dir, df.exists() + "", df.isDirectory() + "", df.isFile() + "" ) ); + throw new IOException( LANG.getMessage( "file.is.not.directory", dir, df.exists() + "", df.isDirectory() + "", df.isFile() + "" ) ); File lockFile = new File( dir,LOCK_FILE ); @@ -821,14 +821,14 @@ try{ Thread.sleep( 1l ); } catch( InterruptedException e ){} df.mkdirs(); exists = df.exists(); - _log.info( _lang.getMessage( "had.to.create.directory", dir, exists + "" ) ); + LOG.info( LANG.getMessage( "had.to.create.directory", dir, exists + "" ) ); } if( !exists ) - throw new IOException( _lang.getMessage( "cannot.create.directory", dir ) ); + throw new IOException( LANG.getMessage( "cannot.create.directory", dir ) ); if( !df.isDirectory() ) - throw new IOException( _lang.getMessage( "file.is.not.directory", dir, df.exists() + "", df.isDirectory() + "", df.isFile() + "" ) ); + throw new IOException( LANG.getMessage( "file.is.not.directory", dir, df.exists() + "", df.isDirectory() + "", df.isFile() + "" ) ); File lockFile = new File( dir,LOCK_FILE ); if( !lockFile.exists() ) @@ -865,7 +865,7 @@ { File df = new File( dir ); if( !df.isDirectory() ) - throw new IOException( _lang.getMessage( "file.is.not.directory", dir ) ); + throw new IOException( LANG.getMessage( "file.is.not.directory", dir ) ); File lock = new File( dir,LOCK_FILE ); if( lock.exists() ) @@ -873,7 +873,7 @@ } catch( IOException e ) { - _log.error( e.getMessage() ); + LOG.error( e.getMessage() ); } } //--------------------------------------------------------------------------------------------------------------- @@ -929,7 +929,7 @@ public static int depth( File file ) { if( file == null || !file.exists() ) - throw new IllegalArgumentException( _lang.getMessage( "file.not.exists.error", file == null ? "null" : file.getAbsolutePath() ) ); + throw new IllegalArgumentException( LANG.getMessage( "file.not.exists.error", file == null ? "null" : file.getAbsolutePath() ) ); if( file.isFile() ) return 0; Modified: maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/MercuryWagon.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/MercuryWagon.java?rev=726706&r1=726705&r2=726706&view=diff ============================================================================== --- maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/MercuryWagon.java (original) +++ maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/MercuryWagon.java Mon Dec 15 06:49:51 2008 @@ -74,8 +74,8 @@ extends AbstractWagon implements Wagon { - private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( MercuryWagon.class ); - private static final Language _lang = new DefaultLanguage( MercuryWagon.class ); + private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( MercuryWagon.class ); + private static final Language LANG = new DefaultLanguage( MercuryWagon.class ); public static final String SYSTEM_PARAMETER_DEBUG_TRANSFER = "maven.mercury.wagon.debug.transfer"; private boolean debugTransfer = Boolean.parseBoolean( System.getProperty( SYSTEM_PARAMETER_DEBUG_TRANSFER, "false" ) ); @@ -108,8 +108,8 @@ */ public MercuryWagon() { - if( _log.isDebugEnabled() ) - _log.debug( "MercuryWagon instantiated" ); + if( LOG.isDebugEnabled() ) + LOG.debug( "MercuryWagon instantiated" ); } public MercuryWagon( Server server ) @@ -122,10 +122,10 @@ throws IllegalArgumentException { if( server == null ) - throw new IllegalArgumentException( _lang.getMessage( "null.read.server" ) ); + throw new IllegalArgumentException( LANG.getMessage( "null.read.server" ) ); if( server.getURL() == null ) - throw new IllegalArgumentException( _lang.getMessage( "null.read.server.url", server.getId() ) ); + throw new IllegalArgumentException( LANG.getMessage( "null.read.server.url", server.getId() ) ); this.server = server; @@ -185,8 +185,8 @@ public void get( String resourceName, File destination ) throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException { - if( _log.isDebugEnabled() ) - _log.debug("MercuryWagon getting "+resourceName+" into "+destination); + if( LOG.isDebugEnabled() ) + LOG.debug("MercuryWagon getting "+resourceName+" into "+destination); Binding binding = null; @@ -222,12 +222,12 @@ if( response.hasExceptions() ) { - _log.error( response.getExceptions().toString() ); + LOG.error( response.getExceptions().toString() ); throw new ResourceDoesNotExistException( response.getExceptions().toString() ); } - if( _log.isDebugEnabled() ) - _log.debug("MercuryWagon got ["+resourceName+" ==> "+destination + "], time " + (System.currentTimeMillis()-start) + " millis"); + if( LOG.isDebugEnabled() ) + LOG.debug("MercuryWagon got ["+resourceName+" ==> "+destination + "], time " + (System.currentTimeMillis()-start) + " millis"); } @@ -241,8 +241,8 @@ public void put( File source, String destination ) throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException { - if( _log.isDebugEnabled() ) - _log.debug( "put request for: "+source+" => "+destination ); + if( LOG.isDebugEnabled() ) + LOG.debug( "put request for: "+source+" => "+destination ); Resource resource = new Resource( destination ); @@ -285,8 +285,8 @@ throw new TransferFailedException( response.getExceptions().toString() ); } - if( _log.isDebugEnabled() ) - _log.debug("MercuryWagon put ["+source+" ==> "+destination + "], time " + (System.currentTimeMillis()-start) + " millis"); + if( LOG.isDebugEnabled() ) + LOG.debug("MercuryWagon put ["+source+" ==> "+destination + "], time " + (System.currentTimeMillis()-start) + " millis"); } protected void closeConnection() @@ -317,8 +317,8 @@ protected void openConnectionInternal() throws ConnectionException, AuthenticationException { - if( _log.isDebugEnabled() ) - _log.debug( "opening connection to repository "+repository ); + if( LOG.isDebugEnabled() ) + LOG.debug( "opening connection to repository "+repository ); try { @@ -332,8 +332,8 @@ String url = protocol + theRest; - if(_log.isDebugEnabled()) - _log.debug( "converted url "+repository.getUrl()+" ==> "+url ); + if(LOG.isDebugEnabled()) + LOG.debug( "converted url "+repository.getUrl()+" ==> "+url ); Server server = new Server( repository.getId(), new URL( url ) ); @@ -343,8 +343,8 @@ server.setServerCredentials( user ); - if( _log.isDebugEnabled() ) - _log.debug( "user ceredentials: "+user.getUser()+"/..." ); + if( LOG.isDebugEnabled() ) + LOG.debug( "user ceredentials: "+user.getUser()+"/..." ); } @@ -369,13 +369,13 @@ server.setProxyCredentials( proxyUser ); - if(_log.isDebugEnabled()) - _log.debug( "proxy credentials set to : " + proxyUser.getUser()+"/..." ); + if(LOG.isDebugEnabled()) + LOG.debug( "proxy credentials set to : " + proxyUser.getUser()+"/..." ); } } - if(_log.isDebugEnabled()) - _log.debug( "proxy url set to : " + server.getProxy() ); + if(LOG.isDebugEnabled()) + LOG.debug( "proxy url set to : " + server.getProxy() ); init( server ); @@ -389,7 +389,7 @@ catch( Throwable e ) { e.printStackTrace(); - _log.error( e.getMessage() ); + LOG.error( e.getMessage() ); throw new ConnectionException( e.getMessage() ); } } @@ -426,8 +426,8 @@ if( pgpConfig == null ) return res; - if( _log.isDebugEnabled() ) - _log.debug( "PGP signature configuration will be read from "+pgpConfig ); + if( LOG.isDebugEnabled() ) + LOG.debug( "PGP signature configuration will be read from "+pgpConfig ); Properties pgpProps = new Properties(); pgpProps.load( new FileInputStream(pgpConfig) ); @@ -444,8 +444,8 @@ StreamVerifierFactory rf = new PgpStreamVerifierFactory( readerAttr, new FileInputStream(readerKeyring) ); - if( _log.isDebugEnabled() ) - _log.debug( "public key file: "+new File(readerKeyring).getAbsolutePath() ); + if( LOG.isDebugEnabled() ) + LOG.debug( "public key file: "+new File(readerKeyring).getAbsolutePath() ); Set<StreamVerifierFactory> rs = new HashSet<StreamVerifierFactory>(1); rs.add( rf ); @@ -458,8 +458,8 @@ if( writerKeyring != null && writerKeyId != null && writerKeyringPass != null ) { - if( _log.isDebugEnabled() ) - _log.debug( "secret key file: "+new File(writerKeyring).getAbsolutePath() ); + if( LOG.isDebugEnabled() ) + LOG.debug( "secret key file: "+new File(writerKeyring).getAbsolutePath() ); StreamVerifierAttributes writerAttr = new StreamVerifierAttributes( PgpStreamVerifierFactory.DEFAULT_EXTENSION @@ -482,8 +482,8 @@ { this.userAgent = httpHeaders.getProperty( "User-Agent", null ); - if( _log.isDebugEnabled() ) - _log.debug( "userAgent set to : "+this.userAgent ); + if( LOG.isDebugEnabled() ) + LOG.debug( "userAgent set to : "+this.userAgent ); } @@ -491,8 +491,8 @@ public boolean resourceExists( String resourceName ) throws TransferFailedException, AuthorizationException { - if( _log.isDebugEnabled() ) - _log.debug( "check if resourceExists: "+resourceName+" on server "+(server == null ? "null" : server.getURL() ) ); + if( LOG.isDebugEnabled() ) + LOG.debug( "check if resourceExists: "+resourceName+" on server "+(server == null ? "null" : server.getURL() ) ); File temp; try @@ -527,7 +527,7 @@ if( response.hasExceptions() ) { - _log.error( response.getExceptions().toString() ); + LOG.error( response.getExceptions().toString() ); return false; } return true; Modified: maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/StupidWagonObserverAdapter.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/StupidWagonObserverAdapter.java?rev=726706&r1=726705&r2=726706&view=diff ============================================================================== --- maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/StupidWagonObserverAdapter.java (original) +++ maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/StupidWagonObserverAdapter.java Mon Dec 15 06:49:51 2008 @@ -34,7 +34,7 @@ public class StupidWagonObserverAdapter implements StreamObserver { - private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( StupidWagonObserverAdapter.class ); + private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( StupidWagonObserverAdapter.class ); byte [] buf = new byte[2048]; @@ -48,8 +48,8 @@ { this.wagon = wagon; this.event = event; - if( _log.isDebugEnabled() ) - _log.debug( "|=========-> adapter for "+event.getResource().getName()+" is created" ); + if( LOG.isDebugEnabled() ) + LOG.debug( "|=========-> adapter for "+event.getResource().getName()+" is created" ); } public void byteReady( int b ) @@ -76,7 +76,7 @@ public void setLength( long length ) { this.length = length; -_log.info( "|=-> length is "+length ); +LOG.info( "|=-> length is "+length ); } public void setLastModified(String time) Modified: maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/TransferEventDebugger.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/TransferEventDebugger.java?rev=726706&r1=726705&r2=726706&view=diff ============================================================================== --- maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/TransferEventDebugger.java (original) +++ maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/TransferEventDebugger.java Mon Dec 15 06:49:51 2008 @@ -36,7 +36,7 @@ public static final String SYSTEM_PARAMETER_DEBUG_TRANSFER_BYTES = "maven.mercury.wagon.debug.transfer.bytes"; private boolean debugTransferBytes = Boolean.parseBoolean( System.getProperty( SYSTEM_PARAMETER_DEBUG_TRANSFER_BYTES, "false" ) ); - private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( TransferEventDebugger.class ); + private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( TransferEventDebugger.class ); public void debug( String message ) { @@ -45,17 +45,17 @@ public void transferCompleted( TransferEvent transferEvent ) { - _log.info("|=============> completed: "+transferEvent.getResource().getName() ); + LOG.info("|=============> completed: "+transferEvent.getResource().getName() ); } public void transferError( TransferEvent transferEvent ) { - _log.info("|=============> error: "+transferEvent.getResource().getName() ); + LOG.info("|=============> error: "+transferEvent.getResource().getName() ); } public void transferInitiated( TransferEvent transferEvent ) { - _log.info("|=============> initialized: "+transferEvent.getResource().getName() ); + LOG.info("|=============> initialized: "+transferEvent.getResource().getName() ); } public void transferProgress( @@ -64,13 +64,13 @@ int length ) { if( debugTransferBytes ) - _log.info("|=============> ready "+length+" bytes : "+transferEvent.getResource().getName() ); + LOG.info("|=============> ready "+length+" bytes : "+transferEvent.getResource().getName() ); } public void transferStarted( TransferEvent transferEvent ) { - _log.info("|=============> started: "+transferEvent.getResource().getName() ); + LOG.info("|=============> started: "+transferEvent.getResource().getName() ); } }
