james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r537045 - in /james/jspf/trunk: ./ src/assemble/ src/main/appended-resources/ stage/org.apache.james/jars/ stage/org.apache.james/poms/ stage/org.apache.james/xmls/
Date Fri, 11 May 2007 00:03:33 GMT
Author: bago
Date: Thu May 10 17:03:31 2007
New Revision: 537045

URL: http://svn.apache.org/viewvc?view=rev&rev=537045
Log:
Changed the package goal to create:
1) the main jar
2) the javadoc jar
3) the sources jar
4) the src package including the full tree
5) the bin package including the main jar, the runtime dependencies jars, the javadocs.
Updated staged dependencies.
Make use of the remote resources plugin to bundle a LICENSE/NOTICE in generated artifacts.

Added:
    james/jspf/trunk/src/assemble/
    james/jspf/trunk/src/assemble/bin.xml
    james/jspf/trunk/src/assemble/source.xml
    james/jspf/trunk/src/assemble/src.xml
    james/jspf/trunk/src/main/appended-resources/
    james/jspf/trunk/src/main/appended-resources/supplemental-models.xml
Modified:
    james/jspf/trunk/pom.xml
    james/jspf/trunk/stage/org.apache.james/jars/maven-skin-1.1-SNAPSHOT.jar
    james/jspf/trunk/stage/org.apache.james/poms/james-parent-1.1-SNAPSHOT.pom
    james/jspf/trunk/stage/org.apache.james/poms/james-project-1.1-SNAPSHOT.pom
    james/jspf/trunk/stage/org.apache.james/poms/maven-skin-1.1-SNAPSHOT.pom
    james/jspf/trunk/stage/org.apache.james/xmls/james-project-1.1-SNAPSHOT-site.xml

Modified: james/jspf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/pom.xml?view=diff&rev=537045&r1=537044&r2=537045
==============================================================================
--- james/jspf/trunk/pom.xml (original)
+++ james/jspf/trunk/pom.xml Thu May 10 17:03:31 2007
@@ -27,10 +27,10 @@
     <version>1.1-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>../james-project/pom.xml</relativePath>
+    <relativePath>../james-project/project/pom.xml</relativePath>
   </parent>
   <name>Apache JAMES jSPF</name>
-  <version>0.9b4</version>
+  <version>0.9.5-SNAPSHOT</version>
   <description>
     Apache James jSPF is an SPF spec implementation written in Java
   </description>
@@ -91,17 +91,6 @@
     </dependency>
   </dependencies>
 
-  <contributors>
-    <contributor>
-      <name>Roger Fullerton</name>
-      <properties>
-        <description>
-          Wrote spfjava, the first spf implementation in java
-        </description>
-      </properties>
-    </contributor>
-  </contributors>
-
   <issueManagement>
     <system>JIRA</system>
     <url>http://issues.apache.org/jira/browse/JSPF</url>
@@ -113,20 +102,6 @@
     <url>http://svn.apache.org/viewvc/james/jspf/trunk/</url>
   </scm>
 
-  <pluginRepositories>
-    <pluginRepository>
-      <releases>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>maven-central</id>
-      <name>maven-central</name>
-      <url>http://repo1.maven.org/maven2</url>
-    </pluginRepository>
-  </pluginRepositories>
-  
   <repositories>
     <repository>
       <id>local-jspf-stage-repository</id>
@@ -217,37 +192,6 @@
   </reporting>
   <build>
     <plugins>
-      <!--
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>clean</phase>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-clover-plugin</artifactId>
-        <configuration>
-          <generateHtml>true</generateHtml>
-          <generatePdf>false</generatePdf>
-          <generateXml>false</generateXml>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>site</phase>
-            <goals>
-              <goal>instrument</goal>
-              <goal>clover</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -266,13 +210,78 @@
         </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-jar-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <mode>development</mode>
+              <url>${pom.url}</url>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.2</version>
+        <executions>
+          <execution>
+            <id>create-javadocs</id> <!-- this is used for inheritance merges
-->
+            <phase>package</phase> <!-- append to the packaging phase. -->
+            <goals>
+              <goal>javadoc</goal> <!-- goals == mojos -->
+              <goal>jar</goal> <!-- goals == mojos -->
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-1</version>
         <configuration>
-          <descriptorRefs>
-            <descriptorRef>bin</descriptorRef>
-            <descriptorRef>src</descriptorRef>
-          </descriptorRefs>
+          <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
         </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id> <!-- this is used for inheritance merges
