You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/04/17 01:45:18 UTC
cvs commit: maven-new/src/java/org/apache/maven/project/builder DefaultProjectBuilder.java
jvanzyl 2003/04/16 16:45:18
Modified: src/java/org/apache/maven/project/builder
DefaultProjectBuilder.java
Log:
o Unmarshaller is now a component.
Revision Changes Path
1.4 +16 -3 maven-new/src/java/org/apache/maven/project/builder/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-new/src/java/org/apache/maven/project/builder/DefaultProjectBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultProjectBuilder.java 16 Apr 2003 12:39:28 -0000 1.3
+++ DefaultProjectBuilder.java 16 Apr 2003 23:45:18 -0000 1.4
@@ -5,6 +5,8 @@
import org.apache.maven.util.CollectionUtils;
import org.apache.plexus.util.DirectoryScanner;
import org.apache.plexus.util.StringUtils;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
import java.io.File;
import java.io.FileInputStream;
@@ -26,13 +28,24 @@
// This should be a component too.
/** POM Unmarshaller */
- private PomUnmarshaller pomUnmarshaller = new PomUnmarshaller();
+ private ProjectUnmarshaller projectUnmarshaller;
// This should be tracked by Maven not the builder.
/** Map of loaded POMs. */
private HashMap parentPoms = new HashMap();
+ // ----------------------------------------------------------------------
+ // Lifecylce Management
+ // ----------------------------------------------------------------------
+
+ public void service( ServiceManager serviceManager )
+ throws ServiceException
+ {
+ projectUnmarshaller = (ProjectUnmarshaller) serviceManager.lookup( ProjectUnmarshaller.ROLE );
+ }
+
+
public Project build( File projectDescriptor )
throws Exception
{
@@ -81,7 +94,7 @@
// parent project.
// 1)
- Project project = pomUnmarshaller.parse( new FileReader( projectDescriptor ) );
+ Project project = projectUnmarshaller.parse( new FileReader( projectDescriptor ) );
// 2)
Map propertiesMap = createPropertiesMap( projectDescriptor.getParentFile(),
@@ -104,7 +117,7 @@
if ( parent == null )
{
- parent = pomUnmarshaller.parse( new FileReader( parentPom ) );
+ parent = projectUnmarshaller.parse( new FileReader( parentPom ) );
if ( parent != null )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org