You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ba...@apache.org on 2008/08/10 12:27:35 UTC

svn commit: r684447 - in /james/jspf/branches/multimodule-proposal: BUILDING.txt STATUS.txt pom.xml resolver/pom.xml resolver/src/site/ resolver/src/site/site.xml src/site/site.xml stage/pom.xml tester/pom.xml tester/src/site/ tester/src/site/site.xml

Author: bago
Date: Sun Aug 10 03:27:32 2008
New Revision: 684447

URL: http://svn.apache.org/viewvc?rev=684447&view=rev
Log:
Updated configuration to use latest parents.
Make sure we have a site.xml in each module (maven-site-plugin 2.0-beta-7 have issues when they are missing, previous versions have more issues with relative paths).
Updated notes according to the changes.

Added:
    james/jspf/branches/multimodule-proposal/resolver/src/site/
    james/jspf/branches/multimodule-proposal/resolver/src/site/site.xml
    james/jspf/branches/multimodule-proposal/tester/src/site/
    james/jspf/branches/multimodule-proposal/tester/src/site/site.xml
Modified:
    james/jspf/branches/multimodule-proposal/BUILDING.txt
    james/jspf/branches/multimodule-proposal/STATUS.txt
    james/jspf/branches/multimodule-proposal/pom.xml
    james/jspf/branches/multimodule-proposal/resolver/pom.xml
    james/jspf/branches/multimodule-proposal/src/site/site.xml
    james/jspf/branches/multimodule-proposal/stage/pom.xml
    james/jspf/branches/multimodule-proposal/tester/pom.xml

Modified: james/jspf/branches/multimodule-proposal/BUILDING.txt
URL: http://svn.apache.org/viewvc/james/jspf/branches/multimodule-proposal/BUILDING.txt?rev=684447&r1=684446&r2=684447&view=diff
==============================================================================
--- james/jspf/branches/multimodule-proposal/BUILDING.txt (original)
+++ james/jspf/branches/multimodule-proposal/BUILDING.txt Sun Aug 10 03:27:32 2008
@@ -14,45 +14,17 @@
    $ mv maven-2.0.9 /usr/local
    $ ln -sf /usr/local/maven-2.0.9/bin/mvn /usr/local/bin/mvn
 
-3) Change directory to jspf source dir
+3) [offline build support] Change directory to jspf/stage dir
+   $ cd jspf-x/stage
+
+4) [offline build support] Locally install preprequisite dependencies
+   $ mvn -Plocal compile
+
+5) Change directory to jspf source dir
    $ cd jspf-x/
    
-4) Run the build (the "-Plocal" restrict maven to use bundled dependencies)
+6) Run the build (the "-Plocal" restrict maven to use bundled dependencies)
    $ mvn -Plocal package
 
-Please note that due to http://jira.codehaus.org/browse/MNG-2896
-if you don't have james-project checked out in ../james-project
-you will have to alter the local stage repository url in the pom.xml
-file to use your absolute path to the project instead of ${basedir}, 
-or, otherwise, manually install the parent poms
-
-#windows:
-mvn -fignorepom.xml install:install-file \ 
-    -Dfile=stage\org.apache.james\poms\james-parent-1.1.pom \ 
-    -Dpackaging=pom \
-    -DgroupId=org.apache.james \
-    -DartifactId=james-parent \
-    -Dversion=1.1
-mvn -fignorepom.xml install:install-file \ 
-    -Dfile=stage\org.apache.james\poms\james-project-1.2.pom \ 
-    -Dpackaging=pom \
-    -DgroupId=org.apache.james \ 
-    -DartifactId=james-project \
-    -Dversion=1.2
-
-#linux:
-mvn -fignorepom.xml install:install-file \ 
-    -Dfile=stage/org.apache.james/poms/james-parent-1.1.pom \ 
-    -Dpackaging=pom \
-    -DgroupId=org.apache.james \ 
-    -DartifactId=james-parent \
-    -Dversion=1.1
-mvn -fignorepom.xml install:install-file \ 
-    -Dfile=stage/org.apache.james/poms/james-project-1.2.pom \ 
-    -Dpackaging=pom \
-    -DgroupId=org.apache.james \ 
-    -DartifactId=james-project \
-    -Dversion=1.2
-
 That's it.  Please contact server-dev@james.apache.org if you have any