-->
+            <phase>package</phase> <!-- append to the packaging phase. -->
+            <goals>
+              <goal>attached</goal> <!-- goals == mojos -->
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- Add NOTICE and LICENSE to generated JAR -->
+      <plugin>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <version>1.0-alpha-5</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
+              </resourceBundles>
+              <properties>
+	              <!--  <preProjectText>PRE PROCESS TEXT</preProjectText>  -->
+	              <postProjectText>This file is automatically generated by dependencies
declared in pom.xml</postProjectText>
+	              <addLicense>true</addLicense>
+              </properties>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>

Added: james/jspf/trunk/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/assemble/bin.xml?view=auto&rev=537045
==============================================================================
--- james/jspf/trunk/src/assemble/bin.xml (added)
+++ james/jspf/trunk/src/assemble/bin.xml Thu May 10 17:03:31 2007
@@ -0,0 +1,57 @@
+<assembly>
+  <!--
+  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.
+  -->
+  <id>bin</id>
+  <!-- 
+  Generates a jar file including the binary jar and the runtime dependencies.
+  including NOTICE and LICENSE in the root.
+  -->
+  <formats>
+    <format>zip</format>
+    <format>tar.gz</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>target/maven-shared-archive-resources/META-INF/</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>NOTICE</include>
+        <include>LICENSE</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>${artifactId}-${version}.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/site/apidocs</directory>
+      <outputDirectory>javadocs</outputDirectory>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/lib/</outputDirectory>
+      <!-- <outputFileNameMapping></outputFileNameMapping> -->
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>
\ No newline at end of file

Added: james/jspf/trunk/src/assemble/source.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/assemble/source.xml?view=auto&rev=537045
==============================================================================
--- james/jspf/trunk/src/assemble/source.xml (added)
+++ james/jspf/trunk/src/assemble/source.xml Thu May 10 17:03:31 2007
@@ -0,0 +1,41 @@
+<assembly>
+  <!--
+  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.
+  -->
+  <id>source</id>
+  <!-- 
+  Generates a jar file including all sources (original and generated) and
+  including NOTICE and LICENSE from the remote-resources plugin.
+  -->
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>./src/main/java/</directory>
+      <useDefaultExcludes>true</useDefaultExcludes>
+      <outputDirectory></outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/maven-shared-archive-resources/</directory>
+      <outputDirectory></outputDirectory>
+      <useDefaultExcludes>true</useDefaultExcludes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file

Added: james/jspf/trunk/src/assemble/src.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/assemble/src.xml?view=auto&rev=537045
==============================================================================
--- james/jspf/trunk/src/assemble/src.xml (added)
+++ james/jspf/trunk/src/assemble/src.xml Thu May 10 17:03:31 2007
@@ -0,0 +1,52 @@
+<assembly>
+  <!--
+  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.
+  -->
+  <id>src</id>
+  <!-- 
+  Generates a file including all the source tree excluding files/folders
+  starting with "." , *.bak and the target
+  -->
+  <formats>
+    <format>zip</format>
+    <format>tar.gz</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>.</directory>
+      <outputDirectory></outputDirectory>
+      <excludes>
+        <exclude>**/target/**</exclude>
+        <exclude>.*</exclude>
+        <exclude>.*/**</exclude>
+        <exclude>**.bak</exclude>
+        <exclude>NOTICE</exclude>
+        <exclude>LICENSE</exclude>
+      </excludes>
+      <useDefaultExcludes>true</useDefaultExcludes>
+    </fileSet>
+    <fileSet>
+      <directory>target/maven-shared-archive-resources/META-INF/</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>NOTICE</include>
+        <include>LICENSE</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file

Added: james/jspf/trunk/src/main/appended-resources/supplemental-models.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/appended-resources/supplemental-models.xml?view=auto&rev=537045
==============================================================================
--- james/jspf/trunk/src/main/appended-resources/supplemental-models.xml (added)
+++ james/jspf/trunk/src/main/appended-resources/supplemental-models.xml Thu May 10 17:03:31
2007
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<supplementalDataModels>
+  <!--
+  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.
+  -->
+  <supplement>
+    <project>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <name>Apache Commons CLI</name>
+      <url>http://jakarta.apache.org/commons/cli/</url>
+      <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>Apache License, Version 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+          <distribution>repo</distribution>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <name>Apache Log4j</name>
+      <url>http://logging.apache.org/log4j/</url>
+      <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>Apache License, Version 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+          <distribution>repo</distribution>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <name>JUnit</name>
+      <url>http://www.junit.org/</url>
+      <organization>
+      	<name>Kent Beck, Erich Gamma, and David Saff</name>
+      </organization>
+      <licenses>
+        <license>
+          <name>Common Public License Version 1.0</name>
+          <url>http://www.opensource.org/licenses/cpl.php</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>dnsjava</groupId>
+      <artifactId>dnsjava</artifactId>
+      <name>DNSJava</name>
+      <url>http://www.dnsjava.org/</url>
+      <organization>
+      	<name>Brian Wellington</name>
+      </organization>
+      <licenses>
+        <license>
+          <name>3 Clauses BSD license</name>
+          <url>http://www.dnsjava.org/dnsjava-current/README</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>uk.nominet</groupId>
+      <artifactId>dnsjnio</artifactId>
+      <name>DNSJnio</name>
+      <url>http://sourceforge.net/projects/dnsjnio/</url>
+      <organization>
+      	<name>Alex D. and Nominet UK</name>
+      </organization>
+      <licenses>
+        <license>
+          <name>Mozilla Public License 1.1 (MPL 1.1)</name>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>org.jvyaml</groupId>
+      <artifactId>jvyaml</artifactId>
+      <name>JvYAML</name>
+      <url>https://jvyaml.dev.java.net/</url>
+      <organization>
+      	<name>Ola Bini</name>
+      </organization>
+      <licenses>
+        <license>
+          <name>The MIT License</name>
+          <url>http://www.opensource.org/licenses/mit-license.php</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+</supplementalDataModels>
\ No newline at end of file

