Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodul/bin/gui/intro/Login_GUI.class
	Dozentenmodulserver/bin/server/ServerHandler.class
	Dozentenmodulserver/bin/server/startServer.class
	Dozentenmodulserver/src/server/startServer.java

1 files changed, 5 insertions, 1 deletions

diff --git a/Dozentenmodulserver/src/util/XMLCreator.java b/Dozentenmodulserver/src/util/XMLCreator.java
index 111a6337..564543fa 100644
--- a/Dozentenmodulserver/src/util/XMLCreator.java
+++ b/Dozentenmodulserver/src/util/XMLCreator.java
@@ -18,12 +18,15 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import models.Configuration;
+
 import org.apache.log4j.Logger;
 import org.w3c.dom.Comment;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import server.BinaryListener;
+import sql.SQL;
 
 public class XMLCreator {
 
@@ -36,10 +39,11 @@ public class XMLCreator {
 	private Statement st = null;
 	private ResultSet rs = null;
 	private String vmName;
-	private String filePath = "/srv/openslx/nfs/temp/";
+	private String filePath = Configuration.config.getAbsolute_path()+"prod/";
 	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 "