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 bt...@apache.org on 2015/09/22 13:42:59 UTC
svn commit: r1704586 - in /james/server/trunk: Overview.md
src/site/xdoc/dev-build.xml src/site/xdoc/install.xml
src/site/xdoc/quick-start.xml
Author: btellier
Date: Tue Sep 22 11:42:57 2015
New Revision: 1704586
URL: http://svn.apache.org/viewvc?rev=1704586&view=rev
Log:
JAMES-1613 Fix some outdated documentation -- contributed bu Matthieu Baechler
Modified:
james/server/trunk/Overview.md
james/server/trunk/src/site/xdoc/dev-build.xml
james/server/trunk/src/site/xdoc/install.xml
james/server/trunk/src/site/xdoc/quick-start.xml
Modified: james/server/trunk/Overview.md
URL: http://svn.apache.org/viewvc/james/server/trunk/Overview.md?rev=1704586&r1=1704585&r2=1704586&view=diff
==============================================================================
--- james/server/trunk/Overview.md (original)
+++ james/server/trunk/Overview.md Tue Sep 22 11:42:57 2015
@@ -98,8 +98,6 @@ There are multiple ways to start/deploy
* as a web application (WAR) inside an application server (Apache Tomcat, Jetty, GlassFish)
* inside an OSGi container - Apache Karaf (in progress)
-The preferred way is
-
DNS Service
===========
Modified: james/server/trunk/src/site/xdoc/dev-build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/dev-build.xml?rev=1704586&r1=1704585&r2=1704586&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/dev-build.xml (original)
+++ james/server/trunk/src/site/xdoc/dev-build.xml Tue Sep 22 11:42:57 2015
@@ -49,7 +49,7 @@
<li>Get the source code using SVN - this method gives you access to the cutting edge code
base. Instructions on how to use SVN to get the James source code
can be found <a href="http://www.apache.org/dev/version-control.html">here</a>.
- Apache James Server beta1 repository is <a href="http://svn.apache.org/repos/asf/james/server/tags/james-server-3.0-beta4/">http://svn.apache.org/repos/asf/james/server/tags/james-server-3.0-beta4/</a>.</li>
+ Apache James Server beta4 repository is <a href="http://svn.apache.org/repos/asf/james/server/tags/james-server-3.0-beta4/">http://svn.apache.org/repos/asf/james/server/tags/james-server-3.0-beta4/</a>.</li>
<li>For information, you can download all Apache James sources (server, mailbox, imap, mailet...) if you check out <a href="http://svn.apache.org/repos/asf/james/current">http://svn.apache.org/repos/asf/james/current/</a>.
Watch out!: you will get a release, but what we call a "trunk", that is on constant development and debugging.</li>
</ol>
@@ -84,7 +84,7 @@
<li>compile - compiles the source code.</li>
<li>test - run unit tests for James.</li>
<li><b>package - generates all the James distributions, packed.
- From the root directory, cd to 'container-spring/target' to have the build distribution.
+ From the root directory, cd to 'server/container/spring/target' to have the build distribution.
Notice, for the latest trunk(revision 1430655+), a specific profile argument need to be set: '-Pwith-assembly'.
The location of final distributions is also changed to 'JAMES_SRC_HOME/server/app/target'.</b></li>
<li>javadocs:javadocs - builds the James javadocs.</li>
@@ -92,7 +92,7 @@
</ul>
</p>
<p>For example, invoke <code>mvn package</code> to get a zip/tar of James distribution.</p>
- <p>All built products are output in the <code>container-spring/target</code>
+ <p>All built products are output in the <code>server/container/spring/target</code>
subdirectory of the James source directory.
This directory will be deleted if you run build with the clean argument.</p>
<p><strong>Warning!</strong> Any changes you've made in the 'dist' directory
@@ -150,11 +150,11 @@
<p>You still have to prepare the following to be able to run from Eclipse:</p>
<ol>
<li>Copy the <code>context</code> folder, <code>log4j.properties</code>
- and <code>META-INF</code> folder from <code>container-spring\src\main\config\james</code>
- directory to a source folder of <code>container-spring</code> project (you can use for example a
+ and <code>META-INF</code> folder from <code>server/container/spring/src/main/config/james</code>
+ directory to a source folder of <code>james-server-spring</code> project (you can use for example a
new folder called <code>stage</code> as Eclipse source folder).</li>
<li>Copy all files (except context folder log4j.properties and META-INF/persistence.xml)
- from <code>container-spring\src\main\config\james</code> folder to a <code>conf</code> folder
+ from <code>server/container/src/main/config/james</code> folder to a <code>conf</code> folder
(<code>conf</code> folder must be a sub-folder of the JAMES_SRC_HOME directory where you made the check-out).
As non-root privilege user, you may need to change the SMTP/IMAP/POP3 ports to values higher than 1024.</li>
<li>For ease, you can also create 2 new eclipse projects to edit the files and visualize the created mails/store/...:
@@ -171,7 +171,7 @@
<p>If you change a JPA Entity class, your will need to run 'mvn package'
or add the following option to the VM argument of your run configuration
- '-javaagent:my_home_folder/.m2/repository/org/apache/openjpa/openjpa/2.0.1/openjpa-2.0.1.jar'
+ '-javaagent:my_home_folder/.m2/repository/org/apache/openjpa/openjpa/2.2.1/openjpa-2.2.1.jar'
</p>
</subsection>
Modified: james/server/trunk/src/site/xdoc/install.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/install.xml?rev=1704586&r1=1704585&r2=1704586&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/install.xml (original)
+++ james/server/trunk/src/site/xdoc/install.xml Tue Sep 22 11:42:57 2015
@@ -29,8 +29,8 @@
<subsection name="Java Virtual Machine">
- <p>James requires a Java Runtime Environment. Java version 1.5 or higher is required to run the
- James application. The exact JREs available depend on the platform. In addition, the environment variable JAVA_HOME should be set to
+ <p>James requires a Java Runtime Environment. Java version 1.6 or higher is required to run the
+ James application. The exact JREs available depends on the platform. In addition, the environment variable JAVA_HOME should be set to
the JRE home directory before running James.</p>
<p>If you run JDK7, James will not start due to a bug in JAXB. As temporary workaround, you can
Modified: james/server/trunk/src/site/xdoc/quick-start.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/quick-start.xml?rev=1704586&r1=1704585&r2=1704586&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/quick-start.xml (original)
+++ james/server/trunk/src/site/xdoc/quick-start.xml Tue Sep 22 11:42:57 2015
@@ -34,7 +34,7 @@
Step 0: Requirements
####################
- * JRE 1.5+
+ * JRE 1.6+
* root (linux/unix) or Administrator (Windows)
* libc6 (linux)
* 512MB RAM (launches with -Xmx512M - can use less, can need more, depending on load)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org