jvanzyl 2004/04/12 07:41:31
Modified: maven-project project.xml
maven-project/src/main/java/org/apache/maven/artifact
AbstractMavenArtifact.java
maven-project/src/main/java/org/apache/maven/project
DefaultMavenProjectBuilder.java
maven-project/src/main/resources/META-INF/plexus
components.xml
maven-project/src/test/input project.xml
maven-project/src/test/input/a project.xml
maven-project/src/test/input/a/aa project.xml
maven-project/src/test/input/b project.xml
maven-project/src/test/input/b/bb project.xml
maven-project/src/test/input/b/bb/bbb project.xml
maven-project/src/test/input/c project.xml
maven-project/src/test/input/c/cc project.xml
maven-project/src/test/input/c/cc/ccc project.xml
maven-project/src/test/input/d project.xml
maven-project/src/test/input/e project.xml
maven-project/src/test/input/f project.xml
maven-project/src/test/java/org/apache/maven/project
DefaultProjectBuilderTest.java
DefaultProjectBuilderTest.xml
child-with-bogus-parent.xml child.xml
fully-populated-child.xml
project-which-needs-directory-alignment-child.xml
project-which-needs-directory-alignment.xml
project.xml
maven-project/src/test/java/org/apache/maven/project/plugins
project-which-needs-directory-alignment-child.xml
maven-project/xdocs index.xml
Log:
o Committing changes submitted by Trygve Laugstøl to accomodate the new form
of specifying a parent model to use which is of the form:
<parent>
<groupId/>
<artifactId/>
<version/>
</parent>
This allows us to work consistently from the local repository or the
unified
source root where missing models are downloaded now that we have the required
information within the <parent/> element.
Revision Changes Path
1.4 +6 -2 maven-components/maven-project/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 7 Apr 2004 20:28:41 -0000 1.3
+++ project.xml 12 Apr 2004 14:41:30 -0000 1.4
@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <extend>../project.xml</extend>
+ <parent>
+ <groupId>maven</groupId>
+ <artifactId>maven-component</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
<name>Maven Project</name>
<groupId>maven</groupId>
<id>maven-project</id>
<artifactId>maven-project</artifactId>
<currentVersion>2.0-SNAPSHOT</currentVersion>
<gumpRepositoryId>jakarta</gumpRepositoryId>
- <description>Maven is a project management and project comprehension tool. Maven
is based on the concept of a project object model: builds, documentation creation,
site publication, and distribution publication are all controlled from the project
object model. Maven also provides tools to create source metrics, change logs based
directly on source repository, and source cross-references.</description>
+ <description></description>
<shortDescription>Java Project Management Tools</shortDescription>
<repository>
1.3 +1 -1
maven-components/maven-project/src/main/java/org/apache/maven/artifact/AbstractMavenArtifact.java
Index: AbstractMavenArtifact.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/AbstractMavenArtifact.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractMavenArtifact.java 22 Mar 2004 00:11:14 -0000 1.2
+++ AbstractMavenArtifact.java 12 Apr 2004 14:41:30 -0000 1.3
@@ -63,7 +63,7 @@
public String generatePath()
{
- return "/" + getArtifactDirectory( getDependency() )
+ return ps + getArtifactDirectory( getDependency() )
+ ps + getDependency().getType() + "s"
+ ps + getArtifact( getDependency() );
}
1.11 +98 -23
maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Index: DefaultMavenProjectBuilder.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultMavenProjectBuilder.java 9 Apr 2004 03:47:11 -0000 1.10
+++ DefaultMavenProjectBuilder.java 12 Apr 2004 14:41:30 -0000 1.11
@@ -16,20 +16,6 @@
* limitations under the License.
*/
-import org.apache.maven.artifact.factory.MavenArtifactFactory;
-import org.apache.maven.artifact.collector.ArtifactCollector;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.PropertyUtils;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.CollectionUtils;
-import org.codehaus.plexus.util.dag.DAG;
-import org.codehaus.plexus.util.dag.TopologicalSorter;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-
import java.io.File;
import java.io.FileReader;
import java.io.InputStreamReader;
@@ -43,10 +29,30 @@
import java.util.Map;
import java.util.Properties;
+import org.apache.maven.artifact.MavenArtifact;
+import org.apache.maven.artifact.collector.ArtifactCollector;
+import org.apache.maven.artifact.factory.MavenArtifactFactory;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Parent;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
+import org.apache.maven.wagon.Wagon;
+import org.apache.maven.wagon.manager.WagonManager;
+
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import org.codehaus.plexus.util.CollectionUtils;
+import org.codehaus.plexus.util.PropertyUtils;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.dag.DAG;
+import org.codehaus.plexus.util.dag.TopologicalSorter;
+
public class DefaultMavenProjectBuilder
extends AbstractLogEnabled
implements MavenProjectBuilder, Initializable
{
+ // configuration
private MavenXpp3Writer modelWriter;
private MavenXpp3Reader modelReader;
@@ -57,6 +63,9 @@
private ArtifactCollector artifactCollector;
+ private WagonManager wagonManager;
+
+ // member variables
private Model superModel;
public void initialize()
@@ -116,6 +125,8 @@
Map properties = createProjectProperties( projectDescriptor.getParentFile()
);
+ String mavenRepoLocal = (String) properties.get( "maven.repo.local" );
+
FileReader reader = new FileReader( projectDescriptor );
Model model = modelReader.read( reader );
@@ -128,18 +139,43 @@
String modelToExtend = model.getExtend();
+ Parent parentModel = model.getParent();
+
if ( modelToExtend != null && useParentPom )
{
modelToExtend = StringUtils.interpolate( modelToExtend, properties );
- File parentModel = new File( modelToExtend );
+ File parentModelFile = new File( modelToExtend );
- if ( !parentModel.isAbsolute() )
+ if ( !parentModelFile.isAbsolute() )
{
- parentModel = new File( projectDescriptor.getParentFile(),
modelToExtend );
+ parentModelFile = new File( projectDescriptor.getParentFile(),
modelToExtend );
}
- MavenProject parent = assembleLineage( parentModel, useParentPom,
lineage );
+ MavenProject parent = assembleLineage( parentModelFile, useParentPom,
lineage );
+
+ project.setParent( parent );
+ }
+ else if ( parentModel != null && useParentPom )
+ {
+ if( isEmpty( parentModel.getArtifactId() ) )
+ {
+ throw new ProjectBuildingException( "Missing artifact id element
from parent element" );
+ }
+
+ if( isEmpty( parentModel.getGroupId() ) )
+ {
+ throw new ProjectBuildingException( "Missing group id element from
parent element" );
+ }
+
+ if( isEmpty( parentModel.getVersion() ) )
+ {
+ throw new ProjectBuildingException( "Missing version element from
parent element" );
+ }
+
+ File parentPom = findParentModel( parentModel, mavenRepoLocal );
+
+ MavenProject parent = assembleLineage( parentPom, useParentPom, lineage
);
project.setParent( parent );
}
@@ -151,6 +187,34 @@
return project;
}
+ // For this we need better integration with Wagon
+ private File findParentModel( Parent parent, String mavenRepoLocal )
+ throws ProjectBuildingException
+ {
+ Dependency dependency = new Dependency();
+
+ dependency.setGroupId( parent.getGroupId() );
+
+ dependency.setArtifactId( parent.getArtifactId() );
+
+ dependency.setVersion( parent.getVersion() );
+
+ dependency.setType( "pom" );
+
+ MavenArtifact artifact = artifactory.createArtifact( dependency );
+
+ File parentModelFile = new File( mavenRepoLocal, artifact.getPath() );
+
+ if ( !parentModelFile.exists() )
+ {
+ throw new ProjectBuildingException( "Missing parent POM. " );
+ }
+
+ // We need to download when not here.
+
+ return parentModelFile;
+ }
+
private void setupMavenFinalName( MavenProject project )
{
String mavenFinalName = project.getProperty( "maven.final.name" );
@@ -179,14 +243,20 @@
Properties userBuildProperties = PropertyUtils.loadProperties(
userBuildPropertiesFile );
// project build properties
- File projectBuildPropertiesFile = new File( descriptorDirectory,
"build.properties" );
+ Properties projectBuildProperties = null;
+ Properties projectProperties = null;
+
+ if ( descriptorDirectory != null )
+ {
+ File projectBuildPropertiesFile = new File( descriptorDirectory,
"build.properties" );
- Properties projectBuildProperties = PropertyUtils.loadProperties(
projectBuildPropertiesFile );
+ projectBuildProperties = PropertyUtils.loadProperties(
projectBuildPropertiesFile );
- // project properties
- File projectPropertiesFile = new File( descriptorDirectory,
"project.properties" );
+ // project properties
+ File projectPropertiesFile = new File( descriptorDirectory,
"project.properties" );
- Properties projectProperties = PropertyUtils.loadProperties(
projectPropertiesFile );
+ projectProperties = PropertyUtils.loadProperties( projectPropertiesFile
);
+ }
Properties defaultProperties = PropertyUtils.loadProperties(
DefaultMavenProjectBuilder.class.getClassLoader().getResourceAsStream(
DEFAULTS_PROPERTIES ) );
@@ -293,5 +363,10 @@
}
return sortedProjects;
+ }
+
+ private boolean isEmpty( String string )
+ {
+ return string == null || string.trim().length() == 0;
}
}
1.6 +3 -0
maven-components/maven-project/src/main/resources/META-INF/plexus/components.xml
Index: components.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/main/resources/META-INF/plexus/components.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- components.xml 9 Apr 2004 03:47:11 -0000 1.5
+++ components.xml 12 Apr 2004 14:41:30 -0000 1.6
@@ -13,6 +13,9 @@
<requirement>
<role>org.apache.maven.artifact.factory.MavenArtifactFactory</role>
</requirement>
+ <requirement>
+ <role>org.apache.maven.wagon.manager.WagonManager</role>
+ </requirement>
</requirements>
</component>
<component>
1.2 +3 -0 maven-components/maven-project/src/test/input/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/input/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Mar 2004 17:11:05 -0000 1.1
+++ project.xml 12 Apr 2004 14:41:30 -0000 1.2
@@ -2,6 +2,9 @@
<project>
<modelVersion>3</modelVersion>
+
+ <artifactId>toplevel</artifactId>
+ <groupId>x</groupId>
<version>1.0-beta-8</version>
<organization>
<name>Apache Software Foundation</name>
1.2 +7 -0 maven-components/maven-project/src/test/input/a/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/input/a/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Mar 2004 17:11:05 -0000 1.1
+++ project.xml 12 Apr 2004 14:41:31 -0000 1.2
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
+
<extend>${basedir}/../project.xml</extend>
+
+ <parent>
+ <groupId>x</groupId>
+ <artifactId>toplevel</artifactId>
+ <version>1.0-beta-8</version>
+ </parent>
<groupId>a</groupId>
<artifactId>a</artifactId>
<name>a</name>
1.2 +7 -0 maven-components/maven-project/src/test/input/a/aa/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/input/a/aa/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Mar 2004 17:11:05 -0000 1.1
+++ project.xml 12 Apr 2004 14:41:31 -0000 1.2
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
+
<extend>${basedir}/../project.xml</extend>
+
+ <parent>
+ <artifactId>a</artifactId>
+ <groupId>a</groupId>
+ <version>SNAPSHOT</version>
+ </parent>
<groupId>aa</groupId>
<artifactId>aa</artifactId>
<name>aa</name>
1.2 +7 -0 maven-components/maven-project/src/test/input/b/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/input/b/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Mar 2004 17:11:05 -0000 1.1
+++ project.xml 12 Apr 2004 14:41:31 -0000 1.2
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
+
<extend>${basedir}/../project.xml</extend>
+
+ <parent>
+ <groupId>x</groupId>
+ <artifactId>toplevel</artifactId>
+ <version>1.0-beta-8</version>
+ </parent>
<groupId>b</groupId>
<artifactId>b</artifactId>
<name>b</name>
1.2 +7 -0 maven-components/maven-project/src/test/input/b/bb/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/input/b/bb/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Mar 2004 17:11:05 -0000 1.1
+++ project.xml 12 Apr 2004 14:41:31 -0000 1.2
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
+
<extend>${basedir}/../project.xml</extend>
+
+ <parent>
+ <groupId>b</groupId>
+ <artifactId>b</artifactId>
+ <version>1.0</version>
+ </parent>
<groupId>bb</groupId>
<artifactId>bb</artifactId>
<name>bb</name>
1.2 +7 -0
maven-components/maven-project/src/test/input/b/bb/bbb/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/input/b/bb/bbb/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Mar 2004 17:11:05 -0000 1.1
+++ project.xml 12 Apr 2004 14:41:31 -0000 1.2
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
+
<extend>${basedir}/../project.xml</extend>
+
+ <parent>
+ <groupId>bb</groupId>
+ <artifactId>bb</artifactId>
+ <version>2.0</version>
+ </parent>
<groupId>bbb</groupId>
<artifactId>bbb</artifactId>
<name>bbb</name>
1.2 +7 -0 maven-components/maven-project/src/test/input/c/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/input/c/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Mar 2004 17:11:05 -0000 1.1
+++ project.xml 12 Apr 2004 14:41:31 -0000 1.2
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
+
<extend>${basedir}/../project.xml</extend>
+
+ <parent>
+ <groupId>x</groupId>
+ <artifactId>toplevel</artifactId>
+ <version>1.0-beta-8</version>
+ </parent>
<groupId>c</groupId>
<artifactId>c</artifactId>
<name>c</name>
1.2 +7 -0 maven-components/maven-project/src/test/input/c/cc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/input/c/cc/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Mar 2004 17:11:05 -0000 1.1
+++ project.xml 12 Apr 2004 14:41:31 -0000 1.2
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
+
<extend>${basedir}/../project.xml</extend>
+
+ <parent>
+ <groupId>c</groupId>
+ <artifactId>c</artifactId>
+ <version>1.0</version>
+ </parent>
<groupId>cc</groupId>
<artifactId>cc</artifactId>
<name>cc</name>
1.2 +7 -0
maven-components/maven-project/src/test/input/c/cc/ccc/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/input/c/cc/ccc/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Mar 2004 17:11:05 -0000 1.1
+++ project.xml 12 Apr 2004 14:41:31 -0000 1.2
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
+
<extend>${basedir}/../project.xml</extend>
+
+ <parent>
+ <groupId>cc</groupId>
+ <artifactId>cx</artifactId>
+ <version>3.0</version>
+ </parent>
<groupId>ccc</groupId>
<artifactId>ccc</artifactId>
<name>ccc</name>
1.2 +7 -0 maven-components/maven-project/src/test/input/d/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/input/d/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Mar 2004 17:11:05 -0000 1.1
+++ project.xml 12 Apr 2004 14:41:31 -0000 1.2
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
+
<extend>${basedir}/../project.xml</extend>
+
+ <parent>
+ <groupId>x</groupId>
+ <artifactId>toplevel</artifactId>
+ <version>1.0-beta-8</version>
+ </parent>
<groupartifactId>d</groupartifactId>
<artifactId>d</artifactId>
<name>d</name>
1.2 +7 -0 maven-components/maven-project/src/test/input/e/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/input/e/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Mar 2004 17:11:05 -0000 1.1
+++ project.xml 12 Apr 2004 14:41:31 -0000 1.2
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
+
<extend>${basedir}/../project.xml</extend>
+
+ <parent>
+ <groupId>x</groupId>
+ <artifactId>toplevel</artifactId>
+ <version>1.0-beta-8</version>
+ </parent>
<artifactId>e</artifactId>
<name>e</name>
<currentVersion>1.0</currentVersion>
1.2 +7 -0 maven-components/maven-project/src/test/input/f/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/input/f/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Mar 2004 17:11:05 -0000 1.1
+++ project.xml 12 Apr 2004 14:41:31 -0000 1.2
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
+
<extend>${basedir}/../project.xml</extend>
+
+ <parent>
+ <groupId>x</groupId>
+ <artifactId>toplevel</artifactId>
+ <version>1.0-beta-8</version>
+ </parent>
<id>f</id>
<name>f</name>
<currentVersion>1.0</currentVersion>
1.3 +0 -6
maven-components/maven-project/src/test/java/org/apache/maven/project/DefaultProjectBuilderTest.java
Index: DefaultProjectBuilderTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/DefaultProjectBuilderTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultProjectBuilderTest.java 21 Mar 2004 21:40:43 -0000 1.2
+++ DefaultProjectBuilderTest.java 12 Apr 2004 14:41:31 -0000 1.3
@@ -23,11 +23,6 @@
private String dir = "src/test/java/org/apache/maven/project/";
- public DefaultProjectBuilderTest( String testName )
- {
- super( testName );
- }
-
public void setUp()
throws Exception
{
@@ -119,7 +114,6 @@
ProjectTestHelper.testProjectFieldRetrieval( project );
}
-
public void testModelInheritanceWhereChildInheritsNothing()
throws Exception
1.3 +36 -1
maven-components/maven-project/src/test/java/org/apache/maven/project/DefaultProjectBuilderTest.xml
Index: DefaultProjectBuilderTest.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/DefaultProjectBuilderTest.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultProjectBuilderTest.xml 19 Mar 2004 17:23:04 -0000 1.2
+++ DefaultProjectBuilderTest.xml 12 Apr 2004 14:41:31 -0000 1.3
@@ -8,5 +8,40 @@
<threshold>fatal</threshold>
</configuration>
</component>
+<!--
+ <component>
+ <role>org.apache.maven.wagon.manager.WagonManager</role>
+
<implementation>org.apache.maven.wagon.manager.DefaultWagonManager</implementation>
+ </component>
+-->
+ <component>
+ <role>org.apache.maven.wagon.Wagon</role>
+ <role-hint>file</role-hint>
+
<implementation>org.apache.maven.wagon.providers.file.FileWagon</implementation>
+ <instantiation-strategy>per-lookup</instantiation-strategy>
+ </component>
+
+<!-- a FileWagon configured as a http one -->
+ <component>
+ <role>org.apache.maven.wagon.Wagon</role>
+ <role-hint>http</role-hint>
+
<implementation>org.apache.maven.wagon.providers.file.FileWagon</implementation>
+ <instantiation-strategy>per-lookup</instantiation-strategy>
+ </component>
+<!--
+ <component>
+ <role>org.codehaus.plexus.jetty.Httpd</role>
+ <implementation>org.codehaus.plexus.jetty.DefaultHttpd</implementation>
+ <configuration>
+ <port>10007</port>
+ <contexts>
+ <context>
+ <path>/</path>
+ <document-root>${basedir}/target/http-repository</document-root>
+ </context>
+ </contexts>
+ </configuration>
+ </component>
+-->
</components>
-</plexus>
\ No newline at end of file
+</plexus>
1.2 +8 -1
maven-components/maven-project/src/test/java/org/apache/maven/project/child-with-bogus-parent.xml
Index: child-with-bogus-parent.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/child-with-bogus-parent.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- child-with-bogus-parent.xml 19 Mar 2004 17:11:04 -0000 1.1
+++ child-with-bogus-parent.xml 12 Apr 2004 14:41:31 -0000 1.2
@@ -1,3 +1,10 @@
<project>
+
<extend>${basedir}/bogus.xml</extend>
-</project>
\ No newline at end of file
+
+ <parent>
+ <groupId>maven</groupId>
+ <artifactId>bogus</artifactId>
+ <version>1.0-beta-9</version>
+ </parent>
+</project>
1.2 +8 -1
maven-components/maven-project/src/test/java/org/apache/maven/project/child.xml
Index: child.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/child.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- child.xml 19 Mar 2004 17:11:04 -0000 1.1
+++ child.xml 12 Apr 2004 14:41:31 -0000 1.2
@@ -1,3 +1,10 @@
<project>
+
<extend>project.xml</extend>
-</project>
\ No newline at end of file
+
+ <parent>
+ <groupId>maven</groupId>
+ <artifactId>maven-project-test</artifactId>
+ <version>1.0-beta-9</version>
+ </parent>
+</project>
1.2 +5 -0
maven-components/maven-project/src/test/java/org/apache/maven/project/fully-populated-child.xml
Index: fully-populated-child.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/fully-populated-child.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fully-populated-child.xml 19 Mar 2004 17:11:04 -0000 1.1
+++ fully-populated-child.xml 12 Apr 2004 14:41:31 -0000 1.2
@@ -2,6 +2,11 @@
<project>
<extend>project.xml</extend>
+ <parent>
+ <groupId>maven</groupId>
+ <artifactId>maven-project-test</artifactId>
+ <version>1.0-beta-9</version>
+ </parent>
<modelVersion>3</modelVersion>
<groupId>maven</groupId>
<artifactId>maven</artifactId>
1.2 +8 -1
maven-components/maven-project/src/test/java/org/apache/maven/project/project-which-needs-directory-alignment-child.xml
Index: project-which-needs-directory-alignment-child.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/project-which-needs-directory-alignment-child.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project-which-needs-directory-alignment-child.xml 19 Mar 2004 17:11:04 -0000
1.1
+++ project-which-needs-directory-alignment-child.xml 12 Apr 2004 14:41:31 -0000
1.2
@@ -1,3 +1,10 @@
<project>
+
<extend>project-which-needs-directory-alignment.xml</extend>
-</project>
\ No newline at end of file
+
+ <parent>
+ <groupId>maven</groupId>
+ <artifactId>project-which-needs-directory-alignment.xml</artifactId>
+ <version>1.0-beta-9</version>
+ </parent>
+</project>
1.2 +1 -1
maven-components/maven-project/src/test/java/org/apache/maven/project/project-which-needs-directory-alignment.xml
Index: project-which-needs-directory-alignment.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/project-which-needs-directory-alignment.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project-which-needs-directory-alignment.xml 19 Mar 2004 17:11:04 -0000
1.1
+++ project-which-needs-directory-alignment.xml 12 Apr 2004 14:41:31 -0000
1.2
@@ -3,7 +3,7 @@
<project>
<modelVersion>3</modelVersion>
<groupId>maven</groupId>
- <artifactId>maven</artifactId>
+ <artifactId>project-which-needs-directory-alignment</artifactId>
<name>Maven</name>
<version>1.0-beta-9</version>
<inceptionYear>2001</inceptionYear>
1.2 +1 -1
maven-components/maven-project/src/test/java/org/apache/maven/project/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Mar 2004 17:11:04 -0000 1.1
+++ project.xml 12 Apr 2004 14:41:31 -0000 1.2
@@ -3,7 +3,7 @@
<project>
<modelVersion>3</modelVersion>
<groupId>maven</groupId>
- <artifactId>maven</artifactId>
+ <artifactId>maven-project-test</artifactId>
<name>Maven</name>
<version>1.0-beta-9</version>
<inceptionYear>2001</inceptionYear>
1.2 +8 -1
maven-components/maven-project/src/test/java/org/apache/maven/project/plugins/project-which-needs-directory-alignment-child.xml
Index: project-which-needs-directory-alignment-child.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/plugins/project-which-needs-directory-alignment-child.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project-which-needs-directory-alignment-child.xml 19 Mar 2004 17:11:04 -0000
1.1
+++ project-which-needs-directory-alignment-child.xml 12 Apr 2004 14:41:31 -0000
1.2
@@ -1,3 +1,10 @@
<project>
+
<extend>../project-which-needs-directory-alignment.xml</extend>
-</project>
\ No newline at end of file
+
+ <parent>
+ <groupId>maven</groupId>
+ <artifactId>project-which-needs-directory-alignment</artifactId>
+ <version>1.0-beta-9</version>
+ </parent>
+</project>
1.3 +4 -5 maven-components/maven-project/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/xdocs/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 8 Apr 2004 02:45:58 -0000 1.2
+++ index.xml 12 Apr 2004 14:41:31 -0000 1.3
@@ -23,13 +23,12 @@
back to disk the dependencies inherited from a parent project as that's
implicit using the extend element.
</p>
+ </section>
+
+ <section name="Super Model">
<p>
- The project also carries any runtime notions like artifacts (Michal this is
- where your artifact tools will come in, the ProjectBuilder will use the
- artifact component to create the list of artifacts), dependency maps, source
- roots created by generative processes. Currrently in maven all those notions
- are baked into the project and it's created a horrible mess.
</p>
</section>
+
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
