From 86be044227c0afe30a011e58d1d118986db118dd Mon Sep 17 00:00:00 2001 From: Markus Kroetzsch Date: Fri, 21 Mar 2014 08:51:11 +0100 Subject: [PATCH 01/11] Updated WDTK version to 0.1.0 --- pom.xml | 2 +- wdtk-datamodel/pom.xml | 2 +- wdtk-dumpfiles/pom.xml | 2 +- wdtk-examples/pom.xml | 2 +- wdtk-storage/pom.xml | 2 +- wdtk-testing/pom.xml | 2 +- wdtk-util/pom.xml | 2 +- wdtk-wikibaseapi/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index f5fcac38c..ab6180ccb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.wikidata.wdtk wdtk-parent - 0.0.1 + 0.1.0 pom Wikidata Toolkit diff --git a/wdtk-datamodel/pom.xml b/wdtk-datamodel/pom.xml index 709042d3d..70656999f 100644 --- a/wdtk-datamodel/pom.xml +++ b/wdtk-datamodel/pom.xml @@ -6,7 +6,7 @@ org.wikidata.wdtk wdtk-parent - 0.0.1 + 0.1.0 wdtk-datamodel diff --git a/wdtk-dumpfiles/pom.xml b/wdtk-dumpfiles/pom.xml index c3a8bb4ec..43df73303 100644 --- a/wdtk-dumpfiles/pom.xml +++ b/wdtk-dumpfiles/pom.xml @@ -6,7 +6,7 @@ org.wikidata.wdtk wdtk-parent - 0.0.1 + 0.1.0 wdtk-dumpfiles diff --git a/wdtk-examples/pom.xml b/wdtk-examples/pom.xml index c27b8f3b1..ce8706e0b 100644 --- a/wdtk-examples/pom.xml +++ b/wdtk-examples/pom.xml @@ -6,7 +6,7 @@ org.wikidata.wdtk wdtk-parent - 0.0.1 + 0.1.0 wdtk-examples diff --git a/wdtk-storage/pom.xml b/wdtk-storage/pom.xml index b4ced6f14..bef690fe2 100644 --- a/wdtk-storage/pom.xml +++ b/wdtk-storage/pom.xml @@ -6,7 +6,7 @@ org.wikidata.wdtk wdtk-parent - 0.0.1 + 0.1.0 wdtk-storage diff --git a/wdtk-testing/pom.xml b/wdtk-testing/pom.xml index d052e3a5c..e9ce75d87 100644 --- a/wdtk-testing/pom.xml +++ b/wdtk-testing/pom.xml @@ -6,7 +6,7 @@ org.wikidata.wdtk wdtk-parent - 0.0.1 + 0.1.0 wdtk-testing diff --git a/wdtk-util/pom.xml b/wdtk-util/pom.xml index 5ef444ed5..64da91242 100644 --- a/wdtk-util/pom.xml +++ b/wdtk-util/pom.xml @@ -6,7 +6,7 @@ org.wikidata.wdtk wdtk-parent - 0.0.1 + 0.1.0 wdtk-util diff --git a/wdtk-wikibaseapi/pom.xml b/wdtk-wikibaseapi/pom.xml index d9fa72a88..42b478f6b 100644 --- a/wdtk-wikibaseapi/pom.xml +++ b/wdtk-wikibaseapi/pom.xml @@ -6,7 +6,7 @@ org.wikidata.wdtk wdtk-parent - 0.0.1 + 0.1.0 wdtk-wikibaseapi From dccd3152a322c169dc22074c6e2fc42e9f142f3c Mon Sep 17 00:00:00 2001 From: Markus Kroetzsch Date: Fri, 21 Mar 2014 08:51:31 +0100 Subject: [PATCH 02/11] Release notes --- RELEASE-NOTES.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 RELEASE-NOTES.md diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md new file mode 100644 index 000000000..3bb713b14 --- /dev/null +++ b/RELEASE-NOTES.md @@ -0,0 +1,21 @@ +Wikidata Toolkit Release Notes +============================== + +Version 0.1.0 +------------- + +New features: +* Initial Java implementation of Wikibase datamodel +* Support for downloading Wikimedia dumpfiles +* Support for parsing MediaWiki XML dumps +* Support for parsing Wikibase dump contents to get entity data +* Example Java program shows how to process Wikidata dump files + +Bug fixes: +* not applicable; this is the very first release + +Know issues: +* Entities loaded from dump get wrong base IRI (issue #43) +* URLs for sitelinks are missing (issue #37) + + \ No newline at end of file From 900157142f3d7631f2d26c1d70424b85d56f1309 Mon Sep 17 00:00:00 2001 From: Julian Mendez Date: Tue, 25 Mar 2014 11:48:08 +0100 Subject: [PATCH 03/11] Add module to create a library jar --- pom.xml | 1 + wdtk-distribution/library/LICENSE.txt | 201 ++++++++++++++++++++++++++ wdtk-distribution/library/pom.xml | 55 +++++++ 3 files changed, 257 insertions(+) create mode 100644 wdtk-distribution/library/LICENSE.txt create mode 100644 wdtk-distribution/library/pom.xml diff --git a/pom.xml b/pom.xml index ab6180ccb..8c6267edf 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,7 @@ wdtk-util wdtk-testing wdtk-examples + wdtk-distribution/library diff --git a/wdtk-distribution/library/LICENSE.txt b/wdtk-distribution/library/LICENSE.txt new file mode 100644 index 000000000..261eeb9e9 --- /dev/null +++ b/wdtk-distribution/library/LICENSE.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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 + + 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. diff --git a/wdtk-distribution/library/pom.xml b/wdtk-distribution/library/pom.xml new file mode 100644 index 000000000..4fc7dadfa --- /dev/null +++ b/wdtk-distribution/library/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + + org.wikidata.wdtk + wdtk-parent + 0.1.0 + + + wdtk-library + bundle + + Wikidata Toolkit Library + Module to create the Wikidata Toolkit Library + + + + wdtk-${project.version} + + + + + org.apache.felix + maven-bundle-plugin + 2.3.4 + true + + + org.wikidata.wdtk + wdtk + ${project.version} + WDTK library + Wikidata + https://github.com/Wikidata/Wikidata-Toolkit + ${bundle.classpath} + javax.accessibility, javax.swing, javax.swing.border, org.osgi.framework, org.protege.editor.core.ui.workspace, * + ${mainclass} + + {maven-resources}, {maven-dependencies}, + @../../wdtk-datamodel/target/wdtk-datamodel-${project.version}.jar, + @../../wdtk-dumpfiles/target/wdtk-dumpfiles-${project.version}.jar, + @../../wdtk-storage/target/wdtk-storage-${project.version}.jar, + @../../wdtk-util/target/wdtk-util-${project.version}.jar + + + + + + + + + + From 8601b1785508fc209ce9ab2103eae33332a048d9 Mon Sep 17 00:00:00 2001 From: Julian Mendez Date: Tue, 25 Mar 2014 11:51:07 +0100 Subject: [PATCH 04/11] Remove unnecessary import --- wdtk-distribution/library/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/wdtk-distribution/library/pom.xml b/wdtk-distribution/library/pom.xml index 4fc7dadfa..d4345b659 100644 --- a/wdtk-distribution/library/pom.xml +++ b/wdtk-distribution/library/pom.xml @@ -35,7 +35,6 @@ Wikidata https://github.com/Wikidata/Wikidata-Toolkit ${bundle.classpath} - javax.accessibility, javax.swing, javax.swing.border, org.osgi.framework, org.protege.editor.core.ui.workspace, * ${mainclass} {maven-resources}, {maven-dependencies}, From f96f56c3cde980d06e93f2f0fd0caa736766e72a Mon Sep 17 00:00:00 2001 From: Julian Mendez Date: Tue, 25 Mar 2014 13:10:56 +0100 Subject: [PATCH 05/11] Add profile to sign jars --- wdtk-distribution/library/pom.xml | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/wdtk-distribution/library/pom.xml b/wdtk-distribution/library/pom.xml index d4345b659..3b1890fb4 100644 --- a/wdtk-distribution/library/pom.xml +++ b/wdtk-distribution/library/pom.xml @@ -46,9 +46,32 @@ - + + + sign + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + + + From 0bd5ea4f0a35c75471679f82807fc9cac9f77c41 Mon Sep 17 00:00:00 2001 From: Julian Mendez Date: Tue, 25 Mar 2014 13:41:07 +0100 Subject: [PATCH 06/11] Define relative path of parent POM file --- wdtk-distribution/library/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/wdtk-distribution/library/pom.xml b/wdtk-distribution/library/pom.xml index 3b1890fb4..f2d3990de 100644 --- a/wdtk-distribution/library/pom.xml +++ b/wdtk-distribution/library/pom.xml @@ -7,6 +7,7 @@ org.wikidata.wdtk wdtk-parent 0.1.0 + ../../pom.xml wdtk-library From a0bb51342dec71bbc8da6f6560877d5d5fbda608 Mon Sep 17 00:00:00 2001 From: Julian Mendez Date: Tue, 25 Mar 2014 18:46:43 +0100 Subject: [PATCH 07/11] Make Maven sign all created jars --- pom.xml | 41 ++++++++++++++----- wdtk-distribution/{library => }/LICENSE.txt | 0 wdtk-distribution/{library => }/pom.xml | 45 +++++---------------- 3 files changed, 42 insertions(+), 44 deletions(-) rename wdtk-distribution/{library => }/LICENSE.txt (100%) rename wdtk-distribution/{library => }/pom.xml (51%) diff --git a/pom.xml b/pom.xml index 8c6267edf..5d0330f9d 100644 --- a/pom.xml +++ b/pom.xml @@ -15,11 +15,11 @@ wdtk-datamodel wdtk-dumpfiles wdtk-storage - wdtk-wikibaseapi + wdtk-util wdtk-testing wdtk-examples - wdtk-distribution/library + wdtk-distribution @@ -61,8 +61,8 @@ org.mockito - mockito-core - 1.9.5 + mockito-core + 1.9.5 test @@ -105,8 +105,8 @@ - + org.eclipse.m2e lifecycle-mapping 1.0.0 @@ -139,7 +139,8 @@ license-maven-plugin - + org.apache.maven.plugins maven-compiler-plugin 3.1 @@ -161,7 +162,7 @@ 2.6 xml - + 256m true @@ -169,5 +170,27 @@ - + + + sign + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + + diff --git a/wdtk-distribution/library/LICENSE.txt b/wdtk-distribution/LICENSE.txt similarity index 100% rename from wdtk-distribution/library/LICENSE.txt rename to wdtk-distribution/LICENSE.txt diff --git a/wdtk-distribution/library/pom.xml b/wdtk-distribution/pom.xml similarity index 51% rename from wdtk-distribution/library/pom.xml rename to wdtk-distribution/pom.xml index f2d3990de..1aa8dd5f5 100644 --- a/wdtk-distribution/library/pom.xml +++ b/wdtk-distribution/pom.xml @@ -7,18 +7,17 @@ org.wikidata.wdtk wdtk-parent 0.1.0 - ../../pom.xml - wdtk-library + wdtk-distribution bundle - Wikidata Toolkit Library - Module to create the Wikidata Toolkit Library + Wikidata Toolkit Distribution + Module to create the Wikidata Toolkit Distribution - wdtk-${project.version} + wdtk-distribution-${project.version} @@ -30,19 +29,19 @@ org.wikidata.wdtk - wdtk + wdtk-distribution ${project.version} - WDTK library + Wikidata Toolkit Distribution Wikidata https://github.com/Wikidata/Wikidata-Toolkit ${bundle.classpath} ${mainclass} {maven-resources}, {maven-dependencies}, - @../../wdtk-datamodel/target/wdtk-datamodel-${project.version}.jar, - @../../wdtk-dumpfiles/target/wdtk-dumpfiles-${project.version}.jar, - @../../wdtk-storage/target/wdtk-storage-${project.version}.jar, - @../../wdtk-util/target/wdtk-util-${project.version}.jar + @../wdtk-datamodel/target/wdtk-datamodel-${project.version}.jar, + @../wdtk-dumpfiles/target/wdtk-dumpfiles-${project.version}.jar, + @../wdtk-storage/target/wdtk-storage-${project.version}.jar, + @../wdtk-util/target/wdtk-util-${project.version}.jar @@ -50,29 +49,5 @@ - - - sign - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - - - - From bdbf3f58720bd474cef432cb171b8825a6d71374 Mon Sep 17 00:00:00 2001 From: Julian Mendez Date: Tue, 25 Mar 2014 19:13:30 +0100 Subject: [PATCH 08/11] Add configuration to sign source and javadoc jars --- pom.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pom.xml b/pom.xml index 5d0330f9d..4a3a4fb1e 100644 --- a/pom.xml +++ b/pom.xml @@ -189,6 +189,30 @@ + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + From f4c9b990219fcfd06b478c4d2a9f28e153267e80 Mon Sep 17 00:00:00 2001 From: Julian Mendez Date: Tue, 25 Mar 2014 20:40:45 +0100 Subject: [PATCH 09/11] Add URL and SCM information to parent POM file --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index 4a3a4fb1e..11f12acf6 100644 --- a/pom.xml +++ b/pom.xml @@ -10,6 +10,7 @@ Wikidata Toolkit A Java-based library for working with Wikidata and Wikibase + https://github.com/Wikidata/Wikidata-Toolkit wdtk-datamodel @@ -30,6 +31,7 @@ 2014 + Wikidata Toolkit Developers @@ -170,6 +172,7 @@ + sign @@ -217,4 +220,11 @@ + + + https://github.com/Wikidata/Wikidata-Toolkit.git + scm:git:git://github.com/Wikidata/Wikidata-Toolkit.git + scm:git:git://github.com/Wikidata/Wikidata-Toolkit.git + + From 562912d89d0a674edfdb0e4a8b8dbccccdf48063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kr=C3=B6tzsch?= Date: Wed, 26 Mar 2014 15:07:29 +0100 Subject: [PATCH 10/11] Change project URL to use MediaWiki page --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 11f12acf6..17ece7c79 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ Wikidata Toolkit A Java-based library for working with Wikidata and Wikibase - https://github.com/Wikidata/Wikidata-Toolkit + https://www.mediawiki.org/wiki/Wikidata_Toolkit wdtk-datamodel From e1c371bcef10fad318a53beaddfa534f7419fa47 Mon Sep 17 00:00:00 2001 From: Julian Mendez Date: Wed, 26 Mar 2014 20:14:59 +0100 Subject: [PATCH 11/11] Add developers --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index 17ece7c79..00d171aeb 100644 --- a/pom.xml +++ b/pom.xml @@ -47,6 +47,16 @@ Julian Mendez mendez@tcs.inf.tu-dresden.de + + fer-rum + Fredo Erxleben + fredo.erxleben@tu-dresden.de + + + michael + Michael Günther + guenthermi50@yahoo.de +