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 2006/02/28 22:41:41 UTC
svn commit: r381792 - in /maven/archetype/trunk: ./ maven-archetype-core/
maven-archetype-core/src/main/java/org/apache/maven/archetype/
maven-archetype-core/src/main/mdo/ maven-archetype-model/
maven-archetype-model/src/ maven-archetype-model/src/main...
Author: jvanzyl
Date: Tue Feb 28 13:41:39 2006
New Revision: 381792
URL: http://svn.apache.org/viewcvs?rev=381792&view=rev
Log:
o creating maven-archetype-modello project that we will use to read/write the archetype
descriptors.
Added:
maven/archetype/trunk/maven-archetype-model/
maven/archetype/trunk/maven-archetype-model/pom.xml (with props)
maven/archetype/trunk/maven-archetype-model/src/
maven/archetype/trunk/maven-archetype-model/src/main/
maven/archetype/trunk/maven-archetype-model/src/main/mdo/
maven/archetype/trunk/maven-archetype-model/src/main/mdo/archetype.mdo
Removed:
maven/archetype/trunk/maven-archetype-core/src/main/mdo/
Modified:
maven/archetype/trunk/ (props changed)
maven/archetype/trunk/maven-archetype-core/pom.xml
maven/archetype/trunk/maven-archetype-core/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
maven/archetype/trunk/maven-archetypes/maven-archetype-portlet/pom.xml
maven/archetype/trunk/pom.xml
Propchange: maven/archetype/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb 28 13:41:39 2006
@@ -0,0 +1,9 @@
+target
+*~
+*.ipr
+*.iws
+*.iml
+*.log
+.classpath
+.project
+
Modified: maven/archetype/trunk/maven-archetype-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetype-core/pom.xml?rev=381792&r1=381791&r2=381792&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-core/pom.xml (original)
+++ maven/archetype/trunk/maven-archetype-core/pom.xml Tue Feb 28 13:41:39 2006
@@ -2,7 +2,7 @@
<parent>
<artifactId>maven-archetype</artifactId>
<groupId>org.apache.maven</groupId>
- <version>1.0-alpha-4-SNAPSHOT</version>
+ <version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
Modified: maven/archetype/trunk/maven-archetype-core/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetype-core/src/main/java/org/apache/maven/archetype/DefaultArchetype.java?rev=381792&r1=381791&r2=381792&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-core/src/main/java/org/apache/maven/archetype/DefaultArchetype.java (original)
+++ maven/archetype/trunk/maven-archetype-core/src/main/java/org/apache/maven/archetype/DefaultArchetype.java Tue Feb 28 13:41:39 2006
@@ -85,8 +85,12 @@
// artifactId = maven-foo-archetype
// version = latest
- public void createArchetype( String archetypeGroupId, String archetypeArtifactId, String archetypeVersion,
- ArtifactRepository localRepository, List remoteRepositories, Map parameters )
+ public void createArchetype( String archetypeGroupId,
+ String archetypeArtifactId,
+ String archetypeVersion,
+ ArtifactRepository localRepository,
+ List remoteRepositories,
+ Map parameters )
throws ArchetypeNotFoundException, ArchetypeDescriptorException, ArchetypeTemplateProcessingException
{
// ----------------------------------------------------------------------
@@ -563,5 +567,4 @@
return loader.getResourceAsStream( name );
}
-
}
Added: maven/archetype/trunk/maven-archetype-model/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetype-model/pom.xml?rev=381792&view=auto
==============================================================================
--- maven/archetype/trunk/maven-archetype-model/pom.xml (added)
+++ maven/archetype/trunk/maven-archetype-model/pom.xml Tue Feb 28 13:41:39 2006
@@ -0,0 +1,41 @@
+<project>
+ <parent>
+ <artifactId>maven-archetype</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <version>1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archetype-model</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <version>1.0-alpha-8</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java</goal>
+ <goal>xpp3-writer</goal>
+ <goal>xpp3-reader</goal>
+ <goal>xsd</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <version>1.0.0</version>
+ <model>src/main/mdo/archetype.mdo</model>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/archetype/trunk/maven-archetype-model/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archetype/trunk/maven-archetype-model/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/archetype/trunk/maven-archetype-model/src/main/mdo/archetype.mdo
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetype-model/src/main/mdo/archetype.mdo?rev=381792&view=auto
==============================================================================
--- maven/archetype/trunk/maven-archetype-model/src/main/mdo/archetype.mdo (added)
+++ maven/archetype/trunk/maven-archetype-model/src/main/mdo/archetype.mdo Tue Feb 28 13:41:39 2006
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+
+ <!-- START SNIPPET: modello-model -->
+
+<model>
+ <id>archetype</id>
+ <name>Archetype</name>
+ <description><![CDATA[Maven's model for the archetype descriptor.]]></description>
+ <defaults>
+ <default>
+ <key>package</key>
+ <value>org.apache.maven.archeytpe.model</value>
+ </default>
+ </defaults>
+ <classes>
+ <class rootElement="true" xml.tagName="archetype">
+ <name>Archetype</name>
+ <description>Describes the assembly layout and packaging.</description>
+ <version>1.0.0</version>
+ <fields>
+ <field>
+ <name>id</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <type>String</type>
+ </field>
+ <field>
+ <name>allowPartial</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <type>boolean</type>
+ </field>
+ <field>
+ <name>sources</name>
+ <version>1.0.0</version>
+ <association>
+ <type>String</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ <field>
+ <name>resources</name>
+ <version>1.0.0</version>
+ <association>
+ <type>String</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ <field>
+ <name>testSources</name>
+ <version>1.0.0</version>
+ <association>
+ <type>String</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ <field>
+ <name>testResources</name>
+ <version>1.0.0</version>
+ <association>
+ <type>String</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ <field>
+ <name>siteResources</name>
+ <version>1.0.0</version>
+ <association>
+ <type>String</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ </fields>
+ </class>
+ </classes>
+</model>
+
+ <!-- END SNIPPET: modello-model -->
+
Modified: maven/archetype/trunk/maven-archetypes/maven-archetype-portlet/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/maven-archetypes/maven-archetype-portlet/pom.xml?rev=381792&r1=381791&r2=381792&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetypes/maven-archetype-portlet/pom.xml (original)
+++ maven/archetype/trunk/maven-archetypes/maven-archetype-portlet/pom.xml Tue Feb 28 13:41:39 2006
@@ -8,13 +8,3 @@
<artifactId>maven-archetype-portlet</artifactId>
<version>1.0-SNAPSHOT</version>
</project>
-<project>
- <parent>
- <artifactId>maven-archetypes</artifactId>
- <groupId>org.apache.maven.archetypes</groupId>
- <version>1.0-alpha-4-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>maven-archetype-portlet</artifactId>
- <version>1.0-dev-SNAPSHOT</version>
-</project>
Modified: maven/archetype/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/trunk/pom.xml?rev=381792&r1=381791&r2=381792&view=diff
==============================================================================
--- maven/archetype/trunk/pom.xml (original)
+++ maven/archetype/trunk/pom.xml Tue Feb 28 13:41:39 2006
@@ -1,15 +1,16 @@
<project>
<parent>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <groupId>org.apache.maven</groupId>
<version>2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-archetype</artifactId>
<packaging>pom</packaging>
- <version>1.0-alpha-4-SNAPSHOT</version>
+ <version>1</version>
<modules>
<module>maven-archetype-core</module>
+ <module>maven-archetype-creator</module>
<module>maven-archetype-plugin</module>
<module>maven-archetypes</module>
</modules>