Restructure Httpd deployment

[gpl/argeo-slc.git] / org.argeo.slc.core / src / main / java / org / argeo / slc / support / deploy / HttpdApplicationTargetData.java

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java
index 7097289ec3e0f138cba54474148c6bf8ab3ebd55..08c37916a1144d884c013b7d3b3e66750e969d6c 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java
@@ -8,14 +8,14 @@ import org.argeo.slc.core.SlcException;
 import org.argeo.slc.core.deploy.TargetData;\r
 \r
 public class HttpdApplicationTargetData implements TargetData {\r
-       private ApacheHttpdServer webServer;\r
+       private HttpdServer webServer;\r
        private String relativePath;\r
 \r
-       public ApacheHttpdServer getWebServer() {\r
+       public HttpdServer getWebServer() {\r
                return webServer;\r
        }\r
 \r
-       public void setWebServer(ApacheHttpdServer webServer) {\r
+       public void setWebServer(HttpdServer webServer) {\r
                this.webServer = webServer;\r
        }\r
 \r
@@ -30,6 +30,7 @@ public class HttpdApplicationTargetData implements TargetData {
        public URL getTargetBaseUrl() {\r
                try {\r
                        URL wsUrl = getWebServer().getBaseUrl();\r
+                       // TODO: use URI\r
                        return new URL(wsUrl, wsUrl.getFile() + '/' + relativePath);\r
                } catch (MalformedURLException e) {\r
                        throw new SlcException("Cannot get base url for " + relativePath, e);\r
@@ -37,8 +38,11 @@ public class HttpdApplicationTargetData implements TargetData {
        }\r
 \r
        public File getTargetRootLocation() {\r
-               return new File(getWebServer().getBaseLocation().getPath()\r
-                               + File.separator + getRelativePath());\r
+               HttpdServerTargetData targetData = (HttpdServerTargetData) getWebServer()\r
+                               .getTargetData();\r
+               String path = targetData.getServerRoot() + File.separator\r
+                               + getRelativePath();\r
+               return new File(path);\r
        }\r
 \r
 }\r