Author: felixk
Date: Tue Apr 5 05:01:28 2011
New Revision: 1088897
URL: http://svn.apache.org/viewvc?rev=1088897&view=rev
Log:
Switch to and force maven 3. Add generation of technical reports using the
-Psite-reports profile
Added:
james/mailet/current/src/reporting-site/
james/mailet/current/src/reporting-site/site/
james/mailet/current/src/reporting-site/site/site.xml (with props)
Removed:
james/mailet/current/src/site/resources/
Modified:
james/mailet/current/pom.xml
james/mailet/current/src/site/site.xml
Modified: james/mailet/current/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/current/pom.xml?rev=1088897&r1=1088896&r2=1088897&view=diff
==============================================================================
--- james/mailet/current/pom.xml (original)
+++ james/mailet/current/pom.xml Tue Apr 5 05:01:28 2011
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-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/maven-v4_0_0.xsd";>
- <!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -17,25 +16,26 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
- -->
+-->
+<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/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-project</artifactId>
+ <version>1.6</version>
+ </parent>
<groupId>org.apache.james</groupId>
<artifactId>mailet-project</artifactId>
<name>Apache JAMES Mailet Project</name>
+ <url>http://james.apache.org/mailet/</url>
+ <inceptionYear>2008</inceptionYear>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
+
<description>
Apache JAMES Mailet Project
</description>
- <parent>
- <groupId>org.apache.james</groupId>
- <artifactId>james-project</artifactId>
- <version>1.3</version>
- <relativePath>james-project/project/pom.xml</relativePath>
- </parent>
- <url>http://james.apache.org/mailet/</url>
- <inceptionYear>2008</inceptionYear>
-
+
<modules>
<module>api</module>
<module>base</module>
@@ -78,12 +78,40 @@
</mailingList>
</mailingLists>
- <reporting>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0-beta-3</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
+ <!-- Site generation -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <!-- Attach non-reporting site-descriptor when installing -->
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ <configuration>
+ <siteDirectory>${basedir}/src/site</siteDirectory>
+ <generateReports>false</generateReports>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <siteDirectory>${maven-site-plugin.siteDirectory}</siteDirectory>
+
<generateReports>${maven-site-plugin.generateReports}</generateReports>
+ </configuration>
</plugin>
</plugins>
- </reporting>
+ </build>
</project>
Added: james/mailet/current/src/reporting-site/site/site.xml
URL:
http://svn.apache.org/viewvc/james/mailet/current/src/reporting-site/site/site.xml?rev=1088897&view=auto
==============================================================================
--- james/mailet/current/src/reporting-site/site/site.xml (added)
+++ james/mailet/current/src/reporting-site/site/site.xml Tue Apr 5 05:01:28
2011
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project name="${project.name}">
+
+ <skin>
+ <groupId>org.apache.james</groupId>
+ <artifactId>maven-skin</artifactId>
+ <version>1.6</version>
+ </skin>
+
+ <bannerLeft>
+ <name>JAMES MailetDocs Maven Plugin</name>
+ <src>/images/logos/james-mailets-logo.gif</src>
+ <href>http://james.apache.org/mailet/index.html</href>
+ <alt>james-mailets-logo.gif</alt>
+ </bannerLeft>
+
+ <bannerRight>
+ <name>The Apache Software Foundation</name>
+ <src>images/logos/asf-logo-reduced.gif</src>
+ <href>http://www.apache.org/index.html</href>
+ </bannerRight>
+
+ <body>
+
+ <menu ref="modules" />
+ <menu ref="reports" />
+
+ </body>
+
+</project>
Propchange: james/mailet/current/src/reporting-site/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/mailet/current/src/reporting-site/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: james/mailet/current/src/site/site.xml
URL:
http://svn.apache.org/viewvc/james/mailet/current/src/site/site.xml?rev=1088897&r1=1088896&r2=1088897&view=diff
==============================================================================
--- james/mailet/current/src/site/site.xml (original)
+++ james/mailet/current/src/site/site.xml Tue Apr 5 05:01:28 2011
@@ -18,23 +18,25 @@
under the License.
-->
<project name='mailets'>
+ <skin>
+ <groupId>org.apache.james</groupId>
+ <artifactId>maven-skin</artifactId>
+ <version>1.6</version>
+ </skin>
+
<bannerLeft>
<name>James Project</name>
- <src>images/james-mailets-logo.gif</src>
+ <src>images/logos/james-mailets-logo.gif</src>
<href>http://james.apache.org/index.html</href>
+ <alt>james-mailets-logo.gif</alt>
</bannerLeft>
<bannerRight>
<name>The Apache Software Foundation</name>
- <src>images/asf-logo-reduced.gif</src>
+ <src>images/logos/asf-logo-reduced.gif</src>
<href>http://www.apache.org/index.html</href>
</bannerRight>
- <skin>
- <groupId>org.apache.james</groupId>
- <artifactId>maven-skin</artifactId>
- <version>1.2</version>
- </skin>
<body>
<menu name="Mailet">
<item name="API" href="http://james.apache.org/mailet/api"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