-problems.
+problems.
\ No newline at end of file

Modified: james/jspf/branches/multimodule-proposal/STATUS.txt
URL: http://svn.apache.org/viewvc/james/jspf/branches/multimodule-proposal/STATUS.txt?rev=684447&r1=684446&r2=684447&view=diff
==============================================================================
--- james/jspf/branches/multimodule-proposal/STATUS.txt (original)
+++ james/jspf/branches/multimodule-proposal/STATUS.txt Sun Aug 10 03:27:32 2008
@@ -1,5 +1,10 @@
 This is a branch to make jSPF a multimodule project (JSPF-63)
 
+2008/08/10 - ATM Bago, Bernd, Robert and Norman agreed to go ahead without ant and
+offline build support. No one complained yet.
+
+2008/08/04 - Made a "[PROPOSAL] remove ant and m2 offline build hacks from jSPF"
+
 2008/07/30 - Developing is stalled because there are issues with the offline
 build and a discussion "[jSPF] cost of supporting offline builds" is ongoing on
 the mailing list.
\ No newline at end of file

Modified: james/jspf/branches/multimodule-proposal/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/branches/multimodule-proposal/pom.xml?rev=684447&r1=684446&r2=684447&view=diff
==============================================================================
--- james/jspf/branches/multimodule-proposal/pom.xml (original)
+++ james/jspf/branches/multimodule-proposal/pom.xml Sun Aug 10 03:27:32 2008
@@ -24,48 +24,14 @@
   <parent>
     <groupId>org.apache.james</groupId>
     <artifactId>james-project</artifactId>
-    <version>1.2</version>
-    <!-- Please note that due to http://jira.codehaus.org/browse/MNG-2896 -->
-    <!-- If you don't have james-project checked out in ../james-project -->
-    <!-- you will have to place your absolute path to the project instead -->
-    <!-- of ${basedir}, or, otherwise, manually install the parent poms -->
-    <!--
-         #windows:
-         mvn -fignorepom.xml install:install-file 
-            -Dfile=stage\org.apache.james\poms\james-parent-1.1.pom 
-            -Dpackaging=pom 
-            -DgroupId=org.apache.james 
-            -DartifactId=james-parent 
-            -Dversion=1.1
-         mvn -fignorepom.xml install:install-file 
-            -Dfile=stage\org.apache.james\poms\james-project-1.2.pom 
-            -Dpackaging=pom 
-            -DgroupId=org.apache.james 
-            -DartifactId=james-project 
-            -Dversion=1.2
-
-         #linux:
-         mvn -fignorepom.xml install:install-file 
-            -Dfile=stage/org.apache.james/poms/james-parent-1.1.pom 
-            -Dpackaging=pom 
-            -DgroupId=org.apache.james 
-            -DartifactId=james-parent 
-            -Dversion=1.1
-         mvn -fignorepom.xml install:install-file 
-            -Dfile=stage/org.apache.james/poms/james-project-1.2.pom 
-            -Dpackaging=pom 
-            -DgroupId=org.apache.james 
-            -DartifactId=james-project 
-            -Dversion=1.2
-     -->
-    <relativePath>../james-project/project/pom.xml</relativePath>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <name>Apache JAMES jSPF</name>
   <version>0.9.7-SNAPSHOT</version>
   <description>
     Apache James jSPF is an SPF spec implementation written in Java
   </description>
-  <url>http://james.apache.org/jspf</url>
+  <url>http://james.apache.org/jspf/</url>
   <inceptionYear>2006</inceptionYear>
 
   <distributionManagement>
