Test

1 files changed, 31 insertions, 92 deletions

diff --git a/Dozentenmodul/src/GUI/FTPUploader.java b/Dozentenmodul/src/GUI/FTPUploader.java
index 119f5b6c..d4908914 100644
--- a/Dozentenmodul/src/GUI/FTPUploader.java
+++ b/Dozentenmodul/src/GUI/FTPUploader.java
@@ -1,6 +1,9 @@
 package GUI;

 

 import java.awt.BorderLayout;

+import rmi.*;

+import server.ServerInterface;

+

 import java.awt.Color;

 import java.awt.Dimension;

 import java.awt.EventQueue;

@@ -11,6 +14,7 @@ import java.io.File;
 import java.io.IOException;

 import java.io.InputStream;

 import java.io.InputStreamReader;

+import java.rmi.RemoteException;

 import java.util.Properties;

 import javax.swing.JButton;

 import javax.swing.JFileChooser;

@@ -35,7 +39,7 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;

 import java.awt.event.WindowAdapter;

 import java.awt.event.WindowEvent;

-

+import Models.User;

 @SuppressWarnings("serial")

 public class FTPUploader extends JFrame implements PropertyChangeListener {

 

@@ -44,10 +48,9 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
 	private final JPanel contentPanel = new JPanel();

 	JLabel lblNewLabel;

 	JProgressBar progressBar;

-	String host="bwlp-masterserver.ruf.uni-freiburg.de";

+	String host="141.79.128.121";

 	int port=21;

-	String username="openslx";

-	String password="openslx-ng";

+	User user;

 	String uploadPath="/";

 	String filename="";

 	File uploadFile;

@@ -58,6 +61,8 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
 	 JLabel labelfilesize;

 	 JLabel labelZeit;

 	 JLabel labelverbleibend;

+	 JLabel labeluser;

+	 JLabel labelpass;

 		long filesize;

 		double speed;

 		long bytesread;

@@ -199,6 +204,14 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
 		labelverbleibend = new JLabel("");

 		labelverbleibend.setBounds(434, 114, 108, 14);

 		contentPanel.add(labelverbleibend);

+		

+		labeluser = new JLabel("");

+		labeluser.setBounds(196, 159, 117, 14);

+		contentPanel.add(labeluser);

+		

+		labelpass = new JLabel("");

+		labelpass.setBounds(337, 155, 134, 14);

+		contentPanel.add(labelpass);

 		{

 			JPanel buttonPane = new JPanel();

 			buttonPane.setBackground(UIManager.getColor("Button.background"));

@@ -255,13 +268,24 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
 	    	//System.out.println("OK");

 	    //}

         progressBar.setValue(0);

-        task=new UploadTask(host,port,username,password,uploadPath, uploadFile);

+        RmiClientMethods rmi=new RmiClientMethods();

+        ServerInterface sint=rmi.getInterface();

+        try {

+			user=sint.getFtpUser();

+		} catch (RemoteException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+        System.out.println("username: "+user.getUsername());

+        labeluser.setText(user.getUsername());

+        labelpass.setText(user.getPass());

+        task=new UploadTask(host,port,user.getUsername(),user.getPass(),uploadPath, uploadFile);

         task.addPropertyChangeListener(this);

         task.execute();

         taskrun=true;

         

-        createXML();

-        TransferToSatellit();

+        //createXML();

+        //TransferToSatellit();

         

     	

     }

@@ -304,90 +328,5 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
 		

 	}

 	

-	public void createXML()

-	{

-		JSch j=new JSch();

-		

-		try {

-			Session se=j.getSession("openslx", "132.230.4.16", 22);

-			

-			Properties config = new Properties();

-	        config.setProperty("StrictHostKeyChecking", "no");

-	        se.setConfig(config);

-	        se.setPassword("openslx-ng");

-	        se.connect();

-	       

-			

-			ChannelExec ch=(ChannelExec) se.openChannel("exec");

-			 InputStream is=ch.getInputStream();

-			String OS="winvista";

-			

-			ch.setCommand("sh /home/openslx/scripts/xml_file_creator.sh '"+vm.vl.getLaborname()+"' '"+person.ersteller.getName()+" "+person.ersteller.getVorname()+"' '"+person.ersteller.getEMail()+"' '"+vm.vl.getShortDesc()+"' '"+vm.vl.getLongDesc()+"' '"+OS+"'");

-			//ch.setCommand("ls");

-			

-			ch.connect();

-			

-			BufferedReader reader = new BufferedReader(new InputStreamReader(is));

-	        String line;

-	        int index = 0;

-

-	        while ((line = reader.readLine()) != null)

-	        {

-	            System.out.println(++index + " : " + line);

-	        }

 

-	        

-	        ch.disconnect();

-	        se.disconnect();

-

-	       

-		} catch (JSchException | IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-	}

-	

-	public void TransferToSatellit()

-	{

-		JSch j=new JSch();

-		

-		try {

-			Session se=j.getSession("openslx", "132.230.4.16", 22);

-			

-			Properties config = new Properties();

-	        config.setProperty("StrictHostKeyChecking", "no");

-	        se.setConfig(config);

-	        se.setPassword("openslx-ng");

-	        se.connect();

-	       

-			

-			ChannelExec ch=(ChannelExec) se.openChannel("exec");

-			 InputStream is=ch.getInputStream();

-			

-			System.out.println(vm.vl.getLaborname()+".xml");

-			System.out.println(lblNewLabel.getText().substring(lblNewLabel.getText().lastIndexOf("\\")+1));

-			ch.setCommand("sh /home/openslx/scripts/copy_files_to_satellite.sh '"+vm.vl.getLaborname()+".xml' '"+lblNewLabel.getText().substring(lblNewLabel.getText().lastIndexOf("\\")+1)+"'");

-			//ch.setCommand("ls");

-			System.out.println("Erfolg");

-			ch.connect();

-			

-			BufferedReader reader = new BufferedReader(new InputStreamReader(is));

-	        String line;

-	        int index = 0;

-

-	        while ((line = reader.readLine()) != null)

-	        {

-	            System.out.println(++index + " : " + line);

-	        }

-

-	        

-	        ch.disconnect();

-	        se.disconnect();

-

-	       

-		} catch (JSchException | IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-	}

 }
\ No newline at end of file