Added Globals.java and global properties

Added Ftpserver test
Created some ftp testign in App.java (needs to be removed)
Added Ftplet to trigger on FTP Commands

1 files changed, 56 insertions, 1 deletions

diff --git a/src/test/java/org/openslx/imagemaster/AppTest.java b/src/test/java/org/openslx/imagemaster/AppTest.java
index 0add740..6c1350c 100644
--- a/src/test/java/org/openslx/imagemaster/AppTest.java
+++ b/src/test/java/org/openslx/imagemaster/AppTest.java
@@ -1,9 +1,17 @@
 package org.openslx.imagemaster;
 
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.ConnectException;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+import org.apache.commons.net.ftp.FTP;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPReply;
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
@@ -66,7 +74,7 @@ public class AppTest
 			assertTrue("Could not ping server", false);
 		}
     	try {
-    		SessionData sessionData = client.authenticate("ns202", "xxxxxxxxxxx");
+    		SessionData sessionData = client.authenticate("ns202", "xxxxxxxxxxxx");
 			UserInfo userInfo = client.getUserFromToken(sessionData.getAuthToken());
 			System.out.println("User info: " + userInfo);
 			System.out.println("Server address from MySQL: " + sessionData.serverAddress);
@@ -75,4 +83,51 @@ public class AppTest
 			assertTrue("Could not login", false);
 		}
     }
+    
+    /**
+     * Test FTP connection
+     */
+    public void testFtpConnection() {
+    	FTPClient client = new FTPClient();
+    	String host = "localhost";
+    	int port = 2221;
+    	String user = "admin";
+    	String password = "SI*HoZCC!]V)p>B2";
+    	String fileName = "/home/nils/file_to_upload.bin";
+    	
+    	try {
+			client.connect(host, port);
+			System.out.println("Connected to " + host + ":" + port + ". Reply code: " + client.getReplyCode());
+			if ( !FTPReply.isPositiveCompletion( client.getReplyCode() ) ) {
+				ConnectException ce = new ConnectException("No positive reply code.");
+				throw ce;
+			}
+			if ( !client.login(user, password) ) {
+				ConnectException ce = new ConnectException("Could not login.");
+				throw ce;
+			}
+			System.out.println("Logged in with user: " + user);
+			client.setFileType(FTP.BINARY_FILE_TYPE);
+			client.enterLocalPassiveMode();
+			System.out.println("Entered PASSIVE MODE");
+			InputStream input = new FileInputStream(fileName);
+			client.makeDirectory("myFolder");
+			System.out.println("Made directory 'myFolder'");
+			System.out.print("Starting file upload ... ");
+			client.storeFile("myFolder/myFile.txt", input);
+			System.out.println("done.");
+			client.noop();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			if (client.isConnected()) {
+				try {
+					client.logout();
+					client.disconnect();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}		
+    }
 }