Author: sisbell
Date: Wed Jul 9 18:04:15 2008
New Revision: 675394
URL: http://svn.apache.org/viewvc?rev=675394&view=rev
Log:
Code cleanup.
Modified:
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomArtifactResolver.java
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
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/ProjectBuilder.java
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/resources/META-INF/plexus/components.xml
Modified:
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java?rev=675394&r1=675393&r2=675394&view=diff
==============================================================================
---
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
(original)
+++
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
Wed Jul 9 18:04:15 2008
@@ -1,6 +1,9 @@
package org.apache.maven.project.builder;
-import org.apache.maven.shared.model.*;
+import org.apache.maven.shared.model.ModelContainer;
+import org.apache.maven.shared.model.ModelContainerAction;
+import org.apache.maven.shared.model.ModelContainerFactory;
+import org.apache.maven.shared.model.ModelProperty;
import java.util.*;
@@ -11,13 +14,6 @@
ProjectUri.DependencyManagement.Dependencies.Dependency.xUri,
ProjectUri.Dependencies.Dependency.xUri,
- //
ProjectUri.Profiles.Profile.DependencyManagement.Dependencies.Dependency.xUri,
- // ProjectUri.Profiles.Profile.Dependencies.Dependency.xUri,
- // ProjectUri.Profiles.Profile.Build.Plugins.Plugin.xUri,
- //
ProjectUri.Profiles.Profile.Build.PluginManagement.Plugins.Plugin.xUri,
- //
ProjectUri.Profiles.Profile.Build.PluginManagement.Plugins.Plugin.Dependencies.Dependency.xUri,
-
-
ProjectUri.Build.PluginManagement.Plugins.Plugin.xUri,
ProjectUri.Build.PluginManagement.Plugins.Plugin.Dependencies.Dependency.xUri,
@@ -49,7 +45,6 @@
private ArtifactModelContainer(List<ModelProperty> properties) {
this.properties = new ArrayList<ModelProperty>(properties);
- //Collections.sort(this.properties, new ModelPropertyComparator());
this.properties = Collections.unmodifiableList(this.properties);
for (ModelProperty mp : properties) {
Modified:
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java?rev=675394&r1=675393&r2=675394&view=diff
==============================================================================
---
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
(original)
+++
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
Wed Jul 9 18:04:15 2008
@@ -1,14 +1,15 @@
package org.apache.maven.project.builder;
-import org.apache.maven.shared.model.*;
+import org.apache.maven.shared.model.ModelContainer;
+import org.apache.maven.shared.model.ModelContainerAction;
+import org.apache.maven.shared.model.ModelContainerFactory;
+import org.apache.maven.shared.model.ModelProperty;
import java.util.*;
public class IdModelContainerFactory implements ModelContainerFactory {
private static final Collection<String> uris =
Collections.unmodifiableList(Arrays.asList(
- //ProjectUri.Build.Plugins.Plugin.Executions.Execution.xUri,
-
//ProjectUri.Build.PluginManagement.Plugins.Plugin.Executions.Execution.xUri,
ProjectUri.PluginRepositories.PluginRepository.xUri,
ProjectUri.Repositories.Repository.xUri,
ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.xUri,
@@ -41,10 +42,6 @@
this.id = mp.getValue();
}
}
-
- // if (id == null) {
- // throw new IllegalArgumentException("properties does not
contain id");
- // }
}
public ModelContainerAction containerAction(ModelContainer
modelContainer) {
@@ -68,12 +65,7 @@
}
public void sort(List<ModelProperty> modelProperties) {
- //Collections.sort(modelProperties, new IdModelComparator());
- /* System.out.println("END SORT");
- for(ModelProperty mp : modelProperties) {
- System.out.println(mp);
- }
- */
+
}
public List<ModelProperty> getProperties() {
@@ -84,18 +76,4 @@
return "ID = " + id;
}
}
-
- private static class IdModelComparator implements Comparator {
- public int compare(Object o1, Object o2) {
- ModelProperty a = (ModelProperty) o1;
- ModelProperty b = (ModelProperty) o2;
- System.out.println(a + " : " + b);
- if (a.isParentOf(b)) {
- System.out.println("IS PARENT ABOVE:");
- return -1;
- }
-
- return 0;
- }
- }
}
Modified:
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomArtifactResolver.java?rev=675394&r1=675393&r2=675394&view=diff
==============================================================================
---
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomArtifactResolver.java
(original)
+++
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomArtifactResolver.java
Wed Jul 9 18:04:15 2008
@@ -1,19 +1,14 @@
package org.apache.maven.project.builder;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.ArtifactStatus;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
-import java.util.List;
-import java.util.Date;
-import java.util.HashSet;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
+import java.util.List;
public class PomArtifactResolver {
@@ -38,10 +33,6 @@
File artifactFile = new File(localRepository.getBasedir(),
localRepository.pathOf(artifact));
artifact.setFile(artifactFile);
- for(ArtifactRepository ar: remoteRepositories) {
- System.out.println("repository: " + ar.getUrl());
- }
-
try {
resolver.resolve( artifact, remoteRepositories, localRepository );
} catch (ArtifactResolutionException e) {
@@ -49,32 +40,5 @@
} catch (ArtifactNotFoundException e) {
throw new IOException(e.getMessage());
}
- /*
- ArtifactResolutionRequest request = new ArtifactResolutionRequest()
- .setArtifact(artifact)
- .setLocalRepository(localRepository)
- .setArtifactDependencies(new HashSet<Artifact>())
- .setRemoteRepostories(remoteRepositories);
- resolver.resolve(request);
- */
-
- /*
- if (!artifact.isSnapshot() &&
(ArtifactStatus.NONE.compareTo(ArtifactStatus.DEPLOYED) < 0)) {
- ArtifactRepositoryPolicy policy = new ArtifactRepositoryPolicy();
-
policy.setUpdatePolicy(ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER);
- try {
- if (policy.checkOutOfDate(new
Date(artifact.getFile().lastModified()))) {
- artifact.setResolved(false);
- resolver.resolveAlways(artifact, remoteRepositories,
localRepository);
- }
- } catch (ArtifactNotFoundException e) {
- e.printStackTrace();
- throw new IOException("Parent pom not found: File = " +
artifactFile.getAbsolutePath());
- } catch (ArtifactResolutionException e) {
- e.printStackTrace();
- throw new IOException("Parent pom not found: File = " +
artifactFile.getAbsolutePath());
- }
- }
- */
}
}
Modified:
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java?rev=675394&r1=675393&r2=675394&view=diff
==============================================================================
---
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
(original)
+++
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
Wed Jul 9 18:04:15 2008
@@ -8,7 +8,6 @@
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
import java.io.*;
/**
@@ -42,11 +41,6 @@
this.inputStream =
removeIllegalCharacters(IOUtil.toByteArray(inputStream));
}
- //TODO: Workaround
- private byte[] removeIllegalCharacters(byte[] bytes) {
- return new String(bytes).replaceAll("ø", "").getBytes();
- }
-
public boolean matchesParent(Parent parent) {
Model model;
try {
@@ -54,8 +48,13 @@
} catch (IOException e) {
return false;
}
- return (parent.getGroupId().equals(model.getGroupId()) &&
parent.getArtifactId().equals(model.getArtifactId())
- && parent.getVersion().equals(model.getVersion()));
+
+ String groupId = (model.getGroupId() == null) ?
model.getParent().getGroupId() : model.getGroupId();
+ String artifactId = (model.getArtifactId() == null) ?
model.getParent().getArtifactId() : model.getArtifactId();
+ String version = (model.getVersion() == null) ?
model.getParent().getVersion() : model.getVersion();
+
+ return (parent.getGroupId().equals(groupId) &&
parent.getArtifactId().equals(artifactId)
+ && parent.getVersion().equals(version));
}
public String asString() {
@@ -90,4 +89,9 @@
public void setEventHistory(String eventHistory) {
this.eventHistory = eventHistory;
}
+
+ //TODO: Workaround
+ private byte[] removeIllegalCharacters(byte[] bytes) {
+ return new String(bytes).replaceAll("ø", "").getBytes();
+ }
}
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=675394&r1=675393&r2=675394&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
Wed Jul 9 18:04:15 2008
@@ -1,8 +1,10 @@
package org.apache.maven.project.builder;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-
-import org.apache.maven.shared.model.*;
+import org.apache.maven.shared.model.DomainModel;
+import org.apache.maven.shared.model.ModelMarshaller;
+import org.apache.maven.shared.model.ModelProperty;
+import org.apache.maven.shared.model.ModelTransformer;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.IOException;
@@ -16,15 +18,11 @@
private Set<String> uris;
- public PomClassicTransformer() {
-
- }
-
public String getBaseUri() {
return ProjectUri.baseUri;
}
- public PomClassicTransformer(Set<String> uris) {
+ public PomClassicTransformer() {
this.uris = new HashSet<String>(Arrays.asList(
"http://apache.org/maven/project/build/resources#collection";,
"http://apache.org/maven/project/build/plugins/plugin/dependencies/dependency/exclusions#collection";,
@@ -82,12 +80,6 @@
xml = ModelMarshaller.unmarshalModelPropertiesToXml(properties,
ProjectUri.baseUri);
return new PomClassicDomainModel(new MavenXpp3Reader().read(new
StringReader(xml)));
} catch (XmlPullParserException e) {
- /*
- StringBuffer sb = new StringBuffer("\r\n");
- for (ModelProperty mp : properties) {
- sb.append(mp).append("\r\n");
- }
- */
throw new IOException(e + ":\r\n" + xml);
}
}
@@ -174,7 +166,5 @@
}
return null;
}
-
-
}
Modified:
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java?rev=675394&r1=675393&r2=675394&view=diff
==============================================================================
---
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
(original)
+++
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
Wed Jul 9 18:04:15 2008
@@ -1,13 +1,12 @@
package org.apache.maven.project.builder;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.model.InterpolatorProperty;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.Artifact;
-import java.io.InputStream;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Collection;
public interface ProjectBuilder {
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=675394&r1=675393&r2=675394&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
Wed Jul 9 18:04:15 2008
@@ -1,31 +1,32 @@
package org.apache.maven.project.builder.impl;
-import org.apache.maven.shared.model.*;
-import org.apache.maven.model.Parent;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.model.Model;
+import org.apache.maven.model.Parent;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.builder.*;
import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator;
-import org.apache.maven.project.builder.*;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
-import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.shared.model.DomainModel;
+import org.apache.maven.shared.model.InterpolatorProperty;
+import org.apache.maven.shared.model.ModelTransformerContext;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
+import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
public final class DefaultProjectBuilder implements ProjectBuilder, LogEnabled
{
private ArtifactFactory artifactFactory;
- private ArtifactResolver artifactResolver;
-
private Logger logger;
private ModelValidator validator;
@@ -42,6 +43,9 @@
public MavenProject buildFromArtifact(Artifact artifact,
Collection<InterpolatorProperty> interpolatorProperties, PomArtifactResolver
resolver)
throws IOException {
+ if(resolver == null) {
+ throw new IllegalArgumentException("resolver: null");
+ }
resolver.resolve(artifact);
return buildFromStream(new FileInputStream(artifact.getFile()),
interpolatorProperties, resolver, null);//TODO: Fix
}
@@ -53,6 +57,14 @@
throw new IllegalArgumentException("pom: null");
}
+ if(resolver == null) {
+ throw new IllegalArgumentException("resolver: null");
+ }
+
+ if(projectDirectory == null) {
+ throw new IllegalArgumentException("projectDirectory: null");
+ }
+
List<InterpolatorProperty> properties;
if (interpolatorProperties == null) {
properties = new ArrayList<InterpolatorProperty>();
@@ -65,7 +77,7 @@
domainModels.add(domainModel);
domainModels.addAll(getDomainModelParentsFromRepository((PomClassicDomainModel)
domainModel, resolver, projectDirectory));
- PomClassicTransformer transformer = new PomClassicTransformer(null);
+ PomClassicTransformer transformer = new PomClassicTransformer();
ModelTransformerContext ctx = new ModelTransformerContext(
Arrays.asList(new ArtifactModelContainerFactory(), new
IdModelContainerFactory()));
Model model = ((PomClassicDomainModel) ctx.transform(domainModels,
transformer,
@@ -76,8 +88,7 @@
MavenProject mavenProject = new MavenProject(model);
mavenProject.setArtifact(artifactFactory.createProjectArtifact(model.getGroupId(),
model.getArtifactId(),
model.getVersion()));
- //System.out.println(((PomClassicDomainModel)
ctx.transform(domainModels, transformer,
- // transformer, properties)).asString());
+
return mavenProject;
}
@@ -107,8 +118,8 @@
if (!artifactParent.getFile().exists()) {
logger.info("Parent pom does not exist in repository: File = " +
artifactParent.getFile().getAbsolutePath());
Model model = domainModel.getModel();
- System.out.println("PATH = " + projectDirectory.getAbsolutePath()
+ ":" + model.getParent().getRelativePath());
- System.out.println(new File(projectDirectory,
model.getParent().getRelativePath()).getCanonicalFile());
+ // System.out.println("PATH = " +
projectDirectory.getAbsolutePath() + ":" + model.getParent().getRelativePath());
+ // System.out.println(new File(projectDirectory,
model.getParent().getRelativePath()).getCanonicalFile());
File parentFile = new File(projectDirectory,
model.getParent().getRelativePath()).getCanonicalFile();
if( parentFile.isDirectory()) {
parentFile = new File(parentFile, "pom.xml");
@@ -124,7 +135,6 @@
PomClassicDomainModel parentDomainModel = new
PomClassicDomainModel(new FileInputStream(artifactParent.getFile()));
if
(!parentDomainModel.matchesParent(domainModel.getModel().getParent())) {
logger.warn("Parent pom ids do not match: File = " +
artifactParent.getFile().getAbsolutePath());
- // return domainModels;
}
domainModels.add(parentDomainModel);
Modified:
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=675394&r1=675393&r2=675394&view=diff
==============================================================================
---
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/resources/META-INF/plexus/components.xml
Wed Jul 9 18:04:15 2008
@@ -118,10 +118,6 @@
<requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
</requirement>
- <requirement>
-
<role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- <role-hint>default</role-hint>
- </requirement>
</requirements>
</component>
<component>
