License change

copyright headers changed/added
License text added
NOTICE modified


git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@940 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

2 files changed, 34 insertions, 22 deletions

diff --git a/BKUOnline/src/main/policy/50mocca.policy b/BKUOnline/src/main/policy/50mocca.policy
index 1101161c..03875a22 100644
--- a/BKUOnline/src/main/policy/50mocca.policy
+++ b/BKUOnline/src/main/policy/50mocca.policy
@@ -1,17 +1,23 @@
-//  Copyright 2008 Federal Chancellery Austria and
-//  Graz University of Technology
+// Copyright 2011 by Graz University of Technology, Austria
+// MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint
+// initiative of the Federal Chancellery Austria and Graz University of Technology.
 //
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
+// Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+// the European Commission - subsequent versions of the EUPL (the "Licence");
+// You may not use this work except in compliance with the Licence.
+// You may obtain a copy of the Licence at:
+// http://www.osor.eu/eupl/
 //
-//      http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the Licence for the specific language governing permissions and
+// limitations under the Licence.
 //
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
+// This product combines work with different licenses. See the "NOTICE" text
+// file for details on the various modules and licenses.
+// The "NOTICE" text file is part of the distribution. Any derivative works
+// that you distribute must include a readable copy of the "NOTICE" text file.
 //
 //
 // =========================================================================
diff --git a/BKUOnline/src/main/policy/catalina.policy b/BKUOnline/src/main/policy/catalina.policy
index 2dfb198f..894cf0cb 100644
--- a/BKUOnline/src/main/policy/catalina.policy
+++ b/BKUOnline/src/main/policy/catalina.policy
@@ -1,17 +1,23 @@
-//  Copyright 2008 Federal Chancellery Austria and
-//  Graz University of Technology
+// Copyright 2011 by Graz University of Technology, Austria
+// MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint
+// initiative of the Federal Chancellery Austria and Graz University of Technology.
 //
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
+// Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+// the European Commission - subsequent versions of the EUPL (the "Licence");
+// You may not use this work except in compliance with the Licence.
+// You may obtain a copy of the Licence at:
+// http://www.osor.eu/eupl/
 //
-//      http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the Licence for the specific language governing permissions and
+// limitations under the Licence.
 //
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
+// This product combines work with different licenses. See the "NOTICE" text
+// file for details on the various modules and licenses.
+// The "NOTICE" text file is part of the distribution. Any derivative works
+// that you distribute must include a readable copy of the "NOTICE" text file.
 //
 //
 // =========================================================================