diff options
authortkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2011-09-02 16:01:13 +0000
committertkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2011-09-02 16:01:13 +0000
commit7b127caba3ddc39a5a70628c831953bb870f4b52 (patch)
parent2bcabdd8e2f5e70b32145353e98dd83e527685fe (diff)
website updates
git-svn-id: 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
4 files changed, 51 insertions, 6 deletions
diff --git a/BKUHelpWebStart/src/site/site.xml b/BKUHelpWebStart/src/site/site.xml
new file mode 100644
index 00000000..020a04d5
--- /dev/null
+++ b/BKUHelpWebStart/src/site/site.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ 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 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:
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the Licence is distributed on an "AS IS" basis,
+ 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.
+<project name="MOCCA">
+ <publishDate position="right"/>
+ <bannerLeft>
+ <name>MOCCA</name>
+ <src>../images/mocca-t_s.png</src>
+ <href></href>
+ </bannerLeft>
+ <body>
+ <menu ref="parent"/>
+ <menu ref="reports"/>
+ </body>
+</project> \ No newline at end of file
diff --git a/pom.xml b/pom.xml
index fe48d7e5..9b781e41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,8 @@
- <name>Apache 2</name>
- <url>LICENSE.txt</url>
+ <name>EUPL v1.1</name>
+ <url></url>
diff --git a/src/site/apt/download.apt b/src/site/apt/download.apt
index c6a985bc..0f301531 100644
--- a/src/site/apt/download.apt
+++ b/src/site/apt/download.apt
@@ -10,7 +10,7 @@ Download MOCCA
* <<MOCCA Local>>
- Current stable releases are 1.2.x.
+ Current stable releases are 1.3.x.
<<To install please go to {{}}>>!
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 835fccc2..0abb3922 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -33,8 +33,11 @@ Releases
- The MOCCA project as provided by {{{}EGIZ}} is licensed according to the terms of the {{{}Apache License 2.0}}.
+ Since version 1.3.6, the MOCCA project as provided by {{{}EGIZ}} is licensed according to the terms of the {{{}EUPL v1.1}}.
- MOCCA also requires software provided by third parties. Most of this software is free and open source. Some required software is licensed under a commercial license. This includes software provided by {{{}Stiftung Secure Information and Communication Technologies (SIC)}}, which however grants a free-of-charge license for the use of their software together with the unchanged software provided by the MOCCA project.
+ Up to and including version 1.3.6 of this product were published under an {{{}Apache License 2.0}}.
+ This product includes software developed by third parties and provided under an {{{}open source license}}.
+ This product includes software provided by {{{}Stiftung Secure Information and Communication Technologies (SIC)}}
- {{{}Stiftung Secure Information and Communication Technologies (SIC)}} also offers a free-of-charge {{{}license for open source projects}} which are released under {{{}GPL Version 2.0}}. This allows open source projects to change or extend software developed by the MOCCA project and obtain a free-of-charge license for software required by MOCCA, as long as such projects are released under GPL Version 2.0. The licensee is responsible for obtaining any required licenses. \ No newline at end of file