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

Moved interpolator classes into their own package. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@766088 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2009-04-17 17:16:55 +00:00
parent fa462e6893
commit 635a30a36f
17 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,10 @@ import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.interpolator.DefaultInterpolator;
import org.apache.maven.model.interpolator.Interpolator;
import org.apache.maven.model.interpolator.InterpolatorProperty;
import org.apache.maven.model.interpolator.PomInterpolatorTag;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.MavenEvents;
import org.apache.maven.monitor.logging.DefaultLog;
@ -72,10 +76,6 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.builder.DefaultInterpolator;
import org.apache.maven.project.builder.Interpolator;
import org.apache.maven.project.builder.InterpolatorProperty;
import org.apache.maven.project.builder.PomInterpolatorTag;
import org.apache.maven.project.path.PathTranslator;
import org.apache.maven.realm.MavenRealmManager;
import org.apache.maven.realm.RealmManagementException;

6
maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
View File

@ -29,10 +29,10 @@ import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.builder.api.DependencyProcessorException;
import org.apache.maven.mercury.builder.api.MetadataReader;
import org.apache.maven.mercury.builder.api.MetadataReaderException;
import org.apache.maven.project.builder.DefaultInterpolator;
import org.apache.maven.model.interpolator.DefaultInterpolator;
import org.apache.maven.model.interpolator.InterpolatorProperty;
import org.apache.maven.model.interpolator.PomInterpolatorTag;
import org.apache.maven.project.builder.DomainModel;
import org.apache.maven.project.builder.InterpolatorProperty;
import org.apache.maven.project.builder.PomInterpolatorTag;
import org.apache.maven.project.builder.ProcessorContext;
import org.codehaus.plexus.component.annotations.Component;

4
maven-model-builder/src/main/java/org/apache/maven/project/builder/DefaultInterpolator.java → maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.interpolator;
import java.io.ByteArrayInputStream;
import java.io.File;
@ -25,6 +25,8 @@ import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.Reporting;
import org.apache.maven.model.Resource;
import org.apache.maven.project.builder.PomClassicDomainModel;
import org.apache.maven.project.builder.ProjectUri;
import org.codehaus.plexus.component.annotations.Component;
@Component(role=Interpolator.class)

4
maven-model-builder/src/main/java/org/apache/maven/project/builder/Interpolator.java → maven-model-builder/src/main/java/org/apache/maven/model/interpolator/Interpolator.java
View File