@@ -78,6 +44,9 @@
   <packaging>pom</packaging>
   
   <modules>
+    <!-- The stage module contains dependencies for this product -->
+    <!-- It make sure dependencies needed by other modules are   -->
+    <!-- resolved/installed in the repository                    -->
     <module>stage</module>
     <module>resolver</module>
     <module>tester</module>
@@ -94,6 +63,74 @@
     <url>http://svn.apache.org/viewvc/james/jspf/trunk/</url>
   </scm>
 
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>2.0-beta-7</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.4</version>
+        </plugin>
+	      <plugin>
+	        <artifactId>maven-jxr-plugin</artifactId>
+	        <version>2.1</version>
+	      </plugin>
+	      <plugin>
+	        <artifactId>maven-pmd-plugin</artifactId>
+	        <version>2.4</version>
+	        <configuration>
+	          <targetjdk>1.4</targetjdk>
+	          <rulesets>
+	            <ruleset>/rulesets/basic.xml</ruleset>
+	            <ruleset>/rulesets/controversial.xml</ruleset>
+	          </rulesets>
+	          <format>xml</format>
+	          <linkXref>true</linkXref>
+	          <sourceEncoding>utf-8</sourceEncoding>
+	          <minimumTokens>100</minimumTokens>
+	        </configuration>
+	      </plugin>
+	      <plugin>
+	        <groupId>org.codehaus.mojo</groupId>
+	        <artifactId>rat-maven-plugin</artifactId>
+	        <version>1.0-alpha-3</version>
+	      </plugin>
+	      <plugin>
+	        <artifactId>maven-jar-plugin</artifactId>
+	        <version>2.2</version>
+	      </plugin>
+	      <plugin>
+	        <artifactId>maven-compiler-plugin</artifactId>
+	        <version>2.0.2</version>
+	        <configuration>
+	          <source>1.4</source>
+	          <target>1.4</target>
+	          <encoding>iso8859-1</encoding>
+	        </configuration>
+	      </plugin>      
+	      <plugin>
+	        <artifactId>maven-remote-resources-plugin</artifactId>
+	        <version>1.0</version>
+	      </plugin>
+	      <plugin>
+	        <artifactId>maven-surefire-plugin</artifactId>
+	        <version>2.4.3</version>
+	      </plugin>
+	      <plugin>
+	        <artifactId>maven-surefire-report-plugin</artifactId>
+	        <version>2.4.3</version>
+	      </plugin> 
+	      <plugin>
+	        <artifactId>maven-assembly-plugin</artifactId>
+	        <version>2.2-beta-2</version>
+	      </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+  
 	<dependencyManagement>
 	  <dependencies>
 	    <dependency>
@@ -102,6 +139,12 @@
 	      <version>0.9.7-SNAPSHOT</version>
 	    </dependency>
 	    <dependency>
+	      <groupId>org.apache.james.jspf</groupId>
+	      <artifactId>resolver</artifactId>
+	      <classifier>tests</classifier>
+	      <version>0.9.7-SNAPSHOT</version>
+	    </dependency>
+	    <dependency>
 	      <groupId>dnsjava</groupId>
 	      <artifactId>dnsjava</artifactId>
 	      <version>2.0.6</version>
@@ -155,28 +198,8 @@
     </mailingList>
   </mailingLists>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>2.0-beta-6</version>
-      </plugin>
-    </plugins>
-  </reporting>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
-          <encoding>iso8859-1</encoding>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>
+  <properties>
+    <project.build.sourceEncoding>iso-8859-15</project.build.sourceEncoding>
+  </properties>
+
 </project>

