You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/04/25 20:31:14 UTC

svn commit: r1792650 - in /axis/axis2/java/core/trunk: apidocs/pom.xml modules/transport/testkit/pom.xml

Author: veithen
Date: Tue Apr 25 20:31:14 2017
New Revision: 1792650

URL: http://svn.apache.org/viewvc?rev=1792650&view=rev
Log:
Remove the extra Javadoc for the transport testkit and instead use the custom doclet on the overall Javadoc.

Modified:
    axis/axis2/java/core/trunk/apidocs/pom.xml
    axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml

Modified: axis/axis2/java/core/trunk/apidocs/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/apidocs/pom.xml?rev=1792650&r1=1792649&r2=1792650&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/apidocs/pom.xml (original)
+++ axis/axis2/java/core/trunk/apidocs/pom.xml Tue Apr 25 20:31:14 2017
@@ -273,12 +273,44 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>extract-resource-info</id>
+                        <phase>pre-site</phase>
+                        <goals>
+                            <goal>javadoc</goal>
+                        </goals>
+                        <configuration>
+                            <docletArtifacts>
+                                <docletArtifact>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>axis2-transport-testkit</artifactId>
+                                    <version>${project.version}</version>
+                                </docletArtifact>
+                            </docletArtifacts>
+                            <doclet>org.apache.axis2.transport.testkit.doclet.ResourceInfoDoclet</doclet>
+                            <useStandardDocletOptions>false</useStandardDocletOptions>
+                            <show>private</show>
+                            <additionalparam>-out ${project.build.directory}/resource-info.dat</additionalparam>
+                        </configuration>
+                    </execution>
+                    <execution>
                         <id>site-javadoc</id>
                         <phase>site</phase>
                         <goals>
                             <goal>javadoc-no-fork</goal>
                         </goals>
                         <configuration>
+                            <docletArtifacts>
+                                <docletArtifact>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>axis2-transport-testkit</artifactId>
+                                    <version>${project.version}</version>
+                                </docletArtifact>
+                            </docletArtifacts>
+                            <doclet>org.apache.axis2.transport.testkit.doclet.TestkitJavadocDoclet</doclet>
+                            <useStandardDocletOptions>true</useStandardDocletOptions>
+                            <additionalparam>
+                                -resource-info ${project.build.directory}/resource-info.dat
+                            </additionalparam>
                             <reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
                             <destDir>.</destDir>
                         </configuration>

Modified: axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml?rev=1792650&r1=1792649&r2=1792650&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml Tue Apr 25 20:31:14 2017
@@ -190,58 +190,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>extract-resource-info</id>
-                        <phase>pre-site</phase>
-                        <goals>
-                            <goal>javadoc</goal>
-                        </goals>
-                        <configuration>
-                            <docletArtifacts>
-                                <docletArtifact>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}</artifactId>
-                                    <version>${project.version}</version>
-                                </docletArtifact>
-                            </docletArtifacts>
-                            <doclet>org.apache.axis2.transport.testkit.doclet.ResourceInfoDoclet</doclet>
-                            <useStandardDocletOptions>false</useStandardDocletOptions>
-                            <show>private</show>
-                            <additionalparam>-out ${project.build.directory}/resource-info.dat</additionalparam>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>generate-javadoc</id>
-                        <phase>site</phase>
-                        <goals>
-                            <goal>javadoc</goal>
-                        </goals>
-                        <configuration>
-                            <docletArtifacts>
-                                <docletArtifact>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}</artifactId>
-                                    <version>${project.version}</version>
-                                </docletArtifact>
-                            </docletArtifacts>
-                            <doclet>org.apache.axis2.transport.testkit.doclet.TestkitJavadocDoclet</doclet>
-                            <useStandardDocletOptions>true</useStandardDocletOptions>
-                            <additionalparam>
-                                -resource-info ${project.build.directory}/resource-info.dat
-                                -link http://java.sun.com/j2se/1.5.0/docs/api/
-                                -link http://java.sun.com/j2ee/1.4/docs/api/
-                                -link http://ws.apache.org/axis2/1_4_1/api/
-                                -link http://ws.apache.org/commons/axiom/apidocs/
-                                -link http://junit.org/junit/javadoc/3.8.1/
-                                -link http://www.eclipse.org/aspectj/doc/released/runtime-api/
-                            </additionalparam>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>