james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r1082672 - in /james/mpt/trunk: ./ antlib/ antlib/src/reporting-site/ antlib/src/site/ app/ app/src/reporting-site/ app/src/site/ assemble/ assemble/src/reporting-site/ assemble/src/site/ main/ main/src/reporting-site/ main/src/site/ mavenp...
Date Thu, 17 Mar 2011 20:08:38 GMT
Author: felixk
Date: Thu Mar 17 20:08:37 2011
New Revision: 1082672

URL: http://svn.apache.org/viewvc?rev=1082672&view=rev
Log:
Switch to and force maven 3. Add generation of technical reports using the -Psite-reports profile

Added:
    james/mpt/trunk/antlib/src/reporting-site/
    james/mpt/trunk/antlib/src/reporting-site/site.xml   (with props)
    james/mpt/trunk/app/src/reporting-site/
    james/mpt/trunk/app/src/reporting-site/site.xml   (with props)
    james/mpt/trunk/assemble/src/reporting-site/
    james/mpt/trunk/assemble/src/reporting-site/site.xml   (with props)
    james/mpt/trunk/assemble/src/site/
    james/mpt/trunk/assemble/src/site/site.xml   (with props)
    james/mpt/trunk/main/src/reporting-site/
    james/mpt/trunk/main/src/reporting-site/site.xml   (with props)
    james/mpt/trunk/mavenplugin/src/reporting-site/
    james/mpt/trunk/mavenplugin/src/reporting-site/site.xml   (with props)
    james/mpt/trunk/mavenplugin/src/site/
    james/mpt/trunk/mavenplugin/src/site/apt/
    james/mpt/trunk/mavenplugin/src/site/apt/index.apt   (with props)
    james/mpt/trunk/mavenplugin/src/site/apt/usage.apt.vm   (with props)
    james/mpt/trunk/mavenplugin/src/site/fml/
    james/mpt/trunk/mavenplugin/src/site/fml/faq.fml   (with props)
    james/mpt/trunk/mavenplugin/src/site/site.xml   (with props)
    james/mpt/trunk/src/reporting-site/
    james/mpt/trunk/src/reporting-site/site.xml   (with props)
Modified:
    james/mpt/trunk/antlib/pom.xml
    james/mpt/trunk/antlib/src/site/site.xml
    james/mpt/trunk/app/pom.xml
    james/mpt/trunk/app/src/site/site.xml
    james/mpt/trunk/assemble/pom.xml
    james/mpt/trunk/main/pom.xml
    james/mpt/trunk/main/src/site/site.xml
    james/mpt/trunk/mavenplugin/   (props changed)
    james/mpt/trunk/mavenplugin/pom.xml
    james/mpt/trunk/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java
    james/mpt/trunk/pom.xml
    james/mpt/trunk/src/site/site.xml

Modified: james/mpt/trunk/antlib/pom.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/antlib/pom.xml?rev=1082672&r1=1082671&r2=1082672&view=diff
==============================================================================
--- james/mpt/trunk/antlib/pom.xml (original)
+++ james/mpt/trunk/antlib/pom.xml Thu Mar 17 20:08:37 2011
@@ -22,9 +22,6 @@
     <artifactId>apache-james-mpt-project</artifactId>
     <groupId>org.apache.james</groupId>
     <version>0.2-SNAPSHOT</version>
-    <!-- Either this really points to the james-project/pom.xml or you
-         will have to tune the local repository, later, in this file -->
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
@@ -71,12 +68,12 @@ to the library requiring no extra coding
         <type>test-jar</type>
         <scope>test</scope>
     </dependency>
-    
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
@@ -108,25 +105,21 @@ to the library requiring no extra coding
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.2</version>
         <configuration>
         <archive>
           <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
             <manifestEntries>
               <Specification-Title>Apache James MPT AntLib</Specification-Title>
-              <Specification-Version>${pom.version}</Specification-Version>
+              <Specification-Version>${project.version}</Specification-Version>
               <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
               <Implementation-Title>Apache James MPT AntLib</Implementation-Title>
-              <Implementation-Version>${pom.version}</Implementation-Version>
+              <Implementation-Version>${project.version}</Implementation-Version>
               <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
               <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-              <url>${pom.url}</url>
+              <url>${project.url}</url>
             </manifestEntries>
           </archive>
         </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
             <goals>
@@ -139,7 +132,6 @@ to the library requiring no extra coding
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.3</version>
         <executions>
                 <execution>
                         <id>bundle-manifest</id>
@@ -158,8 +150,8 @@ to the library requiring no extra coding
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.4</version>
         <executions>
           <execution>
             <id>create-javadocs</id> 

