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

Renamed the maven.project packages to maven.model.*. Broke out processors into subpackage. 

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

2
maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
View File

@ -8,7 +8,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Extension;
import org.apache.maven.model.Model;
import org.apache.maven.project.builder.ProjectUri;
import org.apache.maven.model.ProjectUri;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Configuration;

2
maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java
View File

@ -1,7 +1,7 @@
package org.apache.maven.listeners;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.builder.ModelEventListener;
import org.apache.maven.model.ModelEventListener;
public interface MavenModelEventListener

2
maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java
View File

@ -14,9 +14,9 @@ import org.apache.maven.execution.ReactorManager;
import org.apache.maven.model.Build;
import org.apache.maven.model.Extension;
import org.apache.maven.model.Model;
import org.apache.maven.model.ProjectUri;
import org.apache.maven.monitor.event.DefaultEventDispatcher;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.builder.ProjectUri;
import org.apache.maven.wagon.Wagon;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.dag.CycleDetectedException;

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

@ -25,9 +25,9 @@ import java.util.Iterator;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathNotFoundException;
import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
import org.apache.maven.model.PomClassicDomainModel;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.builder.PomClassicDomainModel;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
public class PomTestWrapper

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

@ -29,11 +29,11 @@ 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.model.DomainModel;
import org.apache.maven.model.ProcessorContext;
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.ProcessorContext;
import org.codehaus.plexus.component.annotations.Component;
/**

2
maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
View File

@ -28,7 +28,7 @@ import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Parent;
import org.apache.maven.project.builder.PomClassicDomainModel;
import org.apache.maven.model.PomClassicDomainModel;
public final class MavenDomainModel
extends PomClassicDomainModel

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

@ -1,7 +1,4 @@
package org.apache.maven.project.builder;
import java.io.IOException;
import java.util.List;
package org.apache.maven.model;
public interface DomainModel {

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

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

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;

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

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

25
maven-model-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java → maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -34,7 +34,28 @@ import org.apache.maven.model.PluginExecution;
import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.Profile;
import org.apache.maven.model.Resource;
import org.apache.maven.project.builder.PomClassicDomainModel;
import org.apache.maven.model.processors.BuildProcessor;
import org.apache.maven.model.processors.CiManagementProcessor;
import org.apache.maven.model.processors.ContributorsProcessor;
import org.apache.maven.model.processors.DependencyManagementProcessor;
import org.apache.maven.model.processors.DevelopersProcessor;
import org.apache.maven.model.processors.DistributionManagementProcessor;
import org.apache.maven.model.processors.IssueManagementProcessor;
import org.apache.maven.model.processors.LicensesProcessor;
import org.apache.maven.model.processors.MailingListProcessor;
import org.apache.maven.model.processors.ModelProcessor;
import org.apache.maven.model.processors.ModuleProcessor;
import org.apache.maven.model.processors.OrganizationProcessor;
import org.apache.maven.model.processors.ParentProcessor;
import org.apache.maven.model.processors.PluginsManagementProcessor;
import org.apache.maven.model.processors.PrerequisitesProcessor;
import org.apache.maven.model.processors.ProfilePropertiesProcessor;
import org.apache.maven.model.processors.ProfilesModuleProcessor;
import org.apache.maven.model.processors.ProfilesProcessor;
import org.apache.maven.model.processors.PropertiesProcessor;
import org.apache.maven.model.processors.ReportingProcessor;
import org.apache.maven.model.processors.RepositoriesProcessor;
import org.apache.maven.model.processors.ScmProcessor;
import org.codehaus.plexus.util.xml.Xpp3Dom;
public class ProcessorContext

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -23,10 +23,10 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.PomClassicDomainModel;
import org.apache.maven.model.ProjectUri;
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)

2
maven-model-builder/src/main/java/org/apache/maven/model/interpolator/Interpolator.java
View File

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

3
maven-model-builder/src/main/java/org/apache/maven/project/builder/BaseProcessor.java → maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -30,6 +30,7 @@ import java.util.List;
import java.util.Map;
import org.apache.maven.model.Model;
import org.apache.maven.model.Processor;
public abstract class BaseProcessor implements Processor
{

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -27,8 +27,10 @@ import org.apache.maven.model.Build;
import org.apache.maven.model.BuildBase;
import org.apache.maven.model.Extension;
import org.apache.maven.model.Model;
import org.apache.maven.model.ModelEventListener;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.Processor;
import org.apache.maven.model.Resource;
public class BuildProcessor

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

3
maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelProcessor.java → maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -27,6 +27,7 @@ import java.util.List;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Model;
import org.apache.maven.model.Processor;
/*
* hold original pom

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

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

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

3
maven-model-builder/src/main/java/org/apache/maven/project/builder/ProfilesProcessor.java → maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.maven.model.Model;
import org.apache.maven.model.ProcessorContext;
import org.apache.maven.model.Profile;

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

3
maven-model-builder/src/main/java/org/apache/maven/project/builder/ReportingProcessor.java → maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java
View File

@ -1,5 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -1,4 +1,4 @@
package org.apache.maven.project.builder;
package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

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

@ -36,7 +36,11 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
import org.apache.maven.model.Build;
import org.apache.maven.model.DomainModel;
import org.apache.maven.model.Model;
import org.apache.maven.model.ModelEventListener;
import org.apache.maven.model.PomClassicDomainModel;
import org.apache.maven.model.ProcessorContext;
import org.apache.maven.model.Profile;
import org.apache.maven.model.interpolator.DefaultInterpolator;
import org.apache.maven.model.interpolator.Interpolator;
@ -48,10 +52,6 @@ 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.DomainModel;
import org.apache.maven.project.builder.ModelEventListener;
import org.apache.maven.project.builder.PomClassicDomainModel;
import org.apache.maven.project.builder.ProcessorContext;
import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator;
import org.apache.maven.repository.RepositorySystem;

2
maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
View File

@ -24,8 +24,8 @@ import java.util.List;
import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.ModelEventListener;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.project.builder.ModelEventListener;
public class DefaultProjectBuilderConfiguration
implements ProjectBuilderConfiguration

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

@ -25,7 +25,7 @@ import java.util.Iterator;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathNotFoundException;
import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
import org.apache.maven.project.builder.PomClassicDomainModel;
import org.apache.maven.model.PomClassicDomainModel;
import org.apache.maven.project.MavenProject;
public class PomTestWrapper