From 40c9a23bc2a375e3474a8472cbe5ef7e6a9835ae Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Sun, 26 Apr 2020 19:09:25 +0200 Subject: [PATCH] Added cors filter --- nb-configuration.xml | 1 + pom.xml | 4 ++-- src/main/java/no/nibio/vips/core/VIPSCoreApplication.java | 8 ++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/nb-configuration.xml b/nb-configuration.xml index e9e56b5..00dea3e 100755 --- a/nb-configuration.xml +++ b/nb-configuration.xml @@ -18,5 +18,6 @@ Any value defined here will override the pom.xml file value but is only applicab <netbeans.hint.license>nibio_open_source_license.ftl</netbeans.hint.license> <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>WildFly</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server> <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>1.7-web</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion> + <netbeans.hint.jdkPlatform>JDK_1.8_SUN</netbeans.hint.jdkPlatform> </properties> </project-shared-configuration> diff --git a/pom.xml b/pom.xml index 9d18112..577daad 100755 --- a/pom.xml +++ b/pom.xml @@ -127,8 +127,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.0.2</version> <configuration> - <source>10</source> - <target>10</target> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> <plugin> diff --git a/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java b/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java index 2b2a649..1373801 100755 --- a/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java +++ b/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java @@ -19,10 +19,12 @@ package no.nibio.vips.core; +import java.util.HashSet; import java.util.Set; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; + /** * Responsible for adding REST resources * @copyright 2013-2018 {@link http://www.nibio.no NIBIO} @@ -49,13 +51,7 @@ public class VIPSCoreApplication extends Application resources.add(no.nibio.vips.core.service.ModelResourceImpl.class); } - /** - * Do not modify addRestResourceClasses() method. - * It is automatically re-generated by NetBeans REST support to populate - * given list with all resources defined in the project. - */ private void addRestResourceClasses(Set<Class<?>> resources) { resources.add(no.nibio.vips.core.config.JacksonConfig.class); - resources.add(no.nibio.vips.core.service.ModelResourceImpl.class); } } \ No newline at end of file -- GitLab