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/07/29 19:16:52 UTC
svn commit: r680779 - in /mina/ftpserver/trunk: NOTICE.txt
distribution/LICENSE.txt distribution/NOTICE.txt distribution/README.txt
distribution/pom.xml distribution/release notes.txt
distribution/src/main/assemblies/bin.xml pom.xml
Author: ngn
Date: Tue Jul 29 10:16:51 2008
New Revision: 680779
URL: http://svn.apache.org/viewvc?rev=680779&view=rev
Log:
Finishing up distribution and legal files for release
Added:
mina/ftpserver/trunk/distribution/README.txt (contents, props changed)
- copied, changed from r677721, mina/ftpserver/trunk/distribution/release notes.txt
Removed:
mina/ftpserver/trunk/distribution/LICENSE.txt
mina/ftpserver/trunk/distribution/NOTICE.txt
mina/ftpserver/trunk/distribution/release notes.txt
Modified:
mina/ftpserver/trunk/NOTICE.txt
mina/ftpserver/trunk/distribution/pom.xml
mina/ftpserver/trunk/distribution/src/main/assemblies/bin.xml
mina/ftpserver/trunk/pom.xml
Modified: mina/ftpserver/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/NOTICE.txt?rev=680779&r1=680778&r2=680779&view=diff
==============================================================================
--- mina/ftpserver/trunk/NOTICE.txt (original)
+++ mina/ftpserver/trunk/NOTICE.txt Tue Jul 29 10:16:51 2008
@@ -3,4 +3,5 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
\ No newline at end of file
+
+Foo
Copied: mina/ftpserver/trunk/distribution/README.txt (from r677721, mina/ftpserver/trunk/distribution/release notes.txt)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/distribution/README.txt?p2=mina/ftpserver/trunk/distribution/README.txt&p1=mina/ftpserver/trunk/distribution/release%20notes.txt&r1=677721&r2=680779&rev=680779&view=diff
==============================================================================
--- mina/ftpserver/trunk/distribution/release notes.txt (original)
+++ mina/ftpserver/trunk/distribution/README.txt Tue Jul 29 10:16:51 2008
@@ -1,5 +1,5 @@
-The Apache Incubator FtpServer project team is proud to announce the release of
-Apache Incubator FtpServer, version 1.0-M1-incubator.
+The Apache FtpServer project team is proud to announce the release of
+Apache FtpServer, version 1.0-M2
The Apache FTP Server is a 100% pure Java FTP server. It's designed to be
a complete and portable FTP server engine solution based on currently
@@ -10,14 +10,14 @@
It is also a FTP application platform. We have developed a Java API to let
you write Java code to process FTP event notifications that we call the Ftplet
-API. Apache FTP Server provides an implementation of FTP server to support
+API. Apache FtpServer provides an implementation of FTP server to support
this API.
-1.0-M1-incubator
+1.0-M2
--------------------------------
-This is the very first release of Apache Incubator FtpServer.
+This is the very first release of Apache FtpServer.
The Apache Incubator FtpServer project team is always open for your feedback.
Please let us know what you think about FtpServer via our mailing
-list <http://incubator.apache.org/ftpserver/mailing-lists.html>
+list <http://mina.apache.org/ftpserver/mailing-lists.html>
Propchange: mina/ftpserver/trunk/distribution/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: mina/ftpserver/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/distribution/pom.xml?rev=680779&r1=680778&r2=680779&view=diff
==============================================================================
--- mina/ftpserver/trunk/distribution/pom.xml (original)
+++ mina/ftpserver/trunk/distribution/pom.xml Tue Jul 29 10:16:51 2008
@@ -38,46 +38,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy todir="${project.build.outputDirectory}/META-INF">
- <fileset dir="${basedir}">
- <include name="LICENSE.txt"></include>
- <include name="NOTICE.txt"></include>
- <include name="DISCLAIMER.txt"></include>
- </fileset>
- </copy>
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>download-site</id>
- <phase>process-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <echo>Downloading Manual</echo>
- <mkdir dir="${project.build.directory}/site"></mkdir>
- <!--
- <get src="http://mina.apache.org/ftpserver/ftpserver.zip" dest="${project.build.directory}/${pom.artifactId}-site.zip"></get>
- <unzip src="${project.build.directory}/${pom.artifactId}-site.zip" dest="${project.build.directory}/site"></unzip>
- -->
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
<executions>
@@ -146,16 +106,38 @@
<profiles>
<profile>
- <id>rc</id>
+ <id>release</id>
<build>
<plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>download-docs</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <echo>Downloading Manual</echo>
+ <mkdir dir="${project.build.directory}/site"></mkdir>
+ <get src="http://mina.apache.org/ftpserver/ftpserver.zip" dest="${project.build.directory}/${pom.artifactId}-docs.zip"></get>
+ <unzip src="${project.build.directory}/${pom.artifactId}-docs.zip" dest="${project.build.directory}/docs"></unzip>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
<executions>
<execution>
<id>unpack-ftplet-javadoc</id>
- <phase>package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -173,7 +155,7 @@
</execution>
<execution>
<id>unpack-core-javadoc</id>
- <phase>package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -191,12 +173,12 @@
</execution>
<execution>
<id>unpack-deprecated-javadoc</id>
- <phase>package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}/api/ftpserver-deprecated</outputDirectory>
+ <outputDirectory>${project.build.directory}/api/deprecated</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>${pom.groupId}</groupId>
Modified: mina/ftpserver/trunk/distribution/src/main/assemblies/bin.xml
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/distribution/src/main/assemblies/bin.xml?rev=680779&r1=680778&r2=680779&view=diff
==============================================================================
--- mina/ftpserver/trunk/distribution/src/main/assemblies/bin.xml (original)
+++ mina/ftpserver/trunk/distribution/src/main/assemblies/bin.xml Tue Jul 29 10:16:51 2008
@@ -24,19 +24,23 @@
<format>tar.gz</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <includeSiteDirectory>true</includeSiteDirectory>
<fileSets>
<fileSet>
<includes>
- <include>release*</include>
- <include>README*</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>DISCLAIMER.txt</include>
+ <include>README.txt</include>
<include>common/**</include>
</includes>
</fileSet>
<fileSet>
+ <!-- Include license and notices generated by the remote resources plugin -->
+ <directory>target/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
<directory>res</directory>
<outputDirectory>res</outputDirectory>
<excludes>
@@ -60,14 +64,24 @@
<fileMode>755</fileMode>
</fileSet>
<fileSet>
+ <directory>target/docs</directory>
+ <outputDirectory>/docs</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>target/api</directory>
- <outputDirectory>/site/api</outputDirectory>
+ <outputDirectory>/api</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>common/lib</outputDirectory>
<scope>runtime</scope>
+ <excludes>
+ <exclude>org.apache.ftpserver:ftpserver</exclude>
+ </excludes>
</dependencySet>
</dependencySets>
</assembly>
Modified: mina/ftpserver/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/pom.xml?rev=680779&r1=680778&r2=680779&view=diff
==============================================================================
--- mina/ftpserver/trunk/pom.xml (original)
+++ mina/ftpserver/trunk/pom.xml Tue Jul 29 10:16:51 2008
@@ -411,7 +411,7 @@
</profile>
<profile>
- <id>rc</id>
+ <id>relase</id>
<build>
<plugins>
<plugin>
@@ -458,13 +458,6 @@
</repository>
</distributionManagement>
</profile>
-
- <profile>
- <id>ssl-tests</id>
- <modules>
- <module>ssl-tests</module>
- </modules>
- </profile>
</profiles>
<modules>