incubator-ftpserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r509751 - in /incubator/ftpserver/trunk: distribution/pom.xml distribution/src/main/assemblies/bin.xml distribution/src/main/assemblies/src.xml pom.xml
Date Tue, 20 Feb 2007 20:58:25 GMT
Author: ngn
Date: Tue Feb 20 12:58:24 2007
New Revision: 509751

URL: http://svn.apache.org/viewvc?view=rev&rev=509751
Log:
Fixing last details of packaging the release distributions
Adding license and notices at the root level

Modified:
    incubator/ftpserver/trunk/distribution/pom.xml
    incubator/ftpserver/trunk/distribution/src/main/assemblies/bin.xml
    incubator/ftpserver/trunk/distribution/src/main/assemblies/src.xml
    incubator/ftpserver/trunk/pom.xml

Modified: incubator/ftpserver/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/distribution/pom.xml?view=diff&rev=509751&r1=509750&r2=509751
==============================================================================
--- incubator/ftpserver/trunk/distribution/pom.xml (original)
+++ incubator/ftpserver/trunk/distribution/pom.xml Tue Feb 20 12:58:24 2007
@@ -37,7 +37,88 @@
 
     <build>
         <plugins>
-            <plugin>
+        <plugin>
+          <artifactId>maven-antrun-plugin</artifactId>
+          
+          	<executions>
+              <execution>
+                <phase>process-resources</phase>
+              	<goals>
+                 <goal>run</goal>
+                </goals>
+              	<configuration>
+                	<tasks>
+                    <echo>Downloading Manual</echo>
+                    <mkdir dir="${project.build.directory}/site"/>
+                    <get src="http://incubator.apache.org/ftpserver/ftpserver.zip" dest="${project.build.directory}/${pom.artifactId}-manual.zip"/>
+                    <unzip src="${project.build.directory}/${pom.artifactId}-manual.zip"
dest="${project.build.directory}/site"/>
+                  </tasks>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>unpack-ftplet-javadoc</id>
+                <phase>package</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>package</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>
+              <execution>
+                <id>unpack-admingui-javadoc</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <outputDirectory>${project.build.directory}/api/ftpserver-admin-gui</outputDirectory>
+                	<artifactItems>
+                  	<artifactItem>
+                      <groupId>${pom.groupId}</groupId>
+                      <artifactId>ftpserver-admin-gui</artifactId>
+                      <classifier>javadoc</classifier>
+                      <version>${pom.version}</version>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        
+            <!--<plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
@@ -62,26 +143,12 @@
                                     </fileset>
                                     <classpath refid="maven.compile.classpath"/>
                                     <doctitle>&lt;h1>Apache FTP Server&lt;/h1></doctitle>
-                                    <!--<link offline="true" href="http://java.sun.com/j2se/1.4.2/docs/api/"></link>-->
                                 </javadoc>
                             </tasks>
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
-            
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>site</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>site</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                </plugin>
+            </plugin>-->
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-gpg-plugin</artifactId>
@@ -95,28 +162,41 @@
                 </execution>
               </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.1</version>
-                <executions>
-                    <execution>
-                        <id>bin</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>assembly</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assemblies/bin-with-dependencies.xml</descriptor>
-                                <descriptor>src/main/assemblies/source-jar.xml</descriptor>
-                            </descriptors>
-                            <finalName>ftpserver-${version}</finalName>
-                            <outputDirectory>target/distro</outputDirectory>
-                            <workDirectory>target/work</workDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+                  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>bin</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assemblies/bin.xml</descriptor>
+              </descriptors>
+              <appendAssemblyId>false</appendAssemblyId>
+              <tarLongFileMode>gnu</tarLongFileMode>
+            </configuration>
+          </execution>
+          <execution>
+            <id>src</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assemblies/src.xml</descriptor>
+              </descriptors>
+              <tarLongFileMode>gnu</tarLongFileMode>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
             
         </plugins>
     </build>

Modified: incubator/ftpserver/trunk/distribution/src/main/assemblies/bin.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/distribution/src/main/assemblies/bin.xml?view=diff&rev=509751&r1=509750&r2=509751
==============================================================================
--- incubator/ftpserver/trunk/distribution/src/main/assemblies/bin.xml (original)
+++ incubator/ftpserver/trunk/distribution/src/main/assemblies/bin.xml Tue Feb 20 12:58:24
2007
@@ -24,7 +24,7 @@
         <format>tar.gz</format>
     </formats>
     <includeBaseDirectory>true</includeBaseDirectory>
-    <includeSiteDirectory>false</includeSiteDirectory>
+    <includeSiteDirectory>true</includeSiteDirectory>
     <fileSets>
         <fileSet>
             <includes>

Modified: incubator/ftpserver/trunk/distribution/src/main/assemblies/src.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/distribution/src/main/assemblies/src.xml?view=diff&rev=509751&r1=509750&r2=509751
==============================================================================
--- incubator/ftpserver/trunk/distribution/src/main/assemblies/src.xml (original)
+++ incubator/ftpserver/trunk/distribution/src/main/assemblies/src.xml Tue Feb 20 12:58:24
2007
@@ -31,6 +31,9 @@
         <include>**/*</include>
       </includes>
       <excludes>
+        <exclude>KEYS</exclude>
+        <exclude>res</exclude>
+        <exclude>res/**/*</exclude>
         <exclude>**/target</exclude>
         <exclude>**/target/**/*</exclude>
         <exclude>**/.settings</exclude>

Modified: incubator/ftpserver/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/pom.xml?view=diff&rev=509751&r1=509750&r2=509751
==============================================================================
--- incubator/ftpserver/trunk/pom.xml (original)
+++ incubator/ftpserver/trunk/pom.xml Tue Feb 20 12:58:24 2007
@@ -227,7 +227,6 @@
     </modules>
     
     <profiles>
-<!-- As long as we are in the Incubator we shouldn't relase anything 
         <profile>
             <id>release</id>
             <distributionManagement>
@@ -280,7 +279,6 @@
                 </plugins>
             </build>
         </profile>
-    -->
         <profile>
             <id>rc</id>
             <distributionManagement>
@@ -290,6 +288,13 @@
                     <url>scp://people.apache.org/www/people.apache.org/repo/m2-incubating-repository/</url>
                 </repository>
             </distributionManagement>
+            
+            <modules>
+              <module>ftplet-api</module>
+              <module>core</module>
+              <module>admin-gui</module>
+              <module>distribution</module>
+            </modules>
             
             <!-- Used for snapshot RAT Maven plugin -->
             <repositories>



Mime
View raw message