You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/01/24 12:19:34 UTC

svn commit: r1726477 - in /webservices/axiom/branches/1.2.x: ./ userguide/src/docbkx/userguide.xml

Author: veithen
Date: Sun Jan 24 11:19:34 2016
New Revision: 1726477

URL: http://svn.apache.org/viewvc?rev=1726477&view=rev
Log:
Merge r1726474 and r1726475 to the 1.2 branch.

Modified:
    webservices/axiom/branches/1.2.x/   (props changed)
    webservices/axiom/branches/1.2.x/userguide/src/docbkx/userguide.xml

Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 24 11:19:34 2016
@@ -12,4 +12,4 @@
 /webservices/axiom/branches/attrs-aspects:1685218-1686663
 /webservices/axiom/branches/namespaceURIInterning:1293148-1293587
 /webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101
+/webservices/axiom/trunk:1726096,1726101,1726474-1726475

Modified: webservices/axiom/branches/1.2.x/userguide/src/docbkx/userguide.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/userguide/src/docbkx/userguide.xml?rev=1726477&r1=1726476&r2=1726477&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/userguide/src/docbkx/userguide.xml (original)
+++ webservices/axiom/branches/1.2.x/userguide/src/docbkx/userguide.xml Sun Jan 24 11:19:34 2016
@@ -837,6 +837,7 @@ try {
     <groupId>org.apache.ws.commons.axiom</groupId>
     <artifactId>axiom-impl</artifactId>
     <version>]]>&version;<![CDATA[</version>
+    <scope>runtime</scope>
 </dependency>]]></programlisting>
                 <para>
                     All Axiom releases are deployed to the Maven central repository and there is no need
@@ -861,14 +862,13 @@ try {
                 </tip>
             </section>
             <section>
-                <title>Managing the JAF and JavaMail dependencies</title>
+                <title>Managing the JAF dependency</title>
                 <para>
-                    Axiom requires the Java Activation Framework (JAF) and the JavaMail API to work. There are two
-                    commonly used incarnations of these libraries: one is Sun's reference implementation, the other
+                    Axiom requires the Java Activation Framework (JAF) to work. There are two
+                    commonly used incarnations of this library: one is Sun's reference implementation, the other
                     is part of the <link xlink:href="http://geronimo.apache.org/">Geronimo</link> project. Axiom declares
-                    dependencies on the Geronimo versions (though that might
-                    <link xlink:href="https://issues.apache.org/jira/browse/AXIOM-319">change</link> in the future).
-                    If your project uses another library that depends on JAF and/or JavaMail, but that refers
+                    a dependency on the Geronimo version.
+                    If your project uses another library that depends on JAF, but that refers
                     to Sun's implementation, your project will end up with dependencies on two different
                     artifacts implementing the same API.
                 </para>
@@ -886,27 +886,16 @@ try {
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>
         </exclusion>
-        <exclusion>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javamail_1.4_spec</artifactId>
-        </exclusion>
     </exclusions>
 </dependency>
 ]]></programlisting>
                 <para>
                     If you prefer Geronimo's implementation, then you need to identify the libraries
-                    depending on Sun's artifacts (<literal>javax.activation:activation</literal> and
-                    <literal>javax.mail:mail</literal>) and add the relevant exclusions. You can use
+                    depending on Sun's artifact (<literal>javax.activation:activation</literal>)
+                    and add the relevant exclusions. You can use
                     <userinput>mvn dependency:tree</userinput> to easily identify where a transitive dependency
                     comes from.
                 </para>
-                <para>
-                    The choice between Sun's and Geronimo's implementation is to a large extend
-                    a question of belief. Note however that the <literal>geronimo-javamail_1.4_spec</literal>
-                    artifact used by Axiom only contains the JavaMail API, while Sun's library
-                    bundles the API together with the providers for IMAP and POP3. Depending on your
-                    use case that might be an advantage or disadvantage.
-                </para>
             </section>
         </section>
         <section>