From 11aa4426886d68213226ed82c84202b05d773eda Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 19 May 2010 09:18:16 +0000
Subject: Extended documentation.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@739 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 src/site/apt/example.apt | 91 ------------------------------------------------
 src/site/apt/index.apt   | 14 ++------
 src/site/apt/new.apt     | 22 ++++++++++++
 src/site/site.xml        |  2 ++
 4 files changed, 26 insertions(+), 103 deletions(-)
 delete mode 100644 src/site/apt/example.apt
 create mode 100644 src/site/apt/new.apt

(limited to 'src')

diff --git a/src/site/apt/example.apt b/src/site/apt/example.apt
deleted file mode 100644
index 556e399c..00000000
--- a/src/site/apt/example.apt
+++ /dev/null
@@ -1,91 +0,0 @@
-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
index c0d7ed95..3e2179cc 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -19,7 +19,7 @@ MOCCA Project
 
 	MOCCA Local is provided as Java Web Start application via {{http://webstart.buergerkarte.at}}.
     
-	* <<MOCCA Online>>
+	* <<{{{./BKUOnline/}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.  
 	
@@ -35,17 +35,7 @@ Releases
 
 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}}.
-
-	
+	The current development version of MOCCA is 1.3. Take a look at {{{./new.html}What's new in MOCCA 1.3?}}
  
 Licensing
 
diff --git a/src/site/apt/new.apt b/src/site/apt/new.apt
new file mode 100644
index 00000000..62ad851e
--- /dev/null
+++ b/src/site/apt/new.apt
@@ -0,0 +1,22 @@
+	---
+	What's new in MOCCA 1.3?
+	---
+	EGIZ
+	---
+	2010
+	---
+	
+Whats new in MOCCA 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 {{{./BKUOnline}MOCCA Online}} within the same servlet container. Further, it should also be possible to deploy MOCCA Online together with most other software within a single servlet container.
+	
+	(See {{{./BKUOnline/deployment.html}Deployment}}.)
+
+	* Configuration has been redesigned and is now based on {{{http://commons.apache.org/configuration/}commons-configuration}}.
+	
+	(See {{{./bkucommon/configuration.html}Configuration}}.)
+
+	* {{{http://commons.apache.org/logging/}Commons-Logging}} has been replaced by {{{http://www.slf4j.org/}slf4j}} because of it's MDC (mapped diagnostic context) support.
+
diff --git a/src/site/site.xml b/src/site/site.xml
index 4f0ea09d..79196ed9 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -32,6 +32,7 @@ under the License.
   <body>
     <links>
       <item name="Austrian Citizen Card" href="http://www.buergerkarte.at"/>
+      <item name="Digital Austria" href="http://www.digitales.oesterreich.gv.at/site/6497/Default.aspx"/>
       <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"/>
@@ -43,6 +44,7 @@ under the License.
       <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"/>
+      <item name="What's new in 1.3?" href="new.html"/>
     </menu>
     
     <menu ref="reports"/>
-- 
cgit v1.2.3