Modified: james/jspf/trunk/stage/org.apache.james/jars/maven-skin-1.1-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/jspf/trunk/stage/org.apache.james/jars/maven-skin-1.1-SNAPSHOT.jar?view=diff&rev=537045&r1=537044&r2=537045
==============================================================================
Binary files - no diff available.

Modified: james/jspf/trunk/stage/org.apache.james/poms/james-parent-1.1-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/jspf/trunk/stage/org.apache.james/poms/james-parent-1.1-SNAPSHOT.pom?view=diff&rev=537045&r1=537044&r2=537045
==============================================================================
--- james/jspf/trunk/stage/org.apache.james/poms/james-parent-1.1-SNAPSHOT.pom (original)
+++ james/jspf/trunk/stage/org.apache.james/poms/james-parent-1.1-SNAPSHOT.pom Thu May 10
17:03:31 2007
@@ -28,8 +28,13 @@
   </description>
 
   <prerequisites>
-    <maven>2.0.5</maven>
+    <maven>2.0.6</maven>
   </prerequisites>
+  
+  <modules>
+    <module>maven-skin</module>
+    <module>project</module>
+  </modules>
 
   <url>http://james.apache.org/</url>
   <inceptionYear>2006</inceptionYear>
@@ -158,12 +163,47 @@
         <role>Developer</role>
       </roles>
     </developer>
+    <developer>
+      <id>niklas</id>
+      <name>Niklas Therning</name>
+      <email>niklas(at)apache(dot)org</email>
+      <organization>Trillian AB</organization>
+    </developer>
+    <developer>
+      <id>jcheng</id>
+      <name>Joe Cheng</name>
+      <email>joe(at)joecheng(dot)com</email>
+      <properties>
+        <description>
+          Former author to the mime4j product
+        </description>
+      </properties>
+    </developer>
   </developers>
 
+  <contributors>
+    <contributor>
+      <name>Rob Oxspring</name>
+      <properties>
+        <description>
+          Contributed to the mime4j product
+        </description>
+      </properties>
+    </contributor>
+    <contributor>
+      <name>Roger Fullerton</name>
+      <properties>
+        <description>
+          Wrote spfjava, the first spf implementation in java
+        </description>
+      </properties>
+    </contributor>
+  </contributors>
+
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/james/project/trunk/parent</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/project/trunk/parent</developerConnection>
-    <url>http://svn.apache.org/viewvc/james/project/trunk/parent</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/james/project/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/project/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/james/project/trunk</url>
   </scm>
 
   <distributionManagement>
@@ -184,22 +224,6 @@
     </site>
   </distributionManagement>
 
-	<!--
-  <pluginRepositories>
-    <pluginRepository>
-      <releases>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>maven-central</id>
-      <name>maven-central</name>
-      <url>http://repo1.maven.org/maven2</url>
-    </pluginRepository>
-  </pluginRepositories>
-   -->
-  
   <repositories>
     <repository>
       <id>central</id>
@@ -235,24 +259,27 @@
     </repository>
   </repositories>
   
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-      <!-- also include license and notice files in all the jars -->
-      <resource>
-        <directory>${basedir}</directory>
-        <includes>
-          <include>NOTICE.txt</include>
-          <include>LICENSE.txt</include>
-        </includes>
-        <targetPath>META-INF</targetPath>
-      </resource>
-    </resources>
-  </build>
-
   <profiles>
