You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/07/15 10:16:12 UTC
svn commit: r676827 - in
/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder:
PomClassicTransformer.java impl/DefaultProjectBuilder.java
Author: sisbell
Date: Tue Jul 15 01:16:11 2008
New Revision: 676827
URL: http://svn.apache.org/viewvc?rev=676827&view=rev
Log:
Improved logging.
Modified:
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
Modified: maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=676827&r1=676826&r2=676827&view=diff
==============================================================================
--- maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java (original)
+++ maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java Tue Jul 15 01:16:11 2008
@@ -154,7 +154,6 @@
&& mp.getValue() != null && mp.getValue().equals("false")) {
removeProperties.addAll(container.getProperties());
for (int j = tmp.indexOf(mp); j >= 0; j--) {
- System.out.println("------" + tmp.get(j));
if (tmp.get(j).getUri().equals(ProjectUri.Build.Plugins.Plugin.Executions.xUri)) {
removeProperties.add(tmp.get(j));
break;
@@ -208,7 +207,12 @@
if (domainModels.size() > 1) {
ModelDataSource source = new DefaultModelDataSource();
source.init(tmp, Arrays.asList(new ArtifactModelContainerFactory(), new IdModelContainerFactory()));
- List<ModelContainer> containers = source.queryFor(ProjectUri.Dependencies.Dependency.xUri);
+ List<ModelContainer> containers = null;
+ try {
+ containers = source.queryFor(ProjectUri.Dependencies.Dependency.xUri);
+ } catch (IllegalArgumentException e) {
+ throw new IllegalArgumentException(source.getEventHistory(), e);
+ }
int index = tmp.indexOf(getPropertyFor(ProjectUri.Dependencies.xUri, tmp));
if (index > -1) {
for (ModelContainer container : containers) {
Modified: maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=676827&r1=676826&r2=676827&view=diff
==============================================================================
--- maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java (original)
+++ maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Tue Jul 15 01:16:11 2008
@@ -63,7 +63,7 @@
if(projectDirectory == null) {
throw new IllegalArgumentException("projectDirectory: null");
- }
+ }
List<InterpolatorProperty> properties;
if (interpolatorProperties == null) {
@@ -83,9 +83,9 @@
Model model = ((PomClassicDomainModel) ctx.transform(domainModels, transformer,
transformer, properties)).getModel();
- //validateModel(model);
+ // validateModel(model);
for(DomainModel dm : domainModels) {
- // System.out.println(dm.getEventHistory());
+ // System.out.println(dm.getEventHistory());
}
MavenProject mavenProject = new MavenProject(model);
mavenProject.setArtifact(artifactFactory.createProjectArtifact(model.getGroupId(), model.getArtifactId(),
@@ -103,7 +103,7 @@
List<DomainModel> domainModels = new ArrayList<DomainModel>();
Parent parent = domainModel.getModel().getParent();
-
+
if (parent == null) {
return domainModels;
}