hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 23:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DSC-963] Minor improvements

Browse Source
This commit is contained in:
Luca Giamminonni
2023-03-13 11:46:20 +01:00
parent aff1de4153
commit b3a3acf910
7 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
dspace-server-webapp/pom.xml
View File

@@ -28,6 +28,18 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<!-- Builds a *-tests.jar of all test classes -->
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- This plugin allows us to run a Groovy script in our Maven POM
(see: https://groovy.github.io/gmaven/groovy-maven-plugin/execute.html )
We are generating a OS-agnostic version (agnostic.build.dir) of
@@ -57,25 +69,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

10
dspace-server-webapp/src/main/java/org/dspace/app/rest/WebApplication.java
View File

@@ -42,17 +42,11 @@ import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
/**
* Define the Spring Boot Application settings itself. This class takes the place
* of a web.xml file, and configures all Filters/Listeners as methods (see below).
* <p>
* NOTE: Requires a Servlet 3.0 container, e.g. Tomcat 7.0 or above.
* <p>
* NOTE: This extends SpringBootServletInitializer in order to allow us to build
* a deployable WAR file with Spring Boot. See:
* http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#howto-create-a-deployable-war-file
* Main configuration for the dspace web module.
*
* @author Andrea Bollini (andrea.bollini at 4science.it)
* @author Tim Donohue
* @author Luca Giamminonni (luca.giamminonni at 4science.it)
*/
@EnableScheduling
@EnableCaching

11
dspace-server-webapp/src/test/java/org/dspace/app/rest/TestApplication.java → dspace-server-webapp/src/test/java/org/dspace/app/TestApplication.java
View File

@@ -5,11 +5,18 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.rest;
package org.dspace.app;
import org.dspace.app.rest.WebApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
/**
* Spring boot application for integration tests.
*
* @author Luca Giamminonni (luca.giamminonni at 4science.it)
*
*/
@SpringBootApplication(scanBasePackageClasses = WebApplication.class)
public class TestApplication {
}

2
dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java
View File

@@ -23,7 +23,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils;
import org.dspace.AbstractIntegrationTestWithDatabase;
import org.dspace.app.rest.TestApplication;
import org.dspace.app.TestApplication;
import org.dspace.app.rest.model.patch.Operation;
import org.dspace.app.rest.utils.DSpaceConfigurationInitializer;
import org.dspace.app.rest.utils.DSpaceKernelInitializer;

2
dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractWebClientIntegrationTest.java
View File

@@ -9,7 +9,7 @@ package org.dspace.app.rest.test;
import org.apache.commons.lang3.StringUtils;
import org.dspace.AbstractIntegrationTestWithDatabase;
import org.dspace.app.rest.TestApplication;
import org.dspace.app.TestApplication;
import org.dspace.app.rest.utils.DSpaceConfigurationInitializer;
import org.dspace.app.rest.utils.DSpaceKernelInitializer;
import org.junit.runner.RunWith;

13
dspace-webapp-boot/src/main/java/org/dspace/app/Application.java
View File

@@ -14,6 +14,19 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
/**
* Define the Spring Boot Application settings itself. This class takes the place
* of a web.xml file, and configures all Filters/Listeners as methods (see below).
* <p>
* NOTE: Requires a Servlet 3.0 container, e.g. Tomcat 7.0 or above.
* <p>
* NOTE: This extends SpringBootServletInitializer in order to allow us to build
* a deployable WAR file with Spring Boot. See:
* http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#howto-create-a-deployable-war-file
*
* @author Luca Giamminonni (luca.giamminonni at 4science.it)
*
*/
@SpringBootApplication(scanBasePackageClasses = WebApplication.class)
public class Application extends SpringBootServletInitializer {

2
dspace/config/log4j2-console.xml
View File

@@ -25,7 +25,7 @@
For command line / Ant scripts, we are only concerned about significant warnings/errors.
For the full detail, change this to INFO and re-run Ant. -->
<Loggers>
<Root level='INFO'>
<Root level='WARN'>
<AppenderRef ref='A1'/>
</Root>
</Loggers>