X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.support%2Fsrc%2Forg%2Fargeo%2Fslc%2Fsupport%2Fdeploy%2FHttpdApplicationTargetData.java;h=7b052ec6281b597e9c7716aca691b081e35c0d0e;hb=58b35f147f3c1c1a12a07c303105618f679c7161;hp=3bc08c72ddf256afdbe8cb7c0e40a9d9679d2298;hpb=4a4ff3e314d6bded94f16fbeac5395dd229fea82;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java b/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java
index 3bc08c72d..7b052ec62 100644
--- a/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java
+++ b/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java
@@ -1,80 +1,65 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.slc.support.deploy;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.argeo.slc.SlcException;
-import org.argeo.slc.deploy.TargetData;
-
-public class HttpdApplicationTargetData implements TargetData {
-	private HttpdServer webServer;
-	private String relativePath;
-	private String targetRootPath;
-
-	public HttpdServer getWebServer() {
-		return webServer;
-	}
-
-	public void setWebServer(HttpdServer webServer) {
-		this.webServer = webServer;
-	}
-
-	public String getRelativePath() {
-		return relativePath;
-	}
-
-	/**
-	 * If targetRootLocation not set, used to build the targetRootLocation,
-	 * relative to the webserver base.
-	 */
-	public void setRelativePath(String relativePath) {
-		this.relativePath = relativePath;
-	}
-
-	public String getTargetRootPath() {
-		return targetRootPath;
-	}
-
-	public void setTargetRootPath(String targetRootPath) {
-		this.targetRootPath = targetRootPath;
-	}
-
-	public URL getTargetBaseUrl() {
-		try {
-			URL wsUrl = getWebServer().getBaseUrl();
-			// TODO: use URI
-			return new URL(wsUrl, wsUrl.getFile() + '/' + relativePath);
-		} catch (MalformedURLException e) {
-			throw new SlcException("Cannot get base url for " + relativePath, e);
-		}
-	}
-
-	public File getTargetRootLocation() {
-		if (targetRootPath != null && !targetRootPath.equals("")) {
-			return new File(targetRootPath);
-		} else {
-			HttpdServerTargetData targetData = (HttpdServerTargetData) getWebServer()
-					.getTargetData();
-			String path = targetData.getServerRoot() + File.separator
-					+ getRelativePath();
-			return new File(path);
-		}
-	}
-
-}
+package org.argeo.slc.support.deploy;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.argeo.slc.SlcException;
+import org.argeo.slc.deploy.TargetData;
+
+public class HttpdApplicationTargetData implements TargetData {
+	private HttpdServer webServer;
+	private String relativePath;
+	private String targetRootPath;
+
+	public HttpdServer getWebServer() {
+		return webServer;
+	}
+
+	public void setWebServer(HttpdServer webServer) {
+		this.webServer = webServer;
+	}
+
+	public String getRelativePath() {
+		return relativePath;
+	}
+
+	/**
+	 * If targetRootLocation not set, used to build the targetRootLocation,
+	 * relative to the webserver base.
+	 */
+	public void setRelativePath(String relativePath) {
+		this.relativePath = relativePath;
+	}
+
+	public String getTargetRootPath() {
+		return targetRootPath;
+	}
+
+	public void setTargetRootPath(String targetRootPath) {
+		this.targetRootPath = targetRootPath;
+	}
+
+	public URL getTargetBaseUrl() {
+		try {
+			URL wsUrl = getWebServer().getBaseUrl();
+			// TODO: use URI
+			return new URL(wsUrl, wsUrl.getFile() + '/' + relativePath);
+		} catch (MalformedURLException e) {
+			throw new SlcException("Cannot get base url for " + relativePath, e);
+		}
+	}
+
+	public File getTargetRootLocation() {
+		if (targetRootPath != null && !targetRootPath.equals("")) {
+			return new File(targetRootPath);
+		} else {
+			HttpdServerTargetData targetData = (HttpdServerTargetData) getWebServer()
+					.getTargetData();
+			String path = targetData.getServerRoot() + File.separator
+					+ getRelativePath();
+			return new File(path);
+		}
+	}
+
+}