Author: bago
Date: Tue May  8 15:29:57 2007
New Revision: 536357

URL: http://svn.apache.org/viewvc?view=rev&rev=536357
Log:
Changed james m2 skin to use remote resources plugin (to include NOTICE/LICENSE 
in generated jar)
Changed few references to mailet api new place.
Updated parent to remove usage of "resources" link to NOTICE/LICENSE in favor 
of custom remote resource plugins to be added in child projects.
Fixed some typo in newsarchive.
Updated the HOWTO to reflect the remote-resources needs.

Added:
    james/project/trunk/maven-skin/README.txt
Removed:
    james/project/trunk/maven-skin/LICENSE.txt
    james/project/trunk/maven-skin/NOTICE.txt
Modified:
    james/project/trunk/HOWTO.txt
    james/project/trunk/maven-skin/pom.xml
    james/project/trunk/parent/pom.xml
    james/project/trunk/server/2.2.0/src/site/xdoc/mailet_api.xml
    james/project/trunk/server/src/site/xdoc/FAQ.xml
    james/project/trunk/server/src/site/xdoc/design_objectives.xml
    james/project/trunk/server/src/site/xdoc/index.xml
    james/project/trunk/src/site/xdoc/index.xml
    james/project/trunk/src/site/xdoc/mail.xml
    james/project/trunk/src/site/xdoc/newsarchive.xml

Modified: james/project/trunk/HOWTO.txt
URL: 
http://svn.apache.org/viewvc/james/project/trunk/HOWTO.txt?view=diff&rev=536357&r1=536356&r2=536357
==============================================================================
--- james/project/trunk/HOWTO.txt (original)
+++ james/project/trunk/HOWTO.txt Tue May  8 15:29:57 2007
@@ -4,7 +4,7 @@
  2. Enter parent folder and execute 'mvn -Plocal install'. This will generate 
the 
     artifacts and install them without trying to remove them from remote 
repositories
     (by using the "local" profile defined in the pom.xml).
- 3. Enter the maven-skin folder and execute 'mvn -Plocal install'.
+ 3. Enter the maven-skin folder and execute 'mvn install'.
  4. Return to the root and execute 'mvn -Plocal site'. This will generate the 
website for
     each module.
  5. Test the built site in your browser from target/site

Added: james/project/trunk/maven-skin/README.txt
URL: 
http://svn.apache.org/viewvc/james/project/trunk/maven-skin/README.txt?view=auto&rev=536357
==============================================================================
--- james/project/trunk/maven-skin/README.txt (added)
+++ james/project/trunk/maven-skin/README.txt Tue May  8 15:29:57 2007
@@ -0,0 +1,15 @@
+   ============================
+   Apache JAMES Website M2 Skin
+   ============================
+
+This is the maven skin for JAMES products deplyed at http://james.apache.org
+
+This release include the google analytic javascript code at the bottom of every
+generated page and specifically to page starting with "download" it will also 
add
+a javascript to add tracking of "clicks" over the download links.
+
+Links to external website and having extensions in 
"gz","bz2","zip","jar","asc",
+"sar" will automatically be monitored.
+
+If you are using SNAPSHOT versions of this skin, please remember to "mvn 
install"
+the skin before creating websites for JAMES products.
\ No newline at end of file

Modified: james/project/trunk/maven-skin/pom.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/maven-skin/pom.xml?view=diff&rev=536357&r1=536356&r2=536357
==============================================================================
--- james/project/trunk/maven-skin/pom.xml (original)
+++ james/project/trunk/maven-skin/pom.xml Tue May  8 15:29:57 2007
@@ -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/project/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/parent/pom.xml?view=diff&rev=536357&r1=536356&r2=536357
==============================================================================
--- james/project/trunk/parent/pom.xml (original)
+++ james/project/trunk/parent/pom.xml Tue May  8 15:29:57 2007
@@ -28,7 +28,7 @@
   </description>
 
   <prerequisites>
-    <maven>2.0.5</maven>
+    <maven>2.0.6</maven>
   </prerequisites>
 
   <url>http://james.apache.org/</url>
@@ -184,22 +184,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,23 +219,6 @@
     </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>
     <!-- local profile: used to ignore remote repositories in a local build -->
     <profile>
@@ -355,29 +322,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/project/trunk/server/2.2.0/src/site/xdoc/mailet_api.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/server/2.2.0/src/site/xdoc/mailet_api.xml?view=diff&rev=536357&r1=536356&r2=536357
==============================================================================
--- james/project/trunk/server/2.2.0/src/site/xdoc/mailet_api.xml (original)
+++ james/project/trunk/server/2.2.0/src/site/xdoc/mailet_api.xml Tue May  8 
15:29:57 2007
@@ -40,9 +40,6 @@
 or pass the message to an external API or component.  This can include 
delivering a message to its destination 
 repository or SMTP server.</p>
 <p>The Mailet API is currently in its second revision.  Although, the Mailet 