Added: james/mpt/trunk/antlib/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/antlib/src/reporting-site/site.xml?rev=1082672&view=auto
==============================================================================
--- james/mpt/trunk/antlib/src/reporting-site/site.xml (added)
+++ james/mpt/trunk/antlib/src/reporting-site/site.xml Thu Mar 17 20:08:37 2011
@@ -0,0 +1,29 @@
+<?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}">
+
+    <body>
+
+        <menu ref="parent" />
+        <menu ref="reports" />
+
+    </body>
+
+</project>

Propchange: james/mpt/trunk/antlib/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/mpt/trunk/antlib/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: james/mpt/trunk/antlib/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/antlib/src/site/site.xml?rev=1082672&r1=1082671&r2=1082672&view=diff
==============================================================================
--- james/mpt/trunk/antlib/src/site/site.xml (original)
+++ james/mpt/trunk/antlib/src/site/site.xml Thu Mar 17 20:08:37 2011
@@ -18,20 +18,11 @@
   under the License.    
 -->
 <project name="JAMES Mail Protocol Tester (MPT)">
-  <bannerLeft>
-    <name>JAMES MPT</name>
-    <src>/images/james-mpt-logo.gif</src>
-    <href>http://james.apache.org/mpt/index.html</href>
-  </bannerLeft>
-
-  <bannerRight>
-    <name>The Apache Software Foundation</name>
-    <src>/images/asf-logo-reduced.gif</src>
-    <href>http://www.apache.org/index.html</href>
-  </bannerRight> 
 
   <body>
 
+    <menu ref="parent" />
+
     <menu name="MPT AntLib">
       <item name="Overview" href="index.html"/>
       <item 

Modified: james/mpt/trunk/app/pom.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/app/pom.xml?rev=1082672&r1=1082671&r2=1082672&view=diff
==============================================================================
--- james/mpt/trunk/app/pom.xml (original)
+++ james/mpt/trunk/app/pom.xml Thu Mar 17 20:08:37 2011
@@ -22,16 +22,13 @@
     <artifactId>apache-james-mpt-project</artifactId>
     <groupId>org.apache.james</groupId>
     <version>0.2-SNAPSHOT</version>
-    <!-- Either this really points to the james-project/pom.xml or you
-         will have to tune the local repository, later, in this file -->
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
   <artifactId>apache-james-mpt-app</artifactId>
   <name>Apache JAMES MPT Application</name>
   <description>Apache JAMES Mail Protocol Tester (MPT) is a library providing a framework for the 
-scritable functional testing of ASCII based line protocols. This application provides easy executable
+scriptable functional testing of ASCII based line protocols. This application provides easy executable
 interfaces to the MPT library.</description>
   <url>http://james.apache.org/mpt/app</url>
   <dependencies>
@@ -66,13 +63,13 @@ interfaces to the MPT library.</descript
         <type>test-jar</type>
         <scope>test</scope>
     </dependency>
-    
   </dependencies>
 
   <build>
     <plugins>
       <!-- Uber Jar -->
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
@@ -88,29 +85,52 @@ interfaces to the MPT library.</descript
         </executions>
       </plugin>
 
+      <!--
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <artifactSet>
+            <includes>
+              <include>commons-logging:commons-logging</include>
+              <include>commons-cli:commons-cli</include>
+              <include>junit:junit</include>
+              <include>${project.groupId}:apache-james-mpt-main</include>
+            </includes>
+          </artifactSet>
+        </configuration>
+      </plugin>
+      -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.2</version>
         <configuration>
         <archive>
             <manifestEntries>
               <Main-Class>org.apache.james.mpt.app.Main</Main-Class>
               <Specification-Title>Apache James MPT Application</Specification-Title>
-              <Specification-Version>${pom.version}</Specification-Version>
+              <Specification-Version>${project.version}</Specification-Version>
               <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
               <Implementation-Title>Apache James MPT Application</Implementation-Title>
-              <Implementation-Version>${pom.version}</Implementation-Version>
+              <Implementation-Version>${project.version}</Implementation-Version>
               <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
               <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-              <url>${pom.url}</url>
+              <url>${project.url}</url>
             </manifestEntries>
           </archive>
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.4</version>
         <executions>
           <execution>
             <id>create-javadocs</id> 

Added: james/mpt/trunk/app/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/app/src/reporting-site/site.xml?rev=1082672&view=auto
==============================================================================
--- james/mpt/trunk/app/src/reporting-site/site.xml (added)
+++ james/mpt/trunk/app/src/reporting-site/site.xml Thu Mar 17 20:08:37 2011
@@ -0,0 +1,29 @@
+<?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}">
+
+    <body>
+
+        <menu ref="parent" />
+        <menu ref="reports" />
+
+    </body>
+
+</project>