Modified: james/jspf/branches/multimodule-proposal/resolver/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/branches/multimodule-proposal/resolver/pom.xml?rev=684447&r1=684446&r2=684447&view=diff
==============================================================================
--- james/jspf/branches/multimodule-proposal/resolver/pom.xml (original)
+++ james/jspf/branches/multimodule-proposal/resolver/pom.xml Sun Aug 10 03:27:32 2008
@@ -25,8 +25,6 @@
     <groupId>org.apache.james</groupId>
     <artifactId>apache-jspf</artifactId>
     <version>0.9.7-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>
   <name>Apache JAMES jSPF Resolver</name>
@@ -67,36 +65,19 @@
     <plugins>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.3</version>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.3</version>
       </plugin> 
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.3</version>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.1</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.2</version>
-        <configuration>
-          <targetjdk>1.4</targetjdk>
-          <rulesets>
-            <ruleset>/rulesets/basic.xml</ruleset>
-            <ruleset>/rulesets/controversial.xml</ruleset>
-          </rulesets>
-          <format>xml</format>
-          <linkXref>true</linkXref>
-          <sourceEncoding>utf-8</sourceEncoding>
-          <minimumTokens>100</minimumTokens>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -120,7 +101,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>rat-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
         <executions>
           <execution>
             <phase>verify</phase>
@@ -133,7 +113,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.1</version>
         <configuration>
           <archive>
             <manifest>
@@ -151,16 +130,9 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
-          <encoding>iso8859-1</encoding>
-        </configuration>
       </plugin>      
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.3</version>
         <executions>
           <execution>
             <id>create-javadocs</id> <!-- this is used for inheritance merges -->
@@ -174,7 +146,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-1</version>
         <configuration>
           <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
         </configuration>
@@ -191,7 +162,6 @@
       <!-- Add NOTICE and LICENSE to generated JAR -->
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>1.0-alpha-5</version>
         <executions>
           <execution>
             <goals>
@@ -199,7 +169,7 @@
             </goals>
             <configuration>
               <resourceBundles>
-                <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
+                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
               </resourceBundles>
               <properties>
 	              <!--  <preProjectText>PRE PROCESS TEXT</preProjectText>  -->

Added: james/jspf/branches/multimodule-proposal/resolver/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/jspf/branches/multimodule-proposal/resolver/src/site/site.xml?rev=684447&view=auto
==============================================================================
--- james/jspf/branches/multimodule-proposal/resolver/src/site/site.xml (added)
+++ james/jspf/branches/multimodule-proposal/resolver/src/site/site.xml Sun Aug 10 03:27:32 2008
@@ -0,0 +1,27 @@
+<?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="jSPF">
+  <body>
+    <!-- This is a "dummy" site because of this bug:   -->
+    <!-- http://jira.codehaus.org/browse/MSITE-345     -->
+    <menu ref="parent"/>
+    <menu ref="reports"/>
+  </body>
+</project>

Modified: james/jspf/branches/multimodule-proposal/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/jspf/branches/multimodule-proposal/src/site/site.xml?rev=684447&r1=684446&r2=684447&view=diff
==============================================================================
--- james/jspf/branches/multimodule-proposal/src/site/site.xml (original)
+++ james/jspf/branches/multimodule-proposal/src/site/site.xml Sun Aug 10 03:27:32 2008
@@ -26,17 +26,17 @@
 
   <bannerRight>
     <name>The Apache Software Foundation</name>
-    <src>images/asf-logo-reduced.gif</src>
+    <src>http://james.apache.org/jspf/images/asf-logo-reduced.gif</src>
     <href>http://www.apache.org/index.html</href>
   </bannerRight> 
-
+
   <body>
-
-    <menu name="jSPF">
-      <item name="Overview" href="index.html"/>
-      <item name="jSPF FAQ" href="FAQ.html"/>
-      <item name="Mailing Lists" href="mail-lists.html" />
-      <item name="Useful RFCs" href="rfclist.html"/>
+    
+    <menu name="jSPF" inherit="top">
+      <item name="Overview" href="/index.html"/>
+      <item name="jSPF FAQ" href="/FAQ.html"/>
+      <item name="Mailing Lists" href="/mail-lists.html" />
+      <item name="Useful RFCs" href="/rfclist.html"/>
     </menu>
 
     <!-- Not yet there
