Author: ogusakov
Date: Wed Feb 18 00:26:59 2009
New Revision: 745312
URL: http://svn.apache.org/viewvc?rev=745312&view=rev
Log:
[MNG-3969] intermediate commit - need help to identify stax problem
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/main/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryReaderMap.java
maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java?rev=745312&r1=745311&r2=745312&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java
(original)
+++
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java
Wed Feb 18 00:26:59 2009
@@ -41,6 +41,7 @@
/** dependency processor type, if any */
String _processor;
+
public void setName( String name )
{
_amd = new ArtifactBasicMetadata( name );
@@ -78,6 +79,11 @@
}
}
+ public void setSource( String pom )
+ {
+ setPom( pom );
+ }
+
public void setGroupId( String groupId )
{
if ( _amd == null )
Modified:
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java?rev=745312&r1=745311&r2=745312&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java
(original)
+++
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java
Wed Feb 18 00:26:59 2009
@@ -33,7 +33,9 @@
public static final String _loggerFactoryClassName = System.getProperty(
SYSTEM_PROPERTY_MERCURY_LOG_FACTORY,
MercuryConsoleLoggerFactory.class.getName() );
public static final String SYSTEM_PROPERTY_MERCURY_LOG_THRESHOLD =
"maven.mercury.log.threshold";
- public static final String _loggerThresholdName = System.getProperty(
SYSTEM_PROPERTY_MERCURY_LOG_THRESHOLD, MercuryLoggingLevelEnum.error.name() );
+ public static final String _loggerThresholdName = System.getProperty(
SYSTEM_PROPERTY_MERCURY_LOG_THRESHOLD
+ ,
MercuryLoggingLevelEnum.DEFAULT_LEVEL.name()
+ );
static MercuryLoggingLevelEnum _threshold = MercuryLoggingLevelEnum.valueOf(
_loggerThresholdName );
@@ -51,7 +53,7 @@
catch( Exception e )
{
_loggerFactory = new MercuryConsoleLoggerFactory();
- _loggerFactory.getLogger( MercuryLoggerManager.class ).error( "cannot
load logger for "+_loggerFactoryClassName, e );
+ _loggerFactory.getLogger( MercuryLoggerManager.class ).error( "cannot
create logger factory "+_loggerFactoryClassName, e );
}
}
Modified:
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java?rev=745312&r1=745311&r2=745312&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java
(original)
+++
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java
Wed Feb 18 00:26:59 2009
@@ -35,7 +35,7 @@
, disabled(5)
;
- public static final MercuryLoggingLevelEnum DEFAULT_LEVEL = error;
+ public static final MercuryLoggingLevelEnum DEFAULT_LEVEL = warn;
private int id;
Modified:
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java?rev=745312&r1=745311&r2=745312&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java
(original)
+++
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java
Wed Feb 18 00:26:59 2009
@@ -66,23 +66,24 @@
{
}
- /* (non-Javadoc)
- * @see
org.apache.maven.mercury.logging.MercuryLogger#error(java.lang.String,
java.lang.Throwable)
- */
public void error(
String message,
Throwable throwable )
{
- // TODO Auto-generated method stub
-
+ if( isErrorEnabled() )
+ say( MercuryLoggingLevelEnum.error, message, throwable );
}
public void fatal( String message )
{
+ if( isErrorEnabled() )
+ say( MercuryLoggingLevelEnum.error, message, null );
}
public void fatal( String message, Throwable throwable )
{
+ if( isErrorEnabled() )
+ say( MercuryLoggingLevelEnum.error, message, throwable );
}
public int getThreshold()
@@ -92,26 +93,28 @@
public void info( String message )
{
+ if( isInfoEnabled() )
+ say( MercuryLoggingLevelEnum.info, message, null );
}
public void info(
String message,
Throwable throwable )
{
- // TODO Auto-generated method stub
-
+ if( isInfoEnabled() )
+ say( MercuryLoggingLevelEnum.info, message, throwable );
}
public void warn( String message )
{
- // TODO Auto-generated method stub
-
+ if( isWarnEnabled() )
+ say( MercuryLoggingLevelEnum.warn, message, null );
}
public void warn( String message, Throwable throwable )
{
- // TODO Auto-generated method stub
-
+ if( isWarnEnabled() )
+ say( MercuryLoggingLevelEnum.warn, message, throwable );
}
}
Modified:
maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/main/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryReaderMap.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/main/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryReaderMap.java?rev=745312&r1=745311&r2=745312&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/main/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryReaderMap.java
(original)
+++
maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/main/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryReaderMap.java
Wed Feb 18 00:26:59 2009
@@ -18,37 +18,22 @@
*/
package org.apache.maven.mercury.repository.local.map;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedList;
import java.util.List;
-import java.util.Set;
import org.apache.maven.mercury.artifact.Artifact;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.builder.api.DependencyProcessor;
-import org.apache.maven.mercury.builder.api.DependencyProcessorException;
import org.apache.maven.mercury.builder.api.MetadataReaderException;
-import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
import org.apache.maven.mercury.logging.IMercuryLogger;
import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.repository.api.AbstracRepositoryReader;
import org.apache.maven.mercury.repository.api.AbstractRepository;
-import org.apache.maven.mercury.repository.api.AbstractRepositoryWriter;
import org.apache.maven.mercury.repository.api.ArtifactBasicResults;
import org.apache.maven.mercury.repository.api.ArtifactResults;
-import org.apache.maven.mercury.repository.api.LocalRepository;
import org.apache.maven.mercury.repository.api.Repository;
import org.apache.maven.mercury.repository.api.RepositoryException;
import org.apache.maven.mercury.repository.api.RepositoryReader;
-import org.apache.maven.mercury.repository.api.RepositoryWriter;
-import org.apache.maven.mercury.transport.api.Server;
-import org.apache.maven.mercury.util.FileLockBundle;
-import org.apache.maven.mercury.util.FileUtil;
import org.apache.maven.mercury.util.Util;
import org.codehaus.plexus.lang.DefaultLanguage;
import org.codehaus.plexus.lang.Language;
@@ -185,6 +170,8 @@
}
catch ( Exception e )
{
+ _log.error( e.getMessage() );
+
res.addError( bmd, e );
}
}
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=745312&r1=745311&r2=745312&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
Wed Feb 18 00:26:59 2009
@@ -517,22 +517,33 @@
ArtifactBasicResults res = rr.readDependencies( query );
- if ( res != null && res.hasResults( bmd ) )
+ if ( res != null )
{
- md.setDependencies( res.getResult( bmd ) );
- md.setTracker( rr );
-
- if ( _eventManager != null )
+ if( res.hasExceptions() )
{
- eventRead.setInfo( eventRead.getInfo() + ", found:
" + md.getDependencies() );
+ if ( LOG.isWarnEnabled() )
+ {
+ LOG.warn( bmd + " dependecies: error : " +
res.getExceptions().toString() );
+ }
}
-
- if ( LOG.isDebugEnabled() )
+
+ if( res.hasResults( bmd ) )
{
- LOG.debug( bmd + " dependecies found : " +
md.getDependencies() );
+ md.setDependencies( res.getResult( bmd ) );
+ md.setTracker( rr );
+
+ if ( _eventManager != null )
+ {
+ eventRead.setInfo( eventRead.getInfo() + ",
found: " + md.getDependencies() );
+ }
+
+ if ( LOG.isDebugEnabled() )
+ {
+ LOG.debug( bmd + " dependecies found : " +
md.getDependencies() );
+ }
+
+ return md;
}
-
- return md;
}
}
finally
