Hi,
I tried to describe all steps needed to merge the james modules as
proposed previously.
Compared with previous proposition, I just changed the "james" folder
into the "server" folder for more consistency.
We should get the following tree into james-project module :
james-project
|---- server
|---- mailbox
|---- mailet
|---- mpt
|---- protocols
If you agree, we should do :
in https://svn.apache.org/repos/asf/james/project/trunk :
svn mv http://svn.apache.org/repos/asf/james/server server
svn mv http://svn.apache.org/repos/asf/james/mailbox mailbox
svn mv http://svn.apache.org/repos/asf/james/mailet mailet
svn mv http://svn.apache.org/repos/asf/james/mpt mpt
svn mv http://svn.apache.org/repos/asf/james/protocols protocols
I chose "svn mv" to prevent confusion about where are modules actual
trunk located.
Then we have to update http://svn.apache.org/repos/asf/james/current
accordingly with the following command :
svn propset svn:externals http://svn.apache.org/repos/asf/james/current
hupa https://svn.apache.org/repos/asf/james/hupa/trunk
jdkim https://svn.apache.org/repos/asf/james/jdkim/trunk
jspf https://svn.apache.org/repos/asf/james/jspf/trunk
mime4j https://svn.apache.org/repos/asf/james/mime4j/trunk
postage https://svn.apache.org/repos/asf/james/postage/trunk
jsieve https://svn.apache.org/repos/asf/james/jsieve/trunk
project https://svn.apache.org/repos/asf/james/project/trunk
skin https://svn.apache.org/repos/asf/james/skin/trunk
Then, to update the documentation and the "project" pom, you have to
apply the attached patches and finally commit all this.
Please review this process then I'll ask a commiter to kindly apply it
if people agree.
I can put everything in a JIRA if needed.
Cheers,
--
Matthieu Baechler
Index: mailet/src/site/markdown/quickstart.md
===================================================================
--- mailet/src/site/markdown/quickstart.md (révision 1701740)
+++ mailet/src/site/markdown/quickstart.md (copie de travail)
@@ -29,9 +29,9 @@
### 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>
diff --git a/mailbox/src/site/xdoc/index.xml b/mailbox/src/site/xdoc/index.xml
index 89337af..1be4664 100644
--- a/mailbox/src/site/xdoc/index.xml
+++ b/mailbox/src/site/xdoc/index.xml
@@ -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>
diff --git a/mailbox/src/site/xdoc/source-code.xml b/mailbox/src/site/xdoc/source-code.xml
index 459670e..51cdd97 100644
--- a/mailbox/src/site/xdoc/source-code.xml
+++ b/mailbox/src/site/xdoc/source-code.xml
@@ -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>
diff --git a/src/site/xdoc/dev-build.xml b/server/src/site/xdoc/dev-build.xml
index e2b068a..3b5966b 100644
--- a/server/src/site/xdoc/dev-build.xml
+++ b/server/src/site/xdoc/dev-build.xml
@@ -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">
diff --git a/protocols/src/site/xdoc/imap4.xml b/protocols/src/site/xdoc/imap4.xml
index 8855022..a989e69 100644
--- a/protocols/src/site/xdoc/imap4.xml
+++ b/protocols/src/site/xdoc/imap4.xml
@@ -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>
diff --git a/protocols/src/site/xdoc/source-code.xml b/protocols/src/site/xdoc/source-code.xml
index afd4e15..6560d72 100644
--- a/protocols/src/site/xdoc/source-code.xml
+++ b/protocols/src/site/xdoc/source-code.xml
@@ -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>
Index: pom.xml
===================================================================
--- pom.xml (révision 1701740)
+++ pom.xml (copie de travail)
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
