From 9b3cc41689348dfb8d46a4ed8a66541e9008b851 Mon Sep 17 00:00:00 2001
From: unknown
Date: Fri, 29 Nov 2013 09:50:28 +0100
Subject: Test
---
Dozentenmodul/.classpath | 3 +
Dozentenmodul/bin/GUI/ActionChooser$2.class | Bin 0 -> 1088 bytes
Dozentenmodul/bin/GUI/EingabeAllgemein$4.class | Bin 0 -> 2254 bytes
Dozentenmodul/bin/GUI/EingabeSoftwareDaten$7.class | Bin 0 -> 962 bytes
Dozentenmodul/bin/GUI/EingabeSystemDaten$4.class | Bin 0 -> 2098 bytes
Dozentenmodul/bin/GUI/FTPDownloader$3.class | Bin 0 -> 750 bytes
Dozentenmodul/bin/GUI/FTPDownloader$4.class | Bin 0 -> 695 bytes
Dozentenmodul/bin/GUI/FTPDownloader$5.class | Bin 0 -> 871 bytes
Dozentenmodul/bin/GUI/FTPUploader$4.class | Bin 0 -> 707 bytes
Dozentenmodul/bin/GUI/FTPUploader$5.class | Bin 0 -> 654 bytes
Dozentenmodul/bin/GUI/FTPUploader$6.class | Bin 0 -> 826 bytes
Dozentenmodul/bin/GUI/Freigabe$1.class | Bin 0 -> 629 bytes
Dozentenmodul/bin/GUI/Freigabe$2.class | Bin 0 -> 1099 bytes
Dozentenmodul/bin/GUI/Freigabe$3.class | Bin 0 -> 764 bytes
Dozentenmodul/bin/GUI/Freigabe$4.class | Bin 0 -> 740 bytes
Dozentenmodul/bin/GUI/Freigabe.class | Bin 0 -> 6056 bytes
Dozentenmodul/bin/GUI/LoginWindow$3.class | Bin 0 -> 1011 bytes
Dozentenmodul/bin/GUI/Rechtsbelehrung$1.class | Bin 0 -> 674 bytes
Dozentenmodul/bin/GUI/Rechtsbelehrung$2.class | Bin 0 -> 1152 bytes
Dozentenmodul/bin/GUI/Rechtsbelehrung.class | Bin 0 -> 4602 bytes
Dozentenmodul/bin/GUI/Summary$1.class | Bin 0 -> 623 bytes
Dozentenmodul/bin/GUI/Summary$2.class | Bin 0 -> 733 bytes
Dozentenmodul/bin/GUI/Summary$3.class | Bin 0 -> 650 bytes
Dozentenmodul/bin/GUI/Summary$4.class | Bin 0 -> 738 bytes
Dozentenmodul/bin/GUI/Summary$5.class | Bin 0 -> 739 bytes
Dozentenmodul/bin/GUI/Summary$6.class | Bin 0 -> 743 bytes
Dozentenmodul/bin/GUI/Summary$7.class | Bin 0 -> 711 bytes
Dozentenmodul/bin/GUI/Summary.class | Bin 0 -> 10754 bytes
Dozentenmodul/bin/GUI/getVMwarePlayer$3.class | Bin 0 -> 791 bytes
Dozentenmodul/bin/GUI/getVMwarePlayer$4.class | Bin 0 -> 797 bytes
Dozentenmodul/bin/GUI/searchRohling$5.class | Bin 0 -> 1586 bytes
Dozentenmodul/src/GUI/FTPUploader.java | 123 +++++------------
Dozentenmodul/src/GUI/LoginWindow.java | 1 +
Dozentenmodul/src/rmi/RmiClientMethods.java | 29 ++++
.../WebContent/GUI/de/men\303\274.html" | 9 --
Dozentenmodul_V1/bin/WebContent/GUI/de/AddOS.jsp | 47 +++++++
.../bin/WebContent/GUI/de/ESXI_Redirection.jsp | 37 ++++++
Dozentenmodul_V1/bin/WebContent/GUI/de/Home.jsp | 87 ++++++++++++
Dozentenmodul_V1/bin/WebContent/GUI/de/Login.jsp | 34 +++++
.../bin/WebContent/GUI/de/Login_Error.jsp | 12 ++
Dozentenmodul_V1/bin/WebContent/GUI/de/OTRS.jsp | 20 +++
.../bin/WebContent/GUI/de/VLUpload.jsp | 41 ++++++
.../bin/WebContent/GUI/de/VL_bearbeiten.jsp | 12 ++
.../bin/WebContent/GUI/de/createVL_Software.jsp | 109 +++++++++++++++
.../bin/WebContent/GUI/de/createVL_System.jsp | 146 +++++++++++++++++++++
.../bin/WebContent/GUI/de/createVL_allgemein.jsp | 97 ++++++++++++++
Dozentenmodul_V1/bin/WebContent/GUI/de/footer.html | 7 +
Dozentenmodul_V1/bin/WebContent/GUI/de/header.html | 7 +
Dozentenmodul_V1/bin/WebContent/GUI/de/news.jsp | 15 +++
49 files changed, 735 insertions(+), 101 deletions(-)
create mode 100644 Dozentenmodul/bin/GUI/ActionChooser$2.class
create mode 100644 Dozentenmodul/bin/GUI/EingabeAllgemein$4.class
create mode 100644 Dozentenmodul/bin/GUI/EingabeSoftwareDaten$7.class
create mode 100644 Dozentenmodul/bin/GUI/EingabeSystemDaten$4.class
create mode 100644 Dozentenmodul/bin/GUI/FTPDownloader$3.class
create mode 100644 Dozentenmodul/bin/GUI/FTPDownloader$4.class
create mode 100644 Dozentenmodul/bin/GUI/FTPDownloader$5.class
create mode 100644 Dozentenmodul/bin/GUI/FTPUploader$4.class
create mode 100644 Dozentenmodul/bin/GUI/FTPUploader$5.class
create mode 100644 Dozentenmodul/bin/GUI/FTPUploader$6.class
create mode 100644 Dozentenmodul/bin/GUI/Freigabe$1.class
create mode 100644 Dozentenmodul/bin/GUI/Freigabe$2.class
create mode 100644 Dozentenmodul/bin/GUI/Freigabe$3.class
create mode 100644 Dozentenmodul/bin/GUI/Freigabe$4.class
create mode 100644 Dozentenmodul/bin/GUI/Freigabe.class
create mode 100644 Dozentenmodul/bin/GUI/LoginWindow$3.class
create mode 100644 Dozentenmodul/bin/GUI/Rechtsbelehrung$1.class
create mode 100644 Dozentenmodul/bin/GUI/Rechtsbelehrung$2.class
create mode 100644 Dozentenmodul/bin/GUI/Rechtsbelehrung.class
create mode 100644 Dozentenmodul/bin/GUI/Summary$1.class
create mode 100644 Dozentenmodul/bin/GUI/Summary$2.class
create mode 100644 Dozentenmodul/bin/GUI/Summary$3.class
create mode 100644 Dozentenmodul/bin/GUI/Summary$4.class
create mode 100644 Dozentenmodul/bin/GUI/Summary$5.class
create mode 100644 Dozentenmodul/bin/GUI/Summary$6.class
create mode 100644 Dozentenmodul/bin/GUI/Summary$7.class
create mode 100644 Dozentenmodul/bin/GUI/Summary.class
create mode 100644 Dozentenmodul/bin/GUI/getVMwarePlayer$3.class
create mode 100644 Dozentenmodul/bin/GUI/getVMwarePlayer$4.class
create mode 100644 Dozentenmodul/bin/GUI/searchRohling$5.class
create mode 100644 Dozentenmodul/src/rmi/RmiClientMethods.java
delete mode 100644 "Dozentenmodul_V1/WebContent/GUI/de/men\303\274.html"
create mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/AddOS.jsp
create mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/ESXI_Redirection.jsp
create mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/Home.jsp
create mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/Login.jsp
create mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/Login_Error.jsp
create mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/OTRS.jsp
create mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/VLUpload.jsp
create mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/VL_bearbeiten.jsp
create mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_Software.jsp
create mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_System.jsp
create mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_allgemein.jsp
create mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/footer.html
create mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/header.html
create mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/news.jsp
diff --git a/Dozentenmodul/.classpath b/Dozentenmodul/.classpath
index a0e85c05..a5e66f2d 100644
--- a/Dozentenmodul/.classpath
+++ b/Dozentenmodul/.classpath
@@ -15,5 +15,8 @@
+
+
+
diff --git a/Dozentenmodul/bin/GUI/ActionChooser$2.class b/Dozentenmodul/bin/GUI/ActionChooser$2.class
new file mode 100644
index 00000000..ed820280
Binary files /dev/null and b/Dozentenmodul/bin/GUI/ActionChooser$2.class differ
diff --git a/Dozentenmodul/bin/GUI/EingabeAllgemein$4.class b/Dozentenmodul/bin/GUI/EingabeAllgemein$4.class
new file mode 100644
index 00000000..92b0ab2c
Binary files /dev/null and b/Dozentenmodul/bin/GUI/EingabeAllgemein$4.class differ
diff --git a/Dozentenmodul/bin/GUI/EingabeSoftwareDaten$7.class b/Dozentenmodul/bin/GUI/EingabeSoftwareDaten$7.class
new file mode 100644
index 00000000..bed98da0
Binary files /dev/null and b/Dozentenmodul/bin/GUI/EingabeSoftwareDaten$7.class differ
diff --git a/Dozentenmodul/bin/GUI/EingabeSystemDaten$4.class b/Dozentenmodul/bin/GUI/EingabeSystemDaten$4.class
new file mode 100644
index 00000000..f114d20f
Binary files /dev/null and b/Dozentenmodul/bin/GUI/EingabeSystemDaten$4.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader$3.class b/Dozentenmodul/bin/GUI/FTPDownloader$3.class
new file mode 100644
index 00000000..1856b309
Binary files /dev/null and b/Dozentenmodul/bin/GUI/FTPDownloader$3.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader$4.class b/Dozentenmodul/bin/GUI/FTPDownloader$4.class
new file mode 100644
index 00000000..e8db635a
Binary files /dev/null and b/Dozentenmodul/bin/GUI/FTPDownloader$4.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader$5.class b/Dozentenmodul/bin/GUI/FTPDownloader$5.class
new file mode 100644
index 00000000..058a9c05
Binary files /dev/null and b/Dozentenmodul/bin/GUI/FTPDownloader$5.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPUploader$4.class b/Dozentenmodul/bin/GUI/FTPUploader$4.class
new file mode 100644
index 00000000..af9d1150
Binary files /dev/null and b/Dozentenmodul/bin/GUI/FTPUploader$4.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPUploader$5.class b/Dozentenmodul/bin/GUI/FTPUploader$5.class
new file mode 100644
index 00000000..c7d6217b
Binary files /dev/null and b/Dozentenmodul/bin/GUI/FTPUploader$5.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPUploader$6.class b/Dozentenmodul/bin/GUI/FTPUploader$6.class
new file mode 100644
index 00000000..d7680f6d
Binary files /dev/null and b/Dozentenmodul/bin/GUI/FTPUploader$6.class differ
diff --git a/Dozentenmodul/bin/GUI/Freigabe$1.class b/Dozentenmodul/bin/GUI/Freigabe$1.class
new file mode 100644
index 00000000..4d1020a9
Binary files /dev/null and b/Dozentenmodul/bin/GUI/Freigabe$1.class differ
diff --git a/Dozentenmodul/bin/GUI/Freigabe$2.class b/Dozentenmodul/bin/GUI/Freigabe$2.class
new file mode 100644
index 00000000..d959f1e9
Binary files /dev/null and b/Dozentenmodul/bin/GUI/Freigabe$2.class differ
diff --git a/Dozentenmodul/bin/GUI/Freigabe$3.class b/Dozentenmodul/bin/GUI/Freigabe$3.class
new file mode 100644
index 00000000..a6c51385
Binary files /dev/null and b/Dozentenmodul/bin/GUI/Freigabe$3.class differ
diff --git a/Dozentenmodul/bin/GUI/Freigabe$4.class b/Dozentenmodul/bin/GUI/Freigabe$4.class
new file mode 100644
index 00000000..3d45eda7
Binary files /dev/null and b/Dozentenmodul/bin/GUI/Freigabe$4.class differ
diff --git a/Dozentenmodul/bin/GUI/Freigabe.class b/Dozentenmodul/bin/GUI/Freigabe.class
new file mode 100644
index 00000000..ed4a1bab
Binary files /dev/null and b/Dozentenmodul/bin/GUI/Freigabe.class differ
diff --git a/Dozentenmodul/bin/GUI/LoginWindow$3.class b/Dozentenmodul/bin/GUI/LoginWindow$3.class
new file mode 100644
index 00000000..d212b8f3
Binary files /dev/null and b/Dozentenmodul/bin/GUI/LoginWindow$3.class differ
diff --git a/Dozentenmodul/bin/GUI/Rechtsbelehrung$1.class b/Dozentenmodul/bin/GUI/Rechtsbelehrung$1.class
new file mode 100644
index 00000000..d6ba9e05
Binary files /dev/null and b/Dozentenmodul/bin/GUI/Rechtsbelehrung$1.class differ
diff --git a/Dozentenmodul/bin/GUI/Rechtsbelehrung$2.class b/Dozentenmodul/bin/GUI/Rechtsbelehrung$2.class
new file mode 100644
index 00000000..bd84fb6a
Binary files /dev/null and b/Dozentenmodul/bin/GUI/Rechtsbelehrung$2.class differ
diff --git a/Dozentenmodul/bin/GUI/Rechtsbelehrung.class b/Dozentenmodul/bin/GUI/Rechtsbelehrung.class
new file mode 100644
index 00000000..25d9fdf7
Binary files /dev/null and b/Dozentenmodul/bin/GUI/Rechtsbelehrung.class differ
diff --git a/Dozentenmodul/bin/GUI/Summary$1.class b/Dozentenmodul/bin/GUI/Summary$1.class
new file mode 100644
index 00000000..7c6fc8ab
Binary files /dev/null and b/Dozentenmodul/bin/GUI/Summary$1.class differ
diff --git a/Dozentenmodul/bin/GUI/Summary$2.class b/Dozentenmodul/bin/GUI/Summary$2.class
new file mode 100644
index 00000000..d8cc9f0e
Binary files /dev/null and b/Dozentenmodul/bin/GUI/Summary$2.class differ
diff --git a/Dozentenmodul/bin/GUI/Summary$3.class b/Dozentenmodul/bin/GUI/Summary$3.class
new file mode 100644
index 00000000..ca004f87
Binary files /dev/null and b/Dozentenmodul/bin/GUI/Summary$3.class differ
diff --git a/Dozentenmodul/bin/GUI/Summary$4.class b/Dozentenmodul/bin/GUI/Summary$4.class
new file mode 100644
index 00000000..6089b4ee
Binary files /dev/null and b/Dozentenmodul/bin/GUI/Summary$4.class differ
diff --git a/Dozentenmodul/bin/GUI/Summary$5.class b/Dozentenmodul/bin/GUI/Summary$5.class
new file mode 100644
index 00000000..08342e8f
Binary files /dev/null and b/Dozentenmodul/bin/GUI/Summary$5.class differ
diff --git a/Dozentenmodul/bin/GUI/Summary$6.class b/Dozentenmodul/bin/GUI/Summary$6.class
new file mode 100644
index 00000000..b3483d69
Binary files /dev/null and b/Dozentenmodul/bin/GUI/Summary$6.class differ
diff --git a/Dozentenmodul/bin/GUI/Summary$7.class b/Dozentenmodul/bin/GUI/Summary$7.class
new file mode 100644
index 00000000..6ead73e4
Binary files /dev/null and b/Dozentenmodul/bin/GUI/Summary$7.class differ
diff --git a/Dozentenmodul/bin/GUI/Summary.class b/Dozentenmodul/bin/GUI/Summary.class
new file mode 100644
index 00000000..a525f1f4
Binary files /dev/null and b/Dozentenmodul/bin/GUI/Summary.class differ
diff --git a/Dozentenmodul/bin/GUI/getVMwarePlayer$3.class b/Dozentenmodul/bin/GUI/getVMwarePlayer$3.class
new file mode 100644
index 00000000..6cda22f5
Binary files /dev/null and b/Dozentenmodul/bin/GUI/getVMwarePlayer$3.class differ
diff --git a/Dozentenmodul/bin/GUI/getVMwarePlayer$4.class b/Dozentenmodul/bin/GUI/getVMwarePlayer$4.class
new file mode 100644
index 00000000..ea0677ab
Binary files /dev/null and b/Dozentenmodul/bin/GUI/getVMwarePlayer$4.class differ
diff --git a/Dozentenmodul/bin/GUI/searchRohling$5.class b/Dozentenmodul/bin/GUI/searchRohling$5.class
new file mode 100644
index 00000000..140b79cd
Binary files /dev/null and b/Dozentenmodul/bin/GUI/searchRohling$5.class differ
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
diff --git a/Dozentenmodul/src/GUI/LoginWindow.java b/Dozentenmodul/src/GUI/LoginWindow.java
index c187c3fb..dbe0e7bb 100644
--- a/Dozentenmodul/src/GUI/LoginWindow.java
+++ b/Dozentenmodul/src/GUI/LoginWindow.java
@@ -127,6 +127,7 @@ public class LoginWindow extends JFrame {
if(login==true)
{
+
//Erstellen einer Instanz der Aktionsauswahl
Rechtsbelehrung re=new Rechtsbelehrung();
re.setVisible(true);
diff --git a/Dozentenmodul/src/rmi/RmiClientMethods.java b/Dozentenmodul/src/rmi/RmiClientMethods.java
new file mode 100644
index 00000000..58df1734
--- /dev/null
+++ b/Dozentenmodul/src/rmi/RmiClientMethods.java
@@ -0,0 +1,29 @@
+package rmi;
+import java.rmi.*;
+import server.*;
+
+public class RmiClientMethods {
+
+ public ServerInterface getInterface()
+ {
+ String strName = "rmi://141.79.128.121:9999/TheRMIExample";
+ System.out.println("Client: Looking up " + strName + "...");
+ ServerInterface RMI = null;
+
+ try
+ {
+
+ RMI = (ServerInterface)Naming.lookup(strName);
+
+ }
+ catch (Exception e)
+ {
+ System.out.println("Client: Exception thrown looking up " + strName);
+ System.out.println("Client: " + e.getMessage().toString());
+ System.exit(1);
+ }
+ return RMI;
+ }
+
+
+}
diff --git "a/Dozentenmodul_V1/WebContent/GUI/de/men\303\274.html" "b/Dozentenmodul_V1/WebContent/GUI/de/men\303\274.html"
deleted file mode 100644
index ee5f3f96..00000000
--- "a/Dozentenmodul_V1/WebContent/GUI/de/men\303\274.html"
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/AddOS.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/AddOS.jsp
new file mode 100644
index 00000000..f3547acf
--- /dev/null
+++ b/Dozentenmodul_V1/bin/WebContent/GUI/de/AddOS.jsp
@@ -0,0 +1,47 @@
+
+
+
+
+
+Betriebssystem hinzufügen
+
+
+Betriebssystem hinzufügen
+
+
+
\ No newline at end of file
diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/ESXI_Redirection.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/ESXI_Redirection.jsp
new file mode 100644
index 00000000..2aede85c
--- /dev/null
+++ b/Dozentenmodul_V1/bin/WebContent/GUI/de/ESXI_Redirection.jsp
@@ -0,0 +1,37 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+
+
+
+
+
+
+Dozentenmodul V1
+
+
+
+
+
+ Zur weiteren Bearbeitung ihrer virtuellen Laborumgebung benötigen Sie die Anwendung "vSphere Client".
+ Diese finden Sie unter folgendem Link:
+ vSphere CLient
+
+ Ist die Software bereits installiert, starten Sie diese und geben Sie folgende Verbindungsdaten ein:
+
+
+
+ Benutzername:
+ <Ihr BWIDM-Benutzername>
+
+
+ Passwort:
+ <Ihr BWIDM-Passwort>
+
+
+
+
\ No newline at end of file
diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/Home.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/Home.jsp
new file mode 100644
index 00000000..d50d73b8
--- /dev/null
+++ b/Dozentenmodul_V1/bin/WebContent/GUI/de/Home.jsp
@@ -0,0 +1,87 @@
+
+
+<%@ page language="java" import="db.MySQL"%>
+<%@ page language="java" import="java.sql.*"%>
+
+
+
+Home
+
+
+
+
+
+
+
+
+
+
+
+
Aktive VLs
+
+ <%
+ MySQL sql=new MySQL();
+ Connection con= sql.getConnection();
+
+ ResultSet u=sql.getUserpk(con, "tobias.spitzer@hs-offenburg.de");
+
+ while(u.next())
+ {
+
+ ResultSet v=sql.getVMpk(con, u.getString("pk"));
+
+ while(v.next())
+ {
+
+
+
+ ResultSet rs=sql.getActiveVLs(con, v.getString("VM_pk"));
+
+ while(rs.next()){
+
+ %>
+ <%=rs.getString("Laborname") %>
+ <%
+ }
+ }
+ }
+ %>
+
+
Inaktive VLs
+
+
+ <%
+ while(u.next())
+ {
+ ResultSet v=sql.getVMpk(con, u.getString("pk"));
+
+ while(v.next())
+ {
+
+
+
+ ResultSet rs=sql.getInactiveVLs(con, v.getString("VM_pk"));
+
+ while(rs.next()){
+
+ %>
+
+ <%=rs.getString("Laborname") %>
+
+ <%
+ }
+ }
+ }
+
+ %>
+
+
+
+
+
+
+
+
+
+
diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/Login.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/Login.jsp
new file mode 100644
index 00000000..8d148386
--- /dev/null
+++ b/Dozentenmodul_V1/bin/WebContent/GUI/de/Login.jsp
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+Login Dozentenmodul
+
+
+
+
de |
us
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/Login_Error.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/Login_Error.jsp
new file mode 100644
index 00000000..febf794b
--- /dev/null
+++ b/Dozentenmodul_V1/bin/WebContent/GUI/de/Login_Error.jsp
@@ -0,0 +1,12 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+
+
+
+
+Insert title here
+
+
+Error
+
+
\ No newline at end of file
diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/OTRS.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/OTRS.jsp
new file mode 100644
index 00000000..8e09c34b
--- /dev/null
+++ b/Dozentenmodul_V1/bin/WebContent/GUI/de/OTRS.jsp
@@ -0,0 +1,20 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+
+
+
+
+
+OTRS
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/VLUpload.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/VLUpload.jsp
new file mode 100644
index 00000000..db2806bc
--- /dev/null
+++ b/Dozentenmodul_V1/bin/WebContent/GUI/de/VLUpload.jsp
@@ -0,0 +1,41 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+
+
+
+
+
+VL Upload Bereich
+
+
+
+
+
+
+
+
+
+
Upload Tool
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/VL_bearbeiten.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/VL_bearbeiten.jsp
new file mode 100644
index 00000000..4956d7ea
--- /dev/null
+++ b/Dozentenmodul_V1/bin/WebContent/GUI/de/VL_bearbeiten.jsp
@@ -0,0 +1,12 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+
+
+
+
+Insert title here
+
+
+
+
+
\ No newline at end of file
diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_Software.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_Software.jsp
new file mode 100644
index 00000000..f942ff77
--- /dev/null
+++ b/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_Software.jsp
@@ -0,0 +1,109 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+ <%@ page language="java" import="db.MySQL"%>
+<%@ page language="java" import="java.sql.*"%>
+
+
+
+
+
+
+ Insert title here
+
+
+
+
+
+
+
+
+
+ <%
+ String Laborname=request.getParameter("Laborname");
+ session.setAttribute("Laborname", Laborname);
+
+ String shortDesc=request.getParameter("shortDesc");
+ session.setAttribute("shortDesc", shortDesc);
+
+ String longDesc=request.getParameter("longDesc");
+ session.setAttribute("longDesc", longDesc);
+
+ String comment=request.getParameter("comment");
+ session.setAttribute("comment", comment);
+
+ String OS=request.getParameter("OS");
+ session.setAttribute("OS", OS);
+
+ String von_date=request.getParameter("von_date");
+ session.setAttribute("von_date", von_date);
+
+ String bis_date=request.getParameter("bis_date");
+ session.setAttribute("bis_date", bis_date);
+ %>
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_System.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_System.jsp
new file mode 100644
index 00000000..a16ac8af
--- /dev/null
+++ b/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_System.jsp
@@ -0,0 +1,146 @@
+<%@page import="org.apache.catalina.Session"%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+ <%@ page language="java" import="db.MySQL"%>
+<%@ page language="java" import="java.sql.*"%>
+
+
+
+
+
+
+Insert title here
+
+
+
+
+
+
+
+
+
+ <%
+ String Vorname_V=request.getParameter("Vorname_V");
+ session.setAttribute("Vorname_V",Vorname_V );
+
+ String Nachname_V=request.getParameter("Nachname_V");
+ session.setAttribute("Nachname_V",Nachname_V );
+
+ String Hochschule_V=request.getParameter("Hochschule_V");
+ session.setAttribute("Hochschule_V",Hochschule_V );
+
+ String Email_V=request.getParameter("Email_V");
+ session.setAttribute("Email_V",Email_V );
+
+ String Tel_V=request.getParameter("Tel_V");
+ session.setAttribute("Tel_V",Tel_V );
+
+ String Fakultät_V=request.getParameter("Fakultät_V");
+ session.setAttribute("Fakultät_V",Fakultät_V );
+
+ String Vorname_E=request.getParameter("Vorname_E");
+ session.setAttribute("Vorname_E",Vorname_E );
+
+ String Nachname_E=request.getParameter("Nachname_E");
+ session.setAttribute("Nachname_E",Nachname_E );
+
+ String Hochschule_E=request.getParameter("Hochschule_E");
+ session.setAttribute("Hochschule_E",Hochschule_E );
+
+ String Email_E=request.getParameter("Email_E");
+ session.setAttribute("Email_E",Email_E );
+
+ String Tel_E=request.getParameter("Tel_E");
+ session.setAttribute("Tel_E",Tel_E );
+
+ String Fakultät_E=request.getParameter("Fakultät_E");
+ session.setAttribute("Fakultät_E",Fakultät_E );
+ %>
+
+ Zurück
+ Weiter
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_allgemein.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_allgemein.jsp
new file mode 100644
index 00000000..4ccc6a95
--- /dev/null
+++ b/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_allgemein.jsp
@@ -0,0 +1,97 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+
+
+
+
+
+
+Insert title here
+
+
+
+
+
+
+
+
+
+
+ Allgemeine Informationen zum Verantwortlichen
+
+
+
+
+ Allgemeine Informationen zum Ersteller
+
+
+
+ Zurück
+ Weiter
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/footer.html b/Dozentenmodul_V1/bin/WebContent/GUI/de/footer.html
new file mode 100644
index 00000000..0ebf0a2c
--- /dev/null
+++ b/Dozentenmodul_V1/bin/WebContent/GUI/de/footer.html
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/header.html b/Dozentenmodul_V1/bin/WebContent/GUI/de/header.html
new file mode 100644
index 00000000..5ef0ebcf
--- /dev/null
+++ b/Dozentenmodul_V1/bin/WebContent/GUI/de/header.html
@@ -0,0 +1,7 @@
+
+
+
de |
us
+
+
+
+
\ No newline at end of file
diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/news.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/news.jsp
new file mode 100644
index 00000000..426de579
--- /dev/null
+++ b/Dozentenmodul_V1/bin/WebContent/GUI/de/news.jsp
@@ -0,0 +1,15 @@
+<%@ page language="java" import="news.News" %>
+
+<%
+ News news=new News();
+String text="";
+
+ text=news.refreshNews();
+
+%>
+
News
+
+<%=text.toString() %>
+
+
+
\ No newline at end of file
--
cgit v1.2.3-55-g7522