Propchange: james/mpt/trunk/app/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/mpt/trunk/app/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: james/mpt/trunk/app/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/app/src/site/site.xml?rev=1082672&r1=1082671&r2=1082672&view=diff
==============================================================================
--- james/mpt/trunk/app/src/site/site.xml (original)
+++ james/mpt/trunk/app/src/site/site.xml Thu Mar 17 20:08:37 2011
@@ -18,20 +18,11 @@
   under the License.    
 -->
 <project name="JAMES Mail Protocol Tester (MPT)">
-  <bannerLeft>
-    <name>JAMES MPT</name>
-    <src>/images/james-mpt-logo.gif</src>
-    <href>http://james.apache.org/mpt/index.html</href>
-  </bannerLeft>
-
-  <bannerRight>
-    <name>The Apache Software Foundation</name>
-    <src>/images/asf-logo-reduced.gif</src>
-    <href>http://www.apache.org/index.html</href>
-  </bannerRight> 
 
   <body>
 
+    <menu name="parent" />
+
     <menu name="Mail Protocol Tester">
       <item name="Interface" href="index.html"/>
       <item 

Modified: james/mpt/trunk/assemble/pom.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/assemble/pom.xml?rev=1082672&r1=1082671&r2=1082672&view=diff
==============================================================================
--- james/mpt/trunk/assemble/pom.xml (original)
+++ james/mpt/trunk/assemble/pom.xml Thu Mar 17 20:08:37 2011
@@ -22,7 +22,6 @@
     <artifactId>apache-james-mpt-project</artifactId>
     <groupId>org.apache.james</groupId>
     <version>0.2-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
@@ -67,8 +66,8 @@ MPT is a functional test framework speci
   <build>    
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-2</version>
         <configuration>
           <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
         </configuration>

Added: james/mpt/trunk/assemble/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/assemble/src/reporting-site/site.xml?rev=1082672&view=auto
==============================================================================
--- james/mpt/trunk/assemble/src/reporting-site/site.xml (added)
+++ james/mpt/trunk/assemble/src/reporting-site/site.xml Thu Mar 17 20:08:37 2011
@@ -0,0 +1,29 @@
+<?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}">
+
+    <body>
+
+        <menu ref="parent" />
+        <menu ref="reports" />
+
+    </body>
+
+</project>

Propchange: james/mpt/trunk/assemble/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/mpt/trunk/assemble/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: james/mpt/trunk/assemble/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/assemble/src/site/site.xml?rev=1082672&view=auto
==============================================================================
--- james/mpt/trunk/assemble/src/site/site.xml (added)
+++ james/mpt/trunk/assemble/src/site/site.xml Thu Mar 17 20:08:37 2011
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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}">
+  <body>
+    <menu ref="parent" />
+    <menu ref="reports" />
+  </body>
+</project>

Propchange: james/mpt/trunk/assemble/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/mpt/trunk/assemble/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: james/mpt/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/main/pom.xml?rev=1082672&r1=1082671&r2=1082672&view=diff
==============================================================================
--- james/mpt/trunk/main/pom.xml (original)
+++ james/mpt/trunk/main/pom.xml Thu Mar 17 20:08:37 2011
@@ -22,9 +22,6 @@
     <artifactId>apache-james-mpt-project</artifactId>
     <groupId>org.apache.james</groupId>
     <version>0.2-SNAPSHOT</version>
-    <!-- Either this really points to the james-project/pom.xml or you
-         will have to tune the local repository, later, in this file -->
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
@@ -54,30 +51,27 @@ scritable functional testing of ASCII ba
     <developerConnection>scm:svn:https://rdonkin@svn.apache.org/repos/asf/james/mpt/trunk/main</developerConnection>
     <url>http://svn.apache.org/viewcvs.cgi/james/mpt/trunk/main?root=Apache-SVN</url>
   </scm>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.2</version>
         <configuration>
         <archive>
           <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
             <manifestEntries>
               <Specification-Title>Apache James MPT</Specification-Title>
-              <Specification-Version>${pom.version}</Specification-Version>
+              <Specification-Version>${project.version}</Specification-Version>
               <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
               <Implementation-Title>Apache James MPT</Implementation-Title>
-              <Implementation-Version>${pom.version}</Implementation-Version>
+              <Implementation-Version>${project.version}</Implementation-Version>
               <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
               <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-              <url>${pom.url}</url>
+              <url>${project.url}</url>
             </manifestEntries>
           </archive>
         </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
             <goals>
@@ -89,7 +83,6 @@ scritable functional testing of ASCII ba
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.3</version>
         <executions>
                 <execution>
                         <id>bundle-manifest</id>
@@ -108,8 +101,8 @@ scritable functional testing of ASCII ba
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.4</version>
         <executions>
           <execution>
             <id>create-javadocs</id> 

