summaryrefslogtreecommitdiff
path: root/BKULocal/src/main/webapp/WEB-INF/web.xml
diff options
context:
space:
mode:
authortkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2011-06-22 14:30:14 +0000
committertkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2011-06-22 14:30:14 +0000
commitea1407ba9756252666e5d67f2397d7cb44ba0232 (patch)
treed3bfd53ed6e8169e9b4888b65b2547df509193ae /BKULocal/src/main/webapp/WEB-INF/web.xml
parentf0245892bcc4a5e4bf639b8fa258c4a39f6316e5 (diff)
downloadmocca-ea1407ba9756252666e5d67f2397d7cb44ba0232.tar.gz
mocca-ea1407ba9756252666e5d67f2397d7cb44ba0232.tar.bz2
mocca-ea1407ba9756252666e5d67f2397d7cb44ba0232.zip
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
Diffstat (limited to 'BKULocal/src/main/webapp/WEB-INF/web.xml')
-rw-r--r--BKULocal/src/main/webapp/WEB-INF/web.xml26
1 files changed, 16 insertions, 10 deletions
diff --git a/BKULocal/src/main/webapp/WEB-INF/web.xml b/BKULocal/src/main/webapp/WEB-INF/web.xml
index b8bc8818..acfb5278 100644
--- a/BKULocal/src/main/webapp/WEB-INF/web.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/web.xml
@@ -1,19 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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
-
- http://www.apache.org/licenses/LICENSE-2.0
+ 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/
Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
+ distributed under the Licence 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.
+ See the Licence for the specific language governing permissions and
+ limitations under the Licence.
+
+ 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.
-->
<web-app id="bkulocal" 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>http-security-layer-request</display-name>