@@ -48,18 +48,18 @@
     -->
 
     <menu name="Project">
-      <item name="Bug Database" href="issue-tracking.html"/>
-      <item name="Source Code" href="source-repository.html"/>
-      <item name="Who We Are" href="team-list.html" />
+      <item name="Bug Database" href="/issue-tracking.html"/>
+      <item name="Source Code" href="/source-repository.html"/>
+      <item name="Who We Are" href="/team-list.html" />
       <!-- Not yet there
       <item name="Contributing" href="contribute.html"/>
       -->
-      <item name="License" href="license.html"/>
+      <item name="License" href="/license.html"/>
     </menu>
 
     <menu ref="modules" />
 
-    ${reports}
+    <menu ref="reports" />
 
   </body>
 </project>

Modified: james/jspf/branches/multimodule-proposal/stage/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/branches/multimodule-proposal/stage/pom.xml?rev=684447&r1=684446&r2=684447&view=diff
==============================================================================
--- james/jspf/branches/multimodule-proposal/stage/pom.xml (original)
+++ james/jspf/branches/multimodule-proposal/stage/pom.xml Sun Aug 10 03:27:32 2008
@@ -21,22 +21,23 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james.jspf</groupId>
   <artifactId>stage</artifactId>
+  <!-- 
   <parent>
     <groupId>org.apache.james</groupId>
     <artifactId>apache-jspf</artifactId>
     <version>0.9.7-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>
+   -->
   <name>Apache JAMES jSPF Stage Repository</name>
   <description>Local maven repository for Apache JAMES jSPF</description>
   <packaging>pom</packaging>
+  <version>0.9.7-SNAPSHOT</version>
   <repositories>
     <repository>
       <id>module-local</id>
       <name>Local Repository</name>
-      <url>file://${pom.basedir}/</url>
+      <url>file://${basedir}</url>
       <layout>legacy</layout>
       <snapshots>
         <enabled>true</enabled>
@@ -49,30 +50,77 @@
 
   <dependencies>
     <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-parent</artifactId>
+      <version>1.2-SNAPSHOT</version>
+      <type>pom</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-project</artifactId>
+      <version>1.3-SNAPSHOT</version>
+      <type>pom</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-parent</artifactId>
+      <version>1.2-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>site</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-project</artifactId>
+      <version>1.3-SNAPSHOT</version>
+      <type>xml</type>
+      <classifier>site</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.skins</groupId>
+      <artifactId>maven-default-skin</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>maven-skin</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache</groupId>
+      <artifactId>apache-jar-resource-bundle</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
       <groupId>dnsjava</groupId>
       <artifactId>dnsjava</artifactId>
+      <version>2.0.6</version>
     </dependency>
     <dependency>
       <groupId>uk.nominet</groupId>
       <artifactId>dnsjnio</artifactId>
+      <version>0.9.9</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
+      <version>1.2.14</version>
     </dependency>
     <dependency>
       <groupId>org.jvyaml</groupId>
       <artifactId>jvyaml</artifactId>
+      <version>0.2.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
+      <version>1.1</version>
     </dependency>
   </dependencies>
 
@@ -86,10 +134,16 @@
             <!-- 3rd party descriptors distributed via maven repositories
                  and included "as is" -->
             <exclude>commons-cli/poms/commons-cli-1.1.pom</exclude>
+            <exclude>org.apache/poms/apache-resource-bundles-2.pom</exclude>
+            <exclude>org.apache/poms/apache-jar-resource-bundle-1.4.pom</exclude>
+            <exclude>org.apache.maven.skins/poms/maven-skins-2.pom</exclude>
+            <exclude>org.apache.maven.skins/poms/maven-default-skin-1.0.pom</exclude>
             <exclude>org.apache.james/xmls/james-parent-1.1-site.xml</exclude>
             <exclude>org.apache.james/xmls/james-parent-1.1-site_en.xml</exclude>
             <exclude>org.apache.james/xmls/james-project-1.2-site.xml</exclude>
             <exclude>org.apache.james/xmls/james-project-1.2-site_en.xml</exclude>
