From 8711ef3311ac6ed0c7fe97674fa651e66524e0a9 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Wed, 15 Oct 2014 15:31:23 +0200
Subject: [PATCH] Changed License to Bioforsk Open Source License
---
src/main/resources/META-INF/persistence.xml | 31 +++++++++++----------
src/main/webapp/WEB-INF/beans.xml | 31 +++++++++++----------
src/main/webapp/WEB-INF/jboss-web.xml | 31 +++++++++++----------
src/main/webapp/WEB-INF/web.xml | 31 +++++++++++----------
4 files changed, 64 insertions(+), 60 deletions(-)
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index ad49f8b..ee23b22 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
- 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.
-
- 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ *
+ * This file is part of VIPSCoreManager.
+ * VIPSCoreManager 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
+ * later version.
+ *
+ * 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
+ * Bioforsk Open Source License for more details.
+ *
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager. If not, see <http://www.bioforsk.no/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 b279480..2e87e5b 100644
--- a/src/main/webapp/WEB-INF/beans.xml
+++ b/src/main/webapp/WEB-INF/beans.xml
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
- 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.
-
- 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ *
+ * This file is part of VIPSCoreManager.
+ * VIPSCoreManager 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
+ * later version.
+ *
+ * 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
+ * Bioforsk Open Source License for more details.
+ *
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager. If not, see <http://www.bioforsk.no/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 c7d030b..ea770aa 100644
--- a/src/main/webapp/WEB-INF/jboss-web.xml
+++ b/src/main/webapp/WEB-INF/jboss-web.xml
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
- 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.
-
- 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ *
+ * This file is part of VIPSCoreManager.
+ * VIPSCoreManager 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
+ * later version.
+ *
+ * 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
+ * Bioforsk Open Source License for more details.
+ *
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager. If not, see <http://www.bioforsk.no/licenses/>.
+ *
-->
<jboss-web>
<context-root>/VIPSCoreManager</context-root>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index b604e60..4b48ad1 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
- 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.
-
- 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 VIPSCoreManager. If not, see <http://www.gnu.org/licenses/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ *
+ * This file is part of VIPSCoreManager.
+ * VIPSCoreManager 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
+ * later version.
+ *
+ * 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
+ * Bioforsk Open Source License for more details.
+ *
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager. If not, see <http://www.bioforsk.no/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