From a7635f5b1314a0df5342943d525dff68f4f3fb7b Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 6 May 2010 18:12:14 +0000
Subject: Update project sites.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@728 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 src/main/site/apt/index.apt             | 104 --------------------------------
 src/main/site/apt/notes.apt             |   4 --
 src/main/site/site.xml                  |  30 ---------
 src/site/apt/example.apt                |  91 ++++++++++++++++++++++++++++
 src/site/apt/index.apt                  |  56 +++++++++++++++++
 src/site/resources/images/mocca-t_s.png | Bin 0 -> 8976 bytes
 src/site/site.xml                       |  52 ++++++++++++++++
 7 files changed, 199 insertions(+), 138 deletions(-)
 delete mode 100644 src/main/site/apt/index.apt
 delete mode 100644 src/main/site/apt/notes.apt
 delete mode 100644 src/main/site/site.xml
 create mode 100644 src/site/apt/example.apt
 create mode 100644 src/site/apt/index.apt
 create mode 100644 src/site/resources/images/mocca-t_s.png
 create mode 100644 src/site/site.xml

(limited to 'src')

diff --git a/src/main/site/apt/index.apt b/src/main/site/apt/index.apt
deleted file mode 100644
index 026d7bb0..00000000
--- a/src/main/site/apt/index.apt
+++ /dev/null
@@ -1,104 +0,0 @@
-            ------
-            MOCCA
-            ------
-            Egiz
-            ------
-             Date
-
-  Paragraph 1, line 1.
-  Paragraph 1, line 2.
-
-  Paragraph 2, line 1.
-  Paragraph 2, line 2.
-
-Section title
-
-* Sub-section title
-
-** Sub-sub-section title
-
-*** Sub-sub-sub-section title
-
-**** Sub-sub-sub-sub-section title
-
-      * List item 1.
-
-      * List item 2.
-
-        Paragraph contained in list item 2.
-
-            * Sub-list item 1.
-
-            * Sub-list item 2.
-
-      * List item 3.
-        Force end of list:
-
-      []
-
-+------------------------------------------+
-Verbatim text not contained in list item 3
-+------------------------------------------+
-
-      [[1]] Numbered item 1.
-
-                [[A]] Numbered item A.
-
-                [[B]] Numbered item B.
-
-      [[2]] Numbered item 2.
-
-  List numbering schemes: [[1]], [[a]], [[A]], [[i]], [[I]].
-
-      [Defined term 1] of definition list.
-
-      [Defined term 2] of definition list.
-
-+-------------------------------+
-Verbatim text
-                        in a box
-+-------------------------------+
-
-  --- instead of +-- suppresses the box around verbatim text.
-
-[Figure name] Figure caption
-
-*----------*--------------+----------------:
-| Centered | Left-aligned | Right-aligned  |
-| cell 1,1 | cell 1,2     | cell 1,3       |
-*----------*--------------+----------------:
-| cell 2,1 | cell 2,2     | cell 2,3       |
-*----------*--------------+----------------:
-Table caption
-
-  No grid, no caption:
-
-*-----*------*
- cell | cell
-*-----*------*
- cell | cell
-*-----*------*
-
-  Horizontal line:
-
-=======================================================================
-
-^L
-  New page.
-
-  <Italic> font. <<Bold>> font. <<<Monospaced>>> font.
-
-  {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}.
-  Link to {{{anchor}showing alternate text}}.
-  Link to {{{http://www.pixware.fr}Pixware home page}}.
-
-  Force line\
-  break.
-
-  Non\ breaking\ space.
-
-  Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\.
-
-  Copyright symbol: \251, \xA9, \u00a9.
-
-~~Commented out.
\ No newline at end of file
diff --git a/src/main/site/apt/notes.apt b/src/main/site/apt/notes.apt
deleted file mode 100644
index f224de43..00000000
--- a/src/main/site/apt/notes.apt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-  make include-webstart profile active via settings.xml,
-  otherwise reactor fails to calculate the correct build
-  order (BKUWebStart prior to BKUOnline)
\ No newline at end of file
diff --git a/src/main/site/site.xml b/src/main/site/site.xml
deleted file mode 100644
index f72f52bf..00000000
--- a/src/main/site/site.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="MOCCA">
-  <publishDate position="right"/>
-  <bannerLeft>
-    <name>MOCCA</name>
-    <src>http://mocca.egovlabs.gv.at/mocca-t_s.png</src>
-    <href>http://mocca.egovlabs.gv.at/</href>
-  </bannerLeft>
-
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Maven 1.x" href="http://maven.apache.org/maven-1.x/"/>
-      <item name="Maven 2" href="http://maven.apache.org/"/>
-    </links>
-
-    <menu name="MOCCA">
-      <item name="Introduction" href="index.html"/>
-      <item name="Download" href="download.html"/>
-      <item name="Release Notes" href="release-notes.html" />
-      <item name="General Information" href="about.html"/>
-      <item name="Road Map" href="roadmap.html" />
-    </menu>
-
-    <menu ref="reports"/>
-
-  </body>
-
-</project>
\ No newline at end of file
diff --git a/src/site/apt/example.apt b/src/site/apt/example.apt
new file mode 100644
index 00000000..556e399c
--- /dev/null
+++ b/src/site/apt/example.apt
@@ -0,0 +1,91 @@
+Section title
+
+* Sub-section title
+
+** Sub-sub-section title
+
+*** Sub-sub-sub-section title
+
+**** Sub-sub-sub-sub-section title
+
+      * List item 1.
+
+      * List item 2.
+
+        Paragraph contained in list item 2.
+
+            * Sub-list item 1.
+
+            * Sub-list item 2.
+
+      * List item 3.
+        Force end of list:
+
+      []
+
++------------------------------------------+
+Verbatim text not contained in list item 3
++------------------------------------------+
+
+      [[1]] Numbered item 1.
+
+                [[A]] Numbered item A.
+
+                [[B]] Numbered item B.
+
+      [[2]] Numbered item 2.
+
+  List numbering schemes: [[1]], [[a]], [[A]], [[i]], [[I]].
+
+      [Defined term 1] of definition list.
+
+      [Defined term 2] of definition list.
+
++-------------------------------+
+Verbatim text
+                        in a box
++-------------------------------+
+
+  --- instead of +-- suppresses the box around verbatim text.
+
+[Figure name] Figure caption
+
+*----------*--------------+----------------:
+| Centered | Left-aligned | Right-aligned  |
+| cell 1,1 | cell 1,2     | cell 1,3       |
+*----------*--------------+----------------:
+| cell 2,1 | cell 2,2     | cell 2,3       |
+*----------*--------------+----------------:
+Table caption
+
+  No grid, no caption:
+
+*-----*------*
+ cell | cell
+*-----*------*
+ cell | cell
+*-----*------*
+
+  Horizontal line:
+
+=======================================================================
+
+^L
+  New page.
+
+  <Italic> font. <<Bold>> font. <<<Monospaced>>> font.
+
+  {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}.
+  Link to {{{anchor}showing alternate text}}.
+  Link to {{{http://www.pixware.fr}Pixware home page}}.
+
+  Force line\
+  break.
+
+  Non\ breaking\ space.
+
+  Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\.
+
+  Copyright symbol: \251, \xA9, \u00a9.
+
+~~Commented out.
\ No newline at end of file
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
new file mode 100644
index 00000000..c0d7ed95
--- /dev/null
+++ b/src/site/apt/index.apt
@@ -0,0 +1,56 @@
+	---
+	Introduction
+	---
+	EGIZ
+	---
+	2010
+	---
+
+
+MOCCA Project
+
+	The MOCCA project has been initiated by {{{http://www.egiz.gv.at}EGIZ}} as a joint initiative of {{{http://www.bka.gv.at/}Federal Chancellery Austria}} and {{{http://www.tugraz.at}Graz University of Technology}} to develop a modular, open source {{{http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/Index.en.html}citizen card environment}}.
+
+	Currently two quite different implementations of a citizen card environment in Java are provided:
+    
+	* <<MOCCA Local>>
+    
+	MOCCA Local (aka <BKULocal>) is the "classic" implementation of a citizen card environment <to be installed as local application on the user's PC>. MOCCA Local runs as a service in the background and listens on TCP ports 3495 and 3496 for {{{http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/core/Core.en.html}Security Layer Requests}}. The {{{http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/bindings/Bindings.en.html#http}HTTP binding}} allows the functions of the user's citizen card to be accessed by local applications as well as by web-applications via the user's web browser.
+
+	MOCCA Local is provided as Java Web Start application via {{http://webstart.buergerkarte.at}}.
+    
+	* <<MOCCA Online>>
+
+	MOCCA Online (aka <BKUOnline>) provides a new approach that overcomes the need to install dedicated software on the user's PC. MOCCA Online  is <to be installed as online service> (usually together with a citizen card enabled web application) by a service provider. It offers the same interfaces and protocol bindings for integration with applications via the user's browser as MOCCA Local. Access to the user's citizen card and user interaction is performed via a Java Applet. Therefore, a user only needs a properly installed (PC/SC supported) card reader and a recent version of the Java browser plug-in to be able to use a citizen card with MOCCA Online.  
+	
+	[]
+
+	Both implementations build upon a common set of modules which are also provided by the MOCCA project and offer citizen card related functionality.
+
+Releases
+
+	Current stable versions are 1.2.x. Releases can be found in the {{{http://egovlabs.gv.at/frs/?group_id=13}download}} section.
+
+	NOTE: For <<installation of MOCCA Local>> please go to <<{{http://webstart.buergerkarte.at}}>>!
+
+Development
+
+	The current development version of MOCCA is 1.3.
+
+* Whats new in 1.3?
+
+	* Some parts of MOCCA needed to be redesigned to allow for a better integration with other software deployed within the same servlet container.
+
+	It is now possible to deploy multiple instances of MOCCA within the same servlet container. It should also be possible to deploy MOCCA together with most other software within a single servlet container.
+
+	* Configuration has been redesigned and is now based on {{{http://commons.apache.org/configuration/}commons-configuration}}.
+
+	
+ 
+Licensing
+
+	The MOCCA project as provided by {{{http://www.egiz.gv.at}EGIZ}} is licensed according to the terms of the {{{http://www.apache.org/licenses/LICENSE-2.0.html}Apache License 2.0}}.
+
+	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 {{{http://www.sic.st/}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.
+
+	{{{http://www.sic.st/}Stiftung Secure Information and Communication Technologies (SIC)}} also offers a free-of-charge {{{http://jce.iaik.tugraz.at/sic/Sales/Licences/License-for-Open-Source-Projects}license for open source projects}} which are released under {{{http://www.fsf.org/licenses/gpl.html}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
diff --git a/src/site/resources/images/mocca-t_s.png b/src/site/resources/images/mocca-t_s.png
new file mode 100644
index 00000000..bbf27a66
Binary files /dev/null and b/src/site/resources/images/mocca-t_s.png differ
diff --git a/src/site/site.xml b/src/site/site.xml
new file mode 100644
index 00000000..e43bec96
--- /dev/null
+++ b/src/site/site.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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
+
+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.
+-->
+
+<project name="MOCCA">
+  <publishDate position="right"/>
+  <bannerLeft>
+    <name>MOCCA</name>
+    <src>/images/mocca-t_s.png</src>
+    <href>http://mocca.egovlabs.gv.at/</href>
+  </bannerLeft>
+
+  <body>
+    <links>
+      <item name="Austrian Citizen Card" href="http://www.buergerkarte.at"/>
+      <item name="EGIZ" href="http://www.egiz.gv.at" />
+      <item name="Federal Chancellery" href="http://www.bka.gv.at/"/>
+      <item name="Graz University of Technology" href="http://www.tugraz.at"/>
+    </links>
+
+    <menu name="MOCCA" inherit="true">
+      <item name="About" href="index.html"/>
+      <item name="News" href="http://egovlabs.gv.at/news/?group_id=13"/>
+      <item name="Download" href="http://egovlabs.gv.at/frs/?group_id=13"/>
+      <item name="Source" href="http://egovlabs.gv.at/scm/?group_id=13"/>
+      <item name="Wiki" href="http://egovlabs.gv.at/plugins/wiki/index.php?id=13&amp;type=g"/>
+    </menu>
+    
+    <menu ref="reports"/>
+
+    <menu ref="modules"/>
+
+  </body>
+
+</project>
\ No newline at end of file
-- 
cgit v1.2.3