brett 2005/04/19 02:00:48
Modified: maven-core/src/main/java/org/apache/maven/plugin
MavenPluginDiscoverer.java
maven-core/src/main/java/org/apache/maven/project
DefaultMavenProjectBuilder.java
maven-core/src/main/java/org/apache/maven/settings
DefaultMavenSettingsBuilder.java
maven-core pom.xml
Log:
update to new container
Revision Changes Path
1.7 +6 -5
maven-components/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java
Index: MavenPluginDiscoverer.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MavenPluginDiscoverer.java 13 Apr 2005 05:11:48 -0000 1.6
+++ MavenPluginDiscoverer.java 19 Apr 2005 09:00:47 -0000 1.7
@@ -24,6 +24,7 @@
import org.codehaus.plexus.component.discovery.AbstractComponentDiscoverer;
import org.codehaus.plexus.component.repository.ComponentDescriptor;
import org.codehaus.plexus.component.repository.ComponentSetDescriptor;
+import org.codehaus.plexus.configuration.PlexusConfigurationException;
import java.io.Reader;
import java.util.ArrayList;
@@ -51,7 +52,7 @@
}
public ComponentSetDescriptor createComponentDescriptors( Reader
componentDescriptorConfiguration, String source )
- throws Exception
+ throws PlexusConfigurationException
{
PluginDescriptor pluginDescriptor;
@@ -59,10 +60,10 @@
{
pluginDescriptor = builder.build(
componentDescriptorConfiguration );
}
- catch ( Exception e )
+ catch ( PlexusConfigurationException e )
{
- // If the plugin is not valid, we cannot continue as it may make
the lifecycle ebhave differently than expected
- throw new Exception( "Cannot process plugin descriptor: " +
source, e );
+ // If the plugin is not valid, we cannot continue as it may make
the lifecycle ebhave differently than expected
+ throw new PlexusConfigurationException( "Cannot process plugin
descriptor: " + source, e );
}
//
----------------------------------------------------------------------
1.67 +8 -7
maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Index: DefaultMavenProjectBuilder.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- DefaultMavenProjectBuilder.java 18 Apr 2005 21:50:54 -0000 1.66
+++ DefaultMavenProjectBuilder.java 19 Apr 2005 09:00:47 -0000 1.67
@@ -45,6 +45,7 @@
import org.codehaus.plexus.PlexusContainer;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.context.Context;
+import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import
org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
@@ -125,9 +126,9 @@
// Always cache files in the source tree over those in the repository
modelCache.put( createCacheKey( model.getGroupId(),
model.getArtifactId(), model.getVersion() ), model );
-
+
Settings settings = null;
-
+
try
{
settings = mavenSettingsBuilder.buildSettings();
@@ -136,7 +137,7 @@
{
throw new ProjectBuildingException( "Cannot read settings.", e );
}
-
+
boolean systemOnline = !settings.getActiveProfile().isOffline();
MavenProject project = build( model, localRepository,
resolveDependencies );
@@ -160,7 +161,7 @@
throws ProjectBuildingException
{
Settings settings = null;
-
+
try
{
settings = mavenSettingsBuilder.buildSettings();
@@ -169,7 +170,7 @@
{
throw new ProjectBuildingException( "Cannot read settings.", e );
}
-
+
Model model = findModelFromRepository( artifact,
remoteArtifactRepositories, localRepository );
return build( model, localRepository, false );
@@ -312,7 +313,7 @@
{
throw new ProjectBuildingException( "Cannot read settings.",
e );
}
-
+
MavenMetadataSource sourceReader = new MavenMetadataSource(
artifactResolver, this );
ArtifactResolutionResult result =
artifactResolver.resolveTransitively( project.getArtifacts(),
@@ -583,7 +584,7 @@
}
public void contextualize( Context context )
- throws Exception
+ throws ContextException
{
this.container = (PlexusContainer) context.get(
PlexusConstants.PLEXUS_KEY );
}
1.6 +17 -17
maven-components/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
Index: DefaultMavenSettingsBuilder.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultMavenSettingsBuilder.java 18 Apr 2005 21:50:54 -0000 1.5
+++ DefaultMavenSettingsBuilder.java 19 Apr 2005 09:00:48 -0000 1.6
@@ -16,16 +16,15 @@
* limitations under the License.
*/
-import java.io.File;
-import java.io.FileReader;
-
import org.apache.maven.MavenConstants;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
-
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.util.IOUtil;
+import java.io.File;
+import java.io.FileReader;
+
/**
* @author jdcasey
* @version $Id$
@@ -36,7 +35,9 @@
{
public static final String userHome = System.getProperty( "user.home" );
- /** @configuration */
+ /**
+ * @configuration
+ */
private String settingsPath;
private File settingsFile;
@@ -46,7 +47,6 @@
// ----------------------------------------------------------------------
public void initialize()
- throws Exception
{
settingsFile = getSettingsFile();
@@ -62,7 +62,7 @@
throws Exception
{
Settings settings = null;
-
+
if ( settingsFile.exists() && settingsFile.isFile() )
{
FileReader reader = null;
@@ -79,17 +79,18 @@
IOUtil.close( reader );
}
}
-
- if(settings == null)
+
+ if ( settings == null )
{
getLogger().debug( "Settings model not found. Creating empty
instance of MavenSettings." );
settings = new Settings();
}
-
- if(settings.getActiveProfile() == null)
+
+ if ( settings.getActiveProfile() == null )
{
- File mavenUserConfigurationDirectory = new File( userHome,
MavenConstants.MAVEN_USER_CONFIGURATION_DIRECTORY );
+ File mavenUserConfigurationDirectory = new File( userHome,
+
MavenConstants.MAVEN_USER_CONFIGURATION_DIRECTORY );
if ( !mavenUserConfigurationDirectory.exists() )
{
if ( !mavenUserConfigurationDirectory.mkdirs() )
@@ -98,12 +99,11 @@
}
}
- String localRepository =
- new File( mavenUserConfigurationDirectory,
MavenConstants.MAVEN_REPOSITORY ).getAbsolutePath();
-
+ String localRepository = new File(
mavenUserConfigurationDirectory, MavenConstants.MAVEN_REPOSITORY
).getAbsolutePath();
+
settings.initializeActiveProfile( localRepository );
}
-
+
return settings;
}
1.36 +1 -1 maven-components/maven-core/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/pom.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- pom.xml 15 Apr 2005 08:33:19 -0000 1.35
+++ pom.xml 19 Apr 2005 09:00:48 -0000 1.36
@@ -16,7 +16,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-container-artifact</artifactId>
- <version>1.0-alpha-2</version>
+ <version>1.0-alpha-3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
