Author: sisbell
Date: Wed Apr 29 17:12:08 2009
New Revision: 769836
URL: http://svn.apache.org/viewvc?rev=769836&view=rev
Log:
Having a DomainModel interface doesn't makes sense in the current context. We
no longer have general transforms.
Added:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java
- copied, changed from r769799,
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java
Removed:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=769836&r1=769835&r2=769836&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Wed Apr 29 17:12:08 2009
@@ -38,7 +38,7 @@
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.DomainModel;
import org.apache.maven.model.ProcessorContext;
import org.apache.maven.model.Profile;
import org.apache.maven.model.interpolator.Interpolator;
@@ -116,7 +116,7 @@
throws ProjectBuildingException
{
//Do inheritance
- PomClassicDomainModel domainModel;
+ DomainModel domainModel;
try
{
domainModel = build( "unknown", pomFile, configuration
);
@@ -242,7 +242,7 @@
{
throw new ProjectBuildingException( artifact.getId(), "Error
resolving project artifact.", e );
}
- PomClassicDomainModel domainModel;
+ DomainModel domainModel;
try
{
domainModel = build( "unknown", artifact.getFile(),
configuration );
@@ -392,7 +392,7 @@
return new MavenProjectBuildingResult( project, result );
}
- private Model interpolateDomainModel( PomClassicDomainModel domainModel,
ProjectBuilderConfiguration config, File projectDescriptor )
+ private Model interpolateDomainModel( DomainModel domainModel,
ProjectBuilderConfiguration config, File projectDescriptor )
throws ProjectBuildingException
{
Model model;
@@ -453,7 +453,7 @@
return project;
}
- private PomClassicDomainModel build( String projectId, File pomFile,
ProjectBuilderConfiguration projectBuilderConfiguration )
+ private DomainModel build( String projectId, File pomFile,
ProjectBuilderConfiguration projectBuilderConfiguration )
throws ProjectBuildingException, IOException
{
List<String> activeProfileIds = ( projectBuilderConfiguration != null
&& projectBuilderConfiguration.getGlobalProfileManager() != null &&
projectBuilderConfiguration.getGlobalProfileManager()
@@ -467,7 +467,7 @@
interpolatorProperties.addAll(
InterpolatorProperty.toInterpolatorProperties(
projectBuilderConfiguration.getExecutionProperties(),
PomInterpolatorTag.EXECUTION_PROPERTIES.name() ) );
ProfileManagerInfo profileInfo = new
ProfileManagerInfo(interpolatorProperties, activeProfileIds,
inactiveProfileIds);
- PomClassicDomainModel domainModel = new PomClassicDomainModel(
pomFile );
+ DomainModel domainModel = new DomainModel( pomFile );
domainModel.setProjectDirectory( pomFile.getParentFile() );
domainModel.setMostSpecialized( true );
@@ -498,7 +498,7 @@
if ( mavenParents.size() > 0 )
{
- PomClassicDomainModel dm = (PomClassicDomainModel)
mavenParents.get( 0 );
+ DomainModel dm = (DomainModel) mavenParents.get( 0 );
parentFile = dm.getFile();
domainModel.setParentFile( parentFile );
lineageCount = mavenParents.size();
@@ -507,12 +507,12 @@
domainModels.addAll( mavenParents );
}
- domainModels.add( new PomClassicDomainModel( getSuperModel(),
false ) );
+ domainModels.add( new DomainModel( getSuperModel(), false ) );
List<DomainModel> profileModels = new ArrayList<DomainModel>();
//Process Profiles
for(DomainModel domain : domainModels)
{
- PomClassicDomainModel dm = (PomClassicDomainModel) domain;
+ DomainModel dm = (DomainModel) domain;
if(!dm.getModel().getProfiles().isEmpty())
{
@@ -536,7 +536,7 @@
}
}
- PomClassicDomainModel transformedDomainModel =
ProcessorContext.build(profileModels, listeners);
+ DomainModel transformedDomainModel =
ProcessorContext.build(profileModels, listeners);
// Lineage count is inclusive to add the POM read in itself.
transformedDomainModel.setLineageCount( lineageCount + 1 );
@@ -545,7 +545,7 @@
return transformedDomainModel;
}
- private static boolean useTopLevelProjectForParent(PomClassicDomainModel
currentModel, MavenProject topProject) throws IOException
+ private static boolean useTopLevelProjectForParent(DomainModel
currentModel, MavenProject topProject) throws IOException
{
if(topProject == null || currentModel.getModel().getParent() == null)
{
@@ -633,7 +633,7 @@
}
}
- private List<DomainModel> getDomainModelParentsFromRepository(
PomClassicDomainModel domainModel, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories )
+ private List<DomainModel> getDomainModelParentsFromRepository(
DomainModel domainModel, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories )
throws IOException
{
List<DomainModel> domainModels = new ArrayList<DomainModel>();
@@ -659,7 +659,7 @@
+ " could not be retrieved from any repository" ).initCause( e
);
}
- PomClassicDomainModel parentDomainModel = new PomClassicDomainModel(
artifactParent.getFile() );
+ DomainModel parentDomainModel = new DomainModel(
artifactParent.getFile() );
if ( !parentDomainModel.matchesParentOf( domainModel ) )
{
@@ -684,7 +684,7 @@
* @return
* @throws IOException
*/
- private List<DomainModel> getDomainModelParentsFromLocalPath(
PomClassicDomainModel domainModel, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
+ private List<DomainModel> getDomainModelParentsFromLocalPath( DomainModel
domainModel, ArtifactRepository localRepository, List<ArtifactRepository>
remoteRepositories,
File
projectDirectory, ProjectBuilderConfiguration projectBuilderConfiguration )
throws IOException
{
@@ -704,19 +704,19 @@
}
MavenProject topProject =
projectBuilderConfiguration.getTopLevelProjectFromReactor();
boolean isTop = useTopLevelProjectForParent(domainModel, topProject);
- PomClassicDomainModel parentDomainModel = null;
+ DomainModel parentDomainModel = null;
if ( !isTop )
{
if(!parentFile.isFile())
{
throw new IOException( "File does not exist: File = " +
parentFile.getAbsolutePath() );
}
- parentDomainModel = new PomClassicDomainModel( parentFile );
+ parentDomainModel = new DomainModel( parentFile );
parentDomainModel.setProjectDirectory(
parentFile.getParentFile() );
}
else
{
- parentDomainModel = new
PomClassicDomainModel(projectBuilderConfiguration.getTopLevelProjectFromReactor().getFile());
+ parentDomainModel = new
DomainModel(projectBuilderConfiguration.getTopLevelProjectFromReactor().getFile());
}
if ( !parentDomainModel.matchesParentOf( domainModel ) )
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java?rev=769836&r1=769835&r2=769836&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
Wed Apr 29 17:12:08 2009
@@ -25,13 +25,13 @@
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.DomainModel;
import org.apache.maven.project.MavenProject;
public class PomTestWrapper
{
- private PomClassicDomainModel domainModel;
+ private DomainModel domainModel;
private File pomFile;
@@ -44,13 +44,13 @@
JXPathContextReferenceImpl.addNodePointerFactory( new
Xpp3DomPointerFactory() );
}
- public PomTestWrapper( PomClassicDomainModel domainModel )
+ public PomTestWrapper( DomainModel domainModel )
throws IOException
{
this( null, domainModel );
}
- public PomTestWrapper( File pomFile, PomClassicDomainModel domainModel )
+ public PomTestWrapper( File pomFile, DomainModel domainModel )
throws IOException
{
if ( domainModel == null )
@@ -93,7 +93,7 @@
throw new IllegalArgumentException( "file: null" );
}
- this.domainModel = new PomClassicDomainModel( file );
+ this.domainModel = new DomainModel( file );
context = JXPathContext.newContext( domainModel.getModel() );
}
@@ -102,11 +102,11 @@
return mavenProject;
}
- public PomClassicDomainModel getDomainModel()
+ public DomainModel getDomainModel()
throws IOException {
if ( domainModel == null && mavenProject != null )
{
- domainModel = new PomClassicDomainModel(
mavenProject.getModel() );
+ domainModel = new DomainModel( mavenProject.getModel() );
int lineageCount = 1;
for ( MavenProject parent = mavenProject.getParent(); parent
!= null; parent = parent.getParent() )
{
Copied:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java
(from r769799,
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java?p2=maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java&p1=maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java&r1=769799&r2=769836&rev=769836&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java
(original)
+++
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java
Wed Apr 29 17:12:08 2009
@@ -16,7 +16,7 @@
import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-public class PomClassicDomainModel implements DomainModel
+public class DomainModel
{
/**
@@ -87,14 +87,14 @@
id = groupId + ":" + artifactId + ":" + version;
}
- public PomClassicDomainModel( File file )
+ public DomainModel( File file )
throws IOException
{
this( new FileInputStream( file ) );
this.file = file;
}
- public PomClassicDomainModel( InputStream is )
+ public DomainModel( InputStream is )
throws IOException
{
this.inputBytes = IOUtil.toByteArray( is);
@@ -112,11 +112,11 @@
initializeProperties( model );
}
- public PomClassicDomainModel(Model model) throws IOException {
+ public DomainModel(Model model) throws IOException {
this (model, false);
}
- public PomClassicDomainModel(Model model, boolean b) throws IOException
{
+ public DomainModel(Model model, boolean b) throws IOException {
this.model = model;
this.isMostSpecialized = b;
@@ -182,7 +182,7 @@
return id;
}
- public boolean matchesParentOf( PomClassicDomainModel domainModel ) throws
IOException
+ public boolean matchesParentOf( DomainModel domainModel ) throws
IOException
{
if ( domainModel == null )
{
@@ -262,7 +262,7 @@
public boolean equals( Object o )
{
try {
- return o instanceof PomClassicDomainModel && getId().equals( (
(PomClassicDomainModel) o ).getId() );
+ return o instanceof DomainModel && getId().equals( ( (DomainModel)
o ).getId() );
} catch (IOException e) {
return false;
}
Modified:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java?rev=769836&r1=769835&r2=769836&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
(original)
+++
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
Wed Apr 29 17:12:08 2009
@@ -71,15 +71,15 @@
* @return
* @throws IOException
*/
- public static PomClassicDomainModel build( List<DomainModel> domainModels,
List<ModelEventListener> listeners )
+ public static DomainModel build( List<DomainModel> domainModels,
List<ModelEventListener> listeners )
throws IOException
{
- PomClassicDomainModel child = null;
+ DomainModel child = null;
for ( DomainModel domainModel : domainModels )
{
if(domainModel.isMostSpecialized())
{
- child = (PomClassicDomainModel) domainModel;
+ child = (DomainModel) domainModel;
}
}
if(child == null)
@@ -103,14 +103,14 @@
listener.fire(target);
}
}
- PomClassicDomainModel domainModel = new PomClassicDomainModel( target,
child.isMostSpecialized() );
+ DomainModel domainModel = new DomainModel( target,
child.isMostSpecialized() );
domainModel.setProjectDirectory(child.getProjectDirectory());
domainModel.setParentFile(child.getParentFile());
return domainModel;
}
- public static PomClassicDomainModel
mergeProfilesIntoModel(Collection<Profile> profiles, PomClassicDomainModel
domainModel) throws IOException
+ public static DomainModel mergeProfilesIntoModel(Collection<Profile>
profiles, DomainModel domainModel) throws IOException
{
List<Model> profileModels = new ArrayList<Model>();
List<Model> externalProfileModels = new ArrayList<Model>();
@@ -168,7 +168,7 @@
//TODO: Merge Dependency Management
target.setDependencyManagement( depMng );
- PomClassicDomainModel targetModel = new PomClassicDomainModel( target,
domainModel.isMostSpecialized());
+ DomainModel targetModel = new DomainModel( target,
domainModel.isMostSpecialized());
targetModel.setParentFile(domainModel.getParentFile());
targetModel.setProjectDirectory(domainModel.getProjectDirectory());
return targetModel;
@@ -198,7 +198,7 @@
List<Model> models = new ArrayList<Model>();
for(DomainModel domainModel : domainModels)
{
- PomClassicDomainModel dm = (PomClassicDomainModel) domainModel;
+ DomainModel dm = (DomainModel) domainModel;
if(dm.getModel() != null)
{
if(dm.isMostSpecialized())
Modified:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java?rev=769836&r1=769835&r2=769836&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
(original)
+++
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
Wed Apr 29 17:12:08 2009
@@ -27,7 +27,7 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
-import org.apache.maven.model.PomClassicDomainModel;
+import org.apache.maven.model.DomainModel;
import org.apache.maven.model.ProjectUri;
import org.apache.maven.model.Reporting;
import org.apache.maven.model.Resource;
@@ -172,7 +172,7 @@
try
{
String xml = unmarshalModelPropertiesToXml( modelProperties,
ProjectUri.baseUri );
- Model m = new PomClassicDomainModel( new ByteArrayInputStream(
xml.getBytes( "UTF-8" ) ) ).getModel();
+ Model m = new DomainModel( new ByteArrayInputStream( xml.getBytes(
"UTF-8" ) ) ).getModel();
if ( projectDirectory != null )
{
alignPaths( m, projectDirectory );