API is expected to undergo substantial changes in the near future, it is our 
aim that existing Mailets that abided purely by the prior Mailet API interfaces 
will continue to run with the revised specification.</p>
-<!--
-<p>The Javadoc for the Mailet API can be found <a 
href="mailet/index.html">here</a>.</p>
--->
 <p>James bundles a number of Matchers and Mailets in its distribution.  
Descriptions of provided matchers 
 can be found <a href="provided_matchers.html">here</a>, while descriptions of 
provided mailets can be found 
 <a href="provided_mailets.html">here</a>.</p>

Modified: james/project/trunk/server/src/site/xdoc/FAQ.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/server/src/site/xdoc/FAQ.xml?view=diff&rev=536357&r1=536356&r2=536357
==============================================================================
--- james/project/trunk/server/src/site/xdoc/FAQ.xml (original)
+++ james/project/trunk/server/src/site/xdoc/FAQ.xml Tue May  8 15:29:57 2007
@@ -122,7 +122,7 @@
     &lt;sqlFile>file://conf/sqlResources.xml&lt;/sqlFile>
 &lt;/repository>
 </source>
-        <p>Database users will also need to ensure that they have <a 
href="2.3.0/using_database.html">configured a data-source</a> named to match 
the destination URL</p>
+        <p>Database users will also need to ensure that they have <a 
href="2.3.1/using_database.html">configured a data-source</a> named to match 
the destination URL</p>
         <p>Using the filesystem:-</p>
         <source>
 &lt;repository name="list-james"
@@ -180,7 +180,7 @@
       </subsection>
       <a name="7"/>
       <subsection name="What about support virtual hosting?">
-        <p>James v2.1+ includes a new mailet for database users, <a 
href="2.3.0/apidocs/org/apache/james/transport/mailets/JDBCVirtualUserTable.html">JDBCVirtualUserTable</a>,
 that mimics some of the sendmail capabilities of the same name.</p>
+        <p>James v2.1+ includes a new mailet for database users, <a 
href="2.3.1/apidocs/org/apache/james/transport/mailets/JDBCVirtualUserTable.html">JDBCVirtualUserTable</a>,
 that mimics some of the sendmail capabilities of the same name.</p>
         <p>JDBCVirtualUserTable does not provide any administation tools.
 You'll have to create and maintain the database table yourself.  The
 standard configuration is as follows:</p>
@@ -225,7 +225,7 @@
         <p>We are largely reliant on what Avalon is doing in terms of 
classloading, but here are a few tips and suggestions:
   <ul>
             <li>Stick jars in the james/lib directory and add them to the 
classpath in run.bat or run.sh.</li>
-            <li>Instructions for including classes for custom mailets and 
matchers can be found <a href="2.3.0/custom_mailet.html">here</a> and <a 
href="2.3.0/custom_matcher.html">here</a> respectively..</li>
+            <li>Instructions for including classes for custom mailets and 
matchers can be found <a href="2.3.1/custom_mailet.html">here</a> and <a 
href="2.3.1/custom_matcher.html">here</a> respectively..</li>
           </ul>
   Eventually we hope to support mailet reloading and a special lib and classes 
directory within the james directory that custom mailets can load from, but for 
now these are hopefully some useful tips.</p>
       </subsection>

Modified: james/project/trunk/server/src/site/xdoc/design_objectives.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/server/src/site/xdoc/design_objectives.xml?view=diff&rev=536357&r1=536356&r2=536357
==============================================================================
--- james/project/trunk/server/src/site/xdoc/design_objectives.xml (original)
+++ james/project/trunk/server/src/site/xdoc/design_objectives.xml Tue May  8 
15:29:57 2007
@@ -57,7 +57,7 @@
        systems. Examples of the services a Mailet might provide include: a
        mail-to-fax or mail-to-phone transformer, a filter, a language 
translator, a mailing
        list manager, etc. Several Mailets are included in the JAMES
-       distribution (see <a href="2.2.0/index.html">documentation</a>).</p>
+       distribution (see <a href="2.3.1/index.html">documentation</a>).</p>
         <p>
           <i>
             <b>Resource abstraction</b>

Modified: james/project/trunk/server/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/server/src/site/xdoc/index.xml?view=diff&rev=536357&r1=536356&r2=536357
==============================================================================
--- james/project/trunk/server/src/site/xdoc/index.xml (original)
+++ james/project/trunk/server/src/site/xdoc/index.xml Tue May  8 15:29:57 2007
@@ -61,7 +61,7 @@
         <tr>
           <td>Mailet Engine</td>
           <td>Stable</td>
-          <td>1.2</td>
+          <td>2.3</td>
           <td>0.95</td>
         </tr>
         <tr>

Modified: james/project/trunk/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/src/site/xdoc/index.xml?view=diff&rev=536357&r1=536356&r2=536357
==============================================================================
--- james/project/trunk/src/site/xdoc/index.xml (original)
+++ james/project/trunk/src/site/xdoc/index.xml Tue May  8 15:29:57 2007
@@ -21,6 +21,7 @@
     <i>Read all the news in full in the <a href="newsarchive.html">News 
