You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/02/26 18:28:25 UTC
svn commit: r748216 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/errors/
maven-project/src/main/java/org/apache/maven/profiles/
maven-project/src/main/java/org/apache/maven/profiles/activation/
maven-project/src/main/java/org...
Author: sisbell
Date: Thu Feb 26 17:28:25 2009
New Revision: 748216
URL: http://svn.apache.org/viewvc?rev=748216&view=rev
Log:
Removed remaining activator interfaces and uses.
Removed:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/AlwaysOnProfileActivator.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivatorExpressionEvaluator.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java?rev=748216&r1=748215&r2=748216&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java Thu Feb 26 17:28:25 2009
@@ -13,7 +13,6 @@
import org.apache.maven.model.Repository;
import org.apache.maven.profiles.activation.ProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationException;
-import org.apache.maven.profiles.activation.ProfileActivator;
import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.InvalidProjectModelException;
import org.apache.maven.project.InvalidProjectVersionException;
@@ -74,7 +73,6 @@
}
/**
- * @see ProjectErrorReporter#hasInformationFor(java.lang.Throwable)
*/
public Throwable findReportedException( Throwable error )
{
@@ -137,48 +135,7 @@
formattedMessages.put( error, formattedMessage );
}
- /**
- * @see ProjectErrorReporter#reportActivatorErrorWhileApplyingProfiles(org.apache.maven.profiles.activation.ProfileActivator, org.apache.maven.model.Model, java.io.File, org.apache.maven.model.Profile, org.apache.maven.profiles.activation.ProfileActivationContext, org.apache.maven.profiles.activation.ProfileActivationException)
- */
- public void reportActivatorError( ProfileActivator activator,
- Model model,
- File pomFile,
- Profile profile,
- ProfileActivationContext context,
- ProfileActivationException cause )
- {
- StringWriter writer = new StringWriter();
-
- writer.write( NEWLINE );
- writer.write( "Profile activator: " );
- writer.write( activator.getClass().getName() );
- writer.write( " experienced an error while processing profile:" );
- writer.write( NEWLINE );
- writer.write( NEWLINE );
- writer.write( profile.getId() );
- writer.write( " (source: " );
- writer.write( profile.getSource() );
- writer.write( ")" );
- writer.write( NEWLINE );
- writer.write( NEWLINE );
- writer.write( "Error message: " );
- writer.write( NEWLINE );
- writer.write( cause.getMessage() );
- addStandardInfo( model.getId(), pomFile, writer );
- addTips( ProjectErrorTips.getTipsForActivatorError( activator,
- model.getId(),
- pomFile,
- profile,
- context,
- cause ), writer );
-
- registerBuildError( cause, writer.toString(), cause.getCause() );
- }
-
- /**
- * @see ProjectErrorReporter#reportActivatorLookupError(java.lang.String, java.io.File, org.apache.maven.model.Profile, org.codehaus.plexus.component.repository.exception.ComponentLookupException)
- */
public void reportActivatorLookupError( Model model,
File pomFile,
Profile profile,
@@ -275,9 +232,7 @@
registerBuildError( cause, writer.toString(), cause.getCause() );
}
- /**
- * @see ProjectErrorReporter#reportInvalidRepositoryWhileGettingRepositoriesFromProfiles(org.apache.maven.model.Repository, java.lang.String, java.io.File, org.apache.maven.artifact.InvalidRepositoryException)
- */
+
public void reportInvalidRepositoryWhileGettingRepositoriesFromProfiles( Repository repo,
Model model,
File pomFile,
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java?rev=748216&r1=748215&r2=748216&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java Thu Feb 26 17:28:25 2009
@@ -7,7 +7,6 @@
import org.apache.maven.model.Repository;
import org.apache.maven.profiles.activation.ProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationException;
-import org.apache.maven.profiles.activation.ProfileActivator;
import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.InvalidProjectModelException;
import org.apache.maven.project.InvalidProjectVersionException;
@@ -45,29 +44,6 @@
* --> DefaultProfileAdvisor.getArtifactRepositoriesFromActiveProfiles(..)
* --> DefaultProfileManager.getActiveProfiles(..)
* --> DefaultProfileManager.isActive(..) (private)
- * --> ProfileActivator.canDetermineActivation(..)
- * --> ProfileActivator.isActive(..)
- * <------ ProfileActivationException
- * <------ ProjectBuildingException
- * </pre>
- */
- void reportActivatorError( ProfileActivator activator,
- Model model,
- File pomFile,
- Profile profile,
- ProfileActivationContext context,
- ProfileActivationException cause );
-
- /**
- * <b>Call Stack:</b>
- * <br/>
- * <pre>
- * DefaultProfileAdvisor.applyActivatedProfiles(..)
- * DefaultProfileAdvisor.applyActivatedExternalProfiles(..)
- * --> DefaultProfileAdvisor.applyActivatedProfiles(..) (private)
- * --> DefaultProfileAdvisor.getArtifactRepositoriesFromActiveProfiles(..)
- * --> DefaultProfileManager.getActiveProfiles(..)
- * --> DefaultProfileManager.isActive(..) (private)
* --> PlexusContainer.lookupList(..)
* <-- ComponentLookupException
* <-- ProfileActivationException
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java?rev=748216&r1=748215&r2=748216&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java Thu Feb 26 17:28:25 2009
@@ -7,7 +7,6 @@
import org.apache.maven.model.RepositoryBase;
import org.apache.maven.profiles.activation.ProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationException;
-import org.apache.maven.profiles.activation.ProfileActivator;
import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.InvalidProjectVersionException;
import org.apache.maven.project.MavenProject;
@@ -32,20 +31,6 @@
{
}
- public static List getTipsForActivatorError( ProfileActivator activator,
- String projectId,
- File pomFile,
- Profile profile,
- ProfileActivationContext context,
- ProfileActivationException cause )
- {
- return listOf( new String[]{ "If this is a standard profile activator, see "
- + "http://maven.apache.org/pom.html#Activation for help configuring profile activation.",
- "XSD location for pom.xml: http://maven.apache.org/xsd/maven-4.0.0.xsd",
- "XSD location for settings.xml: http://maven.apache.org/xsd/settings-1.0.0.xsd",
- "XSD location for profiles.xml: http://maven.apache.org/xsd/profiles-1.0.0.xsd" } );
- }
-
public static List getTipsForActivatorLookupError( String projectId,
File pomFile,
Profile profile,
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java?rev=748216&r1=748215&r2=748216&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java Thu Feb 26 17:28:25 2009
@@ -30,7 +30,6 @@
import org.apache.maven.model.Reporting;
import org.apache.maven.model.Repository;
import org.apache.maven.model.Resource;
-import org.apache.maven.profiles.activation.ProfileActivator;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;