You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2010/03/27 16:05:18 UTC
svn commit: r928211 - in
/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles:
maven-archetype-archetype/src/main/resources/META-INF/maven/
maven-archetype-archetype/src/main/resources/archetype-resources/
maven-archetype-archetype/src/mai...
Author: hboutemy
Date: Sat Mar 27 15:05:17 2010
New Revision: 928211
URL: http://svn.apache.org/viewvc?rev=928211&view=rev
Log:
improved archetypes:
o pom format for generated projects
o added XML Schema references
o fixed typos
Modified:
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/META-INF/maven/archetype.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/archetype.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/META-INF/archetype.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-mojo/src/main/resources/META-INF/archetype.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/META-INF/archetype.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/archetype-resources/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/apt/index.apt
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/site.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/META-INF/archetype.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/jetspeed/web.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-profiles/src/main/resources/META-INF/archetype.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-profiles/src/main/resources/archetype-resources/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-quickstart/src/main/resources/META-INF/archetype.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/src/main/resources/META-INF/archetype.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/src/main/resources/archetype-resources/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/site.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/META-INF/archetype.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/format.apt
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/index.apt
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fml/faq.fml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/apt/format.apt
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/apt/index.apt
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/fml/faq.fml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/xdoc/xdoc.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/site.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/site_fr.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/xdoc/xdoc.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-webapp/src/main/resources/META-INF/archetype.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/META-INF/maven/archetype.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/META-INF/maven/archetype.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/META-INF/maven/archetype.xml Sat Mar 27 15:05:17 2010
@@ -1,9 +1,11 @@
-<archetype>
+<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
<id>archetype</id>
+
<resources>
<resource>src/main/resources/archetype-resources/pom.xml</resource>
<resource>src/main/resources/archetype-resources/src/main/java/App.java</resource>
<resource>src/main/resources/archetype-resources/src/test/java/AppTest.java</resource>
<resource>src/main/resources/META-INF/maven/archetype.xml</resource>
- </resources>
+ </resources>
</archetype>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,9 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
+
<name>Archetype - ${artifactId}</name>
<url>http://maven.apache.org</url>
</project>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/archetype.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/archetype.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/archetype.xml Sat Mar 27 15:05:17 2010
@@ -1,6 +1,7 @@
<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
<id>${artifactId}</id>
+
<sources>
<source>src/main/java/App.java</source>
</sources>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,9 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>$${groupId}</groupId>
<artifactId>$${artifactId}</artifactId>
<version>$${version}</version>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/pom.xml Sat Mar 27 15:05:17 2010
@@ -35,6 +35,6 @@ under the License.
<name>Maven Simple J2EE Archetype</name>
<description>
- An archetype which contains a simplifed sample J2EE application.
+ An archetype which contains a simplified sample J2EE application.
</description>
</project>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/META-INF/archetype.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/META-INF/archetype.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/META-INF/archetype.xml Sat Mar 27 15:05:17 2010
@@ -1,6 +1,7 @@
<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
<id>j2ee</id>
+
<resources>
<resource>pom.xml</resource>
<resource>ear/pom.xml</resource>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,48 +1,53 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>root.project</groupId>
- <artifactId>ear</artifactId>
- <packaging>ear</packaging>
- <version>1.0</version>
- <name>ear assembly</name>
- <parent>
- <groupId>root</groupId>
- <artifactId>project</artifactId>
- <version>1.0</version>
- </parent>
- <dependencies>
- <dependency>
- <groupId>root.project</groupId>
- <artifactId>ejbs</artifactId>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>root.project.servlets</groupId>
- <artifactId>servlet</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>root.project</groupId>
- <artifactId>primary-source</artifactId>
- </dependency>
- <dependency>
- <groupId>root.project.projects</groupId>
- <artifactId>logging</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>root.project</groupId>
+ <artifactId>ear</artifactId>
+ <version>1.0</version>
+ <packaging>ear</packaging>
+
+ <name>ear assembly</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>ejbs</artifactId>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>root.project.servlets</groupId>
+ <artifactId>servlet</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,38 +1,43 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>root.project</groupId>
- <artifactId>ejbs</artifactId>
- <packaging>ejb</packaging>
- <version>1.0</version>
- <name>enterprise java beans</name>
- <parent>
- <groupId>root</groupId>
- <artifactId>project</artifactId>
- <version>1.0</version>
- </parent>
- <dependencies>
- <dependency>
- <groupId>root.project</groupId>
- <artifactId>primary-source</artifactId>
- </dependency>
- <dependency>
- <groupId>root.project.projects</groupId>
- <artifactId>logging</artifactId>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>root.project</groupId>
+ <artifactId>ejbs</artifactId>
+ <version>1.0</version>
+ <packaging>ejb</packaging>
+
+ <name>enterprise java beans</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ </dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-ejb-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,37 +1,36 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>root.project</groupId>
- <artifactId>primary-source</artifactId>
- <packaging>jar</packaging>
- <name>core project classes</name>
- <parent>
- <groupId>root</groupId>
- <artifactId>project</artifactId>
- <version>1.0</version>
- </parent>
- <dependencies>
- <dependency>
- <groupId>root.project.projects</groupId>
- <artifactId>logging</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>iso-8859-1</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <minmemory>128m</minmemory>
- <maxmemory>512m</maxmemory>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ <packaging>jar</packaging>
+
+ <name>core project classes</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>512m</maxmemory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,13 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>root.project.projects</groupId>
- <artifactId>logging</artifactId>
- <packaging>jar</packaging>
- <name>logging</name>
- <parent>
- <groupId>root.project</groupId>
- <artifactId>projects</artifactId>
- <version>1.0</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>root.project</groupId>
+ <artifactId>projects</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ <packaging>jar</packaging>
+
+ <name>logging</name>
</project>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,17 +1,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>root.project</groupId>
- <version>1.0</version>
- <artifactId>projects</artifactId>
- <packaging>pom</packaging>
- <name>sub projects</name>
- <parent>
- <groupId>root</groupId>
- <artifactId>project</artifactId>
- <version>1.0</version>
- </parent>
- <modules>
- <module>logging</module>
- </modules>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>root.project</groupId>
+ <artifactId>projects</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <name>sub projects</name>
+
+ <modules>
+ <module>logging</module>
+ </modules>
</project>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,18 +1,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>root.project</groupId>
- <artifactId>servlets</artifactId>
- <packaging>pom</packaging>
- <name>servlets</name>
- <version>1.0</version>
- <parent>
- <groupId>root</groupId>
- <artifactId>project</artifactId>
- <version>1.0</version>
- </parent>
- <modules>
- <module>servlet</module>
- </modules>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>root.project</groupId>
+ <artifactId>servlets</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <name>servlets</name>
+
+ <modules>
+ <module>servlet</module>
+ </modules>
</project>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,20 +1,24 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>root.project.servlets</groupId>
- <artifactId>servlet</artifactId>
- <packaging>war</packaging>
- <name>servlet</name>
- <parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>root.project</groupId>
+ <artifactId>servlets</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>root.project.servlets</groupId>
+ <artifactId>servlet</artifactId>
+ <packaging>war</packaging>
+
+ <name>servlet</name>
+
+ <dependencies>
+ <dependency>
<groupId>root.project</groupId>
- <artifactId>servlets</artifactId>
- <version>1.0</version>
- </parent>
- <dependencies>
- <dependency>
- <groupId>root.project</groupId>
- <artifactId>primary-source</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <artifactId>primary-source</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-mojo/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-mojo/src/main/resources/META-INF/archetype.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-mojo/src/main/resources/META-INF/archetype.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-mojo/src/main/resources/META-INF/archetype.xml Sat Mar 27 15:05:17 2010
@@ -1,6 +1,7 @@
<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
<id>plugin</id>
+
<sources>
<source>src/main/java/MyMojo.java</source>
</sources>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,12 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <packaging>maven-plugin</packaging>
<version>${version}</version>
+ <packaging>maven-plugin</packaging>
+
<name>${artifactId} Maven Mojo</name>
<url>http://maven.apache.org</url>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/META-INF/archetype.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/META-INF/archetype.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/META-INF/archetype.xml Sat Mar 27 15:05:17 2010
@@ -2,6 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
<id>plugin</id>
<allowPartial>true</allowPartial>
+
<siteResources>
<resource>src/site/site.xml</resource>
<resource>src/site/apt/index.apt</resource>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/archetype-resources/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/archetype-resources/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/archetype-resources/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,12 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
+
<name>Maven</name>
<url>http://maven.apache.org/maven2</url>
<inceptionYear>2001</inceptionYear>
+
<distributionManagement>
<site>
<id>website</id>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/apt/index.apt?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/apt/index.apt (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/apt/index.apt Sat Mar 27 15:05:17 2010
@@ -20,11 +20,11 @@ Maven 2 SuperDuper Plugin
* Usage
- Instructions on how to use the SuperDuper Plugin can be found {{{usage.html}here}}.
+ Instructions on how to use the SuperDuper Plugin can be found {{{./usage.html}here}}.
* Examples
To provide you with better understanding of some usages of the SuperDuper Plugin,
you can take a look at the following examples:
- * {{{examples/sample-example.html}Sample Example}}
+ * {{{./examples/sample-example.html}Sample Example}}
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/site.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/site.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/site.xml Sat Mar 27 15:05:17 2010
@@ -18,7 +18,8 @@
*/
-->
-<project>
+<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/META-INF/archetype.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/META-INF/archetype.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/META-INF/archetype.xml Sat Mar 27 15:05:17 2010
@@ -1,6 +1,7 @@
<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
<id>webapp</id>
+
<sources>
<source>src/main/java/MyPortlet.java</source>
</sources>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,45 +1,49 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <packaging>war</packaging>
<version>${version}</version>
+ <packaging>war</packaging>
+
<name>Maven Portlet Archetype</name>
<url>http://maven.apache.org</url>
- <profiles>
- <profile>
- <id>jetspeed</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0-beta-2</version>
- <configuration>
- <webXml>src/main/jetspeed/web.xml</webXml>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
<dependencies>
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.0.4</version>
- </dependency>
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.0.4</version>
+ </dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jetspeed</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0-beta-2</version>
+ <configuration>
+ <webXml>src/main/jetspeed/web.xml</webXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/jetspeed/web.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/jetspeed/web.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/jetspeed/web.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/jetspeed/web.xml Sat Mar 27 15:05:17 2010
@@ -3,34 +3,34 @@
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
- <display-name>${artifactId} Wrapper</display-name>
+ <display-name>${artifactId} Wrapper</display-name>
- <description>Generated Portlet Wrapper</description>
+ <description>Generated Portlet Wrapper</description>
- <servlet>
- <servlet-name>${artifactId}</servlet-name>
- <display-name>${artifactId} Portlet</display-name>
- <description>Portlet for Jetspeed Fusion</description>
- <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
-
- <init-param>
- <param-name>registerAtInit</param-name>
- <param-value>1</param-value>
- </init-param>
-
- <init-param>
- <param-name>portletApplication</param-name>
- <param-value>${artifactId}</param-value>
- </init-param>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>JetspeedContainer</servlet-name>
- <url-pattern>/container/*</url-pattern>
- </servlet-mapping>
-
- <taglib>
- <taglib-uri>http://java.sun.com/portlet</taglib-uri>
- <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
- </taglib>
+ <servlet>
+ <servlet-name>${artifactId}</servlet-name>
+ <display-name>${artifactId} Portlet</display-name>
+ <description>Portlet for Jetspeed Fusion</description>
+ <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+
+ <init-param>
+ <param-name>registerAtInit</param-name>
+ <param-value>1</param-value>
+ </init-param>
+
+ <init-param>
+ <param-name>portletApplication</param-name>
+ <param-value>${artifactId}</param-value>
+ </init-param>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>JetspeedContainer</servlet-name>
+ <url-pattern>/container/*</url-pattern>
+ </servlet-mapping>
+
+ <taglib>
+ <taglib-uri>http://java.sun.com/portlet</taglib-uri>
+ <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
+ </taglib>
</web-app>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml Sat Mar 27 15:05:17 2010
@@ -7,24 +7,24 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd
http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
- <portlet>
- <description>Write here a short description about your portlet.</description>
- <portlet-name>${artifactId}</portlet-name>
- <display-name>${artifactId} Portlet</display-name>
+ <portlet>
+ <description>Write here a short description about your portlet.</description>
+ <portlet-name>${artifactId}</portlet-name>
+ <display-name>${artifactId} Portlet</display-name>
- <portlet-class>${groupId}.${artifactId}</portlet-class>
+ <portlet-class>${groupId}.${artifactId}</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- </supports>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
- <supported-locale>en</supported-locale>
+ <supported-locale>en</supported-locale>
- <portlet-info>
- <title>Put the portlet title here</title>
- <short-title>Portlet Short Title</short-title>
- <keywords>put keywords here</keywords>
- </portlet-info>
- </portlet>
+ <portlet-info>
+ <title>Put the portlet title here</title>
+ <short-title>Portlet Short Title</short-title>
+ <keywords>put keywords here</keywords>
+ </portlet-info>
+ </portlet>
</portlet-app>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Sat Mar 27 15:05:17 2010
@@ -3,34 +3,34 @@
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
- <display-name>FortunePortlet</display-name>
+ <display-name>FortunePortlet</display-name>
- <description>Automated generated Application Wrapper</description>
+ <description>Automated generated Application Wrapper</description>
- <servlet>
- <servlet-name>${artifactId}</servlet-name>
- <display-name>${artifactId} Portlet</display-name>
- <description>Generated Portlet Wrapper</description>
- <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-
- <init-param>
- <param-name>portlet-class</param-name>
- <param-value>${groupId}.${artifactId}</param-value>
- </init-param>
-
- <init-param>
- <param-name>portlet-guid</param-name>
- <param-value>yourportlet.${artifactId}</param-value>
- </init-param>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>${artifactId}</servlet-name>
- <url-pattern>/${artifactId}/*</url-pattern>
- </servlet-mapping>
-
- <taglib>
- <taglib-uri>http://java.sun.com/portlet</taglib-uri>
- <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
- </taglib>
+ <servlet>
+ <servlet-name>${artifactId}</servlet-name>
+ <display-name>${artifactId} Portlet</display-name>
+ <description>Generated Portlet Wrapper</description>
+ <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+
+ <init-param>
+ <param-name>portlet-class</param-name>
+ <param-value>${groupId}.${artifactId}</param-value>
+ </init-param>
+
+ <init-param>
+ <param-name>portlet-guid</param-name>
+ <param-value>yourportlet.${artifactId}</param-value>
+ </init-param>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>${artifactId}</servlet-name>
+ <url-pattern>/${artifactId}/*</url-pattern>
+ </servlet-mapping>
+
+ <taglib>
+ <taglib-uri>http://java.sun.com/portlet</taglib-uri>
+ <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
+ </taglib>
</web-app>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-profiles/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-profiles/src/main/resources/META-INF/archetype.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-profiles/src/main/resources/META-INF/archetype.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-profiles/src/main/resources/META-INF/archetype.xml Sat Mar 27 15:05:17 2010
@@ -1,6 +1,7 @@
<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
<id>profiles</id>
+
<sources>
<source>src/main/java/App.java</source>
</sources>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-profiles/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-profiles/src/main/resources/archetype-resources/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-profiles/src/main/resources/archetype-resources/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-profiles/src/main/resources/archetype-resources/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,12 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <packaging>jar</packaging>
<version>${version}</version>
+ <packaging>jar</packaging>
+
<name>Maven Quick Start Archetype</name>
<url>http://maven.apache.org</url>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-quickstart/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-quickstart/src/main/resources/META-INF/archetype.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-quickstart/src/main/resources/META-INF/archetype.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-quickstart/src/main/resources/META-INF/archetype.xml Sat Mar 27 15:05:17 2010
@@ -1,6 +1,7 @@
<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
<id>quickstart</id>
+
<sources>
<source>src/main/java/App.java</source>
</sources>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,12 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <packaging>jar</packaging>
<version>${version}</version>
+ <packaging>jar</packaging>
+
<name>${artifactId}</name>
<url>http://maven.apache.org</url>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/src/main/resources/META-INF/archetype.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/src/main/resources/META-INF/archetype.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/src/main/resources/META-INF/archetype.xml Sat Mar 27 15:05:17 2010
@@ -2,6 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
<id>plugin</id>
<allowPartial>true</allowPartial>
+
<siteResources>
<resource>src/site/site.xml</resource>
<resource>src/site/apt/index.apt</resource>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/src/main/resources/archetype-resources/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/src/main/resources/archetype-resources/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/src/main/resources/archetype-resources/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,10 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<packaging>pom</packaging>
+
<distributionManagement>
<site>
<id>website</id>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/site.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/site.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/site.xml Sat Mar 27 15:05:17 2010
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
+
+<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<body>
<links>
<item name="Maven" href="http://maven.apache.org/"/>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/META-INF/archetype.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/META-INF/archetype.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/META-INF/archetype.xml Sat Mar 27 15:05:17 2010
@@ -2,6 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
<id>plugin</id>
<allowPartial>true</allowPartial>
+
<siteResources>
<resource>src/site/site.xml</resource>
<resource>src/site/site_fr.xml</resource>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,18 +1,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
+
<name>Maven</name>
- <url>http://maven.apache.org/maven2</url>
+ <url>http://maven.apache.org/</url>
<inceptionYear>2001</inceptionYear>
+
<distributionManagement>
<site>
<id>website</id>
<url>scp://webhost.company.com/www/website</url>
</site>
</distributionManagement>
+
<build>
<plugins>
<plugin>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/format.apt
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/format.apt?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/format.apt (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/format.apt Sat Mar 27 15:05:17 2010
@@ -1,4 +1,10 @@
-
+ -----
+ The APT format
+ -----
+ The Maven Team
+ -----
+ -----
+
The APT format
~~~~~~~~~~~~~~
@@ -26,7 +32,7 @@ The APT format
First line of first paragraph.
Second line of first paragraph.
Third line of first paragraph.
-
+
Line 1 of paragraph 2 (separated from first paragraph by an open line).
Line 2 of paragraph 2.
+------------------------------------------------------------------------+
@@ -56,8 +62,8 @@ My section title (not indented).
spaces. Then the author did even bother to indent the
other lines of the paragraph.
- Second paragraph contains several lines which are all
- indented by two spaces. This style is much nicer than
+ Second paragraph contains several lines which are all
+ indented by two spaces. This style is much nicer than
the one used for the previous paragraph.
+-------------------------------------------------------+
@@ -166,7 +172,7 @@ Section title
* List item 3.
+---------------------------------------+
- List items are indented and begin with a asterisk (<<<*>>>).
+ List items are indented and begin with a asterisk (<<<*>>>).
Plain paragraphs more indented than the first list item are nested in that
list. Displays such as tables (not indented) are always nested in the
@@ -257,7 +263,7 @@ Verbatim text contained in list item 2,
+----------------------------------------+
----------------------------------------
-Verbatim
+Verbatim
text,
preformatted,
escaped.
@@ -310,12 +316,12 @@ Verbatim
similar line.
The first line is not only used to recognize a table but also to specify
- column justification. In the following example,
+ column justification. In the following example,
* the second asterisk (<<<*>>>) is used to specify that column 1 is
centered,
- * the plus sign (<<<+>>>) specifies that column 2 is left aligned,
+ * the plus sign (<<<+>>>) specifies that column 2 is left aligned,
* the colon (<<<:>>>) specifies that column 3 is right aligned.
@@ -396,7 +402,7 @@ Table caption
~~~~~~~~~~~~~~~~~~~
+-----------------------------------------------------------------+
- {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}.
+ {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}.
Link to {{{anchor}showing alternate text}}.
Link to {{{http://www.pixware.fr}Pixware home page}}.
+-----------------------------------------------------------------+
@@ -545,7 +551,7 @@ Verbatim text not contained in list item
+-------------------------------+
Verbatim text
- in a box
+ in a box
+-------------------------------+
--- instead of +-- suppresses the box around verbatim text.
@@ -577,7 +583,7 @@ Table caption
<Italic> font. <<Bold>> font. <<<Monospaced>>> font.
- {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}.
+ {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}.
Link to {{{anchor}showing alternate text}}.
Link to {{{http://www.pixware.fr}Pixware home page}}.
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/index.apt?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/index.apt (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/apt/index.apt Sat Mar 27 15:05:17 2010
@@ -8,9 +8,9 @@ Maven Site for your project
Congratulations! If you are looking at this page then you have successfully generated a
template site employing the site archetype and you have run:
-
+
+-----+
-m2 site:site
+mvn site
+-----+
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fml/faq.fml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fml/faq.fml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fml/faq.fml Sat Mar 27 15:05:17 2010
@@ -1,5 +1,7 @@
<?xml version="1.0"?>
-<faqs id="General FAQ">
+<faqs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/FML/1.0"
+ xsi:schemaLocation="http://maven.apache.org/FML/1.0 http://maven.apache.org/xsd/fml-1.0.xsd"
+ id="General FAQ">
<part id="General">
<faq id="where">
<question>Where did Maven come from?</question>
@@ -12,7 +14,7 @@
</answer>
</faq>
<faq id="why">
- <question>Why is maven so wildly popular?</question>
+ <question>Why is Maven so wildly popular?</question>
<answer>
<p>
Maven saves you so much time in your software development efforts that
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/apt/format.apt
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/apt/format.apt?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/apt/format.apt (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/apt/format.apt Sat Mar 27 15:05:17 2010
@@ -1,9 +1,15 @@
-
+ -----
+ Le format APT
+ -----
+ L'équipe Maven
+ -----
+ -----
+
Le format APT
~~~~~~~~~~~~~
- Dans la section suivante, les boîtes contenant du texte dans la police
- de type machine à écrire sont des exemples de source APT.
+ Dans la section suivante, les boîtes contenant du texte dans la police
+ de type machine à écrire sont des exemples de source APT.
* Structure du document
~~~~~~~~~~~~~~~~~~~~~~~
@@ -26,7 +32,7 @@ Le format APT
First line of first paragraph.
Second line of first paragraph.
Third line of first paragraph.
-
+
Line 1 of paragraph 2 (separated from first paragraph by an open line).
Line 2 of paragraph 2.
+------------------------------------------------------------------------+
@@ -56,8 +62,8 @@ My section title (not indented).
spaces. Then the author did even bother to indent the
other lines of the paragraph.
- Second paragraph contains several lines which are all
- indented by two spaces. This style is much nicer than
+ Second paragraph contains several lines which are all
+ indented by two spaces. This style is much nicer than
the one used for the previous paragraph.
+-------------------------------------------------------+
@@ -166,7 +172,7 @@ Section title
* List item 3.
+---------------------------------------+
- List items are indented and begin with a asterisk (<<<*>>>).
+ List items are indented and begin with a asterisk (<<<*>>>).
Plain paragraphs more indented than the first list item are nested in that
list. Displays such as tables (not indented) are always nested in the
@@ -257,7 +263,7 @@ Verbatim text contained in list item 2,
+----------------------------------------+
----------------------------------------
-Verbatim
+Verbatim
text,
preformatted,
escaped.
@@ -310,12 +316,12 @@ Verbatim
similar line.
The first line is not only used to recognize a table but also to specify
- column justification. In the following example,
+ column justification. In the following example,
* the second asterisk (<<<*>>>) is used to specify that column 1 is
centered,
- * the plus sign (<<<+>>>) specifies that column 2 is left aligned,
+ * the plus sign (<<<+>>>) specifies that column 2 is left aligned,
* the colon (<<<:>>>) specifies that column 3 is right aligned.
@@ -396,7 +402,7 @@ Table caption
~~~~~~~~~~~~~~~~~~~
+-----------------------------------------------------------------+
- {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}.
+ {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}.
Link to {{{anchor}showing alternate text}}.
Link to {{{http://www.pixware.fr}Pixware home page}}.
+-----------------------------------------------------------------+
@@ -545,7 +551,7 @@ Verbatim text not contained in list item
+-------------------------------+
Verbatim text
- in a box
+ in a box
+-------------------------------+
--- instead of +-- suppresses the box around verbatim text.
@@ -577,7 +583,7 @@ Table caption
<Italic> font. <<Bold>> font. <<<Monospaced>>> font.
- {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}.
+ {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}.
Link to {{{anchor}showing alternate text}}.
Link to {{{http://www.pixware.fr}Pixware home page}}.
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/apt/index.apt?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/apt/index.apt (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/apt/index.apt Sat Mar 27 15:05:17 2010
@@ -1,17 +1,17 @@
-----
Le Site
-----
- L'équipe Maven
+ L'équipe Maven
-----
Site Maven pour votre projet
- Félicitations! Si vous regardez cette page alors vous avez
- généré avec succès un modèle de site en utilisant l'archétype
- de site et vous avez lancé :
-
+ Félicitations! Si vous regardez cette page alors vous avez
+ généré avec succès un modèle de site en utilisant l'archétype
+ de site et vous avez lancé :
+
+-----+
-m2 site:site
+mvn site
+-----+
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/fml/faq.fml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/fml/faq.fml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/fml/faq.fml Sat Mar 27 15:05:17 2010
@@ -1,8 +1,10 @@
<?xml version="1.0"?>
-<faqs id="FAQ Général">
+<faqs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/FML/1.0"
+ xsi:schemaLocation="http://maven.apache.org/FML/1.0 http://maven.apache.org/xsd/fml-1.0.xsd"
+ id="FAQ Général">
<part id="General">
<faq id="where">
- <question>D'où vient Maven</question>
+ <question>D'où vient Maven ?</question>
<answer>
<p>
Maven was created by a group of software developers who were tired
@@ -12,7 +14,7 @@
</answer>
</faq>
<faq id="why">
- <question>Pourquoi Maven est-il si populaire?</question>
+ <question>Pourquoi Maven est-il si populaire ?</question>
<answer>
<p>
Maven saves you so much time in your software development efforts that
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/xdoc/xdoc.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/xdoc/xdoc.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/xdoc/xdoc.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/fr/xdoc/xdoc.xml Sat Mar 27 15:05:17 2010
@@ -1,9 +1,11 @@
<?xml version="1.0"?>
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>Bienvenue</title>
<author email="dev@maven.apache.org">The Maven Team</author>
</properties>
+
<body>
<section name="Bienvenue dans un fichier XDOC!">
<p>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/site.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/site.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/site.xml Sat Mar 27 15:05:17 2010
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Maven">
+
+<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<bannerLeft>
<name>Maven</name>
<src>http://maven.apache.org/images/apache-maven-project.png</src>
@@ -8,6 +10,7 @@
<bannerRight>
<src>http://maven.apache.org/images/maven-small.gif</src>
</bannerRight>
+
<body>
<links>
<item name="Apache" href="http://www.apache.org/" />
@@ -18,7 +21,7 @@
<menu name="Maven 2.0">
<item name="APT Format" href="format.html"/>
<item name="FAQ" href="faq.html"/>
- <item name="Xdoc Example" href="xdoc.html"/>
+ <item name="Xdoc Example" href="xdoc.html"/>
</menu>
</body>
</project>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/site_fr.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/site_fr.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/site_fr.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/site_fr.xml Sat Mar 27 15:05:17 2010
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Maven">
+
+<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<bannerLeft>
<name>Maven</name>
<src>http://maven.apache.org/images/apache-maven-project.png</src>
@@ -8,6 +10,7 @@
<bannerRight>
<src>http://maven.apache.org/images/maven-small.gif</src>
</bannerRight>
+
<body>
<links>
<item name="Apache" href="http://www.apache.org/" />
@@ -18,7 +21,7 @@
<menu name="Maven 2.0">
<item name="Format APT" href="format.html"/>
<item name="FAQ" href="faq.html"/>
- <item name="Exemple Xdoc" href="xdoc.html"/>
+ <item name="Exemple Xdoc" href="xdoc.html"/>
</menu>
</body>
</project>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/xdoc/xdoc.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/xdoc/xdoc.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/xdoc/xdoc.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/src/main/resources/archetype-resources/src/site/xdoc/xdoc.xml Sat Mar 27 15:05:17 2010
@@ -1,9 +1,11 @@
<?xml version="1.0"?>
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>Welcome</title>
<author email="dev@maven.apache.org">The Maven Team</author>
</properties>
+
<body>
<section name="Welcome to an XDOC file!">
<p>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-webapp/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-webapp/src/main/resources/META-INF/archetype.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-webapp/src/main/resources/META-INF/archetype.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-webapp/src/main/resources/META-INF/archetype.xml Sat Mar 27 15:05:17 2010
@@ -1,6 +1,7 @@
<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
<id>webapp</id>
+
<resources>
<resource>src/main/webapp/index.jsp</resource>
<resource>src/main/webapp/WEB-INF/web.xml</resource>
Modified: maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml?rev=928211&r1=928210&r2=928211&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml Sat Mar 27 15:05:17 2010
@@ -1,12 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <packaging>war</packaging>
<version>${version}</version>
+ <packaging>war</packaging>
+
<name>${artifactId} Maven Webapp</name>
<url>http://maven.apache.org</url>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -15,6 +18,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<finalName>${artifactId}</finalName>
</build>