diff options
301 files changed, 1438 insertions, 625 deletions
diff --git a/Dozentenmodul/bin/Models/Image.class b/Dozentenmodul/bin/Models/Image.class Binary files differindex 59b34fab..6a1603c3 100644 --- a/Dozentenmodul/bin/Models/Image.class +++ b/Dozentenmodul/bin/Models/Image.class diff --git a/Dozentenmodul/bin/Models/Lecture.class b/Dozentenmodul/bin/Models/Lecture.class Binary files differindex a0cb753d..31755bcf 100644 --- a/Dozentenmodul/bin/Models/Lecture.class +++ b/Dozentenmodul/bin/Models/Lecture.class diff --git a/Dozentenmodul/bin/Models/person.class b/Dozentenmodul/bin/Models/person.class Binary files differindex 36fa9761..ef2a89eb 100644 --- a/Dozentenmodul/bin/Models/person.class +++ b/Dozentenmodul/bin/Models/person.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class Binary files differindex 1d67fe3e..519d3b0f 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class Binary files differindex 9fc35b48..2283207b 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class Binary files differindex 4aedd907..722ecdf2 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class Binary files differindex 2c9cd712..087cc45a 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class Binary files differindex 77c79351..93e19bd4 100644 --- a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class Binary files differindex 353bafa4..f591fa7e 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class Binary files differindex 23d60d2f..14f49298 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class Binary files differindex 03680a6f..65f6eba8 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class Binary files differindex 21e46d35..5aa7bc75 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class Binary files differindex 214beaa8..225b1b06 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class Binary files differindex 04c8b107..ef0dedf1 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class Binary files differindex a846427a..3e960f4f 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class Binary files differindex 885bcd1e..fdf5b938 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class Binary files differindex 58a8dce5..f0f619ac 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class Binary files differdeleted file mode 100644 index 81f1d246..00000000 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class Binary files differdeleted file mode 100644 index 61318fe0..00000000 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class Binary files differindex 4400254b..aebbf028 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class Binary files differindex eca0e58d..d599dabe 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class Binary files differindex c98d437a..9949e5fe 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class Binary files differindex 46b870e2..41208104 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class Binary files differindex 6c550b56..33cf65cb 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class Binary files differindex 0908c65a..b74a9bf2 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class Binary files differindex 033c3dda..88c5fdfe 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class Binary files differindex 245edb20..b55da9f2 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class Binary files differindex 91b73e2a..15cb2ba1 100644 --- a/Dozentenmodul/bin/gui/intro/Login_GUI.class +++ b/Dozentenmodul/bin/gui/intro/Login_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class Binary files differindex be8f1a48..799a2aab 100644 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class +++ b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class Binary files differdeleted file mode 100644 index 0527987f..00000000 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class Binary files differdeleted file mode 100644 index a1ae48ca..00000000 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class Binary files differdeleted file mode 100644 index 1a30bb2e..00000000 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class Binary files differindex 12d4c61f..3577fd18 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class Binary files differindex 51b3d910..db82c341 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class Binary files differindex ceea662a..49b37d40 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class Binary files differindex 67922a25..aeea08eb 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class Binary files differindex 11cda571..8446b2d1 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class Binary files differindex 0759ddca..60c57e03 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class Binary files differindex 0c7b67a0..6a5bcf01 100644 --- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class +++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class Binary files differindex 09461d3a..4a021966 100644 --- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class +++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class Binary files differindex 59b84bd3..c9f61e8d 100644 --- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class +++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class Binary files differindex ddd0274d..75c03435 100644 --- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class +++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class Binary files differindex 194553e1..6d2d2df7 100644 --- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class +++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class Binary files differindex beea9e15..51e86415 100644 --- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class +++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class Binary files differindex 764ffbee..c5d4f8cf 100644 --- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class +++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class diff --git a/Dozentenmodul/bin/models/Image.class b/Dozentenmodul/bin/models/Image.class Binary files differindex 59b34fab..6a1603c3 100644 --- a/Dozentenmodul/bin/models/Image.class +++ b/Dozentenmodul/bin/models/Image.class diff --git a/Dozentenmodul/bin/models/Lecture.class b/Dozentenmodul/bin/models/Lecture.class Binary files differindex a0cb753d..31755bcf 100644 --- a/Dozentenmodul/bin/models/Lecture.class +++ b/Dozentenmodul/bin/models/Lecture.class diff --git a/Dozentenmodul/bin/models/person.class b/Dozentenmodul/bin/models/person.class Binary files differindex 36fa9761..ef2a89eb 100644 --- a/Dozentenmodul/bin/models/person.class +++ b/Dozentenmodul/bin/models/person.class diff --git a/Dozentenmodul/bin/models/user.class b/Dozentenmodul/bin/models/user.class Binary files differindex af67dd13..cd274e48 100644 --- a/Dozentenmodul/bin/models/user.class +++ b/Dozentenmodul/bin/models/user.class diff --git a/Dozentenmodul/bin/thrift/MasterThriftConnection.class b/Dozentenmodul/bin/thrift/MasterThriftConnection.class Binary files differindex 9b587dd3..8229138f 100644 --- a/Dozentenmodul/bin/thrift/MasterThriftConnection.class +++ b/Dozentenmodul/bin/thrift/MasterThriftConnection.class diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java index 0b3c936e..89df5cd5 100644 --- a/Dozentenmodul/src/Models/Image.java +++ b/Dozentenmodul/src/Models/Image.java @@ -1,21 +1,28 @@ package models; public class Image { + private String ImageId; private String version; - private String imagename; private String newName; private String imagepath; + private int shareMode; private boolean licensed; private boolean internet; private int ram; private int cpu; private long filesize; - public static Image image =new Image(); + + public int getShareMode() { + return shareMode; + } + public void setShareMode(int shareMode) { + this.shareMode = shareMode; + } public String getImagepath() { return imagepath; } diff --git a/Dozentenmodul/src/Models/Lecture.java b/Dozentenmodul/src/Models/Lecture.java index 6b7e6fa1..eae05ec5 100644 --- a/Dozentenmodul/src/Models/Lecture.java +++ b/Dozentenmodul/src/Models/Lecture.java @@ -4,7 +4,6 @@ import java.util.Date; public class Lecture { - private String name; private String newName; private String shortDesc; @@ -14,8 +13,6 @@ public class Lecture { private boolean active; private String id; private String linkedImagename; - - public static Lecture lecture =new Lecture(); diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java index 67b6b84e..0f14af51 100644 --- a/Dozentenmodul/src/Models/person.java +++ b/Dozentenmodul/src/Models/person.java @@ -3,9 +3,7 @@ package models; public class person{ - private String username; - private String Name; private String Vorname; private String Hochschule; @@ -13,11 +11,8 @@ public class person{ private String Tel; private String Fakultaet; private boolean ischecked; - - //public static person verantowrtlicher=new person(); public static person verantwortlicher=new person(); - public String getUsername() { return username; } diff --git a/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java b/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java new file mode 100644 index 00000000..ce77282a --- /dev/null +++ b/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java @@ -0,0 +1,251 @@ +package gui.image; + + +import gui.intro.MainMenue_GUI; + +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Toolkit; +import javax.swing.JFrame; +import javax.swing.JButton; +import javax.swing.JPanel; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import java.awt.Color; +import javax.swing.JLabel; +import java.awt.Font; +import javax.swing.JTextPane; +import java.awt.SystemColor; +import java.awt.event.ActionListener; +import java.awt.event.ActionEvent; +import javax.swing.JSeparator; +import javax.swing.JMenuBar; +import javax.swing.JMenu; +import javax.swing.JMenuItem; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.border.TitledBorder; +import javax.swing.JTextArea; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.IOException; + +import javax.swing.JRadioButton; +import javax.swing.ButtonGroup; +import javax.swing.JSpinner; +import javax.swing.SpinnerNumberModel; + +import models.Image; +import models.Links; +import javax.swing.JComboBox; +import javax.swing.DefaultComboBoxModel; + +@SuppressWarnings("serial") +public class CreateImageFreigabe_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + private final ButtonGroup buttonGrouplicense = new ButtonGroup(); + private final ButtonGroup buttonGroupInternet = new ButtonGroup(); + JComboBox comboBox; + + /** + * Create the dialog. + */ + public CreateImageFreigabe_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + System.exit(0); + } + }); + setResizable(false); + + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 722) / 2; + int left=(screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + //setBounds(100, 100, 603, 722); + getContentPane().setLayout(null); + { + JPanel panel = new JPanel(); + panel.setBackground(SystemColor.menu); + panel.setBounds(10, 11, 577, 57); + getContentPane().add(panel); + panel.setLayout(null); + { + JLabel lblNewLabel = new JLabel("Image Freigabe"); + lblNewLabel.setBounds(10, 11, 509, 22); + panel.add(lblNewLabel); + lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); + } + + JTextPane txtpnBitteWhlenSie = new JTextPane(); + txtpnBitteWhlenSie.setEditable(false); + txtpnBitteWhlenSie.setBackground(SystemColor.menu); + txtpnBitteWhlenSie.setText("W\u00E4hlen Sie bitte hier die von Ihnen gew\u00FCnschte Freigabe f\u00FCr Ihr Image aus."); + txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 493); + contentPanel.setBackground(SystemColor.menu); + contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); + getContentPane().add(contentPanel); + contentPanel.setLayout(null); + + JPanel panel_1 = new JPanel(); + panel_1.setBackground(SystemColor.menu); + panel_1.setBorder(new TitledBorder(null, "Freigabe", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBounds(10, 51, 557, 124); + contentPanel.add(panel_1); + panel_1.setLayout(null); + + JLabel lblNewLabel_2 = new JLabel("Freigabemodus:"); + lblNewLabel_2.setBounds(10, 55, 250, 20); + panel_1.add(lblNewLabel_2); + + comboBox = new JComboBox(); + comboBox.setModel(new DefaultComboBoxModel(new String[] {"Lokal (Eigene Hochschule)", "\u00D6ffentlich (Alle Hochschulen)"})); + comboBox.setSelectedIndex(0); + comboBox.setBounds(270, 55, 250, 20); + panel_1.add(comboBox); + + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); + lblHauptmen.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + CreateImageFreigabe_GUI.this.setVisible(false); + MainMenue_GUI main=new MainMenue_GUI(); + main.setVisible(true); + } + }); + lblHauptmen.setForeground(Color.BLUE); + lblHauptmen.setBounds(10, 11, 61, 14); + contentPanel.add(lblHauptmen); + + JLabel label_1 = new JLabel(">"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("VL-Image"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 45, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(133, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Neu"); + lblNewLabel_1.setBounds(146, 11, 46, 14); + contentPanel.add(lblNewLabel_1); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton cancelButton = new JButton("Zur\u00FCck"); + cancelButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + Image.image.setShareMode(comboBox.getSelectedIndex()); + CreateImageTechnisch_GUI sr=new CreateImageTechnisch_GUI(); + sr.setVisible(true); + dispose(); + } + }); + cancelButton.setActionCommand("OK"); + buttonPane.add(cancelButton); + //getRootPane().setDefaultButton(cancelButton); + } + { + JButton continueButton = new JButton("Weiter"); + continueButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + Image.image.setShareMode(comboBox.getSelectedIndex()); + FTPCreateUploader_GUI ea=new FTPCreateUploader_GUI(); + ea.setVisible(true); + dispose(); + + } + }); + continueButton.setActionCommand("Cancel"); + buttonPane.add(continueButton); + getRootPane().setDefaultButton(continueButton); + } + } + + JSeparator separator = new JSeparator(); + separator.setBounds(0, 78, 597, 2); + getContentPane().add(separator); + + JSeparator separator_1 = new JSeparator(); + separator_1.setBounds(0, 627, 597, 2); + getContentPane().add(separator_1); + + JMenuBar menuBar = new JMenuBar(); + setJMenuBar(menuBar); + + JMenu mnNewMenu = new JMenu("Suchen"); + menuBar.add(mnNewMenu); + + JMenuItem mntmVlSuche = new JMenuItem("VL Suche"); + mnNewMenu.add(mntmVlSuche); + + JMenu mnNewMenu_1 = new JMenu("Hilfe"); + menuBar.add(mnNewMenu_1); + + JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + + mnNewMenu_1.add(mntmFaq); + + JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + + mnNewMenu_1.add(mntmOtrs); + + } +} diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java index 64023706..4e53b2d5 100644 --- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java @@ -8,7 +8,6 @@ import java.awt.FlowLayout; import java.awt.Toolkit; import javax.swing.JFrame; import javax.swing.JButton; -import javax.swing.JDialog; import javax.swing.JPanel; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; @@ -53,18 +52,7 @@ public class CreateImageTechnisch_GUI extends JFrame { JRadioButton rdbtnInternetNein; private final ButtonGroup buttonGrouplicense = new ButtonGroup(); private final ButtonGroup buttonGroupInternet = new ButtonGroup(); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - CreateImageTechnisch_GUI dialog = new CreateImageTechnisch_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } + /** * Create the dialog. @@ -327,7 +315,7 @@ public class CreateImageTechnisch_GUI extends JFrame { } Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); - FTPCreateUploader_GUI ea=new FTPCreateUploader_GUI(); + CreateImageFreigabe_GUI ea=new CreateImageFreigabe_GUI(); ea.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index fa1f991c..21147e56 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -25,7 +25,6 @@ import java.util.Iterator; import java.util.List; import javax.swing.JButton; import javax.swing.JComboBox; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -50,11 +49,9 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; - import models.Links; import models.person; import org.apache.thrift.TException; - import server.Server.Client; import thrift.ThriftConnection; import javax.swing.ListSelectionModel; @@ -75,27 +72,22 @@ public class DeleteImage_GUI extends JFrame { "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection con=new ThriftConnection(); Client client = models.Client.clientcon.getClient(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; + final DefaultTableModel modelMyImages = new DefaultTableModel(titles,0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( modelAll); final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( modelMyImages); /** - * Launch the application. - */ - public static void main(String[] args) { - try { - DeleteImage_GUI dialog = new DeleteImage_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** * Create the dialog. */ public DeleteImage_GUI() { @@ -109,7 +101,7 @@ public class DeleteImage_GUI extends JFrame { }); // Verhindert das Vergroessern Des Fensters setResizable(false); - + try { // Setzt das Look & Feel auf System UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); @@ -199,7 +191,7 @@ public class DeleteImage_GUI extends JFrame { textFieldName.setColumns(10); JLabel lblErweiterteSuche = new JLabel( - "<html><u>Erweiterte Suche</u></html>"); + "<html><u>Erweiterte Suche*Folgt noch...*</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { @@ -209,13 +201,13 @@ public class DeleteImage_GUI extends JFrame { // oeffnet das Fenster Extended GUI - ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); - es.setVisible(true); + //ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + //es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - lblErweiterteSuche.setBounds(431, 106, 89, 14); + lblErweiterteSuche.setBounds(332, 106, 188, 14); panel_1.add(lblErweiterteSuche); comboBox = new JComboBox<String>(); @@ -324,7 +316,10 @@ public class DeleteImage_GUI extends JFrame { JScrollPane scrollPaneMyImage = new JScrollPane(); tablemyImages = new JTable(); tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + tablemyImages.setEnabled(true); + tablemyImages.setModel(modelMyImages); + tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); @@ -585,6 +580,7 @@ public class DeleteImage_GUI extends JFrame { images.get(x).getVersion() }; // System.out.println("id:"+images.get(x).getId()); // F\u00FCge diese Objekte der Tabelle hinzu + model.addRow(obj); x++; i.next(); diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index f540e9ec..fe89746c 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -370,6 +370,17 @@ public class EditImageAllgemein_GUI extends JFrame { Image.image.setImagename(map.get("name")); Image.image.setRam(Integer.parseInt(map.get("ram"))); Image.image.setCpu(Integer.parseInt(map.get("cpu"))); + Image.image.setImagepath(map.get("path")); + Image.image.setFilesize(Long.parseLong(map.get("filesize"))); + int mode=0; + if(map.get("shareMode").equals("only_local")){ + mode=0; + } + else + { + mode=1; + } + Image.image.setShareMode(mode); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java b/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java new file mode 100644 index 00000000..0f54c346 --- /dev/null +++ b/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java @@ -0,0 +1,251 @@ +package gui.image; + + +import gui.intro.MainMenue_GUI; + +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Toolkit; +import javax.swing.JFrame; +import javax.swing.JButton; +import javax.swing.JPanel; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import java.awt.Color; +import javax.swing.JLabel; +import java.awt.Font; +import javax.swing.JTextPane; +import java.awt.SystemColor; +import java.awt.event.ActionListener; +import java.awt.event.ActionEvent; +import javax.swing.JSeparator; +import javax.swing.JMenuBar; +import javax.swing.JMenu; +import javax.swing.JMenuItem; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.border.TitledBorder; +import javax.swing.JTextArea; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.IOException; + +import javax.swing.JRadioButton; +import javax.swing.ButtonGroup; +import javax.swing.JSpinner; +import javax.swing.SpinnerNumberModel; + +import models.Image; +import models.Links; +import javax.swing.JComboBox; +import javax.swing.DefaultComboBoxModel; + +@SuppressWarnings("serial") +public class EditImageFreigabe_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + private final ButtonGroup buttonGrouplicense = new ButtonGroup(); + private final ButtonGroup buttonGroupInternet = new ButtonGroup(); + JComboBox comboBox; + + /** + * Create the dialog. + */ + public EditImageFreigabe_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + System.exit(0); + } + }); + setResizable(false); + + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 722) / 2; + int left=(screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + //setBounds(100, 100, 603, 722); + getContentPane().setLayout(null); + { + JPanel panel = new JPanel(); + panel.setBackground(SystemColor.menu); + panel.setBounds(10, 11, 577, 57); + getContentPane().add(panel); + panel.setLayout(null); + { + JLabel lblNewLabel = new JLabel("Image Freigabe"); + lblNewLabel.setBounds(10, 11, 509, 22); + panel.add(lblNewLabel); + lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); + } + + JTextPane txtpnBitteWhlenSie = new JTextPane(); + txtpnBitteWhlenSie.setEditable(false); + txtpnBitteWhlenSie.setBackground(SystemColor.menu); + txtpnBitteWhlenSie.setText("W\u00E4hlen Sie bitte hier die von Ihnen gew\u00FCnschte Freigabe f\u00FCr Ihr Image aus."); + txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 493); + contentPanel.setBackground(SystemColor.menu); + contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); + getContentPane().add(contentPanel); + contentPanel.setLayout(null); + + JPanel panel_1 = new JPanel(); + panel_1.setBackground(SystemColor.menu); + panel_1.setBorder(new TitledBorder(null, "Freigabe", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBounds(10, 51, 557, 124); + contentPanel.add(panel_1); + panel_1.setLayout(null); + + JLabel lblNewLabel_2 = new JLabel("Freigabemodus:"); + lblNewLabel_2.setBounds(10, 55, 250, 20); + panel_1.add(lblNewLabel_2); + + comboBox = new JComboBox(); + comboBox.setModel(new DefaultComboBoxModel(new String[] {"Lokal (Eigene Hochschule)", "\u00D6ffentlich (Alle Hochschulen)"})); + comboBox.setSelectedIndex(Image.image.getShareMode()); + comboBox.setBounds(270, 55, 250, 20); + panel_1.add(comboBox); + + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); + lblHauptmen.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + EditImageFreigabe_GUI.this.setVisible(false); + MainMenue_GUI main=new MainMenue_GUI(); + main.setVisible(true); + } + }); + lblHauptmen.setForeground(Color.BLUE); + lblHauptmen.setBounds(10, 11, 61, 14); + contentPanel.add(lblHauptmen); + + JLabel label_1 = new JLabel(">"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("VL-Image"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 45, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(133, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Neu"); + lblNewLabel_1.setBounds(146, 11, 46, 14); + contentPanel.add(lblNewLabel_1); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton cancelButton = new JButton("Zur\u00FCck"); + cancelButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + Image.image.setShareMode(comboBox.getSelectedIndex()); + EditImageTechnisch_GUI sr=new EditImageTechnisch_GUI(); + sr.setVisible(true); + dispose(); + } + }); + cancelButton.setActionCommand("OK"); + buttonPane.add(cancelButton); + //getRootPane().setDefaultButton(cancelButton); + } + { + JButton continueButton = new JButton("Weiter"); + continueButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + Image.image.setShareMode(comboBox.getSelectedIndex()); + FTPEditUploader_GUI ea=new FTPEditUploader_GUI(); + ea.setVisible(true); + dispose(); + + } + }); + continueButton.setActionCommand("Cancel"); + buttonPane.add(continueButton); + getRootPane().setDefaultButton(continueButton); + } + } + + JSeparator separator = new JSeparator(); + separator.setBounds(0, 78, 597, 2); + getContentPane().add(separator); + + JSeparator separator_1 = new JSeparator(); + separator_1.setBounds(0, 627, 597, 2); + getContentPane().add(separator_1); + + JMenuBar menuBar = new JMenuBar(); + setJMenuBar(menuBar); + + JMenu mnNewMenu = new JMenu("Suchen"); + menuBar.add(mnNewMenu); + + JMenuItem mntmVlSuche = new JMenuItem("VL Suche"); + mnNewMenu.add(mntmVlSuche); + + JMenu mnNewMenu_1 = new JMenu("Hilfe"); + menuBar.add(mnNewMenu_1); + + JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + + mnNewMenu_1.add(mntmFaq); + + JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + + mnNewMenu_1.add(mntmOtrs); + + } +} diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java index fa806cb6..f0d7dacb 100644 --- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -318,7 +318,7 @@ public class EditImageTechnisch_GUI extends JFrame { Image.image.setLicensed(false); } // oeffnet das naechste Fenster - FTPEditUploader_GUI ea = new FTPEditUploader_GUI(); + EditImageFreigabe_GUI ea=new EditImageFreigabe_GUI(); ea.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 544f7b93..6118d1ac 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -3,7 +3,6 @@ package gui.image; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; -import java.awt.EventQueue; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; @@ -41,7 +40,6 @@ import models.person; import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; -//import util.XMLCreator; import ftp.UploadTask; import gui.intro.MainMenue_GUI; import javax.swing.JMenuItem; @@ -80,22 +78,7 @@ public class FTPCreateUploader_GUI extends JFrame implements JButton btnZurck = new JButton("Zur\u00FCck"); int progress = 0; // progress of upload - /** - * Launch the application. - */ - public static void main(String[] args) { - EventQueue.invokeLater(new Runnable() { - public void run() { - try { - FTPCreateUploader_GUI frame = new FTPCreateUploader_GUI(); - frame.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - + /** * Create the frame. */ @@ -512,7 +495,7 @@ public class FTPCreateUploader_GUI extends JFrame implements person.verantwortlicher.getFakultaet(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(), - "temp/" + Image.image.getNewName(),false,Image.image.getFilesize()); + "temp/" + Image.image.getNewName(),false,Image.image.getFilesize(),Image.image.getShareMode()); client.startFileCopy(Image.image.getNewName()); } catch (TException e) { // TODO Auto-generated catch block diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index cc1c297a..96826596 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -374,7 +374,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener try { user = client.getFtpUser(); - downloadFile = client.getPathOfImage(Image.image.getImageId(), + downloadFile = user.path+"/"+client.getPathOfImage(Image.image.getImageId(), Image.image.getVersion()); } catch (TException e) { diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index c0c362f9..a5f64d90 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -3,7 +3,6 @@ package gui.image; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; -import java.awt.EventQueue; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; @@ -80,22 +79,7 @@ public class FTPEditUploader_GUI extends JFrame implements JButton finishButton = new JButton("Fertigstellen"); JButton btnZurck = new JButton("Zur\u00FCck"); - /** - * Launch the application. - */ - public static void main(String[] args) { - EventQueue.invokeLater(new Runnable() { - public void run() { - try { - FTPEditUploader_GUI frame = new FTPEditUploader_GUI(); - frame.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - + /** * Create the frame. */ @@ -313,7 +297,7 @@ public class FTPEditUploader_GUI extends JFrame implements getContentPane().add(buttonPane, BorderLayout.SOUTH); { - finishButton.setEnabled(false); + //finishButton.setEnabled(false); finishButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -425,7 +409,7 @@ public class FTPEditUploader_GUI extends JFrame implements progressBar.setValue(progress); // Button zum Fertigstellen freischalten, wenn 100% erreicht sind - if (progress == 0 || progress == 100) { + if (progress == 100) { // not uploading currently btnZurck.setEnabled(true); } else { @@ -484,12 +468,24 @@ public class FTPEditUploader_GUI extends JFrame implements try { System.out.println("NewName="+Image.image.getNewName()); System.out.println("OldName="+Image.image.getImagename()); + if(Image.image.getNewName().isEmpty()){ + client.updateImageData(Image.image.getImagename(), + Image.image.getImagename(),Image.image.getImagepath(), Image.image.isLicensed(), + Image.image.isInternet(), Image.image.getRam(), + Image.image.getCpu(), Image.image.getImageId(), + Image.image.getVersion(), false,Image.image.getFilesize(),Image.image.getShareMode()); + client.startFileCopy(Image.image.getNewName()); + } + else{ + + client.updateImageData(Image.image.getImagename(), Image.image.getImagename(),"temp/" + Image.image.getNewName(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(), Image.image.getImageId(), - Image.image.getVersion(), false,Image.image.getFilesize()); + Image.image.getVersion(), false,Image.image.getFilesize(),Image.image.getShareMode()); client.startFileCopy(Image.image.getNewName()); + } } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index 593f8e06..ae368310 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -65,14 +65,23 @@ public class SearchEditImage_GUI extends JFrame { JComboBox<String> comboBox; JTable tableAllImages; JTable tablemyImages; + boolean activeSearch=false; private JTextField textFieldName; JTabbedPane tabbedPane; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; + final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( modelAll); final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( @@ -93,6 +102,8 @@ public class SearchEditImage_GUI extends JFrame { @Override public void windowOpened(WindowEvent arg0) { + initTableModel(modelMyImages); + initTableModel(modelAll); textFieldName.requestFocusInWindow(); } }); @@ -170,14 +181,22 @@ public class SearchEditImage_GUI extends JFrame { String stext = textFieldName.getText(); // Wenn Textfield nicht leer - if (stext != "") { + if (stext.isEmpty()==false) { + activeSearch=true; // Filtere nach der Eingabe rowSorterAll.setRowFilter(RowFilter.regexFilter( textFieldName.getText(), 0)); rowSorterMyImages.setRowFilter(RowFilter.regexFilter( textFieldName.getText(), 0)); - - } + } + else{ + activeSearch=false; + String username = person.verantwortlicher.getName() + " " + + person.verantwortlicher.getVorname(); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter( + username, 4)); + rowSorterAll.setRowFilter(null); + } } }); @@ -186,19 +205,19 @@ public class SearchEditImage_GUI extends JFrame { textFieldName.setColumns(10); JLabel lblErweiterteSuche = new JLabel( - "<html><u>Erweiterte Suche</u></html>"); + "<html><u>Erweiterte Suche *Folgt noch*</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { // oeffnet das Fenster Extended GUI - ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); - es.setVisible(true); + //ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + //es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - lblErweiterteSuche.setBounds(431, 106, 89, 14); + lblErweiterteSuche.setBounds(365, 106, 155, 14); panel_1.add(lblErweiterteSuche); comboBox = new JComboBox<String>(); @@ -222,13 +241,23 @@ public class SearchEditImage_GUI extends JFrame { comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { // Prueft das die Auswahl nicht leer ist - if (comboBox.getSelectedItem().toString() != "") { + if (comboBox.getSelectedItem().toString().isEmpty()==false) { // Filtert nach dem ausgewaehlten Betriebssystem + activeSearch=true; rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox .getSelectedItem().toString(), 2)); rowSorterMyImages.setRowFilter(RowFilter.regexFilter( comboBox.getSelectedItem().toString(), 2)); } + else{ + activeSearch=false; + String username = person.verantwortlicher.getName() + " " + + person.verantwortlicher.getVorname(); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter( + username, 4)); + + rowSorterAll.setRowFilter(null); + } } }); @@ -270,15 +299,15 @@ public class SearchEditImage_GUI extends JFrame { tabbedPane = new JTabbedPane(JTabbedPane.TOP); tabbedPane.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent arg0) { - if (tabbedPane.getSelectedIndex() == 0) { + if (tabbedPane.getSelectedIndex() == 0 && activeSearch==false) { String username = person.verantwortlicher.getName() + " " + person.verantwortlicher.getVorname(); // String username="Spitzer Tobias"; rowSorterMyImages.setRowFilter(RowFilter.regexFilter( username, 4)); - } else if (tabbedPane.getSelectedIndex() == 1) { - + } else if(tabbedPane.getSelectedIndex()==1 && activeSearch==false){ + rowSorterAll.setRowFilter(null); } } @@ -286,7 +315,7 @@ public class SearchEditImage_GUI extends JFrame { tabbedPane.setBounds(10, 197, 557, 300); contentPanel.add(tabbedPane); - initTableModel(modelMyImages); + JScrollPane scrollPaneAllImages = new JScrollPane(); tableAllImages = new JTable(); @@ -296,7 +325,7 @@ public class SearchEditImage_GUI extends JFrame { tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit(); tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit(); tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); - initTableModel(modelAll); + JScrollPane scrollPaneMyImage = new JScrollPane(); tablemyImages = new JTable(); diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index d03a218d..59512570 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -48,10 +48,7 @@ import javax.swing.table.TableRowSorter; import models.Image; import models.Links; import models.person; -//import models.person; - import org.apache.thrift.TException; - import server.Server.Client; import thrift.ThriftConnection; @@ -71,8 +68,16 @@ public class SearchImage_GUI extends JFrame { "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; + final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( modelAll); final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( @@ -186,19 +191,19 @@ public class SearchImage_GUI extends JFrame { textFieldName.setColumns(10); JLabel lblErweiterteSuche = new JLabel( - "<html><u>Erweiterte Suche</u></html>"); + "<html><u>Erweiterte Suche *Folgt noch*</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { // oeffnet das Fenster Extended GUI - ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); - es.setVisible(true); + //ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + //es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - lblErweiterteSuche.setBounds(431, 106, 89, 14); + lblErweiterteSuche.setBounds(360, 106, 160, 14); panel_1.add(lblErweiterteSuche); comboBox = new JComboBox<String>(); diff --git a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java index 6ea3e1af..3d312394 100644 --- a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java @@ -15,10 +15,8 @@ import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.IOException; - import javax.swing.ButtonGroup; import javax.swing.JButton; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -33,7 +31,6 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; - import models.Links; @SuppressWarnings("serial") @@ -45,18 +42,7 @@ public class SearchMethodLecture_GUI extends JFrame { JRadioButton rdbtnSearchByLecture; private final ButtonGroup buttonGroup = new ButtonGroup(); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - SearchMethodLecture_GUI dialog = new SearchMethodLecture_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } + /** * Create the dialog. diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index 34469617..5b4ecbd9 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -212,6 +212,7 @@ public class Login_GUI extends JFrame { //set connection to bwLehrpoolSuiteServer ThriftConnection bwthrift=new ThriftConnection(); server.Server.Client bwClient=bwthrift.getThriftConnection(); + System.out.println("Connection zu Satellit aufgebaut!"); models.Client.clientcon.setClient(bwClient); diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java index 607ccf17..59f47f4b 100644 --- a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java +++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java @@ -7,7 +7,6 @@ import java.awt.FlowLayout; import java.awt.Toolkit; import javax.swing.JFrame; import javax.swing.JButton; -import javax.swing.JDialog; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.UIManager; @@ -34,9 +33,7 @@ import java.awt.event.WindowEvent; import javax.swing.JCheckBox; import javax.swing.event.ChangeListener; import javax.swing.event.ChangeEvent; - import models.Links; - import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; @@ -47,18 +44,8 @@ public class VmWareLink_GUI extends JFrame { private final JPanel contentPanel = new JPanel(); String[] result; JCheckBox chckbxNewCheckBox; - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - VmWareLink_GUI dialog = new VmWareLink_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } + private JButton btnWindows; + /** * Create the dialog. @@ -169,13 +156,36 @@ public class VmWareLink_GUI extends JFrame { lbllinuxvmwarePlayer.setBounds(10, 178, 499, 14); contentPanel.add(lbllinuxvmwarePlayer); - JLabel lblvmwarePlayerDownload = new JLabel("<html><a href=\"https:////my.vmware.com//web//vmware//free#desktop_end_user_computing//vmware_player//6_0\" >vmWare Player Download</a></html>"); - lblvmwarePlayerDownload.setBounds(10, 118, 499, 14); - contentPanel.add(lblvmwarePlayerDownload); + btnWindows = new JButton("VMware Player herunterladen"); + btnWindows.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + try { + URI windows= new URI(Links.getUriWindows()); + openWebpage(windows); + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + }); + btnWindows.setBounds(10, 119, 186, 23); + contentPanel.add(btnWindows); - JLabel lblvmwarePlayerDownload_1 = new JLabel("<html><a href=\"https:////my.vmware.com//web//vmware//free#desktop_end_user_computing//vmware_player//6_0\" >vmWare Player Download</a></html>"); - lblvmwarePlayerDownload_1.setBounds(10, 203, 499, 14); - contentPanel.add(lblvmwarePlayerDownload_1); + JButton btnLinux = new JButton("VMware Player herunterladen"); + btnLinux.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + try { + URI windows= new URI(Links.getUriLinux()); + openWebpage(windows); + } catch (URISyntaxException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + } + }); + btnLinux.setBounds(10, 203, 186, 23); + contentPanel.add(btnLinux); { JPanel buttonPane = new JPanel(); buttonPane.setBounds(0, 630, 587, 33); @@ -242,5 +252,17 @@ public class VmWareLink_GUI extends JFrame { - } -} + }//end constructor + + public static void openWebpage(URI uri) { + Desktop desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null; + if (desktop != null && desktop.isSupported(Desktop.Action.BROWSE)) { + try { + desktop.browse(uri); + } catch (Exception e) { + e.printStackTrace(); + } + } + }// end openWebpage + +}// end class diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index b60d358b..0c115f69 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -1,7 +1,6 @@ package gui.lecture; import gui.intro.MainMenue_GUI; - import java.awt.Color; import java.awt.Dimension; import java.awt.FlowLayout; @@ -15,7 +14,6 @@ import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import javax.swing.JButton; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -39,7 +37,6 @@ import java.awt.ScrollPane; import java.io.IOException; import java.util.Calendar; import java.util.Date; - import com.toedter.calendar.JDateChooser; import javax.swing.JRadioButton; @@ -65,18 +62,6 @@ public class CreateLectureAllgemein_GUI extends JFrame { boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect, isAllInformationReady = false; - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - CreateLectureAllgemein_GUI dialog = new CreateLectureAllgemein_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } /** * Create the dialog. diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index fd0fc33f..148e42fc 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -1,7 +1,6 @@ package gui.lecture; import gui.intro.MainMenue_GUI; - import java.awt.Color; import java.awt.Dimension; import java.awt.FlowLayout; @@ -24,7 +23,6 @@ import java.util.Iterator; import java.util.List; import javax.swing.JButton; import javax.swing.JComboBox; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -70,19 +68,7 @@ public class CreateLectureLink_GUI extends JFrame { ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - CreateLectureLink_GUI dialog = new CreateLectureLink_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - + /** * Create the dialog. */ diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index 7559cebe..5a3f24df 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -44,7 +43,6 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; - import models.Links; import models.person; import org.apache.thrift.TException; @@ -78,19 +76,7 @@ public class DeleteLecture_GUI extends JFrame { modelMyLectures); private JButton button; - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - EditLectureSearch_GUI dialog = new EditLectureSearch_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - + /** * Create the dialog. */ @@ -190,19 +176,19 @@ public class DeleteLecture_GUI extends JFrame { textFieldName.setColumns(10); JLabel lblErweiterteSuche = new JLabel( - "<html><u>Erweiterte Suche</u></html>"); + "<html><u>Erweiterte Suche*Folgt noch*</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { // oeffnet das Fenster Extended GUI - ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); - es.setVisible(true); + //ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + //es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - lblErweiterteSuche.setBounds(431, 106, 89, 14); + lblErweiterteSuche.setBounds(336, 106, 184, 14); panel_1.add(lblErweiterteSuche); JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java index 8c5fa5fb..7e171078 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -15,9 +15,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; - import javax.swing.JButton; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -31,7 +29,6 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; - import models.Image; import models.Lecture; import models.Links; @@ -39,7 +36,6 @@ import models.person; import javax.swing.JTextArea; import java.awt.ScrollPane; import java.io.IOException; - import com.toedter.calendar.JDateChooser; import javax.swing.JRadioButton; import javax.swing.ButtonGroup; @@ -61,18 +57,7 @@ public class EditLectureAllgemein_GUI extends JFrame { JDateChooser dateChooserstart; JRadioButton radioButtonno; private final ButtonGroup buttonGroup = new ButtonGroup(); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - EditLectureAllgemein_GUI dialog = new EditLectureAllgemein_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } + /** * Create the dialog. diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index eb5a3748..3c93b46f 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -23,7 +23,6 @@ import java.util.Iterator; import java.util.List; import javax.swing.JButton; import javax.swing.JComboBox; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -69,19 +68,7 @@ public class EditLectureLink_GUI extends JFrame { ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - EditLectureLink_GUI dialog = new EditLectureLink_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - + /** * Create the dialog. */ @@ -183,17 +170,17 @@ public class EditLectureLink_GUI extends JFrame { textFieldName.setColumns(10); JLabel lblErweiterteSuche = new JLabel( - "<html><u>Erweiterte Suche</u></html>"); + "<html><u>Erweiterte Suche *Folgt noch*</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); - es.setVisible(true); + //ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + //es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - lblErweiterteSuche.setBounds(431, 106, 89, 14); + lblErweiterteSuche.setBounds(317, 106, 203, 14); panel_1.add(lblErweiterteSuche); comboBox = new JComboBox<String>(); @@ -458,6 +445,18 @@ public class EditLectureLink_GUI extends JFrame { Links.openFAQ(); +<<<<<<< HEAD +======= + faq = Links.getFAQ(); + + try { + + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } +>>>>>>> 5d24cdec4d239f473ee2359493ab47d1ef3273dd } }); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index 3bf46911..4174ca66 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -22,7 +22,6 @@ import java.text.SimpleDateFormat; import java.util.Iterator; import java.util.List; import javax.swing.JButton; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -73,26 +72,22 @@ public class EditLectureSearch_GUI extends JFrame { "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; + final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( modelAll); final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>( modelMyLectures); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - EditLectureSearch_GUI dialog = new EditLectureSearch_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - + /** * Create the dialog. */ @@ -191,19 +186,19 @@ public class EditLectureSearch_GUI extends JFrame { textFieldName.setColumns(10); JLabel lblErweiterteSuche = new JLabel( - "<html><u>Erweiterte Suche</u></html>"); + "<html><u>Erweiterte Suche *Folgt noch*</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { // oeffnet das Fenster Extended GUI - ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); - es.setVisible(true); + //ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + //es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - lblErweiterteSuche.setBounds(431, 106, 89, 14); + lblErweiterteSuche.setBounds(326, 106, 194, 14); panel_1.add(lblErweiterteSuche); JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java index eb28246f..a8dcf498 100644 --- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java +++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java @@ -3,7 +3,6 @@ package gui.lecture; import gui.image.CreateImageAllgemein_GUI; import gui.image.FTPCreateUploader_GUI; - import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; @@ -11,13 +10,9 @@ import java.awt.SystemColor; import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -31,9 +26,7 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; - import models.Links; - import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.io.IOException; @@ -45,30 +38,13 @@ public class ExtendedSearchForImages_GUI extends JFrame { String[] result; private JTextField textField; private JTextField textField_1; - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - ExtendedSearchForImages_GUI dialog = new ExtendedSearchForImages_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - - } catch (Exception e) { - e.printStackTrace(); - } - } + /** * Create the dialog. */ public ExtendedSearchForImages_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - System.exit(0); - } - }); + setResizable(false); try { diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index 221ecba7..1e1cf7e0 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -43,7 +42,6 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; - import models.Links; import models.person; import org.apache.thrift.TException; @@ -69,25 +67,21 @@ public class SearchLecture_GUI extends JFrame { "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; + final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( modelAll); final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>( modelMyLectures); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - EditLectureSearch_GUI dialog = new EditLectureSearch_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } /** * Create the dialog. @@ -187,19 +181,19 @@ public class SearchLecture_GUI extends JFrame { textFieldName.setColumns(10); JLabel lblErweiterteSuche = new JLabel( - "<html><u>Erweiterte Suche</u></html>"); + "<html><u>Erweiterte Suche *Folgt noch*</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { // oeffnet das Fenster Extended GUI - ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); - es.setVisible(true); + //ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + //es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - lblErweiterteSuche.setBounds(431, 106, 89, 14); + lblErweiterteSuche.setBounds(315, 106, 205, 14); panel_1.add(lblErweiterteSuche); JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); diff --git a/Dozentenmodul/src/models/Client.java b/Dozentenmodul/src/models/Client.java index 6dc587f1..42eccdec 100644 --- a/Dozentenmodul/src/models/Client.java +++ b/Dozentenmodul/src/models/Client.java @@ -3,7 +3,6 @@ package models; public class Client { private server.Server.Client client; - public static Client clientcon=new Client(); public server.Server.Client getClient() { diff --git a/Dozentenmodul/src/models/Image.java b/Dozentenmodul/src/models/Image.java index 0b3c936e..89df5cd5 100644 --- a/Dozentenmodul/src/models/Image.java +++ b/Dozentenmodul/src/models/Image.java @@ -1,21 +1,28 @@ package models; public class Image { + private String ImageId; private String version; - private String imagename; private String newName; private String imagepath; + private int shareMode; private boolean licensed; private boolean internet; private int ram; private int cpu; private long filesize; - public static Image image =new Image(); + + public int getShareMode() { + return shareMode; + } + public void setShareMode(int shareMode) { + this.shareMode = shareMode; + } public String getImagepath() { return imagepath; } diff --git a/Dozentenmodul/src/models/Lecture.java b/Dozentenmodul/src/models/Lecture.java index 6b7e6fa1..eae05ec5 100644 --- a/Dozentenmodul/src/models/Lecture.java +++ b/Dozentenmodul/src/models/Lecture.java @@ -4,7 +4,6 @@ import java.util.Date; public class Lecture { - private String name; private String newName; private String shortDesc; @@ -14,8 +13,6 @@ public class Lecture { private boolean active; private String id; private String linkedImagename; - - public static Lecture lecture =new Lecture(); diff --git a/Dozentenmodul/src/models/Links.java b/Dozentenmodul/src/models/Links.java index 729801e5..860cae35 100644 --- a/Dozentenmodul/src/models/Links.java +++ b/Dozentenmodul/src/models/Links.java @@ -9,6 +9,8 @@ public class Links { private static String FAQ = "http://bwlehrpool.hs-offenburg.de/"; private static String OTRS = "https://bwlehrpool-otrs.rz.hs-offenburg.de//otrs/customer.pl"; + private static String uriWindows="https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0"; + private static String uriLinux="https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0"; public static String getFAQ() { return FAQ; @@ -18,6 +20,7 @@ public class Links { return OTRS; } +<<<<<<< HEAD public static void openFAQ() { String faq = FAQ; @@ -95,4 +98,14 @@ public static void openOTRS() { } } +======= + public static String getUriWindows() { + return uriWindows; + } + + public static String getUriLinux() { + return uriLinux; + } + +>>>>>>> 5d24cdec4d239f473ee2359493ab47d1ef3273dd } diff --git a/Dozentenmodul/src/models/person.java b/Dozentenmodul/src/models/person.java index 67b6b84e..0f14af51 100644 --- a/Dozentenmodul/src/models/person.java +++ b/Dozentenmodul/src/models/person.java @@ -3,9 +3,7 @@ package models; public class person{ - private String username; - private String Name; private String Vorname; private String Hochschule; @@ -13,11 +11,8 @@ public class person{ private String Tel; private String Fakultaet; private boolean ischecked; - - //public static person verantowrtlicher=new person(); public static person verantwortlicher=new person(); - public String getUsername() { return username; } diff --git a/Dozentenmodul/src/models/user.java b/Dozentenmodul/src/models/user.java index be64937f..9aa958a4 100644 --- a/Dozentenmodul/src/models/user.java +++ b/Dozentenmodul/src/models/user.java @@ -4,6 +4,7 @@ public class user { private String userName; private String Password; + public String getUserName() { return userName; } diff --git a/Dozentenmodul/src/thrift/MasterThriftConnection.java b/Dozentenmodul/src/thrift/MasterThriftConnection.java index 760b8bd0..11a27368 100644 --- a/Dozentenmodul/src/thrift/MasterThriftConnection.java +++ b/Dozentenmodul/src/thrift/MasterThriftConnection.java @@ -15,6 +15,8 @@ import thrift.ImageServer.Client; public class MasterThriftConnection { public static final String MASTERSERVERIP="132.230.4.16"; + //public static final String MASTERSERVERIP="127.0.0.1"; + final TTransport transport = new TSocket(MASTERSERVERIP, 9090); public Client getMasterThriftConnection() diff --git a/Dozentenmodulserver/.classpath b/Dozentenmodulserver/.classpath index a4c7b889..7c84817e 100644 --- a/Dozentenmodulserver/.classpath +++ b/Dozentenmodulserver/.classpath @@ -8,5 +8,6 @@ <classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
<classpathentry kind="lib" path="lib/ini4j-0.5.2-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-simple-1.7.5.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/Dozentenmodulserver/bin/server/BinaryListener.class b/Dozentenmodulserver/bin/server/BinaryListener.class Binary files differdeleted file mode 100644 index 4a135f2d..00000000 --- a/Dozentenmodulserver/bin/server/BinaryListener.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class Binary files differdeleted file mode 100644 index 5a2f6467..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class Binary files differdeleted file mode 100644 index 1fa17d1b..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class Binary files differdeleted file mode 100644 index 6160ac92..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class Binary files differdeleted file mode 100644 index 09a58749..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class Binary files differdeleted file mode 100644 index 18262b01..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class Binary files differdeleted file mode 100644 index 7ea4ae26..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class Binary files differdeleted file mode 100644 index 079b5cc7..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class Binary files differdeleted file mode 100644 index a43e1d44..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class Binary files differdeleted file mode 100644 index e12e6ef7..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class Binary files differdeleted file mode 100644 index 0d2560a4..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class Binary files differdeleted file mode 100644 index 9dbdc9f6..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class Binary files differdeleted file mode 100644 index ac6c5c48..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class Binary files differdeleted file mode 100644 index 72130419..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class Binary files differdeleted file mode 100644 index a23e2786..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient.class b/Dozentenmodulserver/bin/server/Server$AsyncClient.class Binary files differdeleted file mode 100644 index 3b5ca5e4..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncIface.class b/Dozentenmodulserver/bin/server/Server$AsyncIface.class Binary files differdeleted file mode 100644 index 047c7443..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncIface.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class Binary files differdeleted file mode 100644 index 738e5415..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class Binary files differdeleted file mode 100644 index e23b322c..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class Binary files differdeleted file mode 100644 index b8f976dd..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class Binary files differdeleted file mode 100644 index eb272cc8..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class Binary files differdeleted file mode 100644 index 2cf81ba1..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class Binary files differdeleted file mode 100644 index f832a80b..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class Binary files differdeleted file mode 100644 index 32c05fd8..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class Binary files differdeleted file mode 100644 index 8d57f1b7..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class Binary files differdeleted file mode 100644 index d4ceb443..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class Binary files differdeleted file mode 100644 index fa9a302d..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class Binary files differdeleted file mode 100644 index cb596b31..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class Binary files differdeleted file mode 100644 index 56016353..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class Binary files differdeleted file mode 100644 index 5a337eb9..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class Binary files differdeleted file mode 100644 index cdd259e4..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Client$Factory.class b/Dozentenmodulserver/bin/server/Server$Client$Factory.class Binary files differdeleted file mode 100644 index 853c4e4f..00000000 --- a/Dozentenmodulserver/bin/server/Server$Client$Factory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Client.class b/Dozentenmodulserver/bin/server/Server$Client.class Binary files differdeleted file mode 100644 index 21eb47eb..00000000 --- a/Dozentenmodulserver/bin/server/Server$Client.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class Binary files differdeleted file mode 100644 index f5119cc8..00000000 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 45cd420e..00000000 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class Binary files differdeleted file mode 100644 index 466ae724..00000000 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class Binary files differdeleted file mode 100644 index dd615cd4..00000000 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class Binary files differdeleted file mode 100644 index fd200c4e..00000000 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class Binary files differdeleted file mode 100644 index 9a10c13e..00000000 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class Binary files differdeleted file mode 100644 index 92dc5b4f..00000000 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 6bde3cf7..00000000 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class Binary files differdeleted file mode 100644 index 482bcd2f..00000000 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class Binary files differdeleted file mode 100644 index f8560d35..00000000 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class Binary files differdeleted file mode 100644 index ca5460c5..00000000 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class Binary files differdeleted file mode 100644 index 703163e2..00000000 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Iface.class b/Dozentenmodulserver/bin/server/Server$Iface.class Binary files differdeleted file mode 100644 index f95adf52..00000000 --- a/Dozentenmodulserver/bin/server/Server$Iface.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class Binary files differdeleted file mode 100644 index 4799479f..00000000 --- a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class Binary files differdeleted file mode 100644 index 5296ea7a..00000000 --- a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class Binary files differdeleted file mode 100644 index 2a8b0148..00000000 --- a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class Binary files differdeleted file mode 100644 index 1a73b881..00000000 --- a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class Binary files differdeleted file mode 100644 index d240b739..00000000 --- a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class Binary files differdeleted file mode 100644 index 6bbed1a2..00000000 --- a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class Binary files differdeleted file mode 100644 index 481fbeee..00000000 --- a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class Binary files differdeleted file mode 100644 index cc5dd9fb..00000000 --- a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class Binary files differdeleted file mode 100644 index 117cbb08..00000000 --- a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class Binary files differdeleted file mode 100644 index 78fd0954..00000000 --- a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class Binary files differdeleted file mode 100644 index 61ebaacd..00000000 --- a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class Binary files differdeleted file mode 100644 index e3b9474b..00000000 --- a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class Binary files differdeleted file mode 100644 index 8fcb63da..00000000 --- a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$Processor.class b/Dozentenmodulserver/bin/server/Server$Processor.class Binary files differdeleted file mode 100644 index e6dcbf15..00000000 --- a/Dozentenmodulserver/bin/server/Server$Processor.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class Binary files differdeleted file mode 100644 index c1684750..00000000 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class Binary files differdeleted file mode 100644 index ce54f213..00000000 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class Binary files differdeleted file mode 100644 index c6828e08..00000000 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class Binary files differdeleted file mode 100644 index 18bde437..00000000 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class Binary files differdeleted file mode 100644 index 40b630b4..00000000 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class Binary files differdeleted file mode 100644 index a3360dfe..00000000 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class Binary files differdeleted file mode 100644 index f255ef55..00000000 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class Binary files differdeleted file mode 100644 index f2c960f0..00000000 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 967beab7..00000000 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class Binary files differdeleted file mode 100644 index a693108c..00000000 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class Binary files differdeleted file mode 100644 index 2578e105..00000000 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class Binary files differdeleted file mode 100644 index 0129e985..00000000 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class Binary files differdeleted file mode 100644 index 03554da6..00000000 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class Binary files differdeleted file mode 100644 index b60b3eb0..00000000 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 0e80eec5..00000000 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class Binary files differdeleted file mode 100644 index 6f24f871..00000000 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class Binary files differdeleted file mode 100644 index 489ee69c..00000000 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class Binary files differdeleted file mode 100644 index 9caa0a60..00000000 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class Binary files differdeleted file mode 100644 index fc5e838b..00000000 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class Binary files differdeleted file mode 100644 index 881358af..00000000 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 3e3107a0..00000000 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class Binary files differdeleted file mode 100644 index 779c256b..00000000 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class Binary files differdeleted file mode 100644 index f7aee8e1..00000000 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class Binary files differdeleted file mode 100644 index 2837ef7f..00000000 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class Binary files differdeleted file mode 100644 index a1faa5cb..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class Binary files differdeleted file mode 100644 index f246d35e..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 27420451..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class Binary files differdeleted file mode 100644 index 3223cc9d..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class Binary files differdeleted file mode 100644 index 22ee0862..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args.class b/Dozentenmodulserver/bin/server/Server$getImageData_args.class Binary files differdeleted file mode 100644 index 975cba41..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class Binary files differdeleted file mode 100644 index 703ba8dc..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class Binary files differdeleted file mode 100644 index 99167e1e..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class Binary files differdeleted file mode 100644 index cd44eab0..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class Binary files differdeleted file mode 100644 index 06dedd3d..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class Binary files differdeleted file mode 100644 index fb889bc2..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result.class b/Dozentenmodulserver/bin/server/Server$getImageData_result.class Binary files differdeleted file mode 100644 index e32f0176..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class Binary files differdeleted file mode 100644 index e0222ef1..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class Binary files differdeleted file mode 100644 index 6eba1d71..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class Binary files differdeleted file mode 100644 index abfd4bed..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class Binary files differdeleted file mode 100644 index bb274671..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class Binary files differdeleted file mode 100644 index cb514b97..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args.class b/Dozentenmodulserver/bin/server/Server$getImageList_args.class Binary files differdeleted file mode 100644 index 8bb9a3cf..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class Binary files differdeleted file mode 100644 index 374792d6..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class Binary files differdeleted file mode 100644 index 2cc855ab..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 3424cbb3..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class Binary files differdeleted file mode 100644 index 84c86eb8..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class Binary files differdeleted file mode 100644 index a4326943..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result.class b/Dozentenmodulserver/bin/server/Server$getImageList_result.class Binary files differdeleted file mode 100644 index 325ba9ed..00000000 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class Binary files differdeleted file mode 100644 index c2fc0276..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class Binary files differdeleted file mode 100644 index bc46d0b4..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 1aa6bae7..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class Binary files differindex 6af1c2d5..4c38d18d 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class Binary files differdeleted file mode 100644 index 5c4317f5..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class Binary files differdeleted file mode 100644 index 2aec57e6..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class Binary files differindex 1a420161..4125b7ed 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class Binary files differdeleted file mode 100644 index 69ee0cea..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 681721cf..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class Binary files differdeleted file mode 100644 index a16e2201..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class Binary files differdeleted file mode 100644 index 11c9d3d2..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class Binary files differdeleted file mode 100644 index 92a45d02..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class Binary files differdeleted file mode 100644 index 22bcc618..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class Binary files differdeleted file mode 100644 index c5edd8ab..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class Binary files differdeleted file mode 100644 index f08a824d..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class Binary files differdeleted file mode 100644 index 7e4ea3a6..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class Binary files differdeleted file mode 100644 index 8d06a0e8..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args.class Binary files differdeleted file mode 100644 index 7506bd63..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class Binary files differdeleted file mode 100644 index 2698739b..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class Binary files differdeleted file mode 100644 index 4e5eaec2..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 33c40b8d..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class Binary files differdeleted file mode 100644 index 735f2fd7..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class Binary files differdeleted file mode 100644 index e96b1739..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class Binary files differdeleted file mode 100644 index f16c05d0..00000000 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class Binary files differdeleted file mode 100644 index 73cab7a1..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class Binary files differdeleted file mode 100644 index 8deaf130..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 12074d17..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class Binary files differdeleted file mode 100644 index 5fb2de31..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class Binary files differdeleted file mode 100644 index a7281f0f..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class Binary files differdeleted file mode 100644 index 67b1de28..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class Binary files differdeleted file mode 100644 index 77a6e6c3..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class Binary files differdeleted file mode 100644 index 53962979..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class Binary files differdeleted file mode 100644 index da59c1d0..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class Binary files differdeleted file mode 100644 index 0d5479f9..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class Binary files differdeleted file mode 100644 index c79bdfdc..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class Binary files differdeleted file mode 100644 index 20359090..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class Binary files differindex 4787013d..23fdf07e 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class Binary files differdeleted file mode 100644 index 2481a5fb..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 6e6cf517..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class Binary files differdeleted file mode 100644 index 9625bd56..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class Binary files differdeleted file mode 100644 index 24e753f5..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class Binary files differdeleted file mode 100644 index 335fbb21..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class Binary files differindex 4111aa57..a0551a3c 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class Binary files differdeleted file mode 100644 index ca4c6f2d..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 1a16ee08..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class Binary files differdeleted file mode 100644 index 69b4268f..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class Binary files differdeleted file mode 100644 index cc51fcb1..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class Binary files differdeleted file mode 100644 index d1987015..00000000 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class Binary files differdeleted file mode 100644 index c6910b20..00000000 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class Binary files differdeleted file mode 100644 index b1602ad1..00000000 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class Binary files differdeleted file mode 100644 index d1302dd7..00000000 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class Binary files differdeleted file mode 100644 index 6d46a74e..00000000 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class Binary files differindex 45328d02..e8adfd24 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class Binary files differindex d0f68324..c6b7ce8d 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class Binary files differindex 93cdb8ba..0fd71044 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class Binary files differdeleted file mode 100644 index 1d1f1ce2..00000000 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 42b8fb5c..00000000 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class Binary files differdeleted file mode 100644 index 270e231e..00000000 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class Binary files differdeleted file mode 100644 index d2e97cc3..00000000 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class Binary files differdeleted file mode 100644 index 58a469ca..00000000 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class Binary files differdeleted file mode 100644 index 1dc597e4..00000000 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class Binary files differdeleted file mode 100644 index 24e20a3d..00000000 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 510db4bb..00000000 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class Binary files differdeleted file mode 100644 index f1bfba09..00000000 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class Binary files differdeleted file mode 100644 index 9077426f..00000000 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class Binary files differindex ed849746..cbbf2577 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class Binary files differindex b1d19883..e15b535c 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class Binary files differdeleted file mode 100644 index 7251fc39..00000000 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class Binary files differdeleted file mode 100644 index d3003c9a..00000000 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class Binary files differdeleted file mode 100644 index a97214a4..00000000 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class Binary files differdeleted file mode 100644 index 94d4ecfa..00000000 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class Binary files differindex 6a27318e..244244ab 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class Binary files differdeleted file mode 100644 index 8a1ac863..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class Binary files differdeleted file mode 100644 index 6bcb3cec..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 6591a3fc..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class Binary files differdeleted file mode 100644 index 412603bb..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class Binary files differindex 9b378c34..d3767956 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class Binary files differindex e5e88214..20d475b0 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class Binary files differindex 57e629d4..96d62007 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class Binary files differdeleted file mode 100644 index 2e0d5003..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 80dd36ee..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class Binary files differdeleted file mode 100644 index 97e4632d..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class Binary files differdeleted file mode 100644 index bf2620bf..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class Binary files differdeleted file mode 100644 index c3f9ba53..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class Binary files differdeleted file mode 100644 index 806f9e32..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class Binary files differdeleted file mode 100644 index ba827fb9..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 5076c563..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class Binary files differdeleted file mode 100644 index 1404c2e0..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class Binary files differdeleted file mode 100644 index 8e125b36..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class Binary files differindex e9082858..c55a82b1 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class Binary files differdeleted file mode 100644 index e9c66269..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class Binary files differdeleted file mode 100644 index e02b06f7..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 1e709219..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class Binary files differdeleted file mode 100644 index a88955b0..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class Binary files differdeleted file mode 100644 index a5547532..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class Binary files differdeleted file mode 100644 index 6c73aa49..00000000 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server.class b/Dozentenmodulserver/bin/server/Server.class Binary files differdeleted file mode 100644 index 4df80d9c..00000000 --- a/Dozentenmodulserver/bin/server/Server.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class Binary files differdeleted file mode 100644 index cf70402f..00000000 --- a/Dozentenmodulserver/bin/server/ServerHandler.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/startServer.class b/Dozentenmodulserver/bin/server/startServer.class Binary files differdeleted file mode 100644 index baa1a480..00000000 --- a/Dozentenmodulserver/bin/server/startServer.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class Binary files differindex fb2abbc3..f12de705 100644 --- a/Dozentenmodulserver/bin/sql/SQL.class +++ b/Dozentenmodulserver/bin/sql/SQL.class diff --git a/Dozentenmodulserver/bin/util/XMLCreator.class b/Dozentenmodulserver/bin/util/XMLCreator.class Binary files differindex fd8a3c2a..cfdf6004 100644 --- a/Dozentenmodulserver/bin/util/XMLCreator.class +++ b/Dozentenmodulserver/bin/util/XMLCreator.class diff --git a/Dozentenmodulserver/lib/slf4j-simple-1.7.5.jar b/Dozentenmodulserver/lib/slf4j-simple-1.7.5.jar Binary files differnew file mode 100644 index 00000000..9dece319 --- /dev/null +++ b/Dozentenmodulserver/lib/slf4j-simple-1.7.5.jar diff --git a/Dozentenmodulserver/src/server/BinaryListener.java b/Dozentenmodulserver/src/server/BinaryListener.java index a48b381e..ffeb9bd5 100644 --- a/Dozentenmodulserver/src/server/BinaryListener.java +++ b/Dozentenmodulserver/src/server/BinaryListener.java @@ -3,33 +3,46 @@ package server; import java.util.Date; import org.apache.log4j.Logger; +import org.apache.thrift.protocol.TProtocolFactory; import org.apache.thrift.server.TServer; -import org.apache.thrift.server.TServer.Args; -import org.apache.thrift.server.TSimpleServer; +import org.apache.thrift.server.TThreadPoolServer.Args; +import org.apache.thrift.server.TThreadPoolServer; import org.apache.thrift.transport.TServerSocket; import org.apache.thrift.transport.TServerTransport; import org.apache.thrift.transport.TTransportException; -public class BinaryListener implements Runnable -{ - private static Logger log = Logger.getLogger( BinaryListener.class ); +public class BinaryListener implements Runnable { + private static Logger log = Logger.getLogger(BinaryListener.class); + + private final int MINWORKERTHREADS = 20; // keine ahnung ob das passt... + private final int MAXWORKERTHREADS = 80; // ebenso @Override - public void run() - { + public void run() { final ServerHandler handler = new ServerHandler(); - final Server.Processor<ServerHandler> processor = new Server.Processor<ServerHandler>( handler ); + final Server.Processor<ServerHandler> processor = new Server.Processor<ServerHandler>( + handler); final TServerTransport transport; + final TProtocolFactory protFactory = new TBinaryProtocolSafe.Factory( + true, true); try { - transport = new TServerSocket( 9090 ); - log.info(new Date()+" - Connected to Port 9090"); - } catch ( TTransportException e ) { - log.fatal( new Date() +" - Could not listen on port 9090" ); + transport = new TServerSocket(9090); + log.info(new Date() + " - Connected to Port 9090"); + + } catch (TTransportException e) { + log.fatal(new Date() + " - Could not listen on port 9090"); return; } - TServer server = new TSimpleServer( new Args( transport ).processor( processor ) ); - log.info(new Date() +" - Started running BinaryListener"); + TServer server = new TThreadPoolServer(new Args(transport) + .protocolFactory(protFactory).processor(processor) + .minWorkerThreads(MINWORKERTHREADS) + .maxWorkerThreads(MAXWORKERTHREADS)); + + log.info(new Date() + " - Started running BinaryListener"); + log.info(new Date() + " - MINWORKERTHREADS=" + MINWORKERTHREADS + + " and MAXWORKERTHREADS=" + MAXWORKERTHREADS + "\n"); server.serve(); + } - + } diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java index ef434865..b652bf7a 100644 --- a/Dozentenmodulserver/src/server/Server.java +++ b/Dozentenmodulserver/src/server/Server.java @@ -42,7 +42,7 @@ public class Server { public String getPathOfImage(String image_id, String version) throws org.apache.thrift.TException; - public boolean writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize) throws org.apache.thrift.TException; + public boolean writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode) throws org.apache.thrift.TException; public List<Image> getImageList() throws org.apache.thrift.TException; @@ -58,7 +58,7 @@ public class Server { public Map<String,String> getImageData(String imageid, String imageversion) throws org.apache.thrift.TException; - public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize) throws org.apache.thrift.TException; + public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode) throws org.apache.thrift.TException; public Map<String,String> getLectureData(String lecturename) throws org.apache.thrift.TException; @@ -82,7 +82,7 @@ public class Server { public void getPathOfImage(String image_id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getImageList(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -98,7 +98,7 @@ public class Server { public void getImageData(String imageid, String imageversion, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getLectureData(String lecturename, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -203,13 +203,13 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getPathOfImage failed: unknown result"); } - public boolean writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize) throws org.apache.thrift.TException + public boolean writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode) throws org.apache.thrift.TException { - send_writeVLdata(imagename, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, isTemplate, filesize); + send_writeVLdata(imagename, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, isTemplate, filesize, shareMode); return recv_writeVLdata(); } - public void send_writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize) throws org.apache.thrift.TException + public void send_writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode) throws org.apache.thrift.TException { writeVLdata_args args = new writeVLdata_args(); args.setImagename(imagename); @@ -227,6 +227,7 @@ public class Server { args.setImagePath(imagePath); args.setIsTemplate(isTemplate); args.setFilesize(filesize); + args.setShareMode(shareMode); sendBase("writeVLdata", args); } @@ -413,13 +414,13 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageData failed: unknown result"); } - public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize) throws org.apache.thrift.TException + public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode) throws org.apache.thrift.TException { - send_updateImageData(name, newName, image_path, license, internet, ram, cpu, id, version, isTemplate, filesize); + send_updateImageData(name, newName, image_path, license, internet, ram, cpu, id, version, isTemplate, filesize, shareMode); return recv_updateImageData(); } - public void send_updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize) throws org.apache.thrift.TException + public void send_updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode) throws org.apache.thrift.TException { updateImageData_args args = new updateImageData_args(); args.setName(name); @@ -433,6 +434,7 @@ public class Server { args.setVersion(version); args.setIsTemplate(isTemplate); args.setFilesize(filesize); + args.setShareMode(shareMode); sendBase("updateImageData", args); } @@ -717,9 +719,9 @@ public class Server { } } - public void writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - writeVLdata_call method_call = new writeVLdata_call(imagename, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, isTemplate, filesize, resultHandler, this, ___protocolFactory, ___transport); + writeVLdata_call method_call = new writeVLdata_call(imagename, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, isTemplate, filesize, shareMode, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -740,7 +742,8 @@ public class Server { private String imagePath; private boolean isTemplate; private long filesize; - public writeVLdata_call(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private long shareMode; + public writeVLdata_call(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.imagename = imagename; this.login = login; @@ -757,6 +760,7 @@ public class Server { this.imagePath = imagePath; this.isTemplate = isTemplate; this.filesize = filesize; + this.shareMode = shareMode; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -777,6 +781,7 @@ public class Server { args.setImagePath(imagePath); args.setIsTemplate(isTemplate); args.setFilesize(filesize); + args.setShareMode(shareMode); args.write(prot); prot.writeMessageEnd(); } @@ -1051,9 +1056,9 @@ public class Server { } } - public void updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - updateImageData_call method_call = new updateImageData_call(name, newName, image_path, license, internet, ram, cpu, id, version, isTemplate, filesize, resultHandler, this, ___protocolFactory, ___transport); + updateImageData_call method_call = new updateImageData_call(name, newName, image_path, license, internet, ram, cpu, id, version, isTemplate, filesize, shareMode, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -1070,7 +1075,8 @@ public class Server { private String version; private boolean isTemplate; private long filesize; - public updateImageData_call(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private long shareMode; + public updateImageData_call(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.name = name; this.newName = newName; @@ -1083,6 +1089,7 @@ public class Server { this.version = version; this.isTemplate = isTemplate; this.filesize = filesize; + this.shareMode = shareMode; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -1099,6 +1106,7 @@ public class Server { args.setVersion(version); args.setIsTemplate(isTemplate); args.setFilesize(filesize); + args.setShareMode(shareMode); args.write(prot); prot.writeMessageEnd(); } @@ -1472,7 +1480,7 @@ public class Server { public writeVLdata_result getResult(I iface, writeVLdata_args args) throws org.apache.thrift.TException { writeVLdata_result result = new writeVLdata_result(); - result.success = iface.writeVLdata(args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath, args.isTemplate, args.filesize); + result.success = iface.writeVLdata(args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath, args.isTemplate, args.filesize, args.shareMode); result.setSuccessIsSet(true); return result; } @@ -1635,7 +1643,7 @@ public class Server { public updateImageData_result getResult(I iface, updateImageData_args args) throws org.apache.thrift.TException { updateImageData_result result = new updateImageData_result(); - result.success = iface.updateImageData(args.name, args.newName, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version, args.isTemplate, args.filesize); + result.success = iface.updateImageData(args.name, args.newName, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version, args.isTemplate, args.filesize, args.shareMode); result.setSuccessIsSet(true); return result; } @@ -2002,7 +2010,7 @@ public class Server { } public void start(I iface, writeVLdata_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.writeVLdata(args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath, args.isTemplate, args.filesize,resultHandler); + iface.writeVLdata(args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath, args.isTemplate, args.filesize, args.shareMode,resultHandler); } } @@ -2413,7 +2421,7 @@ public class Server { } public void start(I iface, updateImageData_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.updateImageData(args.name, args.newName, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version, args.isTemplate, args.filesize,resultHandler); + iface.updateImageData(args.name, args.newName, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version, args.isTemplate, args.filesize, args.shareMode,resultHandler); } } @@ -4869,6 +4877,7 @@ public class Server { private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("imagePath", org.apache.thrift.protocol.TType.STRING, (short)-13); private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.BOOL, (short)-14); private static final org.apache.thrift.protocol.TField FILESIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("filesize", org.apache.thrift.protocol.TType.I64, (short)-15); + private static final org.apache.thrift.protocol.TField SHARE_MODE_FIELD_DESC = new org.apache.thrift.protocol.TField("shareMode", org.apache.thrift.protocol.TType.I64, (short)-16); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -4891,6 +4900,7 @@ public class Server { public String imagePath; // required public boolean isTemplate; // required public long filesize; // required + public long shareMode; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -4908,7 +4918,8 @@ public class Server { CPU((short)-12, "cpu"), IMAGE_PATH((short)-13, "imagePath"), IS_TEMPLATE((short)-14, "isTemplate"), - FILESIZE((short)-15, "filesize"); + FILESIZE((short)-15, "filesize"), + SHARE_MODE((short)-16, "shareMode"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -4953,6 +4964,8 @@ public class Server { return IS_TEMPLATE; case -15: // FILESIZE return FILESIZE; + case -16: // SHARE_MODE + return SHARE_MODE; default: return null; } @@ -4999,6 +5012,7 @@ public class Server { private static final int __CPU_ISSET_ID = 3; private static final int __ISTEMPLATE_ISSET_ID = 4; private static final int __FILESIZE_ISSET_ID = 5; + private static final int __SHAREMODE_ISSET_ID = 6; private byte __isset_bitfield = 0; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { @@ -5033,6 +5047,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.FILESIZE, new org.apache.thrift.meta_data.FieldMetaData("filesize", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + tmpMap.put(_Fields.SHARE_MODE, new org.apache.thrift.meta_data.FieldMetaData("shareMode", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64 , "int"))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(writeVLdata_args.class, metaDataMap); } @@ -5055,7 +5071,8 @@ public class Server { long cpu, String imagePath, boolean isTemplate, - long filesize) + long filesize, + long shareMode) { this(); this.imagename = imagename; @@ -5079,6 +5096,8 @@ public class Server { setIsTemplateIsSet(true); this.filesize = filesize; setFilesizeIsSet(true); + this.shareMode = shareMode; + setShareModeIsSet(true); } /** @@ -5119,6 +5138,7 @@ public class Server { } this.isTemplate = other.isTemplate; this.filesize = other.filesize; + this.shareMode = other.shareMode; } public writeVLdata_args deepCopy() { @@ -5148,6 +5168,8 @@ public class Server { this.isTemplate = false; setFilesizeIsSet(false); this.filesize = 0; + setShareModeIsSet(false); + this.shareMode = 0; } public String getImagename() { @@ -5504,6 +5526,29 @@ public class Server { __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FILESIZE_ISSET_ID, value); } + public long getShareMode() { + return this.shareMode; + } + + public writeVLdata_args setShareMode(long shareMode) { + this.shareMode = shareMode; + setShareModeIsSet(true); + return this; + } + + public void unsetShareMode() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SHAREMODE_ISSET_ID); + } + + /** Returns true if field shareMode is set (has been assigned a value) and false otherwise */ + public boolean isSetShareMode() { + return EncodingUtils.testBit(__isset_bitfield, __SHAREMODE_ISSET_ID); + } + + public void setShareModeIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SHAREMODE_ISSET_ID, value); + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case IMAGENAME: @@ -5626,6 +5671,14 @@ public class Server { } break; + case SHARE_MODE: + if (value == null) { + unsetShareMode(); + } else { + setShareMode((Long)value); + } + break; + } } @@ -5676,6 +5729,9 @@ public class Server { case FILESIZE: return Long.valueOf(getFilesize()); + case SHARE_MODE: + return Long.valueOf(getShareMode()); + } throw new IllegalStateException(); } @@ -5717,6 +5773,8 @@ public class Server { return isSetIsTemplate(); case FILESIZE: return isSetFilesize(); + case SHARE_MODE: + return isSetShareMode(); } throw new IllegalStateException(); } @@ -5869,6 +5927,15 @@ public class Server { return false; } + boolean this_present_shareMode = true; + boolean that_present_shareMode = true; + if (this_present_shareMode || that_present_shareMode) { + if (!(this_present_shareMode && that_present_shareMode)) + return false; + if (this.shareMode != that.shareMode) + return false; + } + return true; } @@ -6035,6 +6102,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetShareMode()).compareTo(other.isSetShareMode()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetShareMode()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.shareMode, other.shareMode); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -6150,6 +6227,10 @@ public class Server { sb.append("filesize:"); sb.append(this.filesize); first = false; + if (!first) sb.append(", "); + sb.append("shareMode:"); + sb.append(this.shareMode); + first = false; sb.append(")"); return sb.toString(); } @@ -6315,6 +6396,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case -16: // SHARE_MODE + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.shareMode = iprot.readI64(); + struct.setShareModeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -6330,6 +6419,9 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + oprot.writeFieldBegin(SHARE_MODE_FIELD_DESC); + oprot.writeI64(struct.shareMode); + oprot.writeFieldEnd(); oprot.writeFieldBegin(FILESIZE_FIELD_DESC); oprot.writeI64(struct.filesize); oprot.writeFieldEnd(); @@ -6456,7 +6548,10 @@ public class Server { if (struct.isSetFilesize()) { optionals.set(14); } - oprot.writeBitSet(optionals, 15); + if (struct.isSetShareMode()) { + optionals.set(15); + } + oprot.writeBitSet(optionals, 16); if (struct.isSetImagename()) { oprot.writeString(struct.imagename); } @@ -6502,12 +6597,15 @@ public class Server { if (struct.isSetFilesize()) { oprot.writeI64(struct.filesize); } + if (struct.isSetShareMode()) { + oprot.writeI64(struct.shareMode); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, writeVLdata_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(15); + BitSet incoming = iprot.readBitSet(16); if (incoming.get(0)) { struct.imagename = iprot.readString(); struct.setImagenameIsSet(true); @@ -6568,6 +6666,10 @@ public class Server { struct.filesize = iprot.readI64(); struct.setFilesizeIsSet(true); } + if (incoming.get(15)) { + struct.shareMode = iprot.readI64(); + struct.setShareModeIsSet(true); + } } } @@ -13332,6 +13434,7 @@ public class Server { private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-9); private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.BOOL, (short)-10); private static final org.apache.thrift.protocol.TField FILESIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("filesize", org.apache.thrift.protocol.TType.I64, (short)-11); + private static final org.apache.thrift.protocol.TField SHARE_MODE_FIELD_DESC = new org.apache.thrift.protocol.TField("shareMode", org.apache.thrift.protocol.TType.I64, (short)-12); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -13350,6 +13453,7 @@ public class Server { public String version; // required public boolean isTemplate; // required public long filesize; // required + public long shareMode; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -13363,7 +13467,8 @@ public class Server { ID((short)-8, "id"), VERSION((short)-9, "version"), IS_TEMPLATE((short)-10, "isTemplate"), - FILESIZE((short)-11, "filesize"); + FILESIZE((short)-11, "filesize"), + SHARE_MODE((short)-12, "shareMode"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -13400,6 +13505,8 @@ public class Server { return IS_TEMPLATE; case -11: // FILESIZE return FILESIZE; + case -12: // SHARE_MODE + return SHARE_MODE; default: return null; } @@ -13446,6 +13553,7 @@ public class Server { private static final int __CPU_ISSET_ID = 3; private static final int __ISTEMPLATE_ISSET_ID = 4; private static final int __FILESIZE_ISSET_ID = 5; + private static final int __SHAREMODE_ISSET_ID = 6; private byte __isset_bitfield = 0; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { @@ -13472,6 +13580,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.FILESIZE, new org.apache.thrift.meta_data.FieldMetaData("filesize", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + tmpMap.put(_Fields.SHARE_MODE, new org.apache.thrift.meta_data.FieldMetaData("shareMode", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64 , "int"))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateImageData_args.class, metaDataMap); } @@ -13490,7 +13600,8 @@ public class Server { String id, String version, boolean isTemplate, - long filesize) + long filesize, + long shareMode) { this(); this.name = name; @@ -13510,6 +13621,8 @@ public class Server { setIsTemplateIsSet(true); this.filesize = filesize; setFilesizeIsSet(true); + this.shareMode = shareMode; + setShareModeIsSet(true); } /** @@ -13538,6 +13651,7 @@ public class Server { } this.isTemplate = other.isTemplate; this.filesize = other.filesize; + this.shareMode = other.shareMode; } public updateImageData_args deepCopy() { @@ -13563,6 +13677,8 @@ public class Server { this.isTemplate = false; setFilesizeIsSet(false); this.filesize = 0; + setShareModeIsSet(false); + this.shareMode = 0; } public String getName() { @@ -13823,6 +13939,29 @@ public class Server { __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FILESIZE_ISSET_ID, value); } + public long getShareMode() { + return this.shareMode; + } + + public updateImageData_args setShareMode(long shareMode) { + this.shareMode = shareMode; + setShareModeIsSet(true); + return this; + } + + public void unsetShareMode() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SHAREMODE_ISSET_ID); + } + + /** Returns true if field shareMode is set (has been assigned a value) and false otherwise */ + public boolean isSetShareMode() { + return EncodingUtils.testBit(__isset_bitfield, __SHAREMODE_ISSET_ID); + } + + public void setShareModeIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SHAREMODE_ISSET_ID, value); + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case NAME: @@ -13913,6 +14052,14 @@ public class Server { } break; + case SHARE_MODE: + if (value == null) { + unsetShareMode(); + } else { + setShareMode((Long)value); + } + break; + } } @@ -13951,6 +14098,9 @@ public class Server { case FILESIZE: return Long.valueOf(getFilesize()); + case SHARE_MODE: + return Long.valueOf(getShareMode()); + } throw new IllegalStateException(); } @@ -13984,6 +14134,8 @@ public class Server { return isSetIsTemplate(); case FILESIZE: return isSetFilesize(); + case SHARE_MODE: + return isSetShareMode(); } throw new IllegalStateException(); } @@ -14100,6 +14252,15 @@ public class Server { return false; } + boolean this_present_shareMode = true; + boolean that_present_shareMode = true; + if (this_present_shareMode || that_present_shareMode) { + if (!(this_present_shareMode && that_present_shareMode)) + return false; + if (this.shareMode != that.shareMode) + return false; + } + return true; } @@ -14226,6 +14387,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetShareMode()).compareTo(other.isSetShareMode()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetShareMode()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.shareMode, other.shareMode); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -14309,6 +14480,10 @@ public class Server { sb.append("filesize:"); sb.append(this.filesize); first = false; + if (!first) sb.append(", "); + sb.append("shareMode:"); + sb.append(this.shareMode); + first = false; sb.append(")"); return sb.toString(); } @@ -14442,6 +14617,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case -12: // SHARE_MODE + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.shareMode = iprot.readI64(); + struct.setShareModeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -14457,6 +14640,9 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + oprot.writeFieldBegin(SHARE_MODE_FIELD_DESC); + oprot.writeI64(struct.shareMode); + oprot.writeFieldEnd(); oprot.writeFieldBegin(FILESIZE_FIELD_DESC); oprot.writeI64(struct.filesize); oprot.writeFieldEnd(); @@ -14551,7 +14737,10 @@ public class Server { if (struct.isSetFilesize()) { optionals.set(10); } - oprot.writeBitSet(optionals, 11); + if (struct.isSetShareMode()) { + optionals.set(11); + } + oprot.writeBitSet(optionals, 12); if (struct.isSetName()) { oprot.writeString(struct.name); } @@ -14585,12 +14774,15 @@ public class Server { if (struct.isSetFilesize()) { oprot.writeI64(struct.filesize); } + if (struct.isSetShareMode()) { + oprot.writeI64(struct.shareMode); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, updateImageData_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(11); + BitSet incoming = iprot.readBitSet(12); if (incoming.get(0)) { struct.name = iprot.readString(); struct.setNameIsSet(true); @@ -14635,6 +14827,10 @@ public class Server { struct.filesize = iprot.readI64(); struct.setFilesizeIsSet(true); } + if (incoming.get(11)) { + struct.shareMode = iprot.readI64(); + struct.setShareModeIsSet(true); + } } } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 5744003a..5ce72615 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -8,10 +8,7 @@ import java.nio.file.Path; import java.nio.file.Paths; 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.Date; import java.util.HashMap; import java.util.List; @@ -26,9 +23,11 @@ import org.apache.thrift.TException; import sql.SQL; import util.XMLCreator; + + public class ServerHandler implements Server.Iface { static SQL sql = new SQL(); - static Connection con = sql.getConnection(); + private static Logger log = Logger.getLogger(ServerHandler.class); @Override @@ -38,18 +37,15 @@ public class ServerHandler implements Server.Iface { user.setUserName(UUID.randomUUID().toString().substring(0, 8)); user.setPassword(getEncodedSha1Sum(UUID.randomUUID().toString() .substring(0, 8))); - if(Configuration.config.getAbsolute_path().endsWith("/")) - { + if (Configuration.config.getAbsolute_path().endsWith("/")) { user.setPath(Configuration.config.getAbsolute_path()); + } else { + user.setPath(Configuration.config.getAbsolute_path() + "/"); } - else{ - user.setPath(Configuration.config.getAbsolute_path()+"/"); - } - SQL sql = new SQL(); - Connection con = sql.getConnection(); + // check if folder temp exists if (folderTempExists() == true) { - sql.writeFTPUser(con, user.getUserName(), user.getPassword()); + sql.writeFTPUser(user.getUserName(), user.getPassword()); return user; } else { log.info(new Date() + " - returning null user"); @@ -59,15 +55,11 @@ public class ServerHandler implements Server.Iface { public boolean folderTempExists() { // check if folder temp exists, otherwise create it - Path path=null; - if(Configuration.config.getAbsolute_path().endsWith("/")) - { - path = Paths - .get(Configuration.config.getAbsolute_path() + "temp"); - } - else{ - path = Paths - .get(Configuration.config.getAbsolute_path() + "/temp"); + Path path = null; + if (Configuration.config.getAbsolute_path().endsWith("/")) { + path = Paths.get(Configuration.config.getAbsolute_path() + "temp"); + } else { + path = Paths.get(Configuration.config.getAbsolute_path() + "/temp"); } if (Files.exists(path) == true) { @@ -83,9 +75,9 @@ public class ServerHandler implements Server.Iface { + "'"); return false; } else { - //set permissions + // set permissions try { - Runtime.getRuntime().exec("chmod 777 "+path); + Runtime.getRuntime().exec("chmod 777 " + path); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -112,26 +104,16 @@ public class ServerHandler implements Server.Iface { @Override public long DeleteFtpUser(String user) throws TException { - int ret = sql.DeleteUser(con, user); - return ret; + return sql.DeleteUser(user); } @Override public String getPathOfImage(String image_id, String version) throws TException { + log.info(new Date() + " - successfully returned PathOfImage: " + + sql.getPathOfImage(image_id, version)); + return sql.getPathOfImage(image_id, version); - try { - ResultSet rs = sql.getPathOfImage(con, image_id, version); - rs.next(); - log.info(new Date() + " - successfully returned PathOfImage: " - + rs.getString("image_path")); - return rs.getString("image_path"); - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - log.info(new Date() + " - returning PathOfImage: null"); - return null; } @Override @@ -139,15 +121,25 @@ public class ServerHandler implements Server.Iface { String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, - long filesize) throws TException { + long filesize, long shareMode) throws TException { + + String mode=null; + + if(shareMode==0) + { + mode="only_local"; + } + else{ + mode="to_be_published"; + } - String pk_institution = sql.setInstitution(con, university); + String pk_institution = sql.setInstitution(university); - String pk_person = sql.setPerson(con, login, lastname, firstname, Mail, + String pk_person = sql.setPerson(login, lastname, firstname, Mail, new Date(), pk_institution); - - sql.setImageData(con, pk_person, license, internet, cpu, ram, - imagename, imagePath, isTemplate, filesize); + + sql.setImageData(pk_person, license, internet, cpu, ram, imagename, + imagePath, isTemplate, filesize,mode); log.info(new Date() + " - written VLdata"); // TODO Auto-generated method stub @@ -156,73 +148,21 @@ public class ServerHandler implements Server.Iface { @Override public List<Image> getImageList() throws TException { - ResultSet res = sql.getImageList(con); - - List<Image> list = new ArrayList<Image>(); + return sql.getImageList(); - try { - - while (res.next()) { - - list.add(new Image(res.getString("GUID_imageID"), res - .getString("imageVersion"), - res.getString("image_name"), res - .getString("cond_hasLicenseRestriction"), res - .getString("name"), res.getString("lecture"), - res.getString("image_update_time"), res - .getString("user"))); - - } - - return list; - } catch (SQLException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - log.info(new Date() + " - returning ImageList: " + list.size() - + " items."); - return null; } @Override public List<String> getAllOS() throws TException { - List<String> list = new ArrayList<>(); - ResultSet rs = sql.getAllOS(con); - try { - while (rs.next()) { - list.add(rs.getString("name")); - } - return list; - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return null; + return sql.getAllOS(); + } @Override public Map<String, String> getPersonData(String Vorname, String Nachname) throws TException { - Map<String, String> map = new HashMap<String, String>(); - - ResultSet rs = sql.getPersonData(con, Vorname, Nachname); - try { - while (rs.next()) { - - map.put("mail", rs.getString("mail")); - map.put("Nachname", rs.getString("Nachname")); - map.put("Vorname", rs.getString("Vorname")); - map.put("Hochschule", rs.getString("name")); + return sql.getPersonData(Vorname, Nachname); - } - return map; - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - log.info(new Date() + " - returning PersonData: " + map.size() - + " items."); - return null; } @Override @@ -232,27 +172,19 @@ public class ServerHandler implements Server.Iface { String university, String Mail, String Tel, String Fak) throws TException { String pk_image = null; - + Map<String, String> map = new HashMap<String, String>(); int imageversion = 0; - String pk_institution = sql.setInstitution(con, university); - String pk_person = sql.setPerson(con, login, lastname, firstname, Mail, + String pk_institution = sql.setInstitution(university); + String pk_person = sql.setPerson(login, lastname, firstname, Mail, new Date(), pk_institution); - ResultSet image = sql.getImageIDandVersion(con, imagename); - - try { - while (image.next()) { - pk_image = image.getString("GUID_imageID"); - imageversion = image.getInt("imageVersion"); - } - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + map = sql.getImageIDandVersion(imagename); - sql.setLectureData(con, pk_person, pk_image, imageversion, name, desc, + pk_image = map.get("GUID"); + imageversion = Integer.parseInt(map.get("version")); + sql.setLectureData(pk_person, pk_image, imageversion, name, desc, shortdesc, startDate, endDate, isActive); - XMLCreator xml = new XMLCreator(con, name); + XMLCreator xml = new XMLCreator(sql.getConnection(), name); try { xml.create(name); log.info(new Date() + " - XML created."); @@ -271,6 +203,7 @@ public class ServerHandler implements Server.Iface { @Override public boolean startFileCopy(String filename) throws TException { + //copy file from folder temp to folder prod String file = Configuration.config.getAbsolute_path() + "temp/" + filename; File tmpFile = new File(file); @@ -279,17 +212,13 @@ public class ServerHandler implements Server.Iface { + " - Trying to move file to '/srv/openslx/nfs/prod/" + tmpFile.getName() + "'"); try { - - // der übergebene Filename ist falsch - hier muss der generierte - // name geholt werden, nicht der ursprüngliche name. wo wird dieser - // eingelesen? - FileUtils.moveFile(tmpFile, new File(Configuration.config.getAbsolute_path() + "prod/" + filename)); - int ret = sql.UpdateImagePath(con, filename); - log.info(new Date() + " - update " + ret); - log.info(new Date() + " - file moved"); + // int ret = sql.UpdateImagePath(filename); + if (sql.UpdateImagePath(filename) == 0) { + log.info(new Date() + " - file moved and database updated."); + } } catch (IOException e) { // TODO Auto-generated catch block @@ -302,43 +231,27 @@ public class ServerHandler implements Server.Iface { @Override public Map<String, String> getImageData(String imageid, String imageversion) throws TException { - - ResultSet data = sql.getImageData(con, imageid, imageversion); - - Map<String, String> map = new HashMap<String, String>(); - try { - while (data.next()) { - System.out.println(data - .getString("cond_hasInternetRestriction") - + data.getString("cond_hasLicenseRestriction") - + data.getString("cond_minCPUs") - + data.getString("cond_minRAM")); - map.put("name", data.getString("image_name")); - map.put("internet", - data.getString("cond_hasInternetRestriction")); - map.put("license", data.getString("cond_hasLicenseRestriction")); - map.put("cpu", data.getString("cond_minCPUs")); - map.put("ram", data.getString("cond_minRAM")); - - } - return map; - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - log.info(new Date() + " - returning ImageData: " + map.size() - + "items."); - return null; - + log.info(new Date() + " - returning ImageData: " + + sql.getImageData(imageid, imageversion).size() + "items."); + return sql.getImageData(imageid, imageversion); } @Override public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, - long filesize) throws TException { - sql.UpdateImageData(con, name, newName, image_path, license, internet, - cpu, ram, id, version, isTemplate, filesize); + long filesize, long shareMode) throws TException { + String mode=null; + + if(shareMode==0) + { + mode="only_local"; + } + else{ + mode="to_be_published"; + } + sql.UpdateImageData(name, newName, image_path, license, internet, cpu, + ram, id, version, isTemplate, filesize,mode); return false; } @@ -351,29 +264,13 @@ public class ServerHandler implements Server.Iface { @Override public List<Lecture> getLectureList() throws TException { - ResultSet res = sql.getLectureList(con); - List<Lecture> list = new ArrayList<Lecture>(); - try { - - while (res.next()) { - - list.add(new Lecture(res.getString("lectureID"), res - .getString("name"), res.getString("isActive"), res - .getString("startTime"), res.getString("endTime"), res - .getString("lastUsed"), res.getString("description"), - res.getString("image_name"), res.getString("user"))); + log.info(new Date().toString() + " - returning LectureList: " + + sql.getLectureList().size() + " items."); + return sql.getLectureList(); + - } - return list; - } catch (SQLException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - log.info(new Date() + " - returning LectureList: " + list.size() - + " items."); - return null; } @Override @@ -384,21 +281,14 @@ public class ServerHandler implements Server.Iface { String Fak, String id) throws TException { String pk_image = ""; int imageversion = 0; - ResultSet image = sql.getImageIDandVersion(con, imagename); + Map<String, String> image = sql.getImageIDandVersion(imagename); - try { - while (image.next()) { - pk_image = image.getString("GUID_imageID"); - imageversion = image.getInt("imageVersion"); - } - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - sql.updateLectureData(con, pk_image, imageversion, lastname, newName, - desc, shortdesc, startDate, endDate, isActive, id); + pk_image = image.get("GUID"); + imageversion = Integer.parseInt(image.get("version")); + sql.updateLectureData(pk_image, imageversion, lastname, newName, desc, + shortdesc, startDate, endDate, isActive, id); - XMLCreator xml = new XMLCreator(con, newName); + XMLCreator xml = new XMLCreator(sql.getConnection(), newName); try { xml.create(newName); } catch (SQLException | ParserConfigurationException @@ -416,14 +306,14 @@ public class ServerHandler implements Server.Iface { public boolean deleteImageServer(String imageid, String imageversion) throws TException { - String stringFile = sql.getFile(con, imageid, imageversion); + String stringFile = sql.getFile(imageid, imageversion); log.info(new Date() + " - File to Delete: " + stringFile); File tmpFile = new File(Configuration.config.getAbsolute_path() + stringFile); try { - // File wird von Server gelöscht + // File wird von Server gel�scht FileUtils.forceDelete(tmpFile); return true; @@ -439,36 +329,33 @@ public class ServerHandler implements Server.Iface { @Override public boolean deleteImageData(String id, String version) throws TException { - return sql.deleteImage(con, id, version); + return sql.deleteImage(id, version); } @Override public boolean connectedToLecture(String id, String version) throws TException { // TODO Auto-generated method stub - return sql.connectedToLecture(con, id, version); + return sql.connectedToLecture(id, version); } public boolean deleteLecture(String id, String hs, String user) { - ResultSet rs = sql.getDeleteXMLData(con, id); + Map<String, String> map = new HashMap<String, String>(); + map = sql.getDeleteXMLData(id); try { - rs.next(); - String date = rs.getString("admin_createTime").replace(" ", "") - .replace("-", "").replace(":", ""); - String name = rs.getString("name"); - String path = Configuration.config.getAbsolute_path() + "temp/" - + date.substring(0, date.length() - 2) + "_" + hs + "_" - + user + "_" + name + ".xml"; + + String path = Configuration.config.getAbsolute_path() + + "temp/" + + map.get("date") + .substring(0, map.get("date").length() - 2) + "_" + + hs + "_" + user + "_" + map.get("name") + ".xml"; File xmlFile = new File(path); FileUtils.forceDelete(xmlFile); - } catch (SQLException e) { - log.info(new Date() + " - Failed to execute deleteLecture"); - e.printStackTrace(); } catch (IOException e) { log.info(new Date() + " - Failed to execute deleteLecture"); e.printStackTrace(); } - return sql.deleteLecture(con, id); + return sql.deleteLecture(id); } diff --git a/Dozentenmodulserver/src/server/TBinaryProtocolSafe.java b/Dozentenmodulserver/src/server/TBinaryProtocolSafe.java new file mode 100644 index 00000000..843b58b1 --- /dev/null +++ b/Dozentenmodulserver/src/server/TBinaryProtocolSafe.java @@ -0,0 +1,123 @@ +package server; + +import java.io.UnsupportedEncodingException; +import java.nio.ByteBuffer; + +import org.apache.thrift.TException; +import org.apache.thrift.protocol.TBinaryProtocol; +import org.apache.thrift.protocol.TMessage; +import org.apache.thrift.protocol.TProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.protocol.TProtocolFactory; +import org.apache.thrift.transport.TTransport; + +/** + * Binary protocol implementation for thrift. + * Will not read messages bigger than 12MiB. + * + */ +public class TBinaryProtocolSafe extends TBinaryProtocol +{ + /** + * Factory + */ + @SuppressWarnings( "serial" ) + public static class Factory implements TProtocolFactory + { + + protected boolean strictRead_ = false; + protected boolean strictWrite_ = true; + + public Factory() + { + this( false, true ); + } + + public Factory(boolean strictRead, boolean strictWrite) + { + strictRead_ = strictRead; + strictWrite_ = strictWrite; + } + + public TProtocol getProtocol( TTransport trans ) + { + return new TBinaryProtocolSafe( trans, strictRead_, strictWrite_ ); + } + } + + private static final int maxLen = 12 * 1024 * 1024; // 12 MiB + + /** + * Constructor + */ + public TBinaryProtocolSafe(TTransport trans) + { + this( trans, false, true ); + } + + public TBinaryProtocolSafe(TTransport trans, boolean strictRead, boolean strictWrite) + { + super( trans ); + strictRead_ = strictRead; + strictWrite_ = strictWrite; + } + + /** + * Reading methods. + */ + + public TMessage readMessageBegin() throws TException + { + int size = readI32(); + if ( size > maxLen ) + throw new TProtocolException( TProtocolException.SIZE_LIMIT, "Payload too big." ); + if ( size < 0 ) { + int version = size & VERSION_MASK; + if ( version != VERSION_1 ) { + throw new TProtocolException( TProtocolException.BAD_VERSION, "Bad version in readMessageBegin" ); + } + return new TMessage( readString(), (byte) ( size & 0x000000ff ), readI32() ); + } else { + if ( strictRead_ ) { + throw new TProtocolException( TProtocolException.BAD_VERSION, "Missing version in readMessageBegin, old client?" ); + } + return new TMessage( readStringBody( size ), readByte(), readI32() ); + } + } + + public String readString() throws TException + { + int size = readI32(); + if ( size > maxLen ) + throw new TProtocolException( TProtocolException.SIZE_LIMIT, "Payload too big." ); + if ( trans_.getBytesRemainingInBuffer() >= size ) { + try { + String s = new String( trans_.getBuffer(), trans_.getBufferPosition(), size, "UTF-8" ); + trans_.consumeBuffer( size ); + return s; + } catch ( UnsupportedEncodingException e ) { + throw new TException( "JVM DOES NOT SUPPORT UTF-8" ); + } + } + + return readStringBody( size ); + } + + public ByteBuffer readBinary() throws TException + { + int size = readI32(); + if ( size > maxLen ) + throw new TProtocolException( TProtocolException.SIZE_LIMIT, "Payload too big." ); + if ( trans_.getBytesRemainingInBuffer() >= size ) { + ByteBuffer bb = ByteBuffer.wrap( trans_.getBuffer(), trans_.getBufferPosition(), size ); + trans_.consumeBuffer( size ); + return bb; + } + + byte[] buf = new byte[ size ]; + trans_.readAll( buf, 0, size ); + return ByteBuffer.wrap( buf ); + } + +} + diff --git a/Dozentenmodulserver/src/server/startServer.java b/Dozentenmodulserver/src/server/startServer.java index 949b3538..a5509d04 100644 --- a/Dozentenmodulserver/src/server/startServer.java +++ b/Dozentenmodulserver/src/server/startServer.java @@ -16,6 +16,13 @@ import org.ini4j.Wini; import server.BinaryListener; +import org.apache.thrift.protocol.TProtocolFactory; +import org.apache.thrift.server.TServer; +import org.apache.thrift.server.TThreadPoolServer; +import org.apache.thrift.transport.TServerSocket; +import org.apache.thrift.transport.TServerTransport; +import org.apache.thrift.transport.TTransportException; +import org.apache.thrift.server.TThreadPoolServer.Args; public class startServer { /** @@ -28,6 +35,27 @@ public class startServer { public static void main(String[] args) { + + + + //final ImageServerHandler handler = new ImageServerHandler(); + //final ImageServer.Processor<ImageServerHandler> processor = new ImageServer.Processor<ImageServerHandler>(handler); + + /* + try{ + TServerTransport serverTransport = new TServerSocket(9090); + //TServer server = new TSimpleServer(new Args(serverTransport).processor(processor)); + TServer server = new TThreadPoolServer(new TThreadPoolServer.Args(serverTransport).processor(processor)); + server.serve(); + } catch (Exception e){ + e.printStackTrace(); + } + */ + + //deprecated + + + //get Configuration try { Wini ini=new Wini(new File("Server_Config.ini")); @@ -43,14 +71,15 @@ public class startServer { e1.printStackTrace(); } //Start Server + BasicConfigurator.configure(); - log.info( new Date() + " - starting Application\n" ); + log.info("***** "+ new Date() + " - starting Application *****" ); Thread t; t = new Thread(new BinaryListener()); servers.add(t); t.start(); //information - log.info( new Date()+" - new thread created. Now "+servers.size()+" thread(s).\n" ); + //log.info( new Date()+" - new thread created. Now "+servers.size()+" thread(s).\n" ); // Run more servers // ... // Wait for all servers to die @@ -66,7 +95,7 @@ public class startServer { } } log.info( new Date()+" - all Servers shut down, exiting...\n" ); - + } } diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 69843988..98fc8ef7 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -4,7 +4,11 @@ import java.sql.*; import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.Random;
import java.util.UUID;
@@ -12,6 +16,8 @@ import models.Configuration; import org.apache.log4j.Logger;
import server.BinaryListener;
+import server.Image;
+import server.Lecture;
public class SQL {
@@ -29,7 +35,7 @@ public class SQL { Connection con = DriverManager
.getConnection("jdbc:mysql://"+Configuration.config.getSql_connection()+"?user="+Configuration.config.getSql_user()+"&password="+Configuration.config.getSql_pass()+"");
con.setAutoCommit(false);
- log.info(new Date() + " - Connection returned to Client.");
+
return con;
} catch (SQLException e) {
// TODO Auto-generated catch block
@@ -39,9 +45,10 @@ public class SQL { return null;
}
- public int writeFTPUser(Connection con, String user, String pass) {
+ public int writeFTPUser(String user, String pass) {
Statement stm;
try {
+ Connection con=getConnection();
stm = con.createStatement();
int ret = stm
@@ -51,6 +58,7 @@ public class SQL { + pass
+ "'),'10001','12345','"+Configuration.config.getAbsolute_path()+"temp/');");
con.commit();
+ con.close();
log.info(new Date() + " - created FTPUser " + user + " : " + pass
+ ".");
return ret;
@@ -62,15 +70,17 @@ public class SQL { return -1;
}
- public int DeleteUser(Connection con, String user) {
+ public int DeleteUser(String user) {
Statement stm;
try {
+ Connection con=getConnection();
stm = con.createStatement();
int ret = stm
.executeUpdate("DELETE FROM `bwLehrpool`.`FtpUsers` where User like '"
+ user + "';");
con.commit();
+ con.close();
log.info(new Date() + " - FTPUser " + user + " deleted.");
return ret;
} catch (SQLException e) {
@@ -81,13 +91,15 @@ public class SQL { return -1;
}
- public ResultSet getImage(Connection con) {
+ public ResultSet getImage() {
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
-
- return stm
+ ResultSet rs=stm
.executeQuery("SELECT image_name FROM bwLehrpool.m_VLData_imageInfo;");
-
+ con.close();
+ return rs;
+
} catch (SQLException e) {
// TODO Auto-generated catch block
log.info(new Date() + " - Failed to getImage.");
@@ -97,17 +109,21 @@ public class SQL { return null;
}
- public ResultSet getPathOfImage(Connection con, String image_id,
+ public String getPathOfImage(String image_id,
String version) {
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
-
- return stm
+ ResultSet rs=stm
.executeQuery("SELECT image_path FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID='"
+ image_id
+ "' and imageVersion='"
+ version
+ "';");
+ rs.first();
+ String path=rs.getString("image_path");
+ con.close();
+ return path;
} catch (SQLException e) {
// TODO Auto-generated catch block
@@ -118,13 +134,15 @@ public class SQL { return null;
}
- public String setInstitution(Connection con, String university) {
+ public String setInstitution(String university) {
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
ResultSet ret = stm
.executeQuery("SELECT * FROM bwLehrpool.m_institution where name like'"
+ university + "';");
+
if (ret.next() == false) {
String id = UUID.randomUUID().toString();
@@ -135,9 +153,14 @@ public class SQL { .executeQuery("SELECT institutionID FROM bwLehrpool.m_institution WHERE name like '"
+ university + "';");
rs.next();
- return rs.getString("institutionID");
+ String institution=rs.getString("institutionID");
+ con.close();
+
+ return institution;
} else {
- return ret.getString("institutionID");
+ String institution=ret.getString("institutionID");
+ con.close();
+ return institution;
}
} catch (SQLException e) {
@@ -148,10 +171,11 @@ public class SQL { return "-1";
}
- public String setPerson(Connection con, String login, String lastname,
+ public String setPerson(String login, String lastname,
String firstname, String mail, Date lastlogin, String Institution) {
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
ResultSet ret = stm
@@ -187,10 +211,14 @@ public class SQL { + firstname
+ "';");
rs.next();
- return rs.getString("userID");
+ String userid=rs.getString("userID");
+ con.close();
+ return userid;
} else {
ret.first();
- return ret.getString("userID");
+ String userid=ret.getString("userID");
+ con.close();
+ return userid;
}
} catch (SQLException e) {
@@ -201,9 +229,9 @@ public class SQL { return "-1";
}
- public boolean setImageData(Connection con, String pk_person, boolean license,
+ public boolean setImageData(String pk_person, boolean license,
boolean internet, long cpu, long ram, String imagename,
- String imagePath, boolean isTemplate, long filesize) {
+ String imagePath, boolean isTemplate, long filesize, String shareMode) {
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
@@ -217,10 +245,11 @@ public class SQL { }
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
String uid = UUID.randomUUID().toString();
- stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`,`image_isTemplate`,`image_filesize`)VALUES('"
+ stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`,`image_isTemplate`,`image_filesize`,`image_syncMode`)VALUES('"
+ uid // GUID_imageID
+ "',1,'" // imageVersion
+ imagename // image_name
@@ -248,9 +277,10 @@ public class SQL { + "','" + cpu // cond_minCPUs
+ "','" + isTemplate //image_isTemplate
+ "','" + filesize //image_filesize
+ + "','" + shareMode //shareMode
+ "');");
con.commit();
-
+ con.close();
} catch (SQLException e) {
// TODO Auto-generated catch block
log.info(new Date() + " - Failed to setImageData.");
@@ -260,28 +290,60 @@ public class SQL { }
- public ResultSet getImageList(Connection con) {
- try {
- Statement stm = con.createStatement();
+ public List<Image> getImageList() {
+
+ Connection con=getConnection();
+ Statement stm;
+ List<Image> list = new ArrayList<Image>();
+ try {
+ stm = con.createStatement();
+ ResultSet res=stm
+ .executeQuery("SELECT vl.GUID_imageID, vl.imageVersion,vl.image_name, vl.cond_hasLicenseRestriction, os.name, '' as lecture,vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and vl.image_owner=u.userID and vl.image_name not in (SELECT vl.image_name FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID) union SELECT vl.GUID_imageID, vl.imageVersion,vl.image_name, vl.cond_hasLicenseRestriction, os.name, lect.name as lecture, vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID;");
+
- return stm
- .executeQuery("SELECT vl.GUID_imageID, vl.imageVersion,vl.image_name, vl.cond_hasLicenseRestriction, os.name, '' as lecture,vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and vl.image_owner=u.userID and vl.image_name not in (SELECT vl.image_name FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID) union SELECT vl.GUID_imageID, vl.imageVersion,vl.image_name, vl.cond_hasLicenseRestriction, os.name, lect.name as lecture, vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID;");
+
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- log.info(new Date() + " - Failed to getImageList.");
- e.printStackTrace();
- }
- return null;
+ while (res.next()) {
+
+ list.add(new Image(res.getString("GUID_imageID"), res
+ .getString("imageVersion"),
+ res.getString("image_name"), res
+ .getString("cond_hasLicenseRestriction"), res
+ .getString("name"), res.getString("lecture"),
+ res.getString("image_update_time"), res
+ .getString("user")));
+
+ }
+
+ con.close();
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+
+ return list;
+
}
- public ResultSet getLectureList(Connection con) {
+ public List<Lecture> getLectureList() {
+ List<Lecture> list = new ArrayList<Lecture>();
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
-
- return stm
+ ResultSet res=stm
.executeQuery("SELECT l.lectureID, l.name, l.isActive,l.startTime,l.endTime,l.lastUsed,l.description, i.image_name, concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_lecture l, bwLehrpool.m_VLData_imageInfo i, bwLehrpool.m_user u where i.GUID_imageID=l.imageID and l.admin_owner=u.userID;");
+ while (res.next()) {
+
+ list.add(new Lecture(res.getString("lectureID"), res
+ .getString("name"), res.getString("isActive"), res
+ .getString("startTime"), res.getString("endTime"), res
+ .getString("lastUsed"), res.getString("description"),
+ res.getString("image_name"), res.getString("user")));
+ }
+ con.close();
+ return list;
} catch (SQLException e) {
// TODO Auto-generated catch block
log.info(new Date() + " - Failed to getLectureList.");
@@ -290,12 +352,18 @@ public class SQL { return null;
}
- public ResultSet getAllOS(Connection con) {
-
+ public List<String> getAllOS() {
+ List<String> list = new ArrayList<>();
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
- return stm
+ ResultSet rs=stm
.executeQuery("SELECT name FROM bwLehrpool.m_operatingSystem;");
+ while (rs.next()) {
+ list.add(rs.getString("name"));
+ }
+ return list;
+
} catch (SQLException e) {
// TODO Auto-generated catch block
log.info(new Date() + " - Failed to getAllOS.");
@@ -306,16 +374,28 @@ public class SQL { }
- public ResultSet getPersonData(Connection con, String Vorname,
+ public Map<String,String> getPersonData(String Vorname,
String Nachname) {
+ Map<String, String> map = new HashMap<String, String>();
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
- return stm
+ ResultSet rs= stm
.executeQuery("SELECT u.Nachname, u.Vorname, u.mail, i.name FROM bwLehrpool.m_user u, bwLehrpool.m_institution i where u.Nachname like '"
+ Nachname
+ "' and u.Vorname like '"
+ Vorname
+ "' and u.institution=i.institutionID;");
+ while (rs.next()) {
+
+ map.put("mail", rs.getString("mail"));
+ map.put("Nachname", rs.getString("Nachname"));
+ map.put("Vorname", rs.getString("Vorname"));
+ map.put("Hochschule", rs.getString("name"));
+
+ }
+ con.close();
+ return map;
} catch (SQLException e) {
// TODO Auto-generated catch block
log.info(new Date() + " - Failed to getPersonData.");
@@ -324,7 +404,7 @@ public class SQL { return null;
}
- public int setLectureData(Connection con, String pk_person, String pk_image,
+ public int setLectureData(String pk_person, String pk_image,
int imageversion, String name, String desc, String shortdesc,
String start, String end, boolean isactive) {
@@ -335,6 +415,7 @@ public class SQL { active_bol = 1;
}
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
String uid = UUID.randomUUID().toString();
@@ -367,7 +448,7 @@ public class SQL { + "','"
+ pk_person + "');");
con.commit();
-
+ con.close();
} catch (SQLException e) {
// TODO Auto-generated catch block
log.info(new Date() + " - Failed to setLectureData.");
@@ -377,12 +458,21 @@ public class SQL { }
- public ResultSet getImageIDandVersion(Connection con, String name) {
+ public Map<String,String> getImageIDandVersion(String name) {
+ Map<String, String> map = new HashMap<String, String>();
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
- return stm
+ ResultSet image= stm
.executeQuery("SELECT GUID_imageID, imageVersion FROM bwLehrpool.m_VLData_imageInfo where image_name like '"
+ name + "';");
+ while (image.next()) {
+ map.put("GUID", image.getString("GUID_imageID"));
+ map.put("version", String.valueOf(image.getString("imageVersion")));
+
+ }
+ con.close();
+ return map;
} catch (SQLException e) {
// TODO Auto-generated catch block
log.info(new Date() + " - Failed to getImageIDandVersion.");
@@ -391,12 +481,27 @@ public class SQL { return null;
}
- public ResultSet getImageData(Connection con, String id, String version) {
+ public Map<String,String> getImageData(String id, String version) {
+ Map<String, String> map = new HashMap<String, String>();
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
- return stm
- .executeQuery("SELECT image_name,cond_hasInternetRestriction,cond_hasLicenseRestriction, cond_minCPUs, cond_minRAM FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"
+ ResultSet data=stm
+ .executeQuery("SELECT image_name,cond_hasInternetRestriction,cond_hasLicenseRestriction, cond_minCPUs, cond_minRAM, image_syncMode,image_filesize,image_path FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"
+ id + "' and imageVersion = '" + version + "' ;");
+ while (data.next()) {
+ map.put("name", data.getString("image_name"));
+ map.put("internet",
+ data.getString("cond_hasInternetRestriction"));
+ map.put("license", data.getString("cond_hasLicenseRestriction"));
+ map.put("cpu", data.getString("cond_minCPUs"));
+ map.put("ram", data.getString("cond_minRAM"));
+ map.put("shareMode", data.getString("image_syncMode"));
+ map.put("filesize", data.getString("image_filesize"));
+ map.put("path", data.getString("image_path"));
+ }
+ con.close();
+ return map;
} catch (SQLException e) {
// TODO Auto-generated catch block
log.info(new Date() + " - Failed to getImageData.");
@@ -405,10 +510,11 @@ public class SQL { return null;
}
- public int UpdateImageData(Connection con, String name, String newName,String image_path,
+ public int UpdateImageData(String name, String newName,String image_path,
boolean license, boolean internet, long cpu, long ram, String id,
- String version, boolean isTemplate, long filesize) {
+ String version, boolean isTemplate, long filesize, String shareMode) {
try {
+ Connection con=getConnection();
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
Statement stm = con.createStatement();
int newVersion = Integer.parseInt(version) + 1;
@@ -445,10 +551,13 @@ public class SQL { + isTemplate
+ "',`image_filesize` = '"
+ filesize
+ + "',`image_syncMode` = '"
+ + shareMode
+ "' WHERE `GUID_imageID` = '"
+ id
+ "' AND `imageVersion` = '" + version + "';");
con.commit();
+ con.close();
return 0;
} catch (SQLException e) {
// TODO Auto-generated catch block
@@ -458,17 +567,17 @@ public class SQL { return -1;
}
- public boolean deleteImage(Connection con, String id, String version) {
+ public boolean deleteImage(String id, String version) {
try {
-
+ Connection con=getConnection();
Statement stm = con.createStatement();
stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"
+ id + "' " + "AND imageVersion = '" + version + "';");
con.commit();
-
+ con.close();
return true;
} catch (SQLException e) {
@@ -480,7 +589,7 @@ public class SQL { return false;
}
- public int updateLectureData(Connection con, String pk_image,
+ public int updateLectureData(String pk_image,
int imageversion, String name, String newName, String desc,
String shortdesc, String start, String end, boolean isactive,
String id) {
@@ -492,6 +601,7 @@ public class SQL { active_bol = 1;
}
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
stm.executeUpdate("UPDATE `bwLehrpool`.`m_VLData_lecture` SET `name` = '"
+ newName
@@ -511,6 +621,7 @@ public class SQL { + formatter.format(new Date())
+ "'WHERE `lectureID` = '" + id + "';");
con.commit();
+ con.close();
log.info(new Date() + " - Succeeded to updateLectureData.");
} catch (SQLException e) {
@@ -523,16 +634,16 @@ public class SQL { }
- public boolean connectedToLecture(Connection con, String id, String version) {
+ public boolean connectedToLecture(String id, String version) {
try {
-
+ Connection con=getConnection();
Statement stm = con.createStatement();
ResultSet rs = stm.executeQuery("SELECT lectureID FROM "
+ "bwLehrpool.m_VLData_lecture WHERE imageID = '" + id
+ "' AND imageVersion = '" + version + "';");
-
+ con.close();
return rs.first();
} catch (SQLException e) {
@@ -546,15 +657,16 @@ public class SQL { }
- public boolean deleteLecture(Connection con, String id) {
+ public boolean deleteLecture(String id) {
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_lecture WHERE lectureID = '"
+ id + "';");
-
+
con.commit();
-
+ con.close();
return true;
} catch (SQLException e) {
// TODO Auto-generated catch block
@@ -565,9 +677,10 @@ public class SQL { return false;
}
- public String getFile(Connection con, String imageid, String imageversion) {
+ public String getFile(String imageid, String imageversion) {
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
ResultSet rs = stm
@@ -577,7 +690,9 @@ public class SQL { + imageversion
+ "';");
rs.next();
- return rs.getString("image_path");
+ String path=rs.getString("image_path");
+ con.close();
+ return path;
} catch (SQLException e) {
// TODO Auto-generated catch block
@@ -588,15 +703,23 @@ public class SQL { return null;
}
- public ResultSet getDeleteXMLData(Connection con, String id) {
+ public Map<String,String> getDeleteXMLData(String id) {
+ Map<String, String> map = new HashMap<String, String>();
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
ResultSet rs = stm
.executeQuery("SELECT name, admin_createTime FROM bwLehrpool.m_VLData_lecture where lectureID='"
+ id + "';");
+ rs.next();
+ map.put("date", rs.getString("admin_createTime").replace(" ", "")
+ .replace("-", "").replace(":", ""));
+ map.put("name", rs.getString("name"));
+
- return rs;
+ con.close();
+ return map;
} catch (SQLException e) {
// TODO Auto-generated catch block
@@ -607,9 +730,9 @@ public class SQL { return null;
}
- public int UpdateImagePath(Connection con, String name) {
+ public int UpdateImagePath(String name) {
try {
-
+ Connection con=getConnection();
Statement stm = con.createStatement();
String image_path="prod/"+name;
@@ -618,6 +741,7 @@ public class SQL { + "' WHERE `image_path` = '"
+ "temp/"+name + "';");
con.commit();
+ con.close();
return 0;
} catch (SQLException e) {
// TODO Auto-generated catch block
diff --git a/Dozentenmodulserver/src/util/XMLCreator.java b/Dozentenmodulserver/src/util/XMLCreator.java index bf49dfe3..564543fa 100644 --- a/Dozentenmodulserver/src/util/XMLCreator.java +++ b/Dozentenmodulserver/src/util/XMLCreator.java @@ -26,6 +26,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import server.BinaryListener; +import sql.SQL; public class XMLCreator { @@ -42,6 +43,7 @@ public class XMLCreator { private String imageName; private String xmlName; private static Logger log = Logger.getLogger( BinaryListener.class ); + // phone param not existing private String query = "SELECT m_VLData_imageInfo.image_path ,vorname, nachname, mail, shortdescription, description, m_operatingSystem.name as os, m_VLData_lecture.admin_changeTime as time, m_VLData_lecture.name as lectureName, m_user.institution as userInstitution, m_user.loginName as loginName, m_institution.name as institutionName " diff --git a/Dozentenmodulserver/thrift/server.thrift b/Dozentenmodulserver/thrift/server.thrift index 94ddde43..84cd3fc2 100644 --- a/Dozentenmodulserver/thrift/server.thrift +++ b/Dozentenmodulserver/thrift/server.thrift @@ -36,7 +36,7 @@ service Server{ User getFtpUser(), int DeleteFtpUser(string user), string getPathOfImage(string image_id,string version), - bool writeVLdata(string imagename, string login ,string firstname, string lastname,string university, string Mail, string Tel, string Fak, bool license, bool internet, int ram, int cpu, string imagePath, bool isTemplate ,i64 filesize), + bool writeVLdata(string imagename, string login ,string firstname, string lastname,string university, string Mail, string Tel, string Fak, bool license, bool internet, int ram, int cpu, string imagePath, bool isTemplate ,i64 filesize, int shareMode), list<Image> getImageList(), list<Lecture> getLectureList(), list<string> getAllOS(), @@ -44,7 +44,7 @@ service Server{ bool writeLecturedata(string name, string shortdesc, string desc,string startDate, string endDate, bool isActive, string imagename,string login,string firstname,string lastname, string university, string Mail, string Tel,string Fak), bool startFileCopy(string file), map<string,string> getImageData(string imageid, string imageversion), - bool updateImageData(string name, string newName,string image_path,bool license, bool internet, int ram,int cpu, string id, string version,bool isTemplate ,i64 filesize), + bool updateImageData(string name, string newName,string image_path,bool license, bool internet, int ram,int cpu, string id, string version,bool isTemplate ,i64 filesize, int shareMode), map<string,string> getLectureData(string lecturename), bool deleteImageData(string id, string version), bool updateLecturedata(string name, string newName ,string shortdesc, string desc,string startDate, string endDate, bool isActive, string imagename,string firstname,string lastname, string university, string Mail, string Tel,string Fak, string id), |