diff options
| author | Tobias Kellner <tobias.kellner@iaik.tugraz.at> | 2015-10-27 20:16:19 +0100 | 
|---|---|---|
| committer | Tobias Kellner <tobias.kellner@iaik.tugraz.at> | 2015-10-28 14:06:01 +0100 | 
| commit | 3b853724c7280db23c4170ed86929b9dd6d3050d (patch) | |
| tree | 214ae4b90821a20b8831c3e30c6527af7a2fd77c | |
| parent | 0ba96b399d70eac60ece03f4e438125736169d5b (diff) | |
| download | mocca-3b853724c7280db23c4170ed86929b9dd6d3050d.tar.gz mocca-3b853724c7280db23c4170ed86929b9dd6d3050d.tar.bz2 mocca-3b853724c7280db23c4170ed86929b9dd6d3050d.zip | |
Documentation update
27 files changed, 110 insertions, 50 deletions
| diff --git a/BKUApplet/src/site/site.xml b/BKUApplet/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/BKUApplet/src/site/site.xml +++ b/BKUApplet/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/BKUAppletExt/src/site/site.xml b/BKUAppletExt/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/BKUAppletExt/src/site/site.xml +++ b/BKUAppletExt/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/BKUCertificates/src/site/site.xml b/BKUCertificates/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/BKUCertificates/src/site/site.xml +++ b/BKUCertificates/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/BKUCommonGUI/src/site/site.xml b/BKUCommonGUI/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/BKUCommonGUI/src/site/site.xml +++ b/BKUCommonGUI/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/BKUFonts/src/site/site.xml b/BKUFonts/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/BKUFonts/src/site/site.xml +++ b/BKUFonts/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/BKUGuiExt/src/site/site.xml b/BKUGuiExt/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/BKUGuiExt/src/site/site.xml +++ b/BKUGuiExt/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/BKUHelp/src/site/site.xml b/BKUHelp/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/BKUHelp/src/site/site.xml +++ b/BKUHelp/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/BKUHelpWebStart/src/site/site.xml b/BKUHelpWebStart/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/BKUHelpWebStart/src/site/site.xml +++ b/BKUHelpWebStart/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/BKULocal/src/site/site.xml b/BKULocal/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/BKULocal/src/site/site.xml +++ b/BKULocal/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/BKUOnline/src/site/site.xml b/BKUOnline/src/site/site.xml index 4fe08dcb..f6fc4cb5 100644 --- a/BKUOnline/src/site/site.xml +++ b/BKUOnline/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -46,4 +46,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/BKUViewer/src/site/site.xml b/BKUViewer/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/BKUViewer/src/site/site.xml +++ b/BKUViewer/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/BKUWebStart/src/site/site.xml b/BKUWebStart/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/BKUWebStart/src/site/site.xml +++ b/BKUWebStart/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/JettyTempCleaner/src/site/apt/index.apt b/JettyTempCleaner/src/site/apt/index.apt new file mode 100644 index 00000000..d60219dc --- /dev/null +++ b/JettyTempCleaner/src/site/apt/index.apt @@ -0,0 +1,12 @@ +	--- +	About +	--- +	EGIZ +	--- +	2015 +	--- + +Jetty Temp Cleaner + +	This module is used to remove temporary files used by jetty after the execution of MOCCA ended +	under Microsoft Windows, as those files can't be deleted at runtime. diff --git a/JettyTempCleaner/src/site/site.xml b/JettyTempCleaner/src/site/site.xml new file mode 100644 index 00000000..a1191b25 --- /dev/null +++ b/JettyTempCleaner/src/site/site.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +  Copyright 2015 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: +  http://www.osor.eu/eupl/ + +  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. + +  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/mocca2-t_s.png</src> +    <href>http://joinup.ec.europa.eu/site/mocca/</href> +  </bannerLeft> + +  <body> +   +    <menu ref="parent"/> +   +    <menu ref="reports"/> + +  </body> + +</project> diff --git a/STAL/src/site/site.xml b/STAL/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/STAL/src/site/site.xml +++ b/STAL/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/STALExt/src/site/site.xml b/STALExt/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/STALExt/src/site/site.xml +++ b/STALExt/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/STALService/src/site/site.xml b/STALService/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/STALService/src/site/site.xml +++ b/STALService/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/STALXService/src/site/site.xml b/STALXService/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/STALXService/src/site/site.xml +++ b/STALXService/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/bkucommon/src/site/site.xml b/bkucommon/src/site/site.xml index adb86c2f..0b788c79 100644 --- a/bkucommon/src/site/site.xml +++ b/bkucommon/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -43,4 +43,4 @@    </body> -</project>
\ No newline at end of file +</project> @@ -65,8 +65,8 @@    <licenses>      <license>        <name>EUPL v1.1</name> -      <url>http://joinup.ec.europa.eu/software/page/eupl/licence-eupl</url> -      <distribution>manually</distribution> +      <url>https://joinup.ec.europa.eu/sites/default/files/ckeditor_files/files/eupl%20v%20%201%201%20-%20EN.txt.txt</url> +      <distribution>manual</distribution>      </license>    </licenses>    <build> @@ -204,6 +204,13 @@          </plugin>        </plugins>      </pluginManagement> +    <extensions> +      <extension> +        <groupId>org.apache.maven.wagon</groupId> +        <artifactId>wagon-webdav-jackrabbit</artifactId> +        <version>2.10</version> +      </extension> +    </extensions>    </build>    <repositories>      <repository> @@ -454,7 +461,7 @@    </dependencyManagement>    <distributionManagement>      <site> -      <id>project</id> +      <id>mocca-site-joinup</id>        <url>dav:https://joinup.ec.europa.eu/webdav/mocca/www</url>      </site>      <snapshotRepository> diff --git a/smcc/src/site/site.xml b/smcc/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/smcc/src/site/site.xml +++ b/smcc/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/smccSTAL/src/site/site.xml b/smccSTAL/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/smccSTAL/src/site/site.xml +++ b/smccSTAL/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/smccSTALExt/src/site/site.xml b/smccSTALExt/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/smccSTALExt/src/site/site.xml +++ b/smccSTALExt/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index 0abb3922..6dde03db 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -33,7 +33,7 @@ Releases  Licensing -	Since version 1.3.6, the MOCCA project as provided by {{{http://www.egiz.gv.at}EGIZ}} is licensed according to the terms of the {{{http://osor.eu/eupl}EUPL v1.1}}. +	Since version 1.3.6, the MOCCA project as provided by {{{http://www.egiz.gv.at}EGIZ}} is licensed according to the terms of the {{{https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11}EUPL v1.1}}.  	Up to and including version 1.3.6 of this product were published under an {{{http://www.apache.org/licenses/LICENSE-2.0.html}Apache License 2.0}}. diff --git a/src/site/resources/images/mocca2-t_s.png b/src/site/resources/images/mocca2-t_s.pngBinary files differ new file mode 100644 index 00000000..2c272efb --- /dev/null +++ b/src/site/resources/images/mocca2-t_s.png diff --git a/src/site/site.xml b/src/site/site.xml index 41bcdcd7..a06896a3 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>/images/mocca-t_s.png</src> +    <src>/images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -44,11 +44,10 @@      <menu name="MOCCA" inherit="true">        <item name="About" href="index.html"/> -      <item name="News" href="http://joinup.ec.europa.eu/software/mocca/newsandblog/all"/> +      <item name="News" href="https://joinup.ec.europa.eu/software/mocca/communications/all"/>        <item name="Download" href="download.html"/> -      <item name="Source" href="https://joinup.ec.europa.eu/svn/mocca"/> +      <item name="Source" href="http://git.egiz.gv.at/mocca/"/>        <item name="Wiki" href="http://joinup.ec.europa.eu/software/mocca/wiki/mocca-wiki"/> -      <item name="Tracker" href="http://jira.egovlabs.gv.at/browse/MOCCA"/>        <item name="What's new in 1.3?" href="new.html"/>      </menu> diff --git a/utils/src/site/site.xml b/utils/src/site/site.xml index 32fed3d4..d9028267 100644 --- a/utils/src/site/site.xml +++ b/utils/src/site/site.xml @@ -27,7 +27,7 @@    <publishDate position="right"/>    <bannerLeft>      <name>MOCCA</name> -    <src>../images/mocca-t_s.png</src> +    <src>../images/mocca2-t_s.png</src>      <href>http://joinup.ec.europa.eu/site/mocca/</href>    </bannerLeft> @@ -39,4 +39,4 @@    </body> -</project>
\ No newline at end of file +</project> | 
