You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/11/02 23:18:16 UTC

svn commit: r709959 - in /mina/ftpserver/trunk: distribution/pom.xml pom.xml

Author: ngn
Date: Sun Nov  2 14:18:16 2008
New Revision: 709959

URL: http://svn.apache.org/viewvc?rev=709959&view=rev
Log:
Fix so that Javadoc links work between modules (FTPSERVER-203)

Modified:
    mina/ftpserver/trunk/distribution/pom.xml
    mina/ftpserver/trunk/pom.xml

Modified: mina/ftpserver/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/distribution/pom.xml?rev=709959&r1=709958&r2=709959&view=diff
==============================================================================
--- mina/ftpserver/trunk/distribution/pom.xml (original)
+++ mina/ftpserver/trunk/distribution/pom.xml Sun Nov  2 14:18:16 2008
@@ -135,51 +135,25 @@
               </tasks>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-javadocs-docs</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <echo>Copying Javadocs</echo>
+                <mkdir dir="${project.build.directory}/api"></mkdir>
+		<copy todir="${project.build.directory}/api">
+		    <fileset dir="../target/site/apidocs" />
+		</copy>
+              </tasks>
+            </configuration>
+          </execution>
+
         </executions>
       </plugin>
-
-          <plugin>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <version>2.0</version>
-            <executions>
-              <execution>
-                <id>unpack-ftplet-javadoc</id>
-                <phase>process-resources</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>${project.build.directory}/api/ftplet-api</outputDirectory>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>${pom.groupId}</groupId>
-                      <artifactId>ftplet-api</artifactId>
-                      <classifier>javadoc</classifier>
-                      <version>${pom.version}</version>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-              <execution>
-                <id>unpack-core-javadoc</id>
-                <phase>process-resources</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>${project.build.directory}/api/core</outputDirectory>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>${pom.groupId}</groupId>
-                      <artifactId>ftpserver-core</artifactId>
-                      <classifier>javadoc</classifier>
-                      <version>${pom.version}</version>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>

Modified: mina/ftpserver/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/pom.xml?rev=709959&r1=709958&r2=709959&view=diff
==============================================================================
--- mina/ftpserver/trunk/pom.xml (original)
+++ mina/ftpserver/trunk/pom.xml Sun Nov  2 14:18:16 2008
@@ -376,10 +376,24 @@
                   <goal>jar</goal>
                 </goals>
                 <configuration>
-		  <aggregate>true</aggregate>
                   <source>${maven.compile.source}</source>
 		  <excludePackageNames>
-		    *.impl:org.apache.ftpserver.config.spring:org.apache.ftpserver.command.impl.listing:org.apache.ftpserver.listener.nio:org.apache.ftpserver.util
+		    *.impl:org.apache.ftpserver.example.*:org.apache.ftpserver.config.spring:org.apache.ftpserver.command.impl.listing:org.apache.ftpserver.listener.nio:org.apache.ftpserver.util
+		  </excludePackageNames>
+                </configuration>
+              </execution>
+              <execution>
+                <id>create-site-javadoc</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>aggregate</goal>
+                </goals>
+                <configuration>
+		  <doctitle>Apache FtpServer ${project.version} Public API</doctitle>
+		  <windowtitle>Apache FtpServer ${project.version} Public API</windowtitle>
+                  <source>${maven.compile.source}</source>
+		  <excludePackageNames>
+		    *.impl:org.apache.ftpserver.example.*:org.apache.ftpserver.config.spring:org.apache.ftpserver.command.impl.listing:org.apache.ftpserver.listener.nio:org.apache.ftpserver.util
 		  </excludePackageNames>
                 </configuration>
               </execution>