Added: james/mpt/trunk/main/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/main/src/reporting-site/site.xml?rev=1082672&view=auto
==============================================================================
--- james/mpt/trunk/main/src/reporting-site/site.xml (added)
+++ james/mpt/trunk/main/src/reporting-site/site.xml Thu Mar 17 20:08:37 2011
@@ -0,0 +1,29 @@
+<?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}">
+
+    <body>
+
+        <menu ref="parent" />
+        <menu ref="reports" />
+
+    </body>
+
+</project>

Propchange: james/mpt/trunk/main/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/mpt/trunk/main/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: james/mpt/trunk/main/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/main/src/site/site.xml?rev=1082672&r1=1082671&r2=1082672&view=diff
==============================================================================
--- james/mpt/trunk/main/src/site/site.xml (original)
+++ james/mpt/trunk/main/src/site/site.xml Thu Mar 17 20:08:37 2011
@@ -18,20 +18,11 @@
   under the License.    
 -->
 <project name="JAMES Mail Protocol Tester (MPT)">
-  <bannerLeft>
-    <name>JAMES MPT</name>
-    <src>/images/james-mpt-logo.gif</src>
-    <href>http://james.apache.org/mpt/index.html</href>
-  </bannerLeft>
-
-  <bannerRight>
-    <name>The Apache Software Foundation</name>
-    <src>/images/asf-logo-reduced.gif</src>
-    <href>http://www.apache.org/index.html</href>
-  </bannerRight> 
 
   <body>
 
+    <menu ref="parent" />
+
     <menu name="Mail Protocol Tester">
       <item name="Overview" href="index.html"/>
       <item 

Propchange: james/mpt/trunk/mavenplugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 17 20:08:37 2011
@@ -1 +1,3 @@
 target
+.classpath
+.project

Modified: james/mpt/trunk/mavenplugin/pom.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/mavenplugin/pom.xml?rev=1082672&r1=1082671&r2=1082672&view=diff
==============================================================================
--- james/mpt/trunk/mavenplugin/pom.xml (original)
+++ james/mpt/trunk/mavenplugin/pom.xml Thu Mar 17 20:08:37 2011
@@ -22,19 +22,17 @@
     <artifactId>apache-james-mpt-project</artifactId>
     <groupId>org.apache.james</groupId>
     <version>0.2-SNAPSHOT</version>
-    <!-- Either this really points to the james-project/pom.xml or you
-         will have to tune the local repository, later, in this file -->
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
   <artifactId>maven-mpt-plugin</artifactId>
   <name>Apache JAMES MPT Maven2 Plugin</name>
   <description>Apache JAMES Mail Protocol Tester (MPT) is a library providing a framework for the 
-scritable functional testing of ASCII based line protocols. This Maven2 Plugin  is an easy interface
+scriptable functional testing of ASCII based line protocols. This Maven2 Plugin  is an easy interface
 to the library requiring no extra coding.</description>
   <url>http://james.apache.org/mpt/mavenplugin</url>
   <packaging>maven-plugin</packaging>
+  
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -66,21 +64,27 @@ to the library requiring no extra coding
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <configuration>
+          <goalPrefix>mpt</goalPrefix>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.2</version>
         <configuration>
         <!-- 
         <archive>
           <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
             <manifestEntries>
               <Specification-Title>Apache James MPT Maven2 Plogin</Specification-Title>
-              <Specification-Version>${pom.version}</Specification-Version>
+              <Specification-Version>${project.version}</Specification-Version>
               <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
               <Implementation-Title>Apache James MPT Maven2 Plugin</Implementation-Title>
-              <Implementation-Version>${pom.version}</Implementation-Version>
+              <Implementation-Version>${project.version}</Implementation-Version>
               <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
               <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-              <url>${pom.url}</url>
+              <url>${project.url}</url>
             </manifestEntries>
           </archive>
           -->
@@ -110,8 +114,8 @@ to the library requiring no extra coding
       </plugin>
       -->
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.4</version>
         <executions>
           <execution>
             <id>create-javadocs</id> 
@@ -123,13 +127,51 @@ to the library requiring no extra coding
           </execution>
         </executions>
       </plugin>
+      <!--
+      <plugin>
+         <groupId>org.codehaus.mojo</groupId>
+         <artifactId>aspectj-maven-plugin</artifactId>
+         <!- http://mojo.codehaus.org/aspectj-maven-plugin/ ->
+         <executions>
+           <execution>
+             <goals>
+                <goal>compile</goal>
+             </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-docck-plugin</artifactId>
+        <version>1.0</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <reportPlugins combine.children="append">
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-plugin-plugin</artifactId>
+            </plugin>
+          </reportPlugins>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/james/mpt/trunk/maven</connection>
-    <developerConnection>scm:svn:https://rdonkin@svn.apache.org/repos/asf/james/mpt/trunk/maven</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/james/mpt/trunk/maven?root=Apache-SVN</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/james/mpt/trunk/mavenplugin</connection>
+    <developerConnection>scm:svn:https://rdonkin@svn.apache.org/repos/asf/james/mpt/trunk/mavenplugin</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/james/mpt/trunk/mavenplugin?root=Apache-SVN</url>
   </scm>
