From 93059fe5e5f367a3fa4b45776be4fd5043619c59 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@bioforsk.no> Date: Fri, 7 Feb 2014 15:32:50 +0100 Subject: [PATCH] Corrected license information --- .../vips/coremanager/VIPSCoreManagerApplication.java | 10 ++++------ .../vips/coremanager/entity/ModelUsageLog.java | 8 ++++---- .../bioforsk/vips/coremanager/entity/Organization.java | 8 ++++---- .../vips/coremanager/entity/VIPSCoreCredentials.java | 8 ++++---- .../bioforsk/vips/coremanager/entity/VipsCoreUser.java | 8 ++++---- .../coremanager/service/JsonParseExceptionMapper.java | 8 ++++---- .../vips/coremanager/service/ManagerResourceImpl.java | 8 ++++---- .../vips/coremanager/session/ControllerGetter.java | 8 ++++---- .../vips/coremanager/session/UserController.java | 8 ++++---- src/main/resources/META-INF/persistence.xml | 8 ++++---- src/main/webapp/WEB-INF/beans.xml | 8 ++++---- src/main/webapp/WEB-INF/jboss-web.xml | 8 ++++---- src/main/webapp/WEB-INF/staticcss/stylesheet.css | 8 ++++---- src/main/webapp/WEB-INF/statichtml/index.html | 8 ++++---- src/main/webapp/WEB-INF/web.xml | 8 ++++---- 15 files changed, 60 insertions(+), 62 deletions(-) diff --git a/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java b/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java index 676796f..6c96d4f 100644 --- a/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java +++ b/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.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 VIPSCoreManager. + * VIPSCoreManager 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, + * VIPSCoreManager 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>. * */ @@ -56,9 +56,7 @@ public class VIPSCoreManagerApplication extends Application * given list with all resources defined in the project. */ private void addRestResourceClasses(Set<Class<?>> resources) { - resources.add(no.bioforsk.vips.core.service.ModelResource.class); resources.add(no.bioforsk.vips.coremanager.service.JsonParseExceptionMapper.class); - resources.add(no.bioforsk.vips.coremanager.service.ManagerResource.class); resources.add(no.bioforsk.vips.coremanager.service.ManagerResourceImpl.class); } } \ No newline at end of file diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/ModelUsageLog.java b/src/main/java/no/bioforsk/vips/coremanager/entity/ModelUsageLog.java index 96a1247..a5722e0 100644 --- a/src/main/java/no/bioforsk/vips/coremanager/entity/ModelUsageLog.java +++ b/src/main/java/no/bioforsk/vips/coremanager/entity/ModelUsageLog.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 VIPSCoreManager. + * VIPSCoreManager 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, + * VIPSCoreManager 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java b/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java index e58f8d1..e998967 100644 --- a/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java +++ b/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.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 VIPSCoreManager. + * VIPSCoreManager 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, + * VIPSCoreManager 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/VIPSCoreCredentials.java b/src/main/java/no/bioforsk/vips/coremanager/entity/VIPSCoreCredentials.java index 7e471ef..6e2f1b0 100644 --- a/src/main/java/no/bioforsk/vips/coremanager/entity/VIPSCoreCredentials.java +++ b/src/main/java/no/bioforsk/vips/coremanager/entity/VIPSCoreCredentials.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 VIPSCoreManager. + * VIPSCoreManager 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, + * VIPSCoreManager 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/VipsCoreUser.java b/src/main/java/no/bioforsk/vips/coremanager/entity/VipsCoreUser.java index 9abb8ea..f5c1fa6 100644 --- a/src/main/java/no/bioforsk/vips/coremanager/entity/VipsCoreUser.java +++ b/src/main/java/no/bioforsk/vips/coremanager/entity/VipsCoreUser.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 VIPSCoreManager. + * VIPSCoreManager 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, + * VIPSCoreManager 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java b/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java index d13857a..2658641 100644 --- a/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java +++ b/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.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 VIPSCoreManager. + * VIPSCoreManager 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, + * VIPSCoreManager 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java b/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java index 349b667..7c582a2 100644 --- a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java +++ b/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.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 VIPSCoreManager. + * VIPSCoreManager 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, + * VIPSCoreManager 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/coremanager/session/ControllerGetter.java b/src/main/java/no/bioforsk/vips/coremanager/session/ControllerGetter.java index 306f208..908fdd4 100644 --- a/src/main/java/no/bioforsk/vips/coremanager/session/ControllerGetter.java +++ b/src/main/java/no/bioforsk/vips/coremanager/session/ControllerGetter.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 VIPSCoreManager. + * VIPSCoreManager 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, + * VIPSCoreManager 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java b/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java index 88eaa42..23a3d63 100644 --- a/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java +++ b/src/main/java/no/bioforsk/vips/coremanager/session/UserController.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 VIPSCoreManager. + * VIPSCoreManager 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, + * VIPSCoreManager 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 4472ec9..ad49f8b 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.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 VIPSCoreManager. + VIPSCoreManager 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, + VIPSCoreManager 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>. --> <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> <persistence-unit name="VIPSCoreManager-PU" transaction-type="JTA"> diff --git a/src/main/webapp/WEB-INF/beans.xml b/src/main/webapp/WEB-INF/beans.xml index 192c0a4..b279480 100644 --- a/src/main/webapp/WEB-INF/beans.xml +++ b/src/main/webapp/WEB-INF/beans.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 VIPSCoreManager. + VIPSCoreManager 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, + VIPSCoreManager 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>. --> <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/src/main/webapp/WEB-INF/jboss-web.xml b/src/main/webapp/WEB-INF/jboss-web.xml index 77ef0c8..c7d030b 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 VIPSCoreManager. + VIPSCoreManager 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, + VIPSCoreManager 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>. --> <jboss-web> <context-root>/VIPSCoreManager</context-root> diff --git a/src/main/webapp/WEB-INF/staticcss/stylesheet.css b/src/main/webapp/WEB-INF/staticcss/stylesheet.css index 01b490f..add606b 100644 --- a/src/main/webapp/WEB-INF/staticcss/stylesheet.css +++ b/src/main/webapp/WEB-INF/staticcss/stylesheet.css @@ -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 VIPSCoreManager. + * VIPSCoreManager 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, + * VIPSCoreManager 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>. */ /* Document : stylesheet diff --git a/src/main/webapp/WEB-INF/statichtml/index.html b/src/main/webapp/WEB-INF/statichtml/index.html index 09a0695..dc1d6df 100644 --- a/src/main/webapp/WEB-INF/statichtml/index.html +++ b/src/main/webapp/WEB-INF/statichtml/index.html @@ -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 VIPSCoreManager. + VIPSCoreManager 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, + VIPSCoreManager 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>. --> <html> <head> diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 583e6fd..b604e60 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 VIPSCoreManager. + VIPSCoreManager 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, + VIPSCoreManager 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>. --> <web-app version="2.5" 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_2_5.xsd"> <display-name>VIPSCoreManager</display-name> -- GitLab