You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by br...@apache.org on 2003/01/26 06:25:46 UTC
cvs commit: jakarta-commons-sandbox/net/xdocs changes.xml navigation.xml tasks.xml
brekke 2003/01/25 21:25:46
Modified: net README build.xml project.properties project.xml
net/xdocs changes.xml navigation.xml tasks.xml
Removed: net/src/java/org/apache/commons/net/ftp/ftp2 FTPClient2.java
FTPFileEntryParser.java FTPFileIterator.java
FTPFileList.java
net/src/java/org/apache/commons/net/ftp/ftp2/parser
EnterpriseUnixFTPEntryParser.java
MatchApparatus.java NTFTPEntryParser.java
OS2FTPEntryParser.java UnixFTPEntryParser.java
VMSFTPEntryParser.java
net/src/test/org/apache/commons/net/ftp/ftp2/parser
EnterpriseUnixFTPEntryParserTest.java
FTPParseTestFramework.java
NTFTPEntryParserTest.java
OS2FTPEntryParserTest.java
UnixFTPEntryParserTest.java
VMSFTPEntryParserTest.java
Log:
o Removed the ftp2 code and moved it into a proposal direcotory until we can
decide how to proceed with that implementation.
o Added a migration document simply stating the package name changes that are required.
o Updated the changes document, but the maven changes plugin isn't rendering it very
nicely right now.
o Updated the tasks to reflect package name changes.
o Regenerated the ant build.xml with the latest maven ( b8 - HEAD ).
o The example code is *not* included in the jar that is built by maven.
Revision Changes Path
1.4 +1 -1 jakarta-commons-sandbox/net/README
Index: README
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README 16 Jul 2002 16:45:26 -0000 1.3
+++ README 26 Jan 2003 05:25:44 -0000 1.4
@@ -1,7 +1,7 @@
o Building
-To build, you must have ant and maven installed. Just type 'ant' -- the default
+To build, you must have ant and/or maven installed. Just type 'ant' -- the default
target will compile the classes, run the tests and build the jar
Maven can be downloaded from the main site and there is good documentation
1.14 +96 -132 jakarta-commons-sandbox/net/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 26 Jan 2003 00:21:40 -0000 1.13
+++ build.xml 26 Jan 2003 05:25:45 -0000 1.14
@@ -1,186 +1,150 @@
<?xml version="1.0" encoding="UTF-8"?>
<project default="jar" name="commons-net" basedir=".">
-
- <property name="defaulttargetdir" value="target"></property>
- <property name="classesdir" value="target/classes"></property>
- <property name="testclassesdir" value="target/test-classes"></property>
- <property name="testreportdir" value="target/test-reports"></property>
- <property name="distdir" value="dist"></property>
- <property name="javadocdir" value="target/docs/apidocs"></property>
- <property name="final.name" value="commons-net-1.0.0-dev"></property>
-
+ <property name="defaulttargetdir" value="target">
+ </property>
+ <property name="libdir" value="target/lib">
+ </property>
+ <property name="classesdir" value="target/classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="testreportdir" value="target/test-reports">
+ </property>
+ <property name="distdir" value="dist">
+ </property>
+ <property name="javadocdir" value="dist/docs/api">
+ </property>
+ <property name="final.name" value="commons-net-1.0.0-dev">
+ </property>
<target name="init" description="o Initializes some properties">
- <mkdir dir="lib"></mkdir>
+ <mkdir dir="${libdir}">
+ </mkdir>
<condition property="noget">
- <equals arg2="only" arg1="${build.sysclasspath}"></equals>
+ <equals arg2="only" arg1="${build.sysclasspath}">
+ </equals>
</condition>
</target>
-
<target name="compile" description="o Compile the code" depends="get-deps">
-
- <mkdir dir="${classesdir}"></mkdir>
-
+ <mkdir dir="${classesdir}">
+ </mkdir>
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
<src>
- <pathelement location="src/java"></pathelement>
+ <pathelement location="src/java">
+ </pathelement>
</src>
<classpath>
- <fileset dir="lib">
- <include name="*.jar"></include>
+ <fileset dir="${libdir}">
+ <include name="*.jar">
+ </include>
</fileset>
</classpath>
</javac>
-
-
-
-
-
- <copy todir="${classesdir}">
-
-
-
- <fileset dir="${basedir}">
-
-
- <include name="**/*.properties"></include>
-
-
- </fileset>
- </copy>
-
-
-
- </target>
-
- <target name="jar" description="o Create the jar"
- depends="compile">
-<!--
- depends="compile,test">
--->
- <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
-
</target>
-
+ <target name="jar" description="o Create the jar" depends="compile,test">
+ <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+ </jar>
+ </target>
<target name="clean" description="o Clean up the generated directories">
- <delete dir="${defaulttargetdir}"></delete>
- <delete dir="${distdir}"></delete>
+ <delete dir="${defaulttargetdir}">
+ </delete>
+ <delete dir="${distdir}">
+ </delete>
</target>
-
<target name="dist" description="o Create a distribution" depends="jar, javadoc">
- <mkdir dir="dist"></mkdir>
+ <mkdir dir="dist">
+ </mkdir>
<copy todir="dist">
- <fileset dir="${defaulttargetdir}"></fileset>
+ <fileset dir="${defaulttargetdir}" includes="*.jar">
+ </fileset>
+ <fileset dir="${basedir}" includes="LICENSE*, README*">
+ </fileset>
</copy>
</target>
-
<target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
- <fail message="There were test failures."></fail>
+ <fail message="There were test failures.">
+ </fail>
</target>
<target name="internal-test" depends="compile-tests">
- <mkdir dir="${testreportdir}"></mkdir>
+ <mkdir dir="${testreportdir}">
+ </mkdir>
<junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
- <sysproperty key="basedir" value="src/test"></sysproperty>
- <formatter type="xml"></formatter>
- <formatter usefile="true" type="plain"></formatter>
+ <sysproperty key="basedir" value=".">
+ </sysproperty>
+ <formatter type="xml">
+ </formatter>
+ <formatter usefile="false" type="plain">
+ </formatter>
<classpath>
- <fileset dir="lib">
- <include name="*.jar"></include>
+ <fileset dir="${libdir}">
+ <include name="*.jar">
+ </include>
</fileset>
- <pathelement path="${testclassesdir}"></pathelement>
- <pathelement path="${classesdir}"></pathelement>
+ <pathelement path="${testclassesdir}">
+ </pathelement>
+ <pathelement path="${classesdir}">
+ </pathelement>
</classpath>
<batchtest todir="${testreportdir}">
<fileset dir="src/test">
-
- <include name="**/*Test.java"></include>
-
-
+ <include name="**/*Test.java">
+ </include>
</fileset>
</batchtest>
</junit>
</target>
-
<target name="compile-tests" depends="compile">
- <mkdir dir="${testclassesdir}"></mkdir>
+ <mkdir dir="${testclassesdir}">
+ </mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
<src>
- <pathelement location="src/test"></pathelement>
+ <pathelement location="src/test">
+ </pathelement>
</src>
<classpath>
- <fileset dir="lib">
- <include name="*.jar"></include>
+ <fileset dir="${libdir}">
+ <include name="*.jar">
+ </include>
</fileset>
- <pathelement path="${classesdir}"></pathelement>
+ <pathelement path="${classesdir}">
+ </pathelement>
</classpath>
</javac>
-
-
-
-
-
- <copy todir="${testclassesdir}">
- <fileset dir="src/test">
-
-
- </fileset>
- </copy>
-
</target>
-
<target name="javadoc" description="o Generate javadoc" depends="jar">
-
-
- <mkdir dir="${javadocdir}"></mkdir>
-
-
+ <mkdir dir="${javadocdir}">
+ </mkdir>
<tstamp>
- <format pattern="1997-yyyy" property="year"></format>
+ <format pattern="1997-yyyy" property="year">
+ </format>
</tstamp>
-
- <property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved."></property>
-
- <property name="title" value="Jakarta Commons/Net 1.0.0-dev API"></property>
-
- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.*">
+ <property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved.">
+ </property>
+ <property name="title" value="Jakarta Commons/Net 1.0.0-dev API">
+ </property>
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.net.*">
<classpath>
- <fileset dir="lib">
- <include name="*.jar"></include>
+ <fileset dir="${libdir}">
+ <include name="*.jar">
+ </include>
</fileset>
- <pathelement location="target/${final.name}.jar"></pathelement>
+ <pathelement location="target/${final.name}.jar">
+ </pathelement>
</classpath>
</javadoc>
-
</target>
-
<target name="get-deps" unless="noget" depends="init">
-
-
- <get dest="lib/oro-2.0.6.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/oro/jars/oro-2.0.6.jar"></get>
- <get dest="lib/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"></get>
-
- <get dest="lib/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"></get>
-
- </target>
-
-
-
-
-
-
-
-
-
-
+ <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
+ </get>
+ <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
+ </get>
+ <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar">
+ </get>
+ </target>
<target name="install-maven">
-
-
-
- <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${maven.repo.remote}/maven/maven-install-latest.jar"></get>
-
- <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
-
- </target>
-
-</project>
-
\ No newline at end of file
+ <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${maven.repo.remote}/maven/maven-install-latest.jar">
+ </get>
+ <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+ </unjar>
+ </target>
+</project>
\ No newline at end of file
1.4 +2 -0 jakarta-commons-sandbox/net/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/project.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.properties 20 Sep 2002 02:44:28 -0000 1.3
+++ project.properties 26 Jan 2003 05:25:45 -0000 1.4
@@ -6,3 +6,5 @@
maven.checkstyle.format = turbine
maven.xdoc.date = left
+
+maven.jar.excludes=**/examples/**/*
1.18 +11 -33 jakarta-commons-sandbox/net/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/project.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- project.xml 1 Oct 2002 13:10:07 -0000 1.17
+++ project.xml 26 Jan 2003 05:25:45 -0000 1.18
@@ -11,7 +11,7 @@
<logo>/images/jakarta-logo-blue.gif</logo>
</organization>
<inceptionYear>1997</inceptionYear>
- <package>org.apache.commons</package>
+ <package>org.apache.commons.net</package>
<gumpRepositoryId>jakarta</gumpRepositoryId>
@@ -49,6 +49,14 @@
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/net/</url>
</repository>
+ <versions>
+ <version>
+ <id>1.0.0-dev</id>
+ <name>1.0.0-dev</name>
+ <tag>HEAD</tag>
+ </version>
+ </versions>
+
<mailingLists>
<mailingList>
<name>Commons Developer List</name>
@@ -89,20 +97,7 @@
</contributor>
</contributors>
- <dependencies>
- <dependency>
- <id>oro</id>
- <version>2.0.6</version>
- <url>http://jakarta.apache.org/oro/</url>
- </dependency>
-
- <dependency>
- <id>junit</id>
- <version>3.8.1</version>
- <url>http://junit.org/</url>
- </dependency>
-
- </dependencies>
+ <dependencies/>
<build>
@@ -112,28 +107,11 @@
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <!-- maven b5 onwards -->
<unitTest>
<includes>
<include>**/*Test.java</include>
</includes>
</unitTest>
- <integrationUnitTestSourceDirectory/>
- <integrationUnitTestPatterns/>
-
- <!-- J A R R E S O U R C E S -->
- <!-- Resources that are packaged up inside the JAR file -->
- <resources>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resources>
-
- <jarResources>
- <jarResource>**/*.properties</jarResource>
- </jarResources>
- <jars></jars>
-
-</build>
+ </build>
</project>
1.3 +15 -0 jakarta-commons-sandbox/net/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml 21 Nov 2002 19:02:03 -0000 1.2
+++ changes.xml 26 Jan 2003 05:25:46 -0000 1.3
@@ -7,6 +7,21 @@
<body>
<release version="1.0" date="in CVS">
+ <action dev="brekke" type="add">
+ Added a migration document for moving from NetComponents to Commons/Net.
+ </action>
+ <action dev="brekke" type="fix">
+ Moved the ftp2 tree with tests to a proposal directory and setup
+ a build for that code. This can grow in this area so users don't
+ think it is production ready.
+ </action>
+ <action dev="dfs" type="fix">
+ Cleaned up license header on some source.
+ </action>
+ <action dev="dfs" type="fix">
+ Moved .io and .util to .net.io and .net.util in preparation for
+ 1.0 release.
+ </action>
<action dev="dfs" type="fix" due-to-email="joev@atg.com">
Fixed typo in NNTP.removeProtocolCommandListener() method name. It
was missing an L.
1.4 +4 -0 jakarta-commons-sandbox/net/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/xdocs/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 19 Sep 2002 20:57:12 -0000 1.3
+++ navigation.xml 26 Jan 2003 05:25:46 -0000 1.4
@@ -4,11 +4,15 @@
<title>Jakarta Commons/Net</title>
<body>
+ <menu name="Documentation">
+ <item name="Migration How-to" href="/migration.html"/>
+ </menu>
<menu name="Development">
<item name="Proposal" href="/proposal.html"/>
<item name="Coding Specifications" href="/code-standards.html"/>
<item name="Download" href="/download.html"/>
</menu>
+
</body>
</project>
1.4 +2 -1 jakarta-commons-sandbox/net/xdocs/tasks.xml
Index: tasks.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/xdocs/tasks.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tasks.xml 12 Sep 2002 04:10:42 -0000 1.3
+++ tasks.xml 26 Jan 2003 05:25:46 -0000 1.4
@@ -10,12 +10,13 @@
<section name="Tasks">
<p>
<ul>
+ <li>Add programmer and acceptance tests.</li>
<li>
Convert code to specified coding standards. Checkstyle report provided.
</li>
<li>
Clean out any classes that don't belong in this project. Probably classes from
- org.apache.commons.util and org.apache.commons.io could be moved to their corresponding
+ org.apache.commons.net.util and org.apache.commons.net.io could be moved to their corresponding
commons projects.
</li>
<li>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>