-
+  
 </project>

Modified: james/mpt/trunk/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java?rev=1082672&r1=1082671&r2=1082672&view=diff
==============================================================================
--- james/mpt/trunk/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java (original)
+++ james/mpt/trunk/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java Thu Mar 17 20:08:37 2011
@@ -24,13 +24,17 @@ import org.apache.maven.plugin.MojoExecu
 import org.apache.maven.plugin.MojoFailureException;
 
 /**
+ * Runs MPT scripts
  * @goal run
  */
 public class MailProtocolTestMojo extends AbstractMojo{
 
 	/**
+	 * The Mail Protocol Tests (MPT) to run
+	 * 
 	 * @parameter
 	 * @required
+	 * @since 0.1
 	 */
     private MailProtocolTest[] mailProtocolTests;
 

Added: james/mpt/trunk/mavenplugin/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/mavenplugin/src/reporting-site/site.xml?rev=1082672&view=auto
==============================================================================
--- james/mpt/trunk/mavenplugin/src/reporting-site/site.xml (added)
+++ james/mpt/trunk/mavenplugin/src/reporting-site/site.xml Thu Mar 17 20:08:37 2011
@@ -0,0 +1,29 @@
+<?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}">
+
+    <body>
+
+        <menu ref="parent" />
+        <menu ref="reports" />
+
+    </body>
+
+</project>