@ -1,8 +1,10 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.interpolator;
import java.io.IOException;
import java.util.List;
import org.apache.maven.project.builder.PomClassicDomainModel;
public interface Interpolator
{

2
maven-model-builder/src/main/java/org/apache/maven/project/builder/InterpolatorProperty.java → maven-model-builder/src/main/java/org/apache/maven/model/interpolator/InterpolatorProperty.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.interpolator;
import java.util.*;

5
maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelProperty.java → maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ModelProperty.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.interpolator;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -24,10 +24,11 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* Maps a URI to a string value, which may be null. This class is immutable.
*/
public final class ModelProperty
final class ModelProperty
{
/**

2
maven-model-builder/src/main/java/org/apache/maven/project/builder/PomInterpolatorTag.java → maven-model-builder/src/main/java/org/apache/maven/model/interpolator/PomInterpolatorTag.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.interpolator;
public enum PomInterpolatorTag

4
maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
View File

@ -22,6 +22,8 @@ package org.apache.maven.profiles;
import org.apache.maven.model.Activation;
import org.apache.maven.model.Model;
import org.apache.maven.model.Profile;
import org.apache.maven.model.interpolator.InterpolatorProperty;
import org.apache.maven.model.interpolator.PomInterpolatorTag;
import org.apache.maven.profiles.ProfileActivationContext;
import org.apache.maven.profiles.ProfileActivationException;
import org.apache.maven.profiles.ProfileManager;
@ -30,8 +32,6 @@ import org.apache.maven.profiles.matchers.FileMatcher;
import org.apache.maven.profiles.matchers.JdkMatcher;
import org.apache.maven.profiles.matchers.ProfileMatcher;
import org.apache.maven.profiles.matchers.PropertyMatcher;
import org.apache.maven.project.builder.InterpolatorProperty;
import org.apache.maven.project.builder.PomInterpolatorTag;
import java.util.ArrayList;
import java.util.Arrays;

2
maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java
View File

@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.apache.maven.project.builder.InterpolatorProperty;
import org.apache.maven.model.interpolator.InterpolatorProperty;
public class ProfileManagerInfo
{

2
maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/DefaultMatcher.java
View File

@ -22,7 +22,7 @@ package org.apache.maven.profiles.matchers;
import java.util.List;
import org.apache.maven.model.Profile;
import org.apache.maven.project.builder.InterpolatorProperty;
import org.apache.maven.model.interpolator.InterpolatorProperty;
public class DefaultMatcher implements ProfileMatcher
{

2
maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/FileMatcher.java
View File

@ -5,7 +5,7 @@ import java.util.List;
import org.apache.maven.model.ActivationFile;
import org.apache.maven.model.Profile;
import org.apache.maven.project.builder.InterpolatorProperty;
import org.apache.maven.model.interpolator.InterpolatorProperty;
public class FileMatcher implements ProfileMatcher {

2
maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/JdkMatcher.java
View File

@ -5,7 +5,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.maven.model.Profile;
import org.apache.maven.project.builder.InterpolatorProperty;
import org.apache.maven.model.interpolator.InterpolatorProperty;
public class JdkMatcher
implements ProfileMatcher

2
maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/ProfileMatcher.java
View File

@ -21,8 +21,8 @@ package org.apache.maven.profiles.matchers;
import java.util.List;
import org.apache.maven.project.builder.InterpolatorProperty;
import org.apache.maven.model.Profile;
import org.apache.maven.model.interpolator.InterpolatorProperty;
public interface ProfileMatcher
{

2
maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/PropertyMatcher.java
View File

@ -22,7 +22,7 @@ package org.apache.maven.profiles.matchers;
import java.util.List;
import org.apache.maven.model.Profile;
import org.apache.maven.project.builder.InterpolatorProperty;
import org.apache.maven.model.interpolator.InterpolatorProperty;
public class PropertyMatcher implements ProfileMatcher
{

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

@ -38,19 +38,19 @@ import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.Profile;
import org.apache.maven.model.interpolator.DefaultInterpolator;
import org.apache.maven.model.interpolator.Interpolator;
import org.apache.maven.model.interpolator.InterpolatorProperty;
import org.apache.maven.model.interpolator.PomInterpolatorTag;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.profiles.DefaultProfileManager;
import org.apache.maven.profiles.ProfileActivationException;
import org.apache.maven.profiles.ProfileManagerInfo;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.builder.DefaultInterpolator;
import org.apache.maven.project.builder.DomainModel;
import org.apache.maven.project.builder.Interpolator;
import org.apache.maven.project.builder.InterpolatorProperty;
import org.apache.maven.project.builder.ModelEventListener;
import org.apache.maven.project.builder.PomClassicDomainModel;
import org.apache.maven.project.builder.PomInterpolatorTag;
import org.apache.maven.project.builder.ProcessorContext;
import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator;

2
maven-project/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java
View File

@ -4,7 +4,7 @@ import java.util.Collections;
import org.apache.maven.model.Activation;
import org.apache.maven.model.Profile;
import org.apache.maven.project.builder.InterpolatorProperty;
import org.apache.maven.model.interpolator.InterpolatorProperty;
import junit.framework.TestCase;

9
maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
View File

@ -20,22 +20,13 @@ package org.apache.maven.project.harness;
*/
import java.io.*;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathNotFoundException;
import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.project.builder.ModelProperty;
import org.apache.maven.project.builder.PomClassicDomainModel;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
public class PomTestWrapper
{