+    <!-- parent profile: used to find skin dependency in stage -->
+    <profile>
+      <id>parent</id>
+      <repositories>
+        <repository>
+          <id>local-james-parent-stage</id>
+          <name>Apache JAMES parent stage repository folder</name>
+          <url>file://${basedir}/stage</url>
+          <layout>legacy</layout>
+          <releases>
+            <enabled>true</enabled>
+            <checksumPolicy>ignore</checksumPolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <checksumPolicy>ignore</checksumPolicy>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
     <!-- local profile: used to ignore remote repositories in a local build -->
     <profile>
       <id>local</id>
@@ -355,29 +382,4 @@
     <!-- END SNIPPET: release-profile -->
   </profiles>  
 
-  <!-- Attempt to use velocity-news plugin (not yet working)
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.velocity.site</groupId>
-        <artifactId>velocity-site-news-plugin</artifactId>
-        <configuration>
-          <baseUrl>http://james.apache.org</baseUrl>
-          <newsfile>news.xml</newsfile>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-  
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.velocity.site</groupId>
-        <artifactId>velocity-site-news-extension</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
-      </extension>
-    </extensions>
-  </build>
-  -->
-  
 </project>

Modified: james/jspf/trunk/stage/org.apache.james/poms/james-project-1.1-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/jspf/trunk/stage/org.apache.james/poms/james-project-1.1-SNAPSHOT.pom?view=diff&rev=537045&r1=537044&r2=537045
==============================================================================
--- james/jspf/trunk/stage/org.apache.james/poms/james-project-1.1-SNAPSHOT.pom (original)
+++ james/jspf/trunk/stage/org.apache.james/poms/james-project-1.1-SNAPSHOT.pom Thu May 10
17:03:31 2007
@@ -31,7 +31,7 @@
     <groupId>org.apache.james</groupId>
     <artifactId>james-parent</artifactId>
     <version>1.1-SNAPSHOT</version>
-    <relativePath>parent/pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modules>
@@ -51,9 +51,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/james/project/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/project/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/james/project/trunk</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/james/project/trunk/project</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/project/trunk/project</developerConnection>
+    <url>http://svn.apache.org/viewvc/james/project/trunk/project</url>
   </scm>
 
   <distributionManagement>

Modified: james/jspf/trunk/stage/org.apache.james/poms/maven-skin-1.1-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/jspf/trunk/stage/org.apache.james/poms/maven-skin-1.1-SNAPSHOT.pom?view=diff&rev=537045&r1=537044&r2=537045
==============================================================================
--- james/jspf/trunk/stage/org.apache.james/poms/maven-skin-1.1-SNAPSHOT.pom (original)
+++ james/jspf/trunk/stage/org.apache.james/poms/maven-skin-1.1-SNAPSHOT.pom Thu May 10 17:03:31
2007
@@ -30,7 +30,7 @@
     <groupId>org.apache.james</groupId>
     <artifactId>james-parent</artifactId>
     <version>1.1-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
 
@@ -41,11 +41,35 @@
     </site>
   </distributionManagement>
 
+  <!-- This is here because of http://jira.codehaus.org/browse/MRRESOURCES-6 -->
+  <properties>
+    <maven.test.skip>true</maven.test.skip>
+  </properties>
 
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/james/project/trunk/maven-skin</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/project/trunk/maven-skin</developerConnection>
     <url>http://svn.apache.org/viewvc/james/project/trunk/maven-skin</url>
   </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>

Modified: james/jspf/trunk/stage/org.apache.james/xmls/james-project-1.1-SNAPSHOT-site.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/stage/org.apache.james/xmls/james-project-1.1-SNAPSHOT-site.xml?view=diff&rev=537045&r1=537044&r2=537045
==============================================================================
--- james/jspf/trunk/stage/org.apache.james/xmls/james-project-1.1-SNAPSHOT-site.xml (original)
+++ james/jspf/trunk/stage/org.apache.james/xmls/james-project-1.1-SNAPSHOT-site.xml Thu May
10 17:03:31 2007
@@ -18,6 +18,7 @@
     <links>
       <item name="JAMES Project" href="/index.html" />
       <item name="Server" href="/server/index.html" />
+      <item name="Mailet API" href="/mailet/index.html" />
       <item name="jSPF" href="/jspf/index.html" />
       <item name="Mime4J" href="/mime4j/index.html" />
       <item name="JSieve" href="/jsieve/index.html" />
@@ -25,6 +26,7 @@
     </links>
     <menu name="Sub Projects">
       <item name="Server" href="/server/index.html" />
+      <item name="Mailet API" href="/mailet/index.html" />
       <item name="jSPF" href="/jspf/index.html" />
       <item name="Mime4J" href="/mime4j/index.html" />
       <item name="JSieve" href="/jsieve/index.html" />



---------------------------------------------------------------------
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