Propchange: james/mpt/trunk/mavenplugin/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/mpt/trunk/mavenplugin/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: james/mpt/trunk/mavenplugin/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/james/mpt/trunk/mavenplugin/src/site/apt/index.apt?rev=1082672&view=auto
==============================================================================
--- james/mpt/trunk/mavenplugin/src/site/apt/index.apt (added)
+++ james/mpt/trunk/mavenplugin/src/site/apt/index.apt Thu Mar 17 20:08:37 2011
@@ -0,0 +1,67 @@
+------ 
+Introduction
+------ 
+Author
+------ 
+2011-03-01
+------ 
+
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+
+Maven Plugin MPT
+
+  Plugin introduction, description, and other relevant information.
+
+* Goals Overview
+
+  General Information about the goals.
+
+  * {{{./run-mojo}mpt:run}} short description for this plugin goal.
+
+* Usage
+
+  General instructions on how to use the Plugin Name can be found on the {{{./usage.html}usage page}}. Some more
+  specific use cases are described in the examples given below. Last but not least, users occasionally contribute
+  additional examples, tips or errata to the
+  {{{http://docs.codehaus.org/display/MAVENUSER/Plugin+Name}plugin's wiki page}}.
+
+  In case you still have questions regarding the plugin's usage, please have a look at the {{{./faq.html}FAQ}} and feel
+  free to contact the {{{./mail-lists.html}user mailing list}}. The posts to the mailing list are archived and could
+  already contain the answer to your question as part of an older thread. Hence, it is also worth browsing/searching
+  the {{{./mail-lists.html}mail archive}}.
+
+  If you feel like the plugin is missing a feature or has a defect, you can fill a feature request or bug report in our
+  {{{./issue-tracking.html}issue tracker}}. When creating a new issue, please provide a comprehensive description of your
+  concern. Especially for fixing bugs it is crucial that the developers can reproduce your problem. For this reason,
+  entire debug logs, POMs or most preferably little demo projects attached to the issue are very much appreciated.
+  Of course, patches are welcome, too. Contributors can check out the project from our
+  {{{./source-repository.html}source repository}} and will find supplementary information in the
+  {{{http://maven.apache.org/guides/development/guide-helping.html}guide to helping with Maven}}. 
+
+* Examples
+
+  To provide you with better understanding on some usages of the Plugin Name,
+  you can take a look into the following examples:
+
+  * {{{./examples/short-description1.html}Example Description One}}
+
+  * {{{./examples/short-description2.html}Example Description Two}}

Propchange: james/mpt/trunk/mavenplugin/src/site/apt/index.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/mpt/trunk/mavenplugin/src/site/apt/index.apt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: james/mpt/trunk/mavenplugin/src/site/apt/usage.apt.vm
URL: http://svn.apache.org/viewvc/james/mpt/trunk/mavenplugin/src/site/apt/usage.apt.vm?rev=1082672&view=auto
==============================================================================
--- james/mpt/trunk/mavenplugin/src/site/apt/usage.apt.vm (added)
+++ james/mpt/trunk/mavenplugin/src/site/apt/usage.apt.vm Thu Mar 17 20:08:37 2011
@@ -0,0 +1,83 @@
+ ------
+ Usage
+ ------
+ Felix Knecht
+ ------
+ 2011-02-28
+ ------
+
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+MPT Maven plugin
+
+* The <<<mpt:run>>> Goal
+
+  The <<<mpt:run>>> goal isn't bound to any phase. This goal runs the configured MPTs.
+  
++-----
+mvn mtp:run
++-----
+
+* Configuring the MPT plugin
+
+  Since the MPT plugin doesn't executes automatically during the phases you may want
+  to put <<<executions>>> to the <<<configuration>>>.
+
++-----
+<project>
+  ...
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>${project.artifactId}</artifactId>
+        <version>${project.version}>version>
+        <configuration>
+          <mailProtocolTests>
+            <port></port>
+            <host></host>
+            <shabang></shabang>
+            <scriptFile></scriptFile>
+            <addUsers>
+              <addUser>
+                <port></port>
+                <passwd></passwd>
+                <scriptText></scriptText>
+                <host></host>
+                <scriptFile></scriptFile>
+              </addUser>
+              <addUser>
+                <port></port>
+                <passwd></passwd>
+                <scriptText></scriptText>
+                <host></host>
+                <scriptFile></scriptFile>
+              </addUser>
+              ...
+            </addUsers>
+          </mailProtocolTests>
+        </configuration>
+      <plugin>
+    </plugins>
+  </build>
+  ...
+</project>
++-----

Propchange: james/mpt/trunk/mavenplugin/src/site/apt/usage.apt.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/mpt/trunk/mavenplugin/src/site/apt/usage.apt.vm
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: james/mpt/trunk/mavenplugin/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/mavenplugin/src/site/fml/faq.fml?rev=1082672&view=auto
==============================================================================
--- james/mpt/trunk/mavenplugin/src/site/fml/faq.fml (added)
+++ james/mpt/trunk/mavenplugin/src/site/fml/faq.fml Thu Mar 17 20:08:37 2011
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<faqs id="FAQ" title="Frequently Asked Questions">
+  <part id="General">
+    <faq id="question">
+      <question>Question?</question>
+      <answer>
+        <p>
+          Answer
+        </p>
+      </answer>
+    </faq>
+  </part>
+</faqs>

Propchange: james/mpt/trunk/mavenplugin/src/site/fml/faq.fml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/mpt/trunk/mavenplugin/src/site/fml/faq.fml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: james/mpt/trunk/mavenplugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/mavenplugin/src/site/site.xml?rev=1082672&view=auto
==============================================================================
--- james/mpt/trunk/mavenplugin/src/site/site.xml (added)
+++ james/mpt/trunk/mavenplugin/src/site/site.xml Thu Mar 17 20:08:37 2011
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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}">
+  <body>
+    <menu ref="parent" />
+
+    <menu name="Overview">
+      <item name="Introduction" href="index.html"/>
+      <item name="Goals" href="plugin-info.html"/>
+      <item name="Usage" href="usage.html"/>
+      <item name="FAQ" href="faq.html"/>
+      <item name="Release Notes" href="jira-report.html"/>
+    </menu>
+
+    <menu name="Examples">
+      <item name="description1" href="examples/example1.html"/>
+      <item name="description2" href="examples/example2.html"/>
+    </menu>
+
+    <menu ref="reports" />
+  </body>
+</project>

Propchange: james/mpt/trunk/mavenplugin/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/mpt/trunk/mavenplugin/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: james/mpt/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/pom.xml?rev=1082672&r1=1082671&r2=1082672&view=diff
==============================================================================
--- james/mpt/trunk/pom.xml (original)
+++ james/mpt/trunk/pom.xml Thu Mar 17 20:08:37 2011
@@ -18,23 +18,30 @@
   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>
     <artifactId>james-project</artifactId>
     <groupId>org.apache.james</groupId>
-    <version>1.5</version>
+    <version>1.6-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
   <artifactId>apache-james-mpt-project</artifactId>
   <name>Apache JAMES MPT Project</name>
   <version>0.2-SNAPSHOT</version>
   <description>Functional test framework specialised for the ASCII line-base protocols common in mail.</description>
   <url>http://james.apache.org/mpt/</url>
+  <inceptionYear>2008</inceptionYear>  
+  <packaging>pom</packaging>
+
+  <prerequisites>
+    <maven>3.0.2</maven>
+  </prerequisites>
+
   <issueManagement>
+    <system>JIRA</system>
     <url>http://issues.apache.org/jira/browse/MPT</url>
   </issueManagement>
-  <inceptionYear>2008</inceptionYear>  
-  <packaging>pom</packaging>
+
   <modules>
     <module>main</module>
     <module>antlib</module>
@@ -48,9 +55,90 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/mpt/trunk</developerConnection>
     <url>http://svn.apache.org/viewcvs.cgi/james/mpt/trunk?root=Apache-SVN</url>
   </scm>
+
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.0-beta-3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>1.4</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-pmd-plugin</artifactId>
+          <version>2.5</version>
+        </plugin>
+        <plugin>
+          <goals>org.apache.maven.plugins</goals>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.7</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <version>2.7</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-report-plugin</artifactId>
+          <version>2.4.3</version>
+        </plugin> 
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>2.3.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-changes-plugin</artifactId>
+          <version>2.4</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.8</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jxr-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>cobertura-maven-plugin</artifactId>
+          <version>2.4</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <version>0.7</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>2.2.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>taglist-maven-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <optimize>true</optimize>
@@ -70,9 +158,6 @@
             </manifest>
           </archive>
         </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
             <goals>
@@ -82,6 +167,7 @@
         </executions>
       </plugin>
      
+<!-- 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-doap-plugin</artifactId>
@@ -109,10 +195,10 @@
 
         </configuration>
       </plugin>
+      -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>2.0.4</version>
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -122,6 +208,168 @@
           </execution>
         </executions>
       </plugin>
+
+      <!-- Site generation -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <executions>
+          <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>
+          <reportPlugins>
+            <!-- Order matters. First project-info-reports, second jxr. -->
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-project-info-reports-plugin</artifactId>
+              <reports>
+                <report>dependencies</report>
+                <report>dependency-management</report>
+                <report>dependency-convergence</report>
+                <report>distribution-management</report>
+                <report>index</report>
+                <report>license</report>
+                <report>mailing-list</report>
+                <report>modules</report>
+                <report>plugin-management</report>
+                <report>plugins</report>
+                <report>project-team</report>
+                <report>scm</report>
+                <report>summary</report>
+              </reports>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-jxr-plugin</artifactId>
+              <configuration>
+                <aggregate>true</aggregate>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-report-plugin</artifactId>
+              <configuration>
+                <aggregate>true</aggregate>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.rat</groupId>
+              <artifactId>apache-rat-plugin</artifactId>
+              <configuration>
+                <excludes>
+                  <exclude>NOTICE.*</exclude>
+                  <exclude>LICENSE.*</exclude>
+                  <!-- Generated by Maven -->
+                  <exclude>release.properties</exclude>
+                  <exclude>dist/**/*</exclude>
+                  <!-- Eclipse -->
+                  <exclude>**/.*</exclude>
+                  <exclude>.*/**/*</exclude>
+                </excludes>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-pmd-plugin</artifactId>
+              <configuration>
+                <aggregate>true</aggregate>
+                <targetJdk>${target.jdk}</targetJdk>
+                <rulesets>
+                  <ruleset>/rulesets/basic.xml</ruleset>
+                  <ruleset>/rulesets/unusedcode.xml</ruleset>
+                  <ruleset>/rulesets/imports.xml</ruleset>
+                </rulesets>
+                <format>xml</format>
+                <linkXref>true</linkXref>
+                <sourceEncoding>utf-8</sourceEncoding>
+                <minimumTokens>100</minimumTokens>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <configuration>
+                <minmemory>256m</minmemory>
+                <maxmemory>1g</maxmemory>
+                <linksource>true</linksource>
+                <tags>
+                  <tag>
+                    <name>note</name>
+                    <placement>a</placement>
+                    <head>NOTE</head>
+                  </tag>
+                  <tag>
+                    <name>todo</name>
+                    <placement>a</placement>
+                    <head>TODO</head>
+                  </tag>
+                  <tag>
+                    <name>warning</name>
+                    <placement>a</placement>
+                    <head>WARNING</head>
+                  </tag>
+                </tags>
+                <source>1.5</source>
+              </configuration>
+              <reportSets>
+                <reportSet>
+                  <reports>
+                    <report>aggregate</report>
+                    <report>test-aggregate</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+            </plugin>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>emma-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>findbugs-maven-plugin</artifactId>
+              <configuration>
+                <xrefLocation>${project.reporting.outputDirectory}/../xref</xrefLocation>
+                <xrefTestLocation>${project.reporting.outputDirectory}/../xref-test</xrefTestLocation>
+                <!-- required by dashboard plugin and hudson -->
+                <xmlOutput>true</xmlOutput>
+                <effort>Max</effort>
+                <findbugsXmlOutput>true</findbugsXmlOutput>
+                <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
+              </configuration>
+            </plugin>
+            <!--
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-changes-plugin</artifactId>
+              <configuration>
+                <onlyCurrentVersion>true</onlyCurrentVersion>
+                <resolutionIds>Fixed</resolutionIds>
+                <statusIds>Resolved,Closed</statusIds>
+                <columnNames>Type,Key,Summary,Status,Resolution,Fix Version</columnNames>
+              </configuration>
+              <reportSets>
+                <reportSet>
+                  <reports>
+                    <report>jira-report</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+            </plugin>
+            -->
+          </reportPlugins>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
@@ -142,109 +390,15 @@
     </mailingList>
   </mailingLists>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.4.3</version>
-        <inherited>true</inherited>
-      </plugin> 
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <inherited>true</inherited>
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>emma-maven-plugin</artifactId>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jxr-maven-plugin</artifactId>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <inherited>true</inherited>        
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
-        <inherited>true</inherited>
-        <configuration>
-          <excludes>
-            <exclude>NOTICE.txt</exclude>
-            <exclude>LICENSE.txt</exclude>
-            <!-- Generated by Maven -->
-            <exclude>release.properties</exclude>
-            <exclude>dist/**/*</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>taglist-maven-plugin</artifactId>
-        <version>2.2</version>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <inherited>true</inherited>
-        <configuration>
-          <aggregate>true</aggregate>
-          <targetJdk>${target.jdk}</targetJdk>
-          <rulesets>
-            <ruleset>/rulesets/basic.xml</ruleset>
-            <ruleset>/rulesets/controversial.xml</ruleset>
-          </rulesets>
-          <format>xml</format>
-          <linkXref>true</linkXref>
-          <sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
-          <minimumTokens>100</minimumTokens>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-site-plugin</artifactId>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-changes-plugin</artifactId>
-        <configuration>
-            <onlyCurrentVersion>true</onlyCurrentVersion>
-            <resolutionIds>Closed</resolutionIds>
-        </configuration>
-        <reportSets>
-            <reportSet>
-                <reports>
-                    <report>jira-report</report>
-                </reports>
-            </reportSet>
-        </reportSets>
-      </plugin>
-    </plugins>
-  </reporting>
-
   <distributionManagement>
     <site>
       <id>${james.www.id}</id>
       <url>${james.mpt.www}</url>
     </site>
   </distributionManagement>
+
   <dependencyManagement>
     <dependencies>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>apache-james-mpt-antlib</artifactId>
@@ -270,7 +424,6 @@
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
-    
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>apache-james-mpt-main</artifactId>
@@ -338,8 +491,6 @@
    </dependencies>
   </dependencyManagement>
 
-  <profiles>
-  </profiles>
   <properties>
     <!--
     The website is committed to subversion. This property can be overriden

Added: james/mpt/trunk/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/src/reporting-site/site.xml?rev=1082672&view=auto
==============================================================================
--- james/mpt/trunk/src/reporting-site/site.xml (added)
+++ james/mpt/trunk/src/reporting-site/site.xml Thu Mar 17 20:08:37 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-SNAPSHOT</version>
+    </skin>
+    
+    <bannerLeft>
+        <name>JAMES MPT</name>
+        <src>images/logo/james-mpt-logo.gif</src>
+        <href>http://james.apache.org/mpt/index.html</href>
+        <alt>james-mpt-logo.gif</alt>
+    </bannerLeft>
+    
+    <bannerRight>
+        <name>The Apache Software Foundation</name>
+        <src>images/logo/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/mpt/trunk/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/mpt/trunk/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: james/mpt/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/src/site/site.xml?rev=1082672&r1=1082671&r2=1082672&view=diff
==============================================================================
--- james/mpt/trunk/src/site/site.xml (original)
+++ james/mpt/trunk/src/site/site.xml Thu Mar 17 20:08:37 2011
@@ -18,15 +18,22 @@
   under the License.    
 -->
 <project name="JAMES Mail Protocol Tester (MPT)">
+  <skin>
+    <groupId>org.apache.james</groupId>
+    <artifactId>maven-skin</artifactId>
+    <version>1.6-SNAPSHOT</version>
+  </skin>
+
   <bannerLeft>
     <name>JAMES MPT</name>
-    <src>/images/james-mpt-logo.gif</src>
+    <src>images/logo/james-mpt-logo.gif</src>
     <href>http://james.apache.org/mpt/index.html</href>
+    <alt>james-mpt-logo.gif</alt>
   </bannerLeft>
 
   <bannerRight>
     <name>The Apache Software Foundation</name>
-    <src>/images/asf-logo-reduced.gif</src>
+    <src>images/logo/asf-logo-reduced.gif</src>
     <href>http://www.apache.org/index.html</href>
   </bannerRight> 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message