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/11/24 21:25:41 UTC

svn commit: r720277 - in /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder: PomClassicDomainModelFactory.java PomClassicTransformer.java impl/DefaultProjectBuilder.java

Author: sisbell
Date: Mon Nov 24 12:25:40 2008
New Revision: 720277

URL: http://svn.apache.org/viewvc?rev=720277&view=rev
Log:
PomClassicTransformer now using a factory to create domain model.

Added:
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java
Modified:
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java

Added: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java?rev=720277&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java (added)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java Mon Nov 24 12:25:40 2008
@@ -0,0 +1,29 @@
+package org.apache.maven.project.builder;
+
+import org.apache.maven.shared.model.DomainModelFactory;
+import org.apache.maven.shared.model.DomainModel;
+import org.apache.maven.shared.model.ModelProperty;
+import org.apache.maven.shared.model.ModelMarshaller;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
+import java.util.List;
+import java.io.IOException;
+import java.io.StringReader;
+
+public class PomClassicDomainModelFactory implements DomainModelFactory
+{
+    public DomainModel createDomainModel(List<ModelProperty> modelProperties) throws IOException
+    {
+        String xml = null;
+        try
+        {
+            xml = ModelMarshaller.unmarshalModelPropertiesToXml( modelProperties, ProjectUri.baseUri );
+            return new PomClassicDomainModel( new MavenXpp3Reader().read( new StringReader( xml ) ) );
+        }
+        catch ( XmlPullParserException e )
+        {
+            throw new IOException( e + ":\r\n" + xml );
+        }
+    }
+}

Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=720277&r1=720276&r2=720277&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java Mon Nov 24 12:25:40 2008
@@ -35,6 +35,13 @@
     implements ModelTransformer
 {
 
+    private final DomainModelFactory factory;
+
+    public PomClassicTransformer(DomainModelFactory factory)
+    {
+        this.factory = factory;
+    }
+
     private static Map<String, List<ModelProperty>> cache = new HashMap<String, List<ModelProperty>>();
 
     /**
@@ -168,16 +175,7 @@
             }
         }
 
-        String xml = null;
-        try
-        {
-            xml = ModelMarshaller.unmarshalModelPropertiesToXml( props, ProjectUri.baseUri );
-            return new PomClassicDomainModel( new MavenXpp3Reader().read( new StringReader( xml ) ) );
-        }
-        catch ( XmlPullParserException e )
-        {
-            throw new IOException( e + ":\r\n" + xml );
-        }
+        return factory.createDomainModel( props );
     }
 
     /**

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=720277&r1=720276&r2=720277&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 Mon Nov 24 12:25:40 2008
@@ -161,7 +161,7 @@
             domainModels.add( new PomClassicDomainModel( model ) );
         }
 
-        PomClassicTransformer transformer = new PomClassicTransformer( );
+        PomClassicTransformer transformer = new PomClassicTransformer( new PomClassicDomainModelFactory() );
         ModelTransformerContext ctx = new ModelTransformerContext(
             Arrays.asList( new ArtifactModelContainerFactory(), new IdModelContainerFactory() ) );