Author: aduprat
Date: Wed Oct  7 13:14:19 2015
New Revision: 1707294

URL: http://svn.apache.org/viewvc?rev=1707294&view=rev
Log:
JAMES-1621 James server modules merge. Contributed by Matthieu Baechler

Added:
    james/project/trunk/mailbox/
      - copied from r1707291, james/mailbox/trunk/
    james/project/trunk/mailet/
      - copied from r1707291, james/mailet/trunk/
    james/project/trunk/mpt/
      - copied from r1707291, james/mpt/trunk/
    james/project/trunk/protocols/
      - copied from r1707291, james/protocols/trunk/
    james/project/trunk/server/
      - copied from r1707291, james/server/trunk/
Modified:
    james/project/trunk/mailbox/src/site/xdoc/index.xml
    james/project/trunk/mailbox/src/site/xdoc/source-code.xml
    james/project/trunk/mailet/src/site/markdown/quickstart.md
    james/project/trunk/pom.xml
    james/project/trunk/protocols/src/site/xdoc/imap4.xml
    james/project/trunk/protocols/src/site/xdoc/source-code.xml
    james/project/trunk/server/src/site/xdoc/dev-build.xml

Modified: james/project/trunk/mailbox/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/mailbox/src/site/xdoc/index.xml?rev=1707294&r1=1707291&r2=1707294&view=diff
==============================================================================
--- james/project/trunk/mailbox/src/site/xdoc/index.xml (original)
+++ james/project/trunk/mailbox/src/site/xdoc/index.xml Wed Oct  7 13:14:19 2015
@@ -52,7 +52,7 @@
     <p><a href="http://james.apache.org/server/3";>Apache James Server 3</a> 
uses this library to implement its user mailboxes.</p>
     <p>Apache James Mailbox is tested and fully compatible with other Apache 
James libraries
        such as the <a href="http://james.apache.org/imap";>Apache James 
