Up - und Download funktionieren nun, wichtig im Dozentenmodul muss der volle Serverpfad angegeben sein.

29 files changed, 152 insertions, 153 deletions

diff --git a/Dozentenmodul/bin/GUI/ActionChooser$2.class b/Dozentenmodul/bin/GUI/ActionChooser$2.class
index 986d5e43..b759b25e 100644
--- a/Dozentenmodul/bin/GUI/ActionChooser$2.class
+++ b/Dozentenmodul/bin/GUI/ActionChooser$2.class
diff --git a/Dozentenmodul/bin/GUI/ActionChooser.class b/Dozentenmodul/bin/GUI/ActionChooser.class
index 3c9d4d89..378f708a 100644
--- a/Dozentenmodul/bin/GUI/ActionChooser.class
+++ b/Dozentenmodul/bin/GUI/ActionChooser.class
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader$1.class b/Dozentenmodul/bin/GUI/FTPDownloader$1.class
index 1660d1a1..b97f479a 100644
--- a/Dozentenmodul/bin/GUI/FTPDownloader$1.class
+++ b/Dozentenmodul/bin/GUI/FTPDownloader$1.class
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader$2.class b/Dozentenmodul/bin/GUI/FTPDownloader$2.class
index 297f1c45..3114758a 100644
--- a/Dozentenmodul/bin/GUI/FTPDownloader$2.class
+++ b/Dozentenmodul/bin/GUI/FTPDownloader$2.class
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader$3.class b/Dozentenmodul/bin/GUI/FTPDownloader$3.class
index 1856b309..1804e5a1 100644
--- a/Dozentenmodul/bin/GUI/FTPDownloader$3.class
+++ b/Dozentenmodul/bin/GUI/FTPDownloader$3.class
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader$4.class b/Dozentenmodul/bin/GUI/FTPDownloader$4.class
index 5075949c..95a47553 100644
--- a/Dozentenmodul/bin/GUI/FTPDownloader$4.class
+++ b/Dozentenmodul/bin/GUI/FTPDownloader$4.class
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader.class b/Dozentenmodul/bin/GUI/FTPDownloader.class
index f5ff4747..5e40b98e 100644
--- a/Dozentenmodul/bin/GUI/FTPDownloader.class
+++ b/Dozentenmodul/bin/GUI/FTPDownloader.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader$1.class b/Dozentenmodul/bin/GUI/FTPUploader$1.class
index 663a8846..eb35f67d 100644
--- a/Dozentenmodul/bin/GUI/FTPUploader$1.class
+++ b/Dozentenmodul/bin/GUI/FTPUploader$1.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader$2.class b/Dozentenmodul/bin/GUI/FTPUploader$2.class
index efbfd432..947c4bfc 100644
--- a/Dozentenmodul/bin/GUI/FTPUploader$2.class
+++ b/Dozentenmodul/bin/GUI/FTPUploader$2.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader$3.class b/Dozentenmodul/bin/GUI/FTPUploader$3.class
index b00dc547..a2c03bb7 100644
--- a/Dozentenmodul/bin/GUI/FTPUploader$3.class
+++ b/Dozentenmodul/bin/GUI/FTPUploader$3.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader$4.class b/Dozentenmodul/bin/GUI/FTPUploader$4.class
index 1f329752..e4bc53ff 100644
--- a/Dozentenmodul/bin/GUI/FTPUploader$4.class
+++ b/Dozentenmodul/bin/GUI/FTPUploader$4.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader$5.class b/Dozentenmodul/bin/GUI/FTPUploader$5.class
index 1e96a33d..10020730 100644
--- a/Dozentenmodul/bin/GUI/FTPUploader$5.class
+++ b/Dozentenmodul/bin/GUI/FTPUploader$5.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader.class b/Dozentenmodul/bin/GUI/FTPUploader.class
index 0f80542b..1a25bc45 100644
--- a/Dozentenmodul/bin/GUI/FTPUploader.class
+++ b/Dozentenmodul/bin/GUI/FTPUploader.class
diff --git a/Dozentenmodul/bin/GUI/searchRohling.class b/Dozentenmodul/bin/GUI/searchRohling.class
index 5f0113fd..5ae1d551 100644
--- a/Dozentenmodul/bin/GUI/searchRohling.class
+++ b/Dozentenmodul/bin/GUI/searchRohling.class
diff --git a/Dozentenmodul/bin/downloader/FTPUtility.class b/Dozentenmodul/bin/downloader/FTPUtility.class
index f5a5dd90..33125b5c 100644
--- a/Dozentenmodul/bin/downloader/FTPUtility.class
+++ b/Dozentenmodul/bin/downloader/FTPUtility.class
diff --git a/Dozentenmodul/bin/downloader/jschtest$HardcodedUserInfo.class b/Dozentenmodul/bin/downloader/jschtest$HardcodedUserInfo.class
deleted file mode 100644
index 02818b1a..00000000
--- a/Dozentenmodul/bin/downloader/jschtest$HardcodedUserInfo.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/downloader/jschtest.class b/Dozentenmodul/bin/downloader/jschtest.class
deleted file mode 100644
index 8d06f1fe..00000000
--- a/Dozentenmodul/bin/downloader/jschtest.class
+++ /dev/null
diff --git a/Dozentenmodul/src/GUI/ActionChooser.java b/Dozentenmodul/src/GUI/ActionChooser.java
index f469878d..b5769ba7 100644
--- a/Dozentenmodul/src/GUI/ActionChooser.java
+++ b/Dozentenmodul/src/GUI/ActionChooser.java
@@ -113,7 +113,6 @@ public class ActionChooser extends JFrame {
 		contentPanel.add(rdbtnLaborvorlageHerunterladen);

 		

 		JRadioButton rdbtnEigenschaftenEinerVl = new JRadioButton("Fertiges Labor hochladen");

-		rdbtnEigenschaftenEinerVl.setEnabled(false);

 		buttonGroup.add(rdbtnEigenschaftenEinerVl);

 		rdbtnEigenschaftenEinerVl.setBackground(Color.WHITE);

 		rdbtnEigenschaftenEinerVl.setBounds(6, 53, 185, 23);

diff --git a/Dozentenmodul/src/GUI/FTPDownloader.java b/Dozentenmodul/src/GUI/FTPDownloader.java
index a8ed8785..796e3798 100644
--- a/Dozentenmodul/src/GUI/FTPDownloader.java
+++ b/Dozentenmodul/src/GUI/FTPDownloader.java
@@ -6,6 +6,8 @@ import java.awt.Dimension;
 import java.awt.FlowLayout;

 import java.awt.Toolkit;

 import java.io.File;

+import java.rmi.RemoteException;

+

 import javax.swing.JButton;

 import javax.swing.JFileChooser;

 import javax.swing.JFrame;

@@ -16,6 +18,11 @@ import javax.swing.SwingConstants;
 import javax.swing.UIManager;

 import javax.swing.UnsupportedLookAndFeelException;

 import javax.swing.border.EmptyBorder;

+

+import Models.User;

+

+import rmi.RmiClientMethods;

+import server.ServerInterface;

 import downloader.DownloadTask;

 import java.awt.event.ActionListener;

 import java.awt.event.ActionEvent;

@@ -32,8 +39,9 @@ public class FTPDownloader extends JFrame implements PropertyChangeListener {
 	private final JPanel contentPanel = new JPanel();

 	JLabel lblNewLabel;

 	JLabel downspeed;

+	User user;

 	JProgressBar progressBar;

-	String host="132.230.4.16";

+	String host="141.79.128.121";

 	int port=21;

 	String username="openslx";

 	String password="openslx-ng";

@@ -49,6 +57,8 @@ public class FTPDownloader extends JFrame implements PropertyChangeListener {
 	long bytesread;

 	JLabel labelZeit; 

 	boolean taskrun=false;

+    RmiClientMethods rmi=new RmiClientMethods();

+    ServerInterface sint=rmi.getInterface();

 	/**

 	 * Launch the application.

 	 */

@@ -74,6 +84,12 @@ public class FTPDownloader extends JFrame implements PropertyChangeListener {
 			public void windowClosing(WindowEvent e) {

 				if(taskrun==true)

 				{

+					try {

+						sint.DeleteFtpUser(user.getUsername());

+					} catch (RemoteException e1) {

+						// TODO Auto-generated catch block

+						e1.printStackTrace();

+					}

 				task.cancel(true);

 				}

 				dispose();

@@ -196,6 +212,12 @@ public class FTPDownloader extends JFrame implements PropertyChangeListener {
 						if(taskrun==true)

 						{

 						task.cancel(true);

+						try {

+							sint.DeleteFtpUser(user.getUsername());

+						} catch (RemoteException e1) {

+							// TODO Auto-generated catch block

+							e1.printStackTrace();

+						}

 						}

 						dispose();

 					}

@@ -211,7 +233,18 @@ public class FTPDownloader extends JFrame implements PropertyChangeListener {
     private void buttonDownloadActionPerformed(ActionEvent event) {

  

         progressBar.setValue(0);

-        task = new DownloadTask(host, port, username, password,downloadPath+filename, lblNewLabel.getText(), this);

+

+        try {

+        	user=sint.getFtpUser();

+			downloadPath=sint.getPathOfImage(filename);

+		} catch (RemoteException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

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

+        

+        task = new DownloadTask(host, port, user.getUsername(), user.getPass(),downloadPath+filename+".vmdk", lblNewLabel.getText(), this);

+        System.out.println(downloadPath+filename);

         task.addPropertyChangeListener(this);

         task.execute();

         taskrun=true;

diff --git a/Dozentenmodul/src/GUI/FTPUploader.java b/Dozentenmodul/src/GUI/FTPUploader.java
index f1552be4..f92fa172 100644
--- a/Dozentenmodul/src/GUI/FTPUploader.java
+++ b/Dozentenmodul/src/GUI/FTPUploader.java
@@ -3,19 +3,13 @@ package GUI;
 import java.awt.BorderLayout;

 import rmi.*;

 import server.ServerInterface;

-

 import java.awt.Color;

 import java.awt.Dimension;

 import java.awt.EventQueue;

 import java.awt.FlowLayout;

 import java.awt.Toolkit;

-import java.io.BufferedReader;

 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;

 import javax.swing.JFrame;

@@ -26,12 +20,6 @@ import javax.swing.SwingConstants;
 import javax.swing.UIManager;

 import javax.swing.UnsupportedLookAndFeelException;

 import javax.swing.border.EmptyBorder;

-import com.jcraft.jsch.ChannelExec;

-import com.jcraft.jsch.JSch;

-import com.jcraft.jsch.JSchException;

-import com.jcraft.jsch.Session;

-import Models.person;

-import Models.vm;

 import downloader.UploadTask;

 import java.awt.event.ActionListener;

 import java.awt.event.ActionEvent;

@@ -40,6 +28,7 @@ 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 {

 

diff --git a/Dozentenmodul/src/GUI/searchRohling.java b/Dozentenmodul/src/GUI/searchRohling.java
index 807fc7b3..e0c0a9ba 100644
--- a/Dozentenmodul/src/GUI/searchRohling.java
+++ b/Dozentenmodul/src/GUI/searchRohling.java
@@ -19,7 +19,11 @@ import javax.swing.JTextField;
 import java.awt.event.KeyAdapter;

 import java.awt.event.KeyEvent;

 import java.net.SocketException;

+import java.rmi.RemoteException;

 import java.security.NoSuchAlgorithmException;

+import java.sql.ResultSet;

+import java.sql.SQLException;

+import java.util.ArrayList;

 import java.awt.List;

 import java.awt.event.ActionListener;

 import java.awt.event.ActionEvent;

@@ -35,18 +39,24 @@ import java.awt.event.WindowEvent;
 import javax.swing.JComboBox;

 import javax.swing.DefaultComboBoxModel;

 

+import rmi.RmiClientMethods;

+import server.ServerInterface;

+

+import Models.User;

+

 @SuppressWarnings("serial")

 public class searchRohling extends JFrame {

 

 	private final JPanel contentPanel = new JPanel();

 	private JTextField textFieldsearch;

 	List list;

-	String[] result;

-	String host="132.230.4.16";

+	ArrayList<String> result;

+	String host="141.79.128.121";

+	User user;

 	int port=21;

-	String user="openslx";

-	String pass="openslx-ng";

-	FTPUtility f=new FTPUtility(host, port, user, pass);

+    RmiClientMethods rmi=new RmiClientMethods();

+    ServerInterface sint=rmi.getInterface();

+	//FTPUtility f=new FTPUtility(host, port, user.getUsername(), user.getPass());

 	/**

 	 * Launch the application.

 	 */

@@ -63,7 +73,7 @@ public class searchRohling extends JFrame {
 	/**

 	 * Create the dialog.

 	 */

-	@SuppressWarnings({ "unchecked", "rawtypes" })

+	

 	public searchRohling() {

 		getContentPane().setEnabled(false);

 		addWindowListener(new WindowAdapter() {

@@ -105,14 +115,14 @@ public class searchRohling extends JFrame {
 			txtpnBitteWhlenSie.setBounds(10, 36, 509, 42);

 			panel.add(txtpnBitteWhlenSie);

 		}

-		contentPanel.setBounds(10, 152, 567, 420);

+		contentPanel.setBounds(10, 126, 567, 446);

 		contentPanel.setBackground(Color.WHITE);

 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

 		getContentPane().add(contentPanel);

 		contentPanel.setLayout(null);

 		

 		list = new List();

-		list.setBounds(0, 10, 567, 400);

+		list.setBounds(10, 10, 547, 426);

 		contentPanel.add(list);

 		{

 			JPanel buttonPane = new JPanel();

@@ -161,21 +171,8 @@ public class searchRohling extends JFrame {
 		textFieldsearch.addKeyListener(new KeyAdapter() {

 			@Override

 			public void keyReleased(KeyEvent arg0) {

-				System.out.println(textFieldsearch.getText().toString());

-				

-				try {

-					try {

-						f.connect();

-					} catch (NoSuchAlgorithmException e) {

-						// TODO Auto-generated catch block

-						e.printStackTrace();

-					}

-					result=f.getAllRohling(textFieldsearch.getText().toString());

-				} catch (SocketException | FTPException e) {

-					// TODO Auto-generated catch block

-					e.printStackTrace();

-				}

-				list.removeAll();

+				System.out.println(textFieldsearch.getText().toString());}}

+				/*list.removeAll();

 				for(int i=0;i<result.length;i++)

 				{

 					if(result[i]!=null)

@@ -183,7 +180,7 @@ public class searchRohling extends JFrame {
 					

 				}

 			}

-		});

+		}*/);

 		textFieldsearch.setBounds(91, 95, 166, 20);

 		getContentPane().add(textFieldsearch);

 		textFieldsearch.setColumns(10);

@@ -200,16 +197,6 @@ public class searchRohling extends JFrame {
 		lblName.setBounds(10, 98, 71, 14);

 		getContentPane().add(lblName);

 		

-		JComboBox comboBox = new JComboBox();

-		comboBox.setEnabled(false);

-		comboBox.setModel(new DefaultComboBoxModel(new String[] {"Windows 7", "Windows 8", "Ubuntu"}));

-		comboBox.setBounds(91, 121, 166, 20);

-		getContentPane().add(comboBox);

-		

-		JLabel lblOs = new JLabel("OS:");

-		lblOs.setBounds(10, 123, 71, 14);

-		getContentPane().add(lblOs);

-		

 		JMenuBar menuBar = new JMenuBar();

 		setJMenuBar(menuBar);

 		

@@ -229,22 +216,19 @@ public class searchRohling extends JFrame {
 		mnNewMenu_1.add(mntmOtrs);

 		

 try {

-			try {

-				f.connect();

-			} catch (NoSuchAlgorithmException e1) {

-				// TODO Auto-generated catch block

-				e1.printStackTrace();

-			}

-			result=f.getAllRohling(textFieldsearch.getText().toString());

-			list.removeAll();

-			for(int i=0;i<result.length;i++)

+			result=sint.getImages();

+			

+			for(int i=0; i<result.size();i++)

 			{

-				

-				list.add(result[i]);

+				System.out.println(result.get(i).toString());

+				list.add(result.get(i).toString());

 			}

-		} catch (SocketException | FTPException e) {

+

+			//list.removeAll();

+

+		} catch (RemoteException e2) {

 			// TODO Auto-generated catch block

-			e.printStackTrace();

+			e2.printStackTrace();

 		}

 

 	

diff --git a/Dozentenmodul/src/downloader/FTPUtility.java b/Dozentenmodul/src/downloader/FTPUtility.java
index 14b30aeb..bc45e69f 100644
--- a/Dozentenmodul/src/downloader/FTPUtility.java
+++ b/Dozentenmodul/src/downloader/FTPUtility.java
@@ -4,13 +4,9 @@ import java.io.File;
 import java.io.IOException;

 import java.io.InputStream;

 import java.io.OutputStream;

-import java.math.BigInteger;

 import java.net.SocketException;

-import java.security.MessageDigest;

 import java.security.NoSuchAlgorithmException;

-

 import org.apache.commons.net.ftp.FTP;

-import org.apache.commons.net.ftp.FTPClient;

 import org.apache.commons.net.ftp.FTPFile;

 import org.apache.commons.net.ftp.FTPReply;

 import org.apache.commons.net.ftp.FTPSClient;

diff --git a/Dozentenmodul/src/downloader/jschtest.java b/Dozentenmodul/src/downloader/jschtest.java
deleted file mode 100644
index 83be7e03..00000000
--- a/Dozentenmodul/src/downloader/jschtest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package downloader;

-

-import java.io.File;

-import java.io.FileInputStream;

-import java.io.FileNotFoundException;

-import java.util.Properties;

-

-import com.jcraft.jsch.ChannelSftp;

-import com.jcraft.jsch.JSch;

-import com.jcraft.jsch.JSchException;

-import com.jcraft.jsch.Session;

-import com.jcraft.jsch.SftpException;

-import com.jcraft.jsch.UserInfo;

-

-public class jschtest {

-

-	/**

-	 * @param args

-	 */

-	public static void main(String[] args) {

-		File testfile=new File("C:\\Users\\tspitzer\\Documents\\201301_ws_win7_OPT_Apps_NC_Off2010.zip");

-		try {

-			sftpFile(testfile, "fr-bwlehrpool-rw-admin" , "fefobu36", "bwsonas.lsdf.kit.edu", "/.mounts/bwlehrpool");

-		} catch (FileNotFoundException | JSchException | SftpException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

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

-

-	}

-

-	private static void sftpFile(File localFile, String username, String password, String hostname, String remoteDirectory)

-            throws JSchException, SftpException, FileNotFoundException {

- 

-        JSch jsch = new JSch();

-        String filename = localFile.getName();

-        Session session = jsch.getSession(username, hostname, 22);

-        session.setUserInfo(new HardcodedUserInfo(password));

-        Properties config = new Properties();

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

-        session.setConfig(config);

-        session.connect();

-        ChannelSftp channel = (ChannelSftp)session.openChannel("sftp");

-        channel.connect();

-        channel.cd(remoteDirectory);

-        channel.put(new FileInputStream(localFile), filename);

-        channel.disconnect();

-        session.disconnect();

-    }

-	

-    private static class HardcodedUserInfo implements UserInfo {

-    	 

-        private final String password;

- 

-        private HardcodedUserInfo(String password) {

-            this.password = password;

-        }

- 

-        public String getPassphrase() {

-            return null;

-        }

- 

-        public String getPassword() {

-            return password;

-        }

- 

-        public boolean promptPassword(String s) {

-            return true;

-        }

- 

-        public boolean promptPassphrase(String s) {

-            return true;

-        }

- 

-        public boolean promptYesNo(String s) {

-            return true;

-        }

- 

-        public void showMessage(String s) {

-            System.out.println("message = " + s);

-        }

-    }

- 

-}

diff --git a/Dozentenmodulserver/bin/server/ServerInterface.class b/Dozentenmodulserver/bin/server/ServerInterface.class
index ca7f3971..411a676d 100644
--- a/Dozentenmodulserver/bin/server/ServerInterface.class
+++ b/Dozentenmodulserver/bin/server/ServerInterface.class
diff --git a/Dozentenmodulserver/bin/server/ServerMethod.class b/Dozentenmodulserver/bin/server/ServerMethod.class
index e08f8a11..4b4096d1 100644
--- a/Dozentenmodulserver/bin/server/ServerMethod.class
+++ b/Dozentenmodulserver/bin/server/ServerMethod.class
diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class
index 49415869..245013e2 100644
--- a/Dozentenmodulserver/bin/sql/SQL.class
+++ b/Dozentenmodulserver/bin/sql/SQL.class
diff --git a/Dozentenmodulserver/src/server/ServerInterface.java b/Dozentenmodulserver/src/server/ServerInterface.java
index 6ae6e529..bce713c0 100644
--- a/Dozentenmodulserver/src/server/ServerInterface.java
+++ b/Dozentenmodulserver/src/server/ServerInterface.java
@@ -1,5 +1,7 @@
 package server;

 import java.rmi.*;

+import java.sql.ResultSet;

+import java.util.ArrayList;

 

 import Models.User;

 

@@ -7,6 +9,7 @@ public interface ServerInterface extends Remote
 {

         public User getFtpUser() throws RemoteException;

         public int DeleteFtpUser(String user) throws RemoteException;

-        

+        public ArrayList<String> getImages() throws RemoteException;

+        public String getPathOfImage(String name) throws RemoteException;

         

 }

diff --git a/Dozentenmodulserver/src/server/ServerMethod.java b/Dozentenmodulserver/src/server/ServerMethod.java
index a401c7b9..1039e238 100644
--- a/Dozentenmodulserver/src/server/ServerMethod.java
+++ b/Dozentenmodulserver/src/server/ServerMethod.java
@@ -6,6 +6,9 @@ import java.rmi.server.UnicastRemoteObject;
 import java.security.MessageDigest;

 import java.security.NoSuchAlgorithmException;

 import java.sql.Connection;

+import java.sql.ResultSet;

+import java.sql.SQLException;

+import java.util.ArrayList;

 import java.util.UUID;

 import Models.*;

 import sql.SQL;

@@ -14,6 +17,7 @@ import sql.SQL;
 public class ServerMethod extends UnicastRemoteObject implements ServerInterface

 {

     protected static String          m_strName;

+ 

 

     public ServerMethod() throws RemoteException

     {

@@ -77,6 +81,48 @@ public class ServerMethod extends UnicastRemoteObject implements ServerInterface
 		return null;

 	}

 

-

+	

+	

+	public ArrayList<String> getImages(){

+		

+		

+		SQL sql=new SQL();

+		Connection con=sql.getConnection();

+		ResultSet rs= sql.getImage(con);

+		ArrayList<String> al=new ArrayList<String>();

+		try {

+			while(rs.next())

+			{

+						

+				al.add(rs.getString(1));				

+				

+			}

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		return al;

+	}

+	

+	public String getPathOfImage(String name){

+		

+		String path = null;

+		SQL sql=new SQL();

+		Connection con=sql.getConnection();

+		ResultSet rs= sql.getPathOfImage(con, name);

+		

+		try {

+			while(rs.next())

+			{

+						

+				path=rs.getString(1);				

+				

+			}

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		return path;

+	}

 

 }
\ No newline at end of file
diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index 8a25491b..7d990116 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -2,6 +2,7 @@ package sql;
 

 import java.sql.Connection;

 import java.sql.DriverManager;

+import java.sql.ResultSet;

 import java.sql.SQLException;

 import java.sql.Statement;

 

@@ -59,6 +60,38 @@ public class SQL {
 		}

 		return -1;

 	}

+	

+	public ResultSet getImage(Connection con)

+	{

+		try {

+			Statement stm=con.createStatement();

+			

+			return stm.executeQuery("SELECT image_name FROM bwLehrpool.m_VLData_imageInfo;");

+			

+			

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		

+		

+		return null;

+	}

 

-

+	public ResultSet getPathOfImage(Connection con, String image_name)

+	{

+		try {

+			Statement stm=con.createStatement();

+			

+			return stm.executeQuery("SELECT image_path FROM bwLehrpool.m_VLData_imageInfo where image_name like '"+image_name+"';");

+			

+			

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		

+		

+		return null;

+	}

 }