Commit e286dbac authored by Daniel ANTELME's avatar Daniel ANTELME

Our frontend is now HTTPS and now 'url' gets like this...

Our frontend is now HTTPS and now 'url' gets like this HTTPS://server_name:80/blablabla. Standard path to folder 'images'. Plugin (commented) for generating WAR with sources.
parent 2cdd79c5
.classpath
.project
.settings
digilib-log.txt
dl-access-log.txt
webapp/digilib-log.txt
webapp/dl-access-log.txt
target
......@@ -386,7 +386,10 @@ public class ServletOps {
throw new ServletException("Unable to write error response!", e);
}
}
String url = dlReq.getServletRequest().getRequestURL().toString();
// String url = dlReq.getServletRequest().getRequestURL().toString();
HttpServletRequest dlHttpReq = (HttpServletRequest) dlReq.getServletRequest();
String url = ( ! dlHttpReq.getServerName().toString().equals("localhost") ) ? dlHttpReq.getScheme() + "://" + dlHttpReq.getServerName() + dlHttpReq.getRequestURI() : dlReq.getServletRequest().getRequestURL().toString();
// Our frontend is now HTTPS and now 'url' gets like this HTTPS://server_name:80/blablabla
if (url.endsWith("/info.json")) {
url = url.substring(0, url.lastIndexOf("/info.json"));
} else if (url.endsWith("/")) {
......
......@@ -37,6 +37,18 @@
</includes>
</configuration>
</plugin>
<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin> -->
</plugins>
</pluginManagement>
</build>
......
......@@ -15,8 +15,9 @@
<!-- List of directories where images are searched.
Directories with low-resolution images are LAST!!! in list.
Use OS-specific path separators (":" for Unix, ";" for Windows) -->
<!--<parameter name="basedir-list" value="/home/lerouju8/web/images" />-->
<parameter name="basedir-list" value="/home/entitees/proj-litis/pivaj/images" />
<!--<parameter name="basedir-list" value="/home/lerouju8/web/images" />
<parameter name="basedir-list" value="/home/entitees/proj-litis/pivaj/images" />-->
<parameter name="basedir-list" value="/home/pivan/images" />
<!-- Java class to use for image operations -->
<!--<parameter name="docuimage-class" value="digilib.image.JAIImageLoaderDocuImage" />-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment