From b9761edbf7a96a2265dbae964a286428c54483ba Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Sun, 19 Jul 2015 13:02:33 +0200
Subject: [PATCH] Refactoring everything Bioforsk -> NIBIO
---
LICENSE.txt | 38 +++++++++----------
nb-configuration.xml | 2 +-
pom.xml | 4 +-
.../vips/core/VIPSCoreApplication.java | 24 ++++++------
.../vips/core/config/JacksonConfig.java | 18 ++++-----
.../vips/core/service/ModelResourceImpl.java | 33 ++++++++--------
.../vips/core/startup/StartupListener.java | 20 +++++-----
.../factory/DuplicateModelIdException.java | 18 ++++-----
.../vips/model/factory/ModelFactory.java | 22 +++++------
.../WEB-INF/jboss-deployment-structure.xml | 16 ++++----
src/main/webapp/WEB-INF/jboss-web.xml | 12 +++---
src/main/webapp/WEB-INF/web.xml | 18 ++++-----
12 files changed, 113 insertions(+), 112 deletions(-)
rename src/main/java/no/{bioforsk => nibio}/vips/core/VIPSCoreApplication.java (64%)
rename src/main/java/no/{bioforsk => nibio}/vips/core/config/JacksonConfig.java (67%)
rename src/main/java/no/{bioforsk => nibio}/vips/core/service/ModelResourceImpl.java (91%)
rename src/main/java/no/{bioforsk => nibio}/vips/core/startup/StartupListener.java (69%)
rename src/main/java/no/{bioforsk => nibio}/vips/model/factory/DuplicateModelIdException.java (62%)
rename src/main/java/no/{bioforsk => nibio}/vips/model/factory/ModelFactory.java (94%)
diff --git a/LICENSE.txt b/LICENSE.txt
index e5e9323..9556dad 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,13 +1,13 @@
- BIOFORSK OPEN SOURCE LICENSE V.1.0 (2014)
+ NIBIO OPEN SOURCE LICENSE V.1.0 (2014)
PREAMBLE AND ADDITIONAL TERMS
The original licensor is the Norwegian Institute for Agricultural and
Environmental Research, registered in Norway with registration number 988 983
837, and business address NO-1430 ÅS, NORWAY, hereafter referred to as
-"BIOFORSK".
+"NIBIO".
- This BIOFORSK OPEN SOURCE LICENSE V.1.0 (2014), in short the BIOFORSK Open
+ This NIBIO OPEN SOURCE LICENSE V.1.0 (2014), in short the NIBIO Open
Source License, is based on the GNU Affero General Public License, version 3.
All of the terms and conditions of the GNU Affero General Public License,
version 3, have been set out below, save the below mentioned additional
@@ -15,26 +15,26 @@ prevailing terms that have priority over the terms otherwise identical to the
GNU Affero General Public License, version 3, and that Section 0 ("This
License" definition changed), 13 ("version 3 of the GNU General Public License"
replaced by "this License") and 14 ("The Free Software Foundation" replaced by
-"BIOFORSK" and "GNU Affero General Public License" replaced by "License") have
+"NIBIO" and "GNU Affero General Public License" replaced by "License") have
been adjusted as a consequence of this.
ADDITONAL PREVAILING TERMS
- (a) The BIOFORSK Open Source License regulates the BIOFORSK VIPS Platform
+ (a) The NIBIO Open Source License regulates the NIBIO VIPS Platform
software, an Internet based system enabling prediction of infection risk of
-plant diseases, pests and weeds. The BIOFORSK Open Source License DOES NOT
+plant diseases, pests and weeds. The NIBIO Open Source License DOES NOT
INCLUDE the specific forecasting models, neither their algorithms nor their
-implementation to be used by the BIOFORSK VIPS Platform. You are free to
-implement any other forecasting model to be used by the BIOFORSK VIPS Platform,
+implementation to be used by the NIBIO VIPS Platform. You are free to
+implement any other forecasting model to be used by the NIBIO VIPS Platform,
regardless of license terms at your own responsibility.
(b) This license is governed by Norwegian law, as far as any party or third
-party purports or sets forward any claim towards BIOFORSK. Any claims towards
-BIOFORSK shall be solved by the exclusive venue of Oslo City Courts, Norway.
+party purports or sets forward any claim towards NIBIO. Any claims towards
+NIBIO shall be solved by the exclusive venue of Oslo City Courts, Norway.
This paragraph is not applicable for claims only between any later parties to
this license.
- (c) By entering into this agreement you also agree to indemnify BIOFORSK and
+ (c) By entering into this agreement you also agree to indemnify NIBIO and
its employees / consultants / board, for any claims of liability related to
this license set forward by yourself or any party deviating its rights from you.
@@ -44,17 +44,17 @@ this license set forward by yourself or any party deviating its rights from you.
This file is part of <application name>. <application name> is free
software: you can redistribute it and/or modify it under the terms of
- the Bioforsk Open Source License as published by Bioforsk, either
+ the NIBIO Open Source License as published by NIBIO, either
version 1 of the License, or (at your option) any later version.
<application name> is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- Bioforsk Open Source License for more details.
+ NIBIO Open Source License for more details.
- You should have received a copy of the Bioforsk Open Source License
+ You should have received a copy of the NIBIO Open Source License
along with <application name>. If not, see
- <http://www.bioforsk.no/licenses/>.
+ <http://www.nibio.no/licenses/>.
It is also recommended that you add information on how to contact you by
electronic and paper mail.
@@ -63,7 +63,7 @@ this license set forward by yourself or any party deviating its rights from you.
2. 0. Definitions.
- "This License" refers to BIOFORSK Open Source License v.1.0 (2014).
+ "This License" refers to NIBIO Open Source License v.1.0 (2014).
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
@@ -562,7 +562,7 @@ but the work with which it is combined will remain governed by version
16. 14. Revised Versions of this License.
- BIOFORSK may publish revised and/or new versions of the License from time to
+ NIBIO may publish revised and/or new versions of the License from time to
time. Such new versions will be similar in spirit to the present version, but
may differ in detail to address new problems or concerns.
@@ -570,8 +570,8 @@ may differ in detail to address new problems or concerns.
Program specifies that a certain numbered version of the License "or any later
version" applies to it, you have the option of following the terms and
conditions either of that numbered version or of any later version published by
-BIOFORSK. If the Program does not specify a version number of the License, you
-may choose any version ever published by the BIOFORSK.
+NIBIO. If the Program does not specify a version number of the License, you
+may choose any version ever published by the NIBIO.
If the Program specifies that a proxy can decide which future
versions of the License can be used, that proxy's public statement of
diff --git a/nb-configuration.xml b/nb-configuration.xml
index be09b10..084c449 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -15,6 +15,6 @@ Any value defined here will override the pom.xml file value but is only applicab
-->
<netbeans.hint.j2eeVersion>1.5</netbeans.hint.j2eeVersion>
<org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
- <netbeans.hint.license>bioforsk_open_source_license.ftl</netbeans.hint.license>
+ <netbeans.hint.license>nibio_open_source_license.ftl</netbeans.hint.license>
</properties>
</project-shared-configuration>
diff --git a/pom.xml b/pom.xml
index 04cb5ee..112822f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>no.bioforsk</groupId>
+ <groupId>no.nibio</groupId>
<artifactId>VIPSCore</artifactId>
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>
@@ -58,7 +58,7 @@
<version>0.9.9</version>
</dependency>
<dependency>
- <groupId>no.bioforsk.vips.common</groupId>
+ <groupId>no.nibio.vips.common</groupId>
<artifactId>VIPSCommon</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>provided</scope>
diff --git a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java b/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java
similarity index 64%
rename from src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
rename to src/main/java/no/nibio/vips/core/VIPSCoreApplication.java
index c023ca8..0597d0c 100644
--- a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
+++ b/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java
@@ -1,23 +1,23 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCore.
* VIPSCore is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* VIPSCore is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSCore. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCore. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.core;
+package no.nibio.vips.core;
import java.util.Set;
import javax.ws.rs.ApplicationPath;
@@ -25,8 +25,8 @@ import javax.ws.rs.core.Application;
/**
* Responsible for adding REST resources
- * @copyright 2013-2014 {@link http://www.bioforsk.no Bioforsk}
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013-2014 {@link http://www.nibio.no NIBIO}
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
@ApplicationPath("/")
public class VIPSCoreApplication extends Application
@@ -45,8 +45,8 @@ public class VIPSCoreApplication extends Application
* @param resources
*/
private void addRestResourceClassesManually(Set<Class<?>> resources) {
- resources.add(no.bioforsk.vips.core.config.JacksonConfig.class);
- resources.add(no.bioforsk.vips.core.service.ModelResourceImpl.class);
+ resources.add(no.nibio.vips.core.config.JacksonConfig.class);
+ resources.add(no.nibio.vips.core.service.ModelResourceImpl.class);
}
/**
@@ -55,6 +55,6 @@ public class VIPSCoreApplication extends Application
* given list with all resources defined in the project.
*/
private void addRestResourceClasses(Set<Class<?>> resources) {
- resources.add(no.bioforsk.vips.core.config.JacksonConfig.class);
+ resources.add(no.nibio.vips.core.config.JacksonConfig.class);
}
}
\ No newline at end of file
diff --git a/src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java b/src/main/java/no/nibio/vips/core/config/JacksonConfig.java
similarity index 67%
rename from src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java
rename to src/main/java/no/nibio/vips/core/config/JacksonConfig.java
index 32f813b..493834c 100644
--- a/src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java
+++ b/src/main/java/no/nibio/vips/core/config/JacksonConfig.java
@@ -1,23 +1,23 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCore.
* VIPSCore is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* VIPSCore is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSCore. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCore. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.core.config;
+package no.nibio.vips.core.config;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
@@ -29,8 +29,8 @@ import com.fasterxml.jackson.databind.SerializationFeature;
/**
* This config ensures that Jackson serializes dates as [ISO-8601 ]-compliant notation,
* and not a timestamp
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
@Provider
@Produces(MediaType.APPLICATION_JSON)
diff --git a/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java b/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
similarity index 91%
rename from src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
rename to src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
index 7863ff1..402596c 100644
--- a/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
+++ b/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
@@ -1,24 +1,25 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCore.
* VIPSCore is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* VIPSCore is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSCore. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCore. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.core.service;
+package no.nibio.vips.core.service;
+import no.nibio.vips.core.service.ModelResource;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -30,18 +31,18 @@ import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
-import no.bioforsk.vips.entity.ModelConfiguration;
-import no.bioforsk.vips.entity.Result;
-import no.bioforsk.vips.model.ConfigValidationException;
-import no.bioforsk.vips.model.Model;
-import no.bioforsk.vips.model.ModelExcecutionException;
-import no.bioforsk.vips.model.factory.DuplicateModelIdException;
-import no.bioforsk.vips.model.factory.ModelFactory;
+import no.nibio.vips.entity.ModelConfiguration;
+import no.nibio.vips.entity.Result;
+import no.nibio.vips.model.ConfigValidationException;
+import no.nibio.vips.model.Model;
+import no.nibio.vips.model.ModelExcecutionException;
+import no.nibio.vips.model.factory.DuplicateModelIdException;
+import no.nibio.vips.model.factory.ModelFactory;
/**
* The available resources in this system
- * @copyright 2013 {@link http://www.bioforsk.no Bioforsk}
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 {@link http://www.nibio.no NIBIO}
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
//@Path("")
public class ModelResourceImpl implements ModelResource{
diff --git a/src/main/java/no/bioforsk/vips/core/startup/StartupListener.java b/src/main/java/no/nibio/vips/core/startup/StartupListener.java
similarity index 69%
rename from src/main/java/no/bioforsk/vips/core/startup/StartupListener.java
rename to src/main/java/no/nibio/vips/core/startup/StartupListener.java
index 19a01bd..652f6a4 100644
--- a/src/main/java/no/bioforsk/vips/core/startup/StartupListener.java
+++ b/src/main/java/no/nibio/vips/core/startup/StartupListener.java
@@ -1,33 +1,33 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCore.
* VIPSCore is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* VIPSCore is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSCore. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCore. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.core.startup;
+package no.nibio.vips.core.startup;
import javax.servlet.ServletContextEvent;
-import no.bioforsk.vips.model.factory.ModelFactory;
+import no.nibio.vips.model.factory.ModelFactory;
/**
* This class is created and method contextInitialized called when the application
* is deployed (either at startup of application container or when redeploying the app)
*
- * @copyright 2013 {@link http://www.bioforsk.no Bioforsk}
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 {@link http://www.nibio.no NIBIO}
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class StartupListener implements javax.servlet.ServletContextListener{
diff --git a/src/main/java/no/bioforsk/vips/model/factory/DuplicateModelIdException.java b/src/main/java/no/nibio/vips/model/factory/DuplicateModelIdException.java
similarity index 62%
rename from src/main/java/no/bioforsk/vips/model/factory/DuplicateModelIdException.java
rename to src/main/java/no/nibio/vips/model/factory/DuplicateModelIdException.java
index f4cf918..8bb5530 100644
--- a/src/main/java/no/bioforsk/vips/model/factory/DuplicateModelIdException.java
+++ b/src/main/java/no/nibio/vips/model/factory/DuplicateModelIdException.java
@@ -1,29 +1,29 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCore.
* VIPSCore is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* VIPSCore is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSCore. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCore. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.model.factory;
+package no.nibio.vips.model.factory;
/**
* Thrown if ModelFactory discovers that the system contains different models
* with identical modelIds
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class DuplicateModelIdException extends Exception {
diff --git a/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java b/src/main/java/no/nibio/vips/model/factory/ModelFactory.java
similarity index 94%
rename from src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java
rename to src/main/java/no/nibio/vips/model/factory/ModelFactory.java
index f3465c0..a0e1c8f 100644
--- a/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java
+++ b/src/main/java/no/nibio/vips/model/factory/ModelFactory.java
@@ -1,23 +1,23 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCore.
* VIPSCore is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* VIPSCore is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSCore. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCore. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.model.factory;
+package no.nibio.vips.model.factory;
import java.util.HashMap;
import java.util.HashSet;
@@ -26,7 +26,7 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.reflections.Reflections;
-import no.bioforsk.vips.model.Model;
+import no.nibio.vips.model.Model;
/**
* Provides the models available. Singleton.
@@ -34,7 +34,7 @@ import no.bioforsk.vips.model.Model;
* <h2>Deploying models</h2>
* To make a model available, it must
* <ul>
- * <li>Implement the {@link no.bioforsk.vips.model.Model} interface</li>
+ * <li>Implement the {@link no.nibio.vips.model.Model} interface</li>
* <li>
* Be on the class path of the running application, preferably in a separate JAR.
* The guaranteed way to make it work is to put it inside the VIPSCore WAR-file, in /WEB-INF/lib
@@ -43,8 +43,8 @@ import no.bioforsk.vips.model.Model;
* </li>
* </ul>
*
- * @copyright 2013 {@link http://www.bioforsk.no Bioforsk}
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 {@link http://www.nibio.no NIBIO}
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class ModelFactory {
// The singleton instance
diff --git a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index 2b4e62f..ee829f6 100644
--- a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
This file is part of VIPSCore.
VIPSCore is free software: you can redistribute it and/or modify
-it under the terms of the Bioforsk Open Source License as published by
-Bioforsk, either version 1 of the License, or (at your option) any
+it under the terms of the NIBIO Open Source License as published by
+NIBIO, either version 1 of the License, or (at your option) any
later version.
VIPSCore is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-Bioforsk Open Source License for more details.
+NIBIO Open Source License for more details.
-You should have received a copy of the Bioforsk Open Source License
-along with VIPSCore. If not, see <http://www.bioforsk.no/licenses/>.
+You should have received a copy of the NIBIO Open Source License
+along with VIPSCore. If not, see <http://www.nibio.no/licenses/>.
-->
<jboss-deployment-structure>
<deployment>
<dependencies>
- <module name="no.bioforsk.vips.modelcontainer"/>
- <module name="no.bioforsk.vips.VIPSCommon" export="true"/>
+ <module name="no.nibio.vips.modelcontainer"/>
+ <module name="no.nibio.vips.VIPSCommon" export="true"/>
<module name="com.fasterxml.jackson.core.jackson-core" />
<module name="com.fasterxml.jackson.core.jackson-databind" />
</dependencies>
diff --git a/src/main/webapp/WEB-INF/jboss-web.xml b/src/main/webapp/WEB-INF/jboss-web.xml
index 3d81809..070fe0d 100644
--- a/src/main/webapp/WEB-INF/jboss-web.xml
+++ b/src/main/webapp/WEB-INF/jboss-web.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCore.
* VIPSCore is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* VIPSCore is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSCore. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCore. If not, see <http://www.nibio.no/licenses/>.
-->
<jboss-web>
<context-root>/VIPSCore</context-root>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 6ab6af8..f4d9f29 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,29 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCore.
* VIPSCore is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* VIPSCore is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSCore. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCore. If not, see <http://www.nibio.no/licenses/>.
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<listener>
- <listener-class>no.bioforsk.vips.core.startup.StartupListener</listener-class>
+ <listener-class>no.nibio.vips.core.startup.StartupListener</listener-class>
</listener>
<!-- This is for allowing Cross-Site requests See: http://software.dzhuvinov.com/cors-filter.html -->
<filter>
- <filter-name>CORS</filter-name>
- <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class>
+ <filter-name>CORS</filter-name>
+ <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class>
<init-param>
<param-name>cors.supportedMethods</param-name>
<param-value>GET, POST, HEAD, PUT, DELETE, OPTIONS</param-value>
--
GitLab