diff --git a/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java b/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java index 676796fb31da44974e14d05dddb0acf854a94b85..6c96d4ff2f570ee18f662c5501b5b30a510b4f1e 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 96a124756d0eedb53468bda1d1fa2312cce887ec..a5722e0dc316b9dd24ef4339a32924d5a8686b39 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 e58f8d1a85f659e86abd965d2bd29ab9a3423e4c..e998967b9637534d7fd3016b46c4b4f9071a4b07 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 7e471efb7c530e3d61a27e9843675fd872148aa3..6e2f1b0187ebf58693f698e9f20732fb67761fbf 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 9abb8ea2d49ac928a64c7e5530f307645deec051..f5c1fa6249d6ce07de774d7f6a6b9032fbf24b29 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 d13857aacc0538048501806a0faaa98b629bff49..265864121ff825067561e160d49fe11eed3eaea8 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 349b66764f5b16b7154d3bfe514945602d93ed40..7c582a2322175d6d5c6a2117ccd8a9af41716cb0 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 306f208ced62b11f0c26885a7fdb2c362ceda394..908fdd48f3438bf5223af291151ce1f143bd1503 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 88eaa424655aefc47984332cd0bddf9f16bd1123..23a3d638fe8e89c21b14e8725f529eb7f86a4798 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 4472ec9f3cc20fdb1310f59655bf45daf9907a65..ad49f8b5f59d69a8b70270682109100c9713b91a 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 192c0a42fb0b2de166b9a875c8daf7d90a2ab77c..b279480a3c10d909014ea164f5a27490ab42f464 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 77ef0c844c243d066f78784e4dfab5a50a3abcf5..c7d030b6a2ca270a3c459c95d8ca5cb77d19fca0 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 01b490f05e2377be59fbd044cd90f66c149a53a3..add606b790bc41e0882b3882d6d07a8589eca47a 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 09a069532a1dd2ee82036a6dbe076a4a55fd0c5d..dc1d6df29a2ccd744ef2b47506ac71fc04e58591 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 583e6fdf1f8274bdb0b5db2a83f617bea1aafe79..b604e60830ac38ed6ac58e75083b37d74f6b6340 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>