+            <exclude>org.apache.james/xmls/james-parent-1.2-SNAPSHOT-site.xml</exclude>
+            <exclude>org.apache.james/xmls/james-project-1.3-SNAPSHOT-site.xml</exclude>
             <!-- maven release temporary file -->
             <exclude>release.properties</exclude>
           </excludes>

Modified: james/jspf/branches/multimodule-proposal/tester/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/branches/multimodule-proposal/tester/pom.xml?rev=684447&r1=684446&r2=684447&view=diff
==============================================================================
--- james/jspf/branches/multimodule-proposal/tester/pom.xml (original)
+++ james/jspf/branches/multimodule-proposal/tester/pom.xml Sun Aug 10 03:27:32 2008
@@ -25,14 +25,19 @@
     <groupId>org.apache.james</groupId>
     <artifactId>apache-jspf</artifactId>
     <version>0.9.7-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>
   <name>Apache JAMES OpenSPF Tester</name>
   <description>
     Apache James jSPF OpenSPF Tester tool to test rfc4408 compliance.
   </description>
+  <url>http://james.apache.org/jspf/tester/</url>
+
+  <distributionManagement>
+    <site>
+      <id>jspf-tester-website</id>
+      <url>scp://people.apache.org/www/james.apache.org/jspf/tester/</url>
+    </site>
+  </distributionManagement>
 
   <dependencies>
     <dependency>
@@ -52,37 +57,13 @@
   <reporting>
     <plugins>
       <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.3</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.3</version>
-      </plugin> 
-      <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.3</version>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.1</version>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.2</version>
-        <configuration>
-          <targetjdk>1.4</targetjdk>
-          <rulesets>
-            <ruleset>/rulesets/basic.xml</ruleset>
-            <ruleset>/rulesets/controversial.xml</ruleset>
-          </rulesets>
-          <format>xml</format>
-          <linkXref>true</linkXref>
-          <sourceEncoding>utf-8</sourceEncoding>
-          <minimumTokens>100</minimumTokens>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -105,7 +86,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>rat-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
         <executions>
           <execution>
             <phase>verify</phase>
@@ -116,9 +96,7 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.1</version>
         <configuration>
           <archive>
             <manifest>
@@ -134,18 +112,10 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
-          <encoding>iso8859-1</encoding>
-        </configuration>
       </plugin>      
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.3</version>
         <executions>
           <execution>
             <id>create-javadocs</id> <!-- this is used for inheritance merges -->
@@ -160,7 +130,6 @@
       <!-- Add NOTICE and LICENSE to generated JAR -->
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>1.0-alpha-5</version>
         <executions>
           <execution>
             <goals>
@@ -168,7 +137,7 @@
             </goals>
             <configuration>
               <resourceBundles>
-                <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
+                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
               </resourceBundles>
               <properties>
 	              <!--  <preProjectText>PRE PROCESS TEXT</preProjectText>  -->

Added: james/jspf/branches/multimodule-proposal/tester/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/jspf/branches/multimodule-proposal/tester/src/site/site.xml?rev=684447&view=auto
==============================================================================
--- james/jspf/branches/multimodule-proposal/tester/src/site/site.xml (added)
+++ james/jspf/branches/multimodule-proposal/tester/src/site/site.xml Sun Aug 10 03:27:32 2008
@@ -0,0 +1,27 @@
+<?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="jSPF">
+  <body>
+    <!-- This is a "dummy" site because of this bug:   -->
+    <!-- http://jira.codehaus.org/browse/MSITE-345     -->
+    <menu ref="parent"/>
+    <menu ref="reports"/>
+  </body>
+</project>



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