Author: sebb Date: Fri Apr 21 16:30:03 2017 New Revision: 1792230 URL: http://svn.apache.org/viewvc?rev=1792230&view=rev Log: NET-636 examples should be in org.apache.commons.net subpackage
Added: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ - copied from r1792229, commons/proper/net/trunk/src/main/java/examples/ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/package-info.java (with props) commons/proper/net/trunk/src/main/resources/org/ commons/proper/net/trunk/src/main/resources/org/apache/ commons/proper/net/trunk/src/main/resources/org/apache/commons/ commons/proper/net/trunk/src/main/resources/org/apache/commons/net/ commons/proper/net/trunk/src/main/resources/org/apache/commons/net/examples/ - copied from r1792229, commons/proper/net/trunk/src/main/resources/examples/ commons/proper/net/trunk/src/test/java/org/apache/commons/net/examples/ - copied from r1792229, commons/proper/net/trunk/src/test/java/examples/ Removed: commons/proper/net/trunk/src/main/java/examples/ commons/proper/net/trunk/src/main/resources/examples/ commons/proper/net/trunk/src/test/java/examples/ Modified: commons/proper/net/trunk/pom.xml commons/proper/net/trunk/src/assembly/bin.xml commons/proper/net/trunk/src/changes/changes.xml commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/Main.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/cidr/SubnetUtilsExample.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ftp/ServerToServerFTP.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ftp/TFTPExample.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPImportMbox.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPMail.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPUtils.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/POP3Mail.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/SMTPMail.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/Utils.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/ArticleReader.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/ExtendedNNTPOps.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/ListNewsgroups.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/MessageThreading.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/NNTPUtils.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/PostMessage.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ntp/NTPClient.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ntp/SimpleNTPServer.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ntp/TimeClient.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/telnet/WeatherTelnet.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/chargen.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/daytime.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/echo.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/finger.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/fwhois.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rdate.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rexec.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rlogin.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rshell.java commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/util/IOUtil.java commons/proper/net/trunk/src/main/resources/org/apache/commons/net/examples/examples.properties commons/proper/net/trunk/src/test/java/org/apache/commons/net/examples/MainTest.java commons/proper/net/trunk/src/test/java/org/apache/commons/net/ntp/TestNtpClient.java Modified: commons/proper/net/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/pom.xml?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/pom.xml (original) +++ commons/proper/net/trunk/pom.xml Fri Apr 21 16:30:03 2017 @@ -232,7 +232,7 @@ Supported protocols include: Echo, Finge <artifactId>maven-jar-plugin</artifactId> <configuration> <excludes> - <exclude>examples/**</exclude> + <exclude>**/examples/**</exclude> </excludes> </configuration> </plugin> @@ -243,7 +243,7 @@ Supported protocols include: Echo, Finge <artifactId>maven-source-plugin</artifactId> <configuration> <excludes> - <exclude>examples/**</exclude> + <exclude>**/examples/**</exclude> </excludes> </configuration> </plugin> @@ -309,11 +309,11 @@ Supported protocols include: Echo, Finge <attribute name="X-Compile-Source-JDK" value="${maven.compiler.source}" /> <attribute name="X-Compile-Target-JDK" value="${maven.compiler.target}" /> <!-- Helper application --> - <attribute name="Main-Class" value="examples/Main" /> + <attribute name="Main-Class" value="org/apache/commons/net/examples/Main" /> <!-- Allow java -jar examples.jar to work --> <attribute name="Class-Path" value="commons-net-${project.version}.jar" /> </manifest> - <fileset dir="target/classes" includes="examples/**" /> + <fileset dir="target/classes" includes="**/examples/**" /> </jar> </target> </configuration> @@ -358,7 +358,7 @@ Supported protocols include: Echo, Finge <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <excludePackageNames>examples.*</excludePackageNames> + <excludePackageNames>*.examples.*</excludePackageNames> </configuration> </plugin> @@ -376,7 +376,7 @@ Supported protocols include: Echo, Finge <outputDirectory>${basedir}/target/site/examples</outputDirectory> <resources> <resource> - <directory>src/main/java/examples</directory> + <directory>src/main/java/org/apache/commons/net/examples</directory> <excludes> <exclude>**/Main.java</exclude> </excludes> @@ -403,7 +403,7 @@ Supported protocols include: Echo, Finge <artifactId>clirr-maven-plugin</artifactId> <configuration> <excludes> - <exclude>examples/**</exclude> + <exclude>**/examples/**</exclude> </excludes> </configuration> </plugin> @@ -426,7 +426,7 @@ Supported protocols include: Echo, Finge </execution> </executions> <configuration> - <mainClass>examples.Main</mainClass> + <mainClass>org.apache.commons.net.examples.Main</mainClass> </configuration> </plugin> @@ -464,7 +464,7 @@ Supported protocols include: Echo, Finge <artifactId>clirr-maven-plugin</artifactId> <configuration> <excludes> - <exclude>examples/**</exclude> + <exclude>**/examples/**</exclude> </excludes> </configuration> </plugin> @@ -473,7 +473,7 @@ Supported protocols include: Echo, Finge <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <excludePackageNames>examples.*</excludePackageNames> + <excludePackageNames>*.examples.*</excludePackageNames> </configuration> </plugin> Modified: commons/proper/net/trunk/src/assembly/bin.xml URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/assembly/bin.xml?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/assembly/bin.xml (original) +++ commons/proper/net/trunk/src/assembly/bin.xml Fri Apr 21 16:30:03 2017 @@ -65,8 +65,8 @@ Licensed to the Apache Software Foundati </fileSet> <!-- Include example sources for developers --> <fileSet> - <directory>src/main/java/examples</directory> - <outputDirectory>examples</outputDirectory> + <directory>src/main/java/org/apache/commons/net/examples</directory> + <outputDirectory>org/apache/commons/net/examples</outputDirectory> <includes> <include>**/*</include> </includes> Modified: commons/proper/net/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/changes/changes.xml [utf-8] (original) +++ commons/proper/net/trunk/src/changes/changes.xml [utf-8] Fri Apr 21 16:30:03 2017 @@ -70,7 +70,13 @@ This is mainly a bug-fix release. See fu This release is binary compatible with previous releases. However it is not source compatible with releases before 3.4, as some methods were added to the interface NtpV3Packet in 3.4 + Note that the examples packages were moved under org/apache/commons/net/examples. + The examples are not part of the public API, so this does not affect compatibility. + "> + <action issue="NET-636" type="fix" dev="sebb"> + examples should be in org.apache.commons.net subpackage + </action> <action issue="NET-634" type="add" dev="sebb" due-to="Mauro Molinari"> Add SIZE command support </action> Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/Main.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/Main.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/Main.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/Main.java Fri Apr 21 16:30:03 2017 @@ -16,7 +16,7 @@ * */ -package examples; +package org.apache.commons.net.examples; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/cidr/SubnetUtilsExample.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/cidr/SubnetUtilsExample.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/cidr/SubnetUtilsExample.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/cidr/SubnetUtilsExample.java Fri Apr 21 16:30:03 2017 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package examples.cidr; +package org.apache.commons.net.examples.cidr; import java.util.Arrays; import java.util.Scanner; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.ftp; +package org.apache.commons.net.examples.ftp; import java.io.FileInputStream; import java.io.FileOutputStream; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ftp/ServerToServerFTP.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ftp/ServerToServerFTP.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ftp/ServerToServerFTP.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ftp/ServerToServerFTP.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.ftp; +package org.apache.commons.net.examples.ftp; import java.io.IOException; import java.io.PrintWriter; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ftp/TFTPExample.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ftp/TFTPExample.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ftp/TFTPExample.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ftp/TFTPExample.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.ftp; +package org.apache.commons.net.examples.ftp; import java.io.Closeable; import java.io.File; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.mail; +package org.apache.commons.net.examples.mail; import java.io.BufferedWriter; import java.io.File; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPImportMbox.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPImportMbox.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPImportMbox.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPImportMbox.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.mail; +package org.apache.commons.net.examples.mail; import java.io.BufferedReader; import java.io.File; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPMail.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPMail.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPMail.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPMail.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.mail; +package org.apache.commons.net.examples.mail; import java.io.IOException; import java.net.URI; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPUtils.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPUtils.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPUtils.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/IMAPUtils.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.mail; +package org.apache.commons.net.examples.mail; import java.io.IOException; import java.net.URI; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.mail; +package org.apache.commons.net.examples.mail; import java.io.BufferedReader; import java.io.File; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/POP3Mail.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/POP3Mail.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/POP3Mail.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/POP3Mail.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.mail; +package org.apache.commons.net.examples.mail; import java.io.BufferedReader; import java.io.IOException; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/SMTPMail.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/SMTPMail.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/SMTPMail.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/SMTPMail.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.mail; +package org.apache.commons.net.examples.mail; import java.io.BufferedReader; import java.io.FileNotFoundException; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/Utils.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/Utils.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/Utils.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/mail/Utils.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.mail; +package org.apache.commons.net.examples.mail; import java.io.BufferedReader; import java.io.Console; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/ArticleReader.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/ArticleReader.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/ArticleReader.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/ArticleReader.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.nntp; +package org.apache.commons.net.examples.nntp; import java.io.BufferedReader; import java.io.IOException; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/ExtendedNNTPOps.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/ExtendedNNTPOps.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/ExtendedNNTPOps.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/ExtendedNNTPOps.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.nntp; +package org.apache.commons.net.examples.nntp; import java.io.IOException; import java.io.PrintWriter; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/ListNewsgroups.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/ListNewsgroups.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/ListNewsgroups.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/ListNewsgroups.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.nntp; +package org.apache.commons.net.examples.nntp; import java.io.IOException; import org.apache.commons.net.nntp.NNTPClient; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/MessageThreading.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/MessageThreading.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/MessageThreading.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/MessageThreading.java Fri Apr 21 16:30:03 2017 @@ -16,7 +16,7 @@ */ -package examples.nntp; +package org.apache.commons.net.examples.nntp; import java.io.IOException; import java.io.PrintWriter; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/NNTPUtils.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/NNTPUtils.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/NNTPUtils.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/NNTPUtils.java Fri Apr 21 16:30:03 2017 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package examples.nntp; +package org.apache.commons.net.examples.nntp; import java.io.IOException; import java.util.ArrayList; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/PostMessage.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/PostMessage.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/PostMessage.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/nntp/PostMessage.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.nntp; +package org.apache.commons.net.examples.nntp; import java.io.BufferedReader; import java.io.FileNotFoundException; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ntp/NTPClient.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ntp/NTPClient.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ntp/NTPClient.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ntp/NTPClient.java Fri Apr 21 16:30:03 2017 @@ -1,4 +1,4 @@ -package examples.ntp; +package org.apache.commons.net.examples.ntp; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ntp/SimpleNTPServer.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ntp/SimpleNTPServer.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ntp/SimpleNTPServer.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ntp/SimpleNTPServer.java Fri Apr 21 16:30:03 2017 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package examples.ntp; +package org.apache.commons.net.examples.ntp; import org.apache.commons.net.ntp.NtpUtils; import org.apache.commons.net.ntp.NtpV3Impl; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ntp/TimeClient.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ntp/TimeClient.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ntp/TimeClient.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/ntp/TimeClient.java Fri Apr 21 16:30:03 2017 @@ -1,4 +1,4 @@ -package examples.ntp; +package org.apache.commons.net.examples.ntp; /* * Licensed to the Apache Software Foundation (ASF) under one or more Added: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/package-info.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/package-info.java?rev=1792230&view=auto ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/package-info.java (added) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/package-info.java Fri Apr 21 16:30:03 2017 @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Example classes. + * <p> + * <b>These do not form part of the public API and may change without notice.</b> + */ +package org.apache.commons.net.examples; \ No newline at end of file Propchange: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/package-info.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.telnet; +package org.apache.commons.net.examples.telnet; import java.io.IOException; import java.io.InputStream; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/telnet/WeatherTelnet.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/telnet/WeatherTelnet.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/telnet/WeatherTelnet.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/telnet/WeatherTelnet.java Fri Apr 21 16:30:03 2017 @@ -15,12 +15,12 @@ * limitations under the License. */ -package examples.telnet; +package org.apache.commons.net.examples.telnet; import java.io.IOException; import org.apache.commons.net.telnet.TelnetClient; -import examples.util.IOUtil; +import org.apache.commons.net.examples.util.IOUtil; /*** * This is an example of a trivial use of the TelnetClient class. Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/chargen.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/chargen.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/chargen.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/chargen.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.unix; +package org.apache.commons.net.examples.unix; import java.io.BufferedReader; import java.io.IOException; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/daytime.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/daytime.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/daytime.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/daytime.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.unix; +package org.apache.commons.net.examples.unix; import java.io.IOException; import java.net.InetAddress; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/echo.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/echo.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/echo.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/echo.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.unix; +package org.apache.commons.net.examples.unix; import java.io.BufferedReader; import java.io.IOException; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/finger.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/finger.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/finger.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/finger.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.unix; +package org.apache.commons.net.examples.unix; import java.io.IOException; import java.net.InetAddress; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/fwhois.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/fwhois.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/fwhois.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/fwhois.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.unix; +package org.apache.commons.net.examples.unix; import java.io.IOException; import java.net.InetAddress; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rdate.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rdate.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rdate.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rdate.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.unix; +package org.apache.commons.net.examples.unix; import java.io.IOException; import java.net.InetAddress; Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rexec.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rexec.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rexec.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rexec.java Fri Apr 21 16:30:03 2017 @@ -15,12 +15,12 @@ * limitations under the License. */ -package examples.unix; +package org.apache.commons.net.examples.unix; import java.io.IOException; import org.apache.commons.net.bsd.RExecClient; -import examples.util.IOUtil; +import org.apache.commons.net.examples.util.IOUtil; /*** * This is an example program demonstrating how to use the RExecClient class. Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rlogin.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rlogin.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rlogin.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rlogin.java Fri Apr 21 16:30:03 2017 @@ -15,12 +15,12 @@ * limitations under the License. */ -package examples.unix; +package org.apache.commons.net.examples.unix; import java.io.IOException; import org.apache.commons.net.bsd.RLoginClient; -import examples.util.IOUtil; +import org.apache.commons.net.examples.util.IOUtil; /*** * This is an example program demonstrating how to use the RLoginClient Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rshell.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rshell.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rshell.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/unix/rshell.java Fri Apr 21 16:30:03 2017 @@ -15,12 +15,12 @@ * limitations under the License. */ -package examples.unix; +package org.apache.commons.net.examples.unix; import java.io.IOException; import org.apache.commons.net.bsd.RCommandClient; -import examples.util.IOUtil; +import org.apache.commons.net.examples.util.IOUtil; /*** * This is an example program demonstrating how to use the RCommandClient Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/util/IOUtil.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/util/IOUtil.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/util/IOUtil.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/examples/util/IOUtil.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples.util; +package org.apache.commons.net.examples.util; import java.io.IOException; import java.io.InputStream; Modified: commons/proper/net/trunk/src/main/resources/org/apache/commons/net/examples/examples.properties URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/resources/org/apache/commons/net/examples/examples.properties?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/main/resources/org/apache/commons/net/examples/examples.properties (original) +++ commons/proper/net/trunk/src/main/resources/org/apache/commons/net/examples/examples.properties Fri Apr 21 16:30:03 2017 @@ -21,32 +21,32 @@ # Note that the "/" separators are converted to "." # alias full class name -SubnetUtilsExample examples/cidr/SubnetUtilsExample -FTPClientExample examples/ftp/FTPClientExample -ServerToServerFTP examples/ftp/ServerToServerFTP -TFTPExample examples/ftp/TFTPExample -IMAPExportMbox examples/mail/IMAPExportMbox -IMAPImportMbox examples/mail/IMAPImportMbox -IMAPMail examples/mail/IMAPMail -POP3ExportMbox examples/mail/POP3ExportMbox -POP3Mail examples/mail/POP3Mail -SMTPMail examples/mail/SMTPMail -ArticleReader examples/nntp/ArticleReader -ExtendedNNTPOps examples/nntp/ExtendedNNTPOps -ListNewsgroups examples/nntp/ListNewsgroups -MessageThreading examples/nntp/MessageThreading -PostMessage examples/nntp/PostMessage -NTPClient examples/ntp/NTPClient -SimpleNTPServer examples/ntp/SimpleNTPServer -TimeClient examples/ntp/TimeClient -TelnetClientExample examples/telnet/TelnetClientExample -WeatherTelnet examples/telnet/WeatherTelnet -chargen examples/unix/chargen -daytime examples/unix/daytime -echo examples/unix/echo -finger examples/unix/finger -fwhois examples/unix/fwhois -rdate examples/unix/rdate -rexec examples/unix/rexec -rlogin examples/unix/rlogin -rshell examples/unix/rshell +SubnetUtilsExample org/apache/commons/net/examples/cidr/SubnetUtilsExample +FTPClientExample org/apache/commons/net/examples/ftp/FTPClientExample +ServerToServerFTP org/apache/commons/net/examples/ftp/ServerToServerFTP +TFTPExample org/apache/commons/net/examples/ftp/TFTPExample +IMAPExportMbox org/apache/commons/net/examples/mail/IMAPExportMbox +IMAPImportMbox org/apache/commons/net/examples/mail/IMAPImportMbox +IMAPMail org/apache/commons/net/examples/mail/IMAPMail +POP3ExportMbox org/apache/commons/net/examples/mail/POP3ExportMbox +POP3Mail org/apache/commons/net/examples/mail/POP3Mail +SMTPMail org/apache/commons/net/examples/mail/SMTPMail +ArticleReader org/apache/commons/net/examples/nntp/ArticleReader +ExtendedNNTPOps org/apache/commons/net/examples/nntp/ExtendedNNTPOps +ListNewsgroups org/apache/commons/net/examples/nntp/ListNewsgroups +MessageThreading org/apache/commons/net/examples/nntp/MessageThreading +PostMessage org/apache/commons/net/examples/nntp/PostMessage +NTPClient org/apache/commons/net/examples/ntp/NTPClient +SimpleNTPServer org/apache/commons/net/examples/ntp/SimpleNTPServer +TimeClient org/apache/commons/net/examples/ntp/TimeClient +TelnetClientExample org/apache/commons/net/examples/telnet/TelnetClientExample +WeatherTelnet org/apache/commons/net/examples/telnet/WeatherTelnet +chargen org/apache/commons/net/examples/unix/chargen +daytime org/apache/commons/net/examples/unix/daytime +echo org/apache/commons/net/examples/unix/echo +finger org/apache/commons/net/examples/unix/finger +fwhois org/apache/commons/net/examples/unix/fwhois +rdate org/apache/commons/net/examples/unix/rdate +rexec org/apache/commons/net/examples/unix/rexec +rlogin org/apache/commons/net/examples/unix/rlogin +rshell org/apache/commons/net/examples/unix/rshell Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/examples/MainTest.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/examples/MainTest.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/test/java/org/apache/commons/net/examples/MainTest.java (original) +++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/examples/MainTest.java Fri Apr 21 16:30:03 2017 @@ -15,7 +15,7 @@ * limitations under the License. */ -package examples; +package org.apache.commons.net.examples; import static org.junit.Assert.fail; @@ -66,7 +66,7 @@ public class MainTest { } jf.close(); } else { - File examples = new File(sourceFile, "examples"); // must match top level examples package name + File examples = new File(sourceFile, "org/apache/commons/net/examples"); // must match top level examples package name if (examples.exists()) { scanForClasses(sourceFile.length(), examples, p); } else { @@ -89,7 +89,7 @@ public class MainTest { private static void processFileName(String name, Properties p) { if (!name.endsWith(".class") || name.contains("$") // subclasses - || name.equals("examples/Main.class") // the initial class, don't want to add that + || name.endsWith("examples/Main.class") // the initial class, don't want to add that || !hasMainMethod(name) ) { return; Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/ntp/TestNtpClient.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ntp/TestNtpClient.java?rev=1792230&r1=1792229&r2=1792230&view=diff ============================================================================== --- commons/proper/net/trunk/src/test/java/org/apache/commons/net/ntp/TestNtpClient.java (original) +++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/ntp/TestNtpClient.java Fri Apr 21 16:30:03 2017 @@ -21,7 +21,7 @@ import org.junit.BeforeClass; import org.junit.Assert; import org.junit.Test; -import examples.ntp.SimpleNTPServer; +import org.apache.commons.net.examples.ntp.SimpleNTPServer; import java.io.IOException; import java.net.InetAddress;