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

move injectors to a package 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163377 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-02-23 01:59:34 +00:00
parent b005ece7c4
commit ec94b8fe2e
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -31,6 +31,7 @@ import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.project.inheritance.ModelInheritanceAssembler;
import org.apache.maven.project.injection.ProjectDefaultsInjector;
import org.apache.maven.project.interpolation.ProjectInterpolator;
import org.apache.maven.project.path.PathTranslator;
import org.apache.maven.project.validation.ModelValidationResult;

4
maven-core/src/main/java/org/apache/maven/project/MavenProject.java
View File

@ -17,7 +17,6 @@ package org.apache.maven.project;
* ====================================================================
*/
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Build;
import org.apache.maven.model.CiManagement;
import org.apache.maven.model.Contributor;
@ -34,7 +33,6 @@ import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@ -203,6 +201,7 @@ public class MavenProject
return list;
}
/* TODO: remove - should be using a type handler
public String[] getClasspathElements()
{
int size = getArtifacts().size();
@ -238,6 +237,7 @@ public class MavenProject
return false;
}
*/
// ----------------------------------------------------------------------
// Delegate to the model
// ----------------------------------------------------------------------

3
maven-core/src/main/java/org/apache/maven/project/DefaultProjectDefaultsInjector.java → maven-core/src/main/java/org/apache/maven/project/injection/DefaultProjectDefaultsInjector.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.project;
package org.apache.maven.project.injection;
/*
* Copyright 2001-2005 The Apache Software Foundation.
@ -18,6 +18,7 @@ package org.apache.maven.project;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.project.MavenProject;
import java.util.Iterator;
import java.util.List;

4
maven-core/src/main/java/org/apache/maven/project/ProjectDefaultsInjector.java → maven-core/src/main/java/org/apache/maven/project/injection/ProjectDefaultsInjector.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.project;
package org.apache.maven.project.injection;
/*
* Copyright 2001-2005 The Apache Software Foundation.
@ -16,7 +16,7 @@ package org.apache.maven.project;
* limitations under the License.
*/
/**
import org.apache.maven.project.MavenProject; /**
* @author jdcasey Created on Feb 1, 2005
*/
public interface ProjectDefaultsInjector

10
maven-core/src/main/resources/META-INF/plexus/components.xml
View File

@ -86,8 +86,8 @@
|
-->
<component>
<role>org.apache.maven.project.ProjectDefaultsInjector</role>
<implementation>org.apache.maven.project.DefaultProjectDefaultsInjector</implementation>
<role>org.apache.maven.project.injection.ProjectDefaultsInjector</role>
<implementation>org.apache.maven.project.injection.DefaultProjectDefaultsInjector</implementation>
</component>
<!--
|
@ -99,7 +99,7 @@
<implementation>org.apache.maven.project.DefaultMavenProjectBuilder</implementation>
<requirements>
<requirement>
<role>org.apache.maven.project.ProjectDefaultsInjector</role>
<role>org.apache.maven.project.injection.ProjectDefaultsInjector</role>
</requirement>
<requirement>
<role>org.apache.maven.project.interpolation.ProjectInterpolator</role>
@ -255,12 +255,12 @@
<!-- 14 -->
<phase>
<id>install</id>
<goal>install:install</goal>
<goal>jar:install</goal>
</phase>
<!-- 15 -->
<phase>
<id>deploy</id>
<goal>deploy:deploy</goal>
<goal>jar:deploy</goal>
</phase>
</phases>
<!-- END SNIPPET: lifecycle -->

1
maven-core/src/test/java/org/apache/maven/project/DefaultProjectDefaultsInjectorTest.java
View File

@ -20,6 +20,7 @@ import junit.framework.TestCase;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Model;
import org.apache.maven.project.injection.DefaultProjectDefaultsInjector;
import java.util.List;
import java.util.Properties;