Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some clean up 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163552 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-03-15 02:50:58 +00:00
parent 9fb34fca1b
commit ba06a10501
5 changed files with 3 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
maven-artifact/src/main/java/org/apache/maven/artifact/handler/TestHandler.java
View File

@ -1,27 +0,0 @@
package org.apache.maven.artifact.handler;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* @todo [BP] should be removed and replaced with scope if other design is approved
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
*/
public class TestHandler
extends AbstractArtifactHandler
{
}

7
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
View File

@ -21,9 +21,9 @@ import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.execution.MavenExecutionResponse;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Goal;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.Goal;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.MavenEvents;
import org.apache.maven.plugin.PluginExecutionResponse;
@ -85,15 +85,10 @@ public class DefaultLifecycleExecutor
{
MavenProject project = session.getProject();
// TODO: should enrich this with the type artifactHandler, but for now just
// use "type" as is
ArtifactHandler artifactHandler = artifactHandlerManager.getArtifactHandler( project.getPackaging() );
if ( artifactHandler != null )
{
// TODO: perhaps each type should define their own lifecycle
// completely, using the base as a default?
// If so, remove both of these goals from type artifactHandler
if ( artifactHandler.packageGoal() != null )
{
verifyMojoPhase( artifactHandler.packageGoal(), session );

6
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
View File

@ -211,9 +211,6 @@ public class DefaultPluginManager
{
if ( !isPluginInstalled( groupId, artifactId ) )
{
//!! This is entirely crappy. We need a better naming for plugin
// artifact ids and
ArtifactFactory artifactFactory = null;
try
{
@ -247,7 +244,7 @@ public class DefaultPluginManager
}
}
// TODO: Default over to a sensible value (is 1.0-SNAPSHOT right?)
// TODO: Default over to a sensible value (is 1.0-SNAPSHOT right?) Hardcoging of group ID also
if ( StringUtils.isEmpty( version ) )
{
version = "1.0-SNAPSHOT";
@ -337,7 +334,6 @@ public class DefaultPluginManager
ArtifactResolver artifactResolver = null;
MavenProjectBuilder mavenProjectBuilder = null;
// TODO: should these be released
try
{
artifactResolver = (ArtifactResolver) container.lookup( ArtifactResolver.ROLE );

4
maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java
View File

@ -55,15 +55,13 @@ public class MavenPluginDiscoverer
{
PluginDescriptor pluginDescriptor;
//!! If there is a defective plugin installed should we halt everything or
// just not process that particular plugin
try
{
pluginDescriptor = builder.build( componentDescriptorConfiguration );
}
catch ( Exception 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 );
}

71
maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginInstallMojo.java
View File

@ -1,71 +0,0 @@
package org.apache.maven.plugin.plugin;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.installer.ArtifactInstaller;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.AbstractPlugin;
import org.apache.maven.plugin.PluginExecutionRequest;
import org.apache.maven.plugin.PluginExecutionResponse;
import org.apache.maven.project.MavenProject;
/**
* @goal install
* @description installs project's main artifact in local repository
* @parameter name="project"
* type="org.apache.maven.project.MavenProject"
* required="true"
* validator=""
* expression="#project"
* description=""
* @parameter name="installer"
* type="org.apache.maven.artifact.installer.ArtifactInstaller"
* required="true"
* validator=""
* expression="#component.org.apache.maven.artifact.installer.ArtifactInstaller"
* description=""
* @parameter name="localRepository"
* type="org.apache.maven.artifact.repository.ArtifactRepository"
* required="true"
* validator=""
* expression="#localRepository"
* description=""
* @prereq plugin:descriptor
* @prereq jar:jar
* @todo should be replaced by install:install
*/
public class PluginInstallMojo
extends AbstractPlugin
{
public void execute( PluginExecutionRequest request, PluginExecutionResponse response )
throws Exception
{
MavenProject project = (MavenProject) request.getParameter( "project" );
ArtifactInstaller artifactInstaller = (ArtifactInstaller) request.getParameter( "installer" );
ArtifactRepository localRepository = (ArtifactRepository) request.getParameter( "localRepository" );
if ( !"plugin".equals( project.getPackaging() ) )
{
response.setExecutionFailure( new PluginFailureResponse( "This project isn't a plugin." ) );
return;
}
Artifact artifact = new DefaultArtifact( project.getGroupId(), project.getArtifactId(), project.getVersion(),
project.getPackaging() );
artifactInstaller.install( project.getBuild().getDirectory(), artifact, localRepository );
// ----------------------------------------------------------------------
// This is not the way to do this, but in order to get the integration
// tests working this is what I'm doing. jvz.
// ----------------------------------------------------------------------
Artifact pomArtifact = new DefaultArtifact( project.getGroupId(), project.getArtifactId(),
project.getVersion(), "pom" );
artifactInstaller.install( project.getFile(), pomArtifact, localRepository );
}
}