Skip to content
Snippets Groups Projects
Commit 2707f61a authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Corrected license information

parent 1c3e8457
No related branches found
No related tags found
No related merge requests found
/* /*
* Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
* *
* This file is part of VIPSLogic. * This file is part of VIPSCore.
* VIPSLogic is free software: you can redistribute it and/or modify * 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 * 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 * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (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 * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details. * GNU Affero General Public License for more details.
* *
* You should have received a copy of the GNU Affero General Public License * 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 ...@@ -56,7 +56,5 @@ public class VIPSCoreApplication extends Application
*/ */
private void addRestResourceClasses(Set<Class<?>> resources) { private void addRestResourceClasses(Set<Class<?>> resources) {
resources.add(no.bioforsk.vips.core.config.JacksonConfig.class); 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
/* /*
* Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
* *
* This file is part of VIPSLogic. * This file is part of VIPSCore.
* VIPSLogic is free software: you can redistribute it and/or modify * 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 * 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 * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (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 * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details. * GNU Affero General Public License for more details.
* *
* You should have received a copy of the GNU Affero General Public License * 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/>.
* *
*/ */
......
/* /*
* Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
* *
* This file is part of VIPSLogic. * This file is part of VIPSCore.
* VIPSLogic is free software: you can redistribute it and/or modify * 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 * 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 * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (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 * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details. * GNU Affero General Public License for more details.
* *
* You should have received a copy of the GNU Affero General Public License * 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/>.
* *
*/ */
......
/* /*
* Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
* *
* This file is part of VIPSLogic. * This file is part of VIPSCore.
* VIPSLogic is free software: you can redistribute it and/or modify * 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 * 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 * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (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 * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details. * GNU Affero General Public License for more details.
* *
* You should have received a copy of the GNU Affero General Public License * 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/>.
* *
*/ */
......
/* /*
* Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
* *
* This file is part of VIPSLogic. * This file is part of VIPSCore.
* VIPSLogic is free software: you can redistribute it and/or modify * 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 * 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 * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (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 * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details. * GNU Affero General Public License for more details.
* *
* You should have received a copy of the GNU Affero General Public License * 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/>.
* *
*/ */
......
/* /*
* Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
* *
* This file is part of VIPSLogic. * This file is part of VIPSCore.
* VIPSLogic is free software: you can redistribute it and/or modify * 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 * 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 * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (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 * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details. * GNU Affero General Public License for more details.
* *
* You should have received a copy of the GNU Affero General Public License * 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/>.
* *
*/ */
......
...@@ -2,19 +2,19 @@ ...@@ -2,19 +2,19 @@
<!-- <!--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
This file is part of VIPSLogic. This file is part of VIPSCore.
VIPSLogic is free software: you can redistribute it and/or modify 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 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 the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License 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> <jboss-web>
<context-root>/VIPSCore</context-root> <context-root>/VIPSCore</context-root>
......
...@@ -2,19 +2,19 @@ ...@@ -2,19 +2,19 @@
<!-- <!--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
This file is part of VIPSLogic. This file is part of VIPSCore.
VIPSLogic is free software: you can redistribute it and/or modify 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 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 the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License 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"> <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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment