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

Merge pull request #1691 from samuelcambien/dspace-5_DS-3545

Browse Source 
DS-3545 mirage2: custom sitemap.xmap is ignored
This commit is contained in:
Bram Luyten
2019-07-05 14:39:33 +02:00
committed by GitHub
parent ef01ed688b 274f41258c
commit f7f61fd6c4
1 changed files with 32 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
dspace/modules/xmlui-mirage2/pom.xml
View File

@@ -71,55 +71,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<outputDirectory>${project.build.directory}/themes</outputDirectory>
<resources>
<resource>
<directory>${basedir}/src/main/webapp/themes</directory>
<excludes>
<exclude>**/*.bmp</exclude>
<exclude>**/*.jpg</exclude>
<exclude>**/*.jpeg</exclude>
<exclude>**/*.gif</exclude>
<exclude>**/*.png</exclude>
<exclude>**/*.ico</exclude>
<exclude>**/*.svg</exclude>
<include>**/*.ttf</include>
<include>**/*.woff</include>
<include>**/*.eot</include>
</excludes>
<filtering>true</filtering>
</resource>
<resource>
<directory>${basedir}/src/main/webapp/themes</directory>
<includes>
<include>**/*.bmp</include>
<include>**/*.jpg</include>
<include>**/*.jpeg</include>
<include>**/*.gif</include>
<include>**/*.png</include>
<include>**/*.ico</include>
<include>**/*.svg</include>
<include>**/*.ttf</include>
<include>**/*.woff</include>
<include>**/*.eot</include>
</includes>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -237,7 +188,6 @@
<goal>copy-resources</goal>
<configuration>
<outputDirectory>${project.build.directory}/themes/@item@</outputDirectory>
<overwrite>false</overwrite>
<resources>
<resource>
<directory>${project.build.directory}/mirage2-source-extracted</directory>
@@ -246,6 +196,13 @@
<exclude>sitemap.xmap</exclude>
</excludes>
</resource>
<resource>
<directory>${project.build.directory}/mirage2-source-extracted</directory>
<filtering>true</filtering>
<includes>
<include>sitemap.xmap</include>
</includes>
</resource>
</resources>
</configuration>
</pluginExecutor>
@@ -257,10 +214,17 @@
<goal>copy-resources</goal>
<configuration>
<outputDirectory>${project.build.directory}/themes/@item@</outputDirectory>
<overwrite>false</overwrite>
<overwrite>true</overwrite>
<resources>
<resource>
<directory>${project.build.directory}/mirage2-source-extracted</directory>
<directory>${basedir}/src/main/webapp/themes/@item@</directory>
<filtering>false</filtering>
<excludes>
<exclude>sitemap.xmap</exclude>
</excludes>
</resource>
<resource>
<directory>${basedir}/src/main/webapp/themes/@item@</directory>
<filtering>true</filtering>
<includes>
<include>sitemap.xmap</include>
@@ -399,7 +363,6 @@
<goal>copy-resources</goal>
<configuration>
<outputDirectory>${project.build.directory}/themes/@item@</outputDirectory>
<overwrite>false</overwrite>
<resources>
<resource>
<directory>${project.build.directory}/mirage2-source-extracted</directory>
@@ -408,6 +371,13 @@
<exclude>sitemap.xmap</exclude>
</excludes>
</resource>
<resource>
<directory>${project.build.directory}/mirage2-source-extracted</directory>
<filtering>true</filtering>
<includes>
<include>sitemap.xmap</include>
</includes>
</resource>
</resources>
</configuration>
</pluginExecutor>
@@ -419,10 +389,17 @@
<goal>copy-resources</goal>
<configuration>
<outputDirectory>${project.build.directory}/themes/@item@</outputDirectory>
<overwrite>false</overwrite>
<overwrite>true</overwrite>
<resources>
<resource>
<directory>${project.build.directory}/mirage2-source-extracted</directory>
<directory>${basedir}/src/main/webapp/themes/@item@</directory>
<filtering>false</filtering>
<excludes>
<exclude>sitemap.xmap</exclude>
</excludes>
</resource>
<resource>
<directory>${basedir}/src/main/webapp/themes/@item@</directory>
<filtering>true</filtering>
<includes>
<include>sitemap.xmap</include>