From 2707f61ac8f79c776c5b893e78869ed0b46ffad9 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Fri, 7 Feb 2014 15:31:54 +0100
Subject: [PATCH] Corrected license information

---
 .../no/bioforsk/vips/core/VIPSCoreApplication.java     | 10 ++++------
 .../no/bioforsk/vips/core/config/JacksonConfig.java    |  8 ++++----
 .../bioforsk/vips/core/service/ModelResourceImpl.java  |  8 ++++----
 .../no/bioforsk/vips/core/startup/StartupListener.java |  8 ++++----
 .../vips/model/factory/DuplicateModelIdException.java  |  8 ++++----
 .../no/bioforsk/vips/model/factory/ModelFactory.java   |  8 ++++----
 src/main/webapp/WEB-INF/jboss-web.xml                  |  8 ++++----
 src/main/webapp/WEB-INF/web.xml                        |  8 ++++----
 8 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
index ebec02c..9e2684a 100644
--- a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
+++ b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
- * This file is part of VIPSLogic.
- * VIPSLogic is free software: you can redistribute it and/or modify
+ * This file is part of VIPSCore.
+ * VIPSCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  * 
- * VIPSLogic is distributed in the hope that it will be useful,
+ * 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
  * GNU Affero General Public License for more details.
  * 
  * You should have received a copy of the GNU Affero General Public License
- * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
 
@@ -56,7 +56,5 @@ public class VIPSCoreApplication extends Application
      */
     private void addRestResourceClasses(Set<Class<?>> resources) {
         resources.add(no.bioforsk.vips.core.config.JacksonConfig.class);
-        resources.add(no.bioforsk.vips.core.service.ModelResource.class);
-        resources.add(no.bioforsk.vips.coremanager.service.ManagerResource.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/bioforsk/vips/core/config/JacksonConfig.java
index 9a3564b..260b275 100644
--- a/src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java
+++ b/src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
- * This file is part of VIPSLogic.
- * VIPSLogic is free software: you can redistribute it and/or modify
+ * This file is part of VIPSCore.
+ * VIPSCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  * 
- * VIPSLogic is distributed in the hope that it will be useful,
+ * 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
  * GNU Affero General Public License for more details.
  * 
  * You should have received a copy of the GNU Affero General Public License
- * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java b/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
index e984c45..40a3b54 100644
--- a/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
+++ b/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
- * This file is part of VIPSLogic.
- * VIPSLogic is free software: you can redistribute it and/or modify
+ * This file is part of VIPSCore.
+ * VIPSCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  * 
- * VIPSLogic is distributed in the hope that it will be useful,
+ * 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
  * GNU Affero General Public License for more details.
  * 
  * You should have received a copy of the GNU Affero General Public License
- * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/core/startup/StartupListener.java b/src/main/java/no/bioforsk/vips/core/startup/StartupListener.java
index b5ea0e3..56078c7 100644
--- a/src/main/java/no/bioforsk/vips/core/startup/StartupListener.java
+++ b/src/main/java/no/bioforsk/vips/core/startup/StartupListener.java
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
- * This file is part of VIPSLogic.
- * VIPSLogic is free software: you can redistribute it and/or modify
+ * This file is part of VIPSCore.
+ * VIPSCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  * 
- * VIPSLogic is distributed in the hope that it will be useful,
+ * 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
  * GNU Affero General Public License for more details.
  * 
  * You should have received a copy of the GNU Affero General Public License
- * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/model/factory/DuplicateModelIdException.java b/src/main/java/no/bioforsk/vips/model/factory/DuplicateModelIdException.java
index 3f2a89b..40f1bb0 100644
--- a/src/main/java/no/bioforsk/vips/model/factory/DuplicateModelIdException.java
+++ b/src/main/java/no/bioforsk/vips/model/factory/DuplicateModelIdException.java
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
- * This file is part of VIPSLogic.
- * VIPSLogic is free software: you can redistribute it and/or modify
+ * This file is part of VIPSCore.
+ * VIPSCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  * 
- * VIPSLogic is distributed in the hope that it will be useful,
+ * 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
  * GNU Affero General Public License for more details.
  * 
  * You should have received a copy of the GNU Affero General Public License
- * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java b/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java
index 4376fde..9b64ae1 100644
--- a/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java
+++ b/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
- * This file is part of VIPSLogic.
- * VIPSLogic is free software: you can redistribute it and/or modify
+ * This file is part of VIPSCore.
+ * VIPSCore is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  * 
- * VIPSLogic is distributed in the hope that it will be useful,
+ * 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
  * GNU Affero General Public License for more details.
  * 
  * You should have received a copy of the GNU Affero General Public License
- * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
 
diff --git a/src/main/webapp/WEB-INF/jboss-web.xml b/src/main/webapp/WEB-INF/jboss-web.xml
index ea41c78..3adbe1f 100644
--- a/src/main/webapp/WEB-INF/jboss-web.xml
+++ b/src/main/webapp/WEB-INF/jboss-web.xml
@@ -2,19 +2,19 @@
 <!--
   Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  
-  This file is part of VIPSLogic.
-  VIPSLogic is free software: you can redistribute it and/or modify
+  This file is part of VIPSCore.
+  VIPSCore is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   
-  VIPSLogic is distributed in the hope that it will be useful,
+  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
   GNU Affero General Public License for more details.
   
   You should have received a copy of the GNU Affero General Public License
-  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+  along with VIPSCore.  If not, see <http://www.gnu.org/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 6889384..7b69095 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -2,19 +2,19 @@
 <!--
   Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  
-  This file is part of VIPSLogic.
-  VIPSLogic is free software: you can redistribute it and/or modify
+  This file is part of VIPSCore.
+  VIPSCore is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   
-  VIPSLogic is distributed in the hope that it will be useful,
+  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
   GNU Affero General Public License for more details.
   
   You should have received a copy of the GNU Affero General Public License
-  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+  along with VIPSCore.  If not, see <http://www.gnu.org/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>
-- 
GitLab