You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/11/17 04:23:36 UTC
svn commit: r718165 - in /maven/components/trunk:
maven-project/src/main/java/org/apache/maven/project/builder/
maven-project/src/main/java/org/apache/maven/project/builder/impl/
maven-project/src/main/java/org/apache/maven/project/builder/listeners/ m...
Author: jvanzyl
Date: Sun Nov 16 19:23:35 2008
New Revision: 718165
URL: http://svn.apache.org/viewvc?rev=718165&view=rev
Log:
o adding new logic to process build extensions
Added:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/BuildExtensionListener.java (contents, props changed)
- copied, changed from r717920, maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java
Removed:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java?rev=718165&r1=718164&r2=718165&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java Sun Nov 16 19:23:35 2008
@@ -42,7 +42,8 @@
ProjectUri.Build.PluginManagement.Plugins.Plugin.Dependencies.Dependency.xUri,
ProjectUri.Build.Plugins.Plugin.xUri, ProjectUri.Build.Plugins.Plugin.Dependencies.Dependency.xUri,
- ProjectUri.Build.Plugins.Plugin.Dependencies.Dependency.Exclusions.Exclusion.xUri
+ ProjectUri.Build.Plugins.Plugin.Dependencies.Dependency.Exclusions.Exclusion.xUri,
+ ProjectUri.Build.Extensions.Extension.xUri
) );
public Collection<String> getUris()
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=718165&r1=718164&r2=718165&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Sun Nov 16 19:23:35 2008
@@ -33,7 +33,7 @@
import org.apache.maven.project.builder.PomClassicDomainModel;
import org.apache.maven.project.builder.PomClassicTransformer;
import org.apache.maven.project.builder.ProjectBuilder;
-import org.apache.maven.project.builder.listeners.PluginExtensionListener;
+import org.apache.maven.project.builder.listeners.BuildExtensionListener;
import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator;
import org.apache.maven.shared.model.*;
@@ -176,7 +176,7 @@
transformer,
importModels,
properties,
- Arrays.asList((ModelEventListener) new PluginExtensionListener())) );
+ Arrays.asList((ModelEventListener) new BuildExtensionListener())) );
try
{
MavenProject mavenProject = new MavenProject( transformedDomainModel.getModel(), artifactFactory,
Copied: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/BuildExtensionListener.java (from r717920, maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/BuildExtensionListener.java?p2=maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/BuildExtensionListener.java&p1=maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java&r1=717920&r2=718165&rev=718165&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/BuildExtensionListener.java Sun Nov 16 19:23:35 2008
@@ -7,60 +7,79 @@
import org.apache.maven.project.builder.ProjectUri;
import org.apache.maven.project.builder.ArtifactModelContainerFactory;
+import java.util.Iterator;
import java.util.List;
import java.util.Collection;
import java.util.Arrays;
import java.util.ArrayList;
-public class PluginExtensionListener implements ModelEventListener {
-
- public void fire(List<ModelContainer> modelContainers) {
- List<Plugin> pluginsWithExtension = new ArrayList<Plugin>();
- for (ModelContainer mc : modelContainers) {
- if(hasExtension(mc)) {
- pluginsWithExtension.add(new Plugin(mc.getProperties()));
+public class BuildExtensionListener
+ implements ModelEventListener
+{
+ public void fire( List<ModelContainer> modelContainers )
+ {
+ List<BuildExtension> buildExtensions = new ArrayList<BuildExtension>();
+ for ( ModelContainer mc : modelContainers )
+ {
+ if ( hasExtension( mc ) )
+ {
+ buildExtensions.add( new BuildExtension( mc.getProperties() ) );
}
}
- //Do something with plugins here
+ for( BuildExtension be : buildExtensions )
+ {
+ System.out.println( "Extension ---> " + be.groupId + " : " + be.artifactId + " : " + be.version );
+ }
}
- public List<String> getUris() {
- return Arrays.asList(ProjectUri.Build.Plugins.Plugin.xUri);
+ public List<String> getUris()
+ {
+ return Arrays.asList( ProjectUri.Build.Extensions.Extension.xUri );
}
- public Collection<ModelContainerFactory> getModelContainerFactories() {
- return Arrays.asList((ModelContainerFactory) new ArtifactModelContainerFactory());
+ public Collection<ModelContainerFactory> getModelContainerFactories()
+ {
+ return Arrays.asList( (ModelContainerFactory) new ArtifactModelContainerFactory() );
}
- private static boolean hasExtension(ModelContainer container) {
- for (ModelProperty mp : container.getProperties()) {
- if (mp.getUri().equals(ProjectUri.Build.Plugins.Plugin.extensions) && mp.getValue().equals("true")) {
+ private static boolean hasExtension( ModelContainer container )
+ {
+ for ( ModelProperty mp : container.getProperties() )
+ {
+ if ( mp.getUri().equals( ProjectUri.Build.Extensions.Extension.xUri ) )
+ {
return true;
}
}
return false;
}
- private static class Plugin {
-
+ private static class BuildExtension
+ {
private String groupId;
private String artifactId;
private String version;
- Plugin(List<ModelProperty> modelProperties) {
- for(ModelProperty mp : modelProperties) {
- if(mp.getUri().equals(ProjectUri.Build.Plugins.Plugin.groupId)) {
+ BuildExtension( List<ModelProperty> modelProperties )
+ {
+ for ( ModelProperty mp : modelProperties )
+ {
+ if ( mp.getUri().equals( ProjectUri.Build.Extensions.Extension.groupId ) )
+ {
groupId = mp.getValue();
- } else if(mp.getUri().equals(ProjectUri.Build.Plugins.Plugin.artifactId)) {
+ }
+ else if ( mp.getUri().equals( ProjectUri.Build.Extensions.Extension.artifactId ) )
+ {
artifactId = mp.getValue();
- } else if(mp.getUri().equals(ProjectUri.Build.Plugins.Plugin.version)) {
+ }
+ else if ( mp.getUri().equals( ProjectUri.Build.Extensions.Extension.version ) )
+ {
version = mp.getValue();
}
- //Add additional info if needed
}
- }
+ }
}
}
Propchange: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/BuildExtensionListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 16 19:23:35 2008
@@ -0,0 +1,3 @@
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:679206
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:688587-696625,696644-699681
Modified: maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java?rev=718165&r1=718164&r2=718165&view=diff
==============================================================================
--- maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java (original)
+++ maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java Sun Nov 16 19:23:35 2008
@@ -38,7 +38,6 @@
* Provides methods for marshalling and unmarshalling XML that does not contain attributes.
*/
public final class ModelMarshaller
- implements ModelPropertiesGenerator
{
/**
@@ -47,16 +46,6 @@
private ModelMarshaller()
{
}
-
- public List<ModelProperty> generateModelProperties( InputStream inputStream, String baseUri, Set<String> collections )
- throws IOException
- {
- return marshallXmlToModelProperties( inputStream, baseUri, collections );
- }
-
- public void registerModelPropertyListener( String uri )
- {
- }
/**
* Returns list of model properties transformed from the specified input stream.