Author: sisbell
Date: Mon Apr 13 21:28:43 2009
New Revision: 764617
URL: http://svn.apache.org/viewvc?rev=764617&view=rev
Log:
Perf optimizations through direct use of model.
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java?rev=764617&r1=764616&r2=764617&view=diff
==============================================================================
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
Mon Apr 13 21:28:43 2009
@@ -63,70 +63,50 @@
return model;
}
- private void initializeProperties(List<ModelProperty> modelProperties)
+ private void initializeProperties(Model model)
{
- String groupId = null, artifactId = null, version = null;
- for(ModelProperty mp : modelProperties)
- {
- if(mp.getUri().equals(ProjectUri.groupId))
- {
- groupId = mp.getResolvedValue();
- }
- else if(mp.getUri().equals(ProjectUri.artifactId))
- {
- artifactId = mp.getResolvedValue();
- }
- else if(mp.getUri().equals(ProjectUri.version))
- {
- version = mp.getResolvedValue();
- }
- else if(mp.getUri().equals(ProjectUri.Parent.artifactId))
- {
- parentArtifactId = mp.getResolvedValue();
- }
- else if(mp.getUri().equals(ProjectUri.Parent.groupId))
- {
- parentGroupId = mp.getResolvedValue();
- }
- else if(mp.getUri().equals(ProjectUri.Parent.version))
- {
- parentVersion = mp.getResolvedValue();
- }
- else if(mp.getUri().equals(ProjectUri.Parent.relativePath))
- {
- parentRelativePath = mp.getResolvedValue();
- }
+ String groupId = null, artifactId = null, version = null;
- if(groupId != null && artifactId != null && version != null &&
parentGroupId != null &&
- parentArtifactId != null && parentVersion != null &
parentRelativePath != null)
- {
- break;
- }
- }
- if( groupId == null && parentGroupId != null)
- {
- groupId = parentGroupId;
- }
- if( artifactId == null && parentArtifactId != null)
- {
- artifactId = parentArtifactId;
- }
- if( version == null && parentVersion != null )
- {
- version = parentVersion;
- }
+ groupId = model.getGroupId();
- if(parentGroupId != null && parentArtifactId != null && parentVersion
!= null)
- {
- parentId = parentGroupId + ":" + parentArtifactId + ":" +
parentVersion;
- }
-
- if(parentRelativePath == null)
- {
- parentRelativePath = ".." + File.separator + "pom.xml";
- }
+ artifactId = model.getArtifactId();
+ version = model.getVersion();
+
+ if( model.getParent() != null)
+ {
+ parentArtifactId =model.getParent().getArtifactId();
+
+ parentGroupId = model.getParent().getGroupId();
+
+ parentVersion = model.getParent().getVersion();
+
+ parentRelativePath = model.getParent().getRelativePath();
+ }
+
+ if( groupId == null && parentGroupId != null)
+ {
+ groupId = parentGroupId;
+ }
+ if( artifactId == null && parentArtifactId != null)
+ {
+ artifactId = parentArtifactId;
+ }
+ if( version == null && parentVersion != null )
+ {
+ version = parentVersion;
+ }
+
+ if(parentGroupId != null && parentArtifactId != null && parentVersion
!= null)
+ {
+ parentId = parentGroupId + ":" + parentArtifactId + ":" +
parentVersion;
+ }
+
+ if(parentRelativePath == null)
+ {
+ parentRelativePath = ".." + File.separator + "pom.xml";
+ }
- id = groupId + ":" + artifactId + ":" + version;
+ id = groupId + ":" + artifactId + ":" + version;
}
public PomClassicDomainModel( File file )
@@ -151,8 +131,7 @@
throw new IOException( e.getMessage() );
}
- modelProperties = getModelProperties();
- initializeProperties( modelProperties );
+ initializeProperties( model );
}
@@ -179,6 +158,7 @@
out.close();
}
}
+ initializeProperties( model );
inputBytes = baos.toByteArray();
}
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java?rev=764617&r1=764616&r2=764617&view=diff
==============================================================================
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java
Mon Apr 13 21:28:43 2009
@@ -657,6 +657,7 @@
for (ModelProperty mp : unresolvedProperties) {
if (mp.resolveWith(ip) &&
!continueInterpolation) {
continueInterpolation = true;
+ break;
}
}
}