Archive</a></i><br/>
     <i>Or click the titles to read the full story</i>
     <subsection name="2007">
+        <!-- <a href="newsarchive.html#05052007"><strong>May/2007 - Mailet API 
sub-project lives</strong></a><br/> -->
         <a href="newsarchive.html#04292007"><strong>Apr/2007 - JAMES Server 
2.3.1 Final Released</strong></a><br/>
         <a href="newsarchive.html#04192007"><strong>Apr/2007 - JAMES Server 
2.3.1 RC1 Released</strong></a><br/>
         <a href="newsarchive.html#04162007"><strong>Apr/2007 - Apache JAMES 
Project Guidelines published</strong></a><br/>

Modified: james/project/trunk/src/site/xdoc/mail.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/src/site/xdoc/mail.xml?view=diff&rev=536357&r1=536356&r2=536357
==============================================================================
--- james/project/trunk/src/site/xdoc/mail.xml (original)
+++ james/project/trunk/src/site/xdoc/mail.xml Tue May  8 15:29:57 2007
@@ -241,7 +241,7 @@
           <a href="mailto:[EMAIL PROTECTED]">Unsubscribe</a>
           <a href="mail.html">Guidelines</a>
         </p>
-        <p> This is the public list for the Mailet API subproject, discussing 
all <a href="http://james.apache.org/server/2.3.0/mailet_api.html";>Mailet 
API</a> design and implementation related topics. Questions about using Mailets 
and their configuration should be addressed to the server-user list.</p>
+        <p> This is the public list for the Mailet API subproject, discussing 
all <a href="http://james.apache.org/mailet/index.html";>Mailet API</a> design 
and implementation related topics. Questions about using Mailets and their 
configuration should be addressed to the server-user list.</p>
       </subsection>
     </section>
   </body>

Modified: james/project/trunk/src/site/xdoc/newsarchive.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/src/site/xdoc/newsarchive.xml?view=diff&rev=536357&r1=536356&r2=536357
==============================================================================
--- james/project/trunk/src/site/xdoc/newsarchive.xml (original)
+++ james/project/trunk/src/site/xdoc/newsarchive.xml Tue May  8 15:29:57 2007
@@ -11,11 +11,15 @@
             <iframe src="http://www.apache.org/ads/bannerbar.html"; 
style="border-width:0;" frameborder="0" scrolling="no" width="250" 
height="150"></iframe>
           </div>
         </div>
-    <subsection name="2007">
-        <a name="004029007"/><h4>Apr/2007 - JAMES Server 2.3.1 Final 
Released</h4>
-        <p>James PMC is proud to announce the <a 
href="download.cgi">availability</a> of the final release of JAMES Server 
2.3.1. This is the bugfix released of 2.3.0. More informations on what's fixed 
since the last releas, can be found in the <a 
href="/server/2.3.1/changelog.html">changelog</a>.</p>
+    <subsection name="2007">
+       <!--
+        <a name="05052007"><h4>May/2007 - Mailet API sub-project lives</h4></a>
+        <p></p>
+        -->
+        <a name="04029007"/><h4>Apr/2007 - JAMES Server 2.3.1 Final 
Released</h4>
+        <p>James PMC is proud to announce the <a 
href="download.cgi">availability</a> of the final release of JAMES Server 
2.3.1. More informations on what has been fixed since the 2.3.0 release can be 
found in the <a href="/server/2.3.1/changelog.html">changelog</a>.</p>
         <a name="04192007"><h4>Apr/2007 - JAMES Server 2.3.1 RC1 
released</h4></a>
-        <p>James PMC is proud to announce the <a 
href="http://www.apache.org/dist/james/server/rc";>availability</a> of the frist 
release canidat of JAMES Server 2.3.1. This release is maintenance release. See 
the <a 
href="http://issues.apache.org/jira/browse/JAMES?report=com.atlassian.jira.plugin.system.project:changelog-panel";>
 changelog </a> for more detail.</p>
+        <p>James PMC is proud to announce the <a 
href="http://www.apache.org/dist/james/server/rc";>availability</a> of the first 
release candidate of JAMES Server 2.3.1. This release is maintenance release. 
See the <a 
href="http://issues.apache.org/jira/browse/JAMES?report=com.atlassian.jira.plugin.system.project:changelog-panel";>
 changelog </a> for more detail.</p>
         <a name="04162007"><h4>Apr/2007 - Apache JAMES Project Guidelines 
published</h4></a>
         <p>The James PMC has approved - for the first time - a set of <a 
href="guidelines.html">guidelines</a> for the project. These guidelines are 
intended to reflect and summarize well-known practices in our community. They 
include "... definitions of how conflict is resolved by voting, who is able to 
vote, and the procedures to follow for proposing and making changes to the 
Apache JAMES products." </p>
         <a name="02092007"><h4>Feb/2007 - jSPF-0.9b4 released</h4></a>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to