IMAP</a> 
-       (see <a 
href="https://svn.apache.org/repos/asf/james/mailbox-integration-tester/trunk/";>this
 link</a> 
+       (see <a href="https://svn.apache.org/repos/asf/james/trunk/mpt";>this 
link</a> 
        for the Mailbox/IMAP integration tests source code) </p>
   </section>
 

Modified: james/project/trunk/mailbox/src/site/xdoc/source-code.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/mailbox/src/site/xdoc/source-code.xml?rev=1707294&r1=1707291&r2=1707294&view=diff
==============================================================================
--- james/project/trunk/mailbox/src/site/xdoc/source-code.xml (original)
+++ james/project/trunk/mailbox/src/site/xdoc/source-code.xml Wed Oct  7 
13:14:19 2015
@@ -43,12 +43,12 @@
 
     <subsection name="Anonymous Access">
       <p>The source can be checked out anonymously from SVN with the following 
command.</p>
-      <p><code>$ svn checkout 
http://svn.apache.org/repos/asf/james/mailbox/trunk james-mailbox</code></p>
+      <p><code>$ svn checkout 
http://svn.apache.org/repos/asf/james/trunk/mailbox james-mailbox</code></p>
     </subsection>
 
     <subsection name="Developer Access">
       <p>Everyone can access the Subversion repository via HTTP, but 
Committers must checkout the Subversion repository via HTTPS.</p>
-      <p><code>$ svn checkout 
https://svn.apache.org/repos/asf/james/mailbox/trunk james-mailbox</code></p>
+      <p><code>$ svn checkout 
https://svn.apache.org/repos/asf/james/trunk/mailbox james-mailbox</code></p>
     </subsection>
 
   </section>

Modified: james/project/trunk/mailet/src/site/markdown/quickstart.md
URL: 
http://svn.apache.org/viewvc/james/project/trunk/mailet/src/site/markdown/quickstart.md?rev=1707294&r1=1707291&r2=1707294&view=diff
==============================================================================
--- james/project/trunk/mailet/src/site/markdown/quickstart.md (original)
+++ james/project/trunk/mailet/src/site/markdown/quickstart.md Wed Oct  7 
13:14:19 2015
@@ -29,9 +29,9 @@ Just include something like this in your
 ### Write your own mailets
 
 To learn how to write your own mailets please have a look at
-<a 
href="http://svn.apache.org/repos/asf/james/mailet/trunk/base/src/main/java/org/apache/mailet/base/GenericMatcher.java";>Generic
 Matcher</a> and
-<a 
href="http://svn.apache.org/repos/asf/james/mailet/trunk/base/src/main/java/org/apache/mailet/base/GenericMailet.java";>Generic
 Mailet</a>.
+<a 
href="http://svn.apache.org/repos/asf/james/trunk/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java";>Generic
 Matcher</a> and
+<a 
href="http://svn.apache.org/repos/asf/james/trunk/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java";>Generic
 Mailet</a>.
 
 Another good learning source are the unit tests from
-<a 
href="http://svn.apache.org/repos/asf/james/mailet/trunk/standard/src/test/java/org/apache/james/mailet/standard/";>Standard
 Mailets</a>
+<a 
href="http://svn.apache.org/repos/asf/james/trunk/mailet/standard/src/test/java/org/apache/james/mailet/standard/";>Standard
 Mailets</a>
 

Modified: james/project/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/pom.xml?rev=1707294&r1=1707293&r2=1707294&view=diff
==============================================================================
--- james/project/trunk/pom.xml (original)
+++ james/project/trunk/pom.xml Wed Oct  7 13:14:19 2015
@@ -525,6 +525,14 @@
         <deployTechnicalSiteDirectory/>
     </properties>
 
+    <modules>
+        <module>mailbox</module>
+        <module>mailet</module>
+        <module>mpt</module>
+        <module>protocols</module>
+        <module>server</module>
+    </modules>
+    
     <build>
         <extensions>
             <extension>

Modified: james/project/trunk/protocols/src/site/xdoc/imap4.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/protocols/src/site/xdoc/imap4.xml?rev=1707294&r1=1707291&r2=1707294&view=diff
==============================================================================
--- james/project/trunk/protocols/src/site/xdoc/imap4.xml (original)
+++ james/project/trunk/protocols/src/site/xdoc/imap4.xml Wed Oct  7 13:14:19 
2015
@@ -69,7 +69,7 @@
      <ul>
        <li>IMAP4 SORT and THREAD Extensions (RFC 5256 
http://www.ietf.org/rfc/rfc5256.txt)</li>
      </ul>
-     <p>We have <a 
href="http://svn.apache.org/repos/asf/james/mailbox-integration-tester/trunk/";>integration
 tests</a> for IMAP.</p>
+     <p>We have <a 
href="http://svn.apache.org/repos/asf/james/mpt/trunk/";>integration tests</a> 
for IMAP.</p>
      <p>Our implementation is also tested against external tools such as <a 
href="http://www.imapwiki.org/ImapTest";>http://www.imapwiki.org/ImapTest</a>.</p>
   </section>
 

Modified: james/project/trunk/protocols/src/site/xdoc/source-code.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/protocols/src/site/xdoc/source-code.xml?rev=1707294&r1=1707291&r2=1707294&view=diff
==============================================================================
--- james/project/trunk/protocols/src/site/xdoc/source-code.xml (original)
+++ james/project/trunk/protocols/src/site/xdoc/source-code.xml Wed Oct  7 
13:14:19 2015
@@ -28,11 +28,11 @@
   <section name="Get Source Code">
     <subsection name="Anonymous Access">
       <p>The source can be checked out anonymously from SVN with the following 
command.</p>
-      <p><code>$ svn checkout 
http://svn.apache.org/repos/asf/james/protocols/trunk james-protocols</code></p>
+      <p><code>$ svn checkout 
http://svn.apache.org/repos/asf/james/trunk/protocols/ 
james-protocols</code></p>
     </subsection>
     <subsection name="Developer Access">
       <p>Everyone can access the Subversion repository via HTTP, but 
Committers must checkout the Subversion repository via HTTPS.</p>
-      <p><code>$ svn checkout 
https://svn.apache.org/repos/asf/james/protocols/trunk 
james-protocols</code></p>
+      <p><code>$ svn checkout 
https://svn.apache.org/repos/asf/james/trunk/protocols 
james-protocols</code></p>
     </subsection>
   </section>
 
@@ -83,8 +83,8 @@
       <p>ImapRequestMessage and ImapResponder will be passed to the list of 
Processors that 
          will execute doProcess if applicable.</p>
     </subsection>
-    <subsection name="Apache James Integeration Test">
-      <p>A <a 
href="https://svn.apache.org/repos/asf/james/mailbox-integration-tester/trunk/";>specific
 integration project</a> is 
+    <subsection name="Apache James Integration Test">
+      <p>A <a href="https://svn.apache.org/repos/asf/james/mpt/trunk";>specific 
integration project</a> is 
       responsible to test the IMAP protocol in conjunction with the <a 
href="http://james.apache.org/mailbox";>Apache James mailbox</a> components.</p>
     </subsection>
     

Modified: james/project/trunk/server/src/site/xdoc/dev-build.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/server/src/site/xdoc/dev-build.xml?rev=1707294&r1=1707291&r2=1707294&view=diff
==============================================================================
--- james/project/trunk/server/src/site/xdoc/dev-build.xml (original)
+++ james/project/trunk/server/src/site/xdoc/dev-build.xml Wed Oct  7 13:14:19 
2015
@@ -128,12 +128,6 @@
 
       <img src="./images/eclipse/eclipse-import-maven-view-2.gif"/>
 
-      <p>You can also import other projects from
-         <a href="http://james.apache.org/imap/source-code.html";>imap</a>,
-         <a href="http://james.apache.org/mailbox/source-code.html";>mailbox</a>
-         and <a 
href="http://james.apache.org/protocols/source-code.html";>protocols</a> to have 
a
-         more complete view on the used sources code.</p>
-
     </subsection>
 
     <subsection name="Enable Workspace Resolution">



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to