Merge branch 'damba' of ssh://mecka.net/home/git/yalp into damba

Conflicts:
	build.xml
	server.policy

Signed-off-by: Manuel Traut <manut@mecka.net>

1 files changed, 68 insertions, 68 deletions

diff --git a/src/YalpServer/ServerSettings.java b/src/YalpServer/ServerSettings.java
index 313e875..3faaa37 100755
--- a/src/YalpServer/ServerSettings.java
+++ b/src/YalpServer/ServerSettings.java
@@ -1,68 +1,68 @@
-/*

- * Copyright (c) 2006 Manuel Traut and Volker Dahnke

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- *

- * Contributors: Manuel Traut and Volker Dahnke

- */

-

-package YalpServer;

-

-/*

- * Class ServerSettings

- *

- * <em></em>

- *

- * @author Manuel Traut

- *

- * @version 0.1 27-03-2006<br>

- *

- * @see server.InitServer

- */

-

-public class ServerSettings{

-

-	static final long serialVersionUID = 0;

-

-	public String imageDir = "/media/image";

-	public String videoDir = "/media/video";

-	public String soundDir = "/media/sound";

-

-	/**

-	 * set Directories which contains media Files

-	 * @param startDir

-	 */

-	public void setImageDir(String startDir){

-		this.imageDir = startDir;

-	}

-

-	/**

-	 * set Directories which contains media Files

-	 * @param startDir

-	 */

-	public void setVideoDir(String startDir){

-		this.videoDir = startDir;

-	}

-

-	/**

-	 * set Directories which contains media Files

-	 * @param startDir

-	 */

-	public void setSoundDir(String startDir){

-		this.soundDir = startDir;

-	}

-

-	public String getVideoDir(){

-		return this.videoDir;

-	}

-

-	public String getImageDir(){

-		return this.imageDir;

-	}

-

-	public String getSoundDir(){

-		return this.soundDir;

-	}

-}

+/*
+ * Copyright (c) 2006 Manuel Traut and Volker Dahnke
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors: Manuel Traut and Volker Dahnke
+ */
+
+package YalpServer;
+
+/*
+ * Class ServerSettings
+ *
+ * <em></em>
+ *
+ * @author Manuel Traut
+ *
+ * @version 0.1 27-03-2006<br>
+ *
+ * @see server.InitServer
+ */
+
+public class ServerSettings{
+
+	static final long serialVersionUID = 0;
+
+	public String imageDir = "/media/image";
+	public String videoDir = "/media/video";
+	public String soundDir = "/media/sound";
+
+	/**
+	 * set Directories which contains media Files
+	 * @param startDir
+	 */
+	public void setImageDir(String startDir){
+		this.imageDir = startDir;
+	}
+
+	/**
+	 * set Directories which contains media Files
+	 * @param startDir
+	 */
+	public void setVideoDir(String startDir){
+		this.videoDir = startDir;
+	}
+
+	/**
+	 * set Directories which contains media Files
+	 * @param startDir
+	 */
+	public void setSoundDir(String startDir){
+		this.soundDir = startDir;
+	}
+
+	public String getVideoDir(){
+		return this.videoDir;
+	}
+
+	public String getImageDir(){
+		return this.imageDir;
+	}
+
+	public String getSoundDir(){
+		return this.soundDir;
+	}
+}