hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:DSpace/DSpace into rcaap-openaire4-fields

Browse Source
This commit is contained in:
Paulo Graça
2019-11-18 12:15:22 +00:00
parent d0047c8d65 6add401f81
commit ec7b037a6f
4 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile.jdk8
View File

@@ -54,7 +54,13 @@ EXPOSE 8080 8009
ENV JAVA_OPTS=-Xmx2000m
RUN mv /usr/local/tomcat/webapps/ROOT /usr/local/tomcat/webapps/ROOT.bk && \
ln -s $DSPACE_INSTALL/webapps/server /usr/local/tomcat/webapps/ROOT && \
ln -s $DSPACE_INSTALL/webapps/server /usr/local/tomcat/webapps/server && \
# Run the "server" webapp off the /server path (e.g. http://localhost:8080/server/)
# and the v6.x (deprecated) REST API off the "/rest" path
RUN ln -s $DSPACE_INSTALL/webapps/server /usr/local/tomcat/webapps/server && \
ln -s $DSPACE_INSTALL/webapps/rest /usr/local/tomcat/webapps/rest
# If you wish to run "server" webapp off the ROOT path, then comment out the above RUN, and uncomment the below RUN.
# You also MUST update the URL in dspace/src/main/docker/local.cfg
# Please note that server webapp should only run on one path at a time.
#RUN mv /usr/local/tomcat/webapps/ROOT /usr/local/tomcat/webapps/ROOT.bk && \
# ln -s $DSPACE_INSTALL/webapps/server /usr/local/tomcat/webapps/ROOT && \
# ln -s $DSPACE_INSTALL/webapps/rest /usr/local/tomcat/webapps/rest

16
Dockerfile.jdk8-test
View File

@@ -54,11 +54,17 @@ EXPOSE 8080 8009
ENV JAVA_OPTS=-Xmx2000m
RUN mv /usr/local/tomcat/webapps/ROOT /usr/local/tomcat/webapps/ROOT.bk && \
ln -s $DSPACE_INSTALL/webapps/server /usr/local/tomcat/webapps/ROOT && \
ln -s $DSPACE_INSTALL/webapps/server /usr/local/tomcat/webapps/server && \
# Run the "server" webapp off the /server path (e.g. http://localhost:8080/server/)
# and the v6.x (deprecated) REST API off the "/rest" path
RUN ln -s $DSPACE_INSTALL/webapps/server /usr/local/tomcat/webapps/server && \
ln -s $DSPACE_INSTALL/webapps/rest /usr/local/tomcat/webapps/rest
# If you wish to run "server" webapp off the ROOT path, then comment out the above RUN, and uncomment the below RUN.
# You also MUST update the URL in dspace/src/main/docker/local.cfg
# Please note that server webapp should only run on one path at a time.
#RUN mv /usr/local/tomcat/webapps/ROOT /usr/local/tomcat/webapps/ROOT.bk && \
# ln -s $DSPACE_INSTALL/webapps/server /usr/local/tomcat/webapps/ROOT && \
# ln -s $DSPACE_INSTALL/webapps/rest /usr/local/tomcat/webapps/rest
# Overwrite the v6.x (deprecated) REST API's web.xml, so that we can run it on HTTP (defaults to requiring HTTPS)
COPY dspace/src/main/docker/test/rest_web.xml $DSPACE_INSTALL/webapps/rest/WEB-INF/web.xml
RUN sed -i -e "s|\${dspace.dir}|$DSPACE_INSTALL|" $DSPACE_INSTALL/webapps/rest/WEB-INF/web.xml
RUN sed -i -e "s|\${dspace.dir}|$DSPACE_INSTALL|" $DSPACE_INSTALL/webapps/rest/WEB-INF/web.xml

9
dspace/bin/.gitattributes vendored Normal file
View File

@@ -0,0 +1,9 @@
# Ensure Unix files in this folder always keep Unix line endings
dspace text eol=lf
dspace-info.pl text eol=lf
log-reporter text eol=lf
make-handle-config text eol=lf
start-handle-server text eol=lf
# Ensure Windows files in this folder always keep Windows line endings
*.bat text eol=crlf

10
pom.xml
View File

@@ -16,10 +16,6 @@
<url>http://www.dspace.org</url>
</organization>
<prerequisites>
<maven>3.0</maven>
</prerequisites>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
@@ -55,7 +51,8 @@
(NOTE: individual POMs can override specific settings). -->
<pluginManagement>
<plugins>
<!-- Use to enforce a particular version of Java and ensure no conflicting dependencies -->
<!-- Use to enforce particular versions of Java and Maven,
and to ensure no conflicting dependencies -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -71,6 +68,9 @@
<requireJavaVersion>
<version>${java.version}</version>
</requireJavaVersion>
<requireMavenVersion>
<version>[3.0.5,)</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>