diff --git a/LICENSE.txt b/LICENSE.txt
index 3842e75efc359fffa9a2f67dde69a7e93a94df28..51aa7afaf65b774672b388bca032f7785c2872e7 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -176,7 +176,7 @@
END OF TERMS AND CONDITIONS
- Copyright 2015 Teetime (http://teetime.sourceforge.net)
+ Copyright 2015 TeeTime (http://teetime.sourceforge.net)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/doc/images/carousel_analysis.xcf b/doc/images/carousel_analysis.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..c2817cbf68e0334d64dc9f44bb58c559977a893f
Binary files /dev/null and b/doc/images/carousel_analysis.xcf differ
diff --git a/doc/images/carousel_stages.xcf b/doc/images/carousel_stages.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..d052fba9542fed6ec117e9dc3111df8154f19baa
Binary files /dev/null and b/doc/images/carousel_stages.xcf differ
diff --git a/doc/images/carousel_threads.xcf b/doc/images/carousel_threads.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..b9faa4619d50a911c2e8f94efd9388ee955ac9ad
Binary files /dev/null and b/doc/images/carousel_threads.xcf differ
diff --git a/pom.xml b/pom.xml
index 6d1f8cbdfb459ccf96d1af8f5600501f6556849b..8431ad151856c5519c076e377d03fa809599bd23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
<licenses>
<license>
<name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <url>http://teetime.sourceforge.net/LICENSE.txt</url>
</license>
</licenses>
@@ -260,8 +260,8 @@
<!-- for using markdown syntax -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.3</version>
+ <artifactId>doxia-module-markdown-teetime</artifactId>
+ <version>1.6</version>
</dependency>
<!-- add support for ssh/scp -->
<dependency>
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
deleted file mode 100644
index d27c88e4e1a568d9f247199c5d48350ebc0264df..0000000000000000000000000000000000000000
--- a/src/site/fml/faq.fml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faqs xmlns="http://maven.apache.org/FML/1.0.1"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
- title="Frequently Asked Questions"
- toplink="false">
-
- <part id="general">
- <title>General</title>
-
- <faq id="whats-foo">
- <question>
- What is Foo?
- </question>
- <answer>
- <p>some markup goes here</p>
-
- <source>some source code</source>
-
- <p>some markup goes here</p>
- </answer>
- </faq>
-
- <faq id="whats-bar">
- <question>
- What is Bar?
- </question>
- <answer>
- <p>some markup goes here</p>
- </answer>
- </faq>
- </part>
-
- <part id="install">
-
- <title>Installation</title>
-
- <faq id="how-install">
- <question>
- How do I install Foo?
- </question>
- <answer>
- <p>some markup goes here</p>
- </answer>
- </faq>
-
- </part>
-
-</faqs>
\ No newline at end of file
diff --git a/src/site/markdown/contribute.md b/src/site/markdown/contribute.markdown
similarity index 100%
rename from src/site/markdown/contribute.md
rename to src/site/markdown/contribute.markdown
diff --git a/src/site/markdown/download.md b/src/site/markdown/download.markdown
similarity index 89%
rename from src/site/markdown/download.md
rename to src/site/markdown/download.markdown
index 9a5faccc088a7da63f35d5dce78e01fe1681c5ae..8534053ac7cbfa7435488b58f7ace553a7dafcbe 100644
--- a/src/site/markdown/download.md
+++ b/src/site/markdown/download.markdown
@@ -16,7 +16,7 @@ If you use Maven, simply add following lines to your ``pom.xml``:
<dependency>
<groupId>net.sourceforge.teetime</groupId>
<artifactId>teetime</artifactId>
- <version>1.0</version>
+ <version>${teetime.stableversion}</version>
</dependency>
```
@@ -25,7 +25,7 @@ Please make sure, your project management tool uses Maven's central repository.
#### Binaries and sources
-The latest TeeTime release can be downloaded directly from [Sourceforge](https://sourceforge.net/projects/teetime/files/latest/download). If you also want to download the source and/or JavaDoc, you can also get a summary of available files on [Sourceforge](https://sourceforge.net/projects/teetime/files/). Alternatively, all files are accessible [directly from Maven's central repository](http://repo1.maven.org/maven2/net/sourceforge/teetime/teetime/).
+The latest TeeTime release can be downloaded directly from [Sourceforge](https://sourceforge.net/projects/teetime/files/latest/download). If you also want to download the source and/or JavaDoc, you can also get a summary of available files on [Sourceforge](https://sourceforge.net/projects/teetime/files/).
## Snapshot
@@ -43,7 +43,7 @@ To download these builds, add following lines to your project's ``pom.xml``:
<dependency>
<groupId>net.sourceforge.teetime</groupId>
<artifactId>teetime</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${teetime.snapshotversion}</version>
</dependency>
```
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.markdown
similarity index 76%
rename from src/site/markdown/index.md
rename to src/site/markdown/index.markdown
index 35878922cdbc47dbaae5b9bf67d0b06065763cc2..1dba3232508d69c81c617251b58160276ecbadbe 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.markdown
@@ -1,18 +1,18 @@
#### TeeTime
-
+
-Implement your analysis or filters in a new, easy and fast way.
+Implement your analysis or filters in a new, easy, and fast way.
-#### Simple & Fast
+#### Automatic Thread Management
-
+
-The main focus is on fast execution and easy usage.
+Data exchange between stages is automatically synchronized on demand.
#### Start today
-
+
Predefined stages are provided within the source code. You can immediatly start to write your own analysis.
@@ -21,7 +21,6 @@ Predefined stages are provided within the source code. You can immediatly start
## What is it?
-<!---  TeeTime Logo -->
TeeTime is a Pipes-And-Filters-Framework for Java.
It provides various features, which will bring you to the next level of analysis programming, such as:
@@ -42,11 +41,10 @@ You can get TeeTime through various ways. If your projects uses Maven, just add
<dependency>
<groupId>net.sourceforge.teetime</groupId>
<artifactId>teetime</artifactId>
- <version>1.0</version>
+ <version>${teetime.stableversion}</version>
</dependency>
```
-
To get the source code or the plain jar, take a look at the [download](download.html) section.
## How to use it?
diff --git a/src/site/markdown/news.markdown b/src/site/markdown/news.markdown
new file mode 100644
index 0000000000000000000000000000000000000000..f9d744f104370f6cb1393112676cb3bbc6cc7a21
--- /dev/null
+++ b/src/site/markdown/news.markdown
@@ -0,0 +1,5 @@
+# News
+
+### Release 1.0 - 19.12.2014
+
+As from today, TeeTime is available as a stable release. It can be downloaded from the [download section](download.html).
\ No newline at end of file
diff --git a/src/site/markdown/wiki b/src/site/markdown/wiki
index cdfd44ee829e7bba079ee71983e5711a4e6cb259..a93581905ef7b0584d52eae1898148ffa6201a31 160000
--- a/src/site/markdown/wiki
+++ b/src/site/markdown/wiki
@@ -1 +1 @@
-Subproject commit cdfd44ee829e7bba079ee71983e5711a4e6cb259
+Subproject commit a93581905ef7b0584d52eae1898148ffa6201a31
diff --git a/src/site/resources/LICENSE.txt b/src/site/resources/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..51aa7afaf65b774672b388bca032f7785c2872e7
--- /dev/null
+++ b/src/site/resources/LICENSE.txt
@@ -0,0 +1,191 @@
+
+ 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
+
+ Copyright 2015 TeeTime (http://teetime.sourceforge.net)
+
+ 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/src/site/resources/images/bg_gross.png b/src/site/resources/images/bg_gross.png
new file mode 100644
index 0000000000000000000000000000000000000000..06574acb114d260fbf7a1747fbe1a9edc56504a3
Binary files /dev/null and b/src/site/resources/images/bg_gross.png differ
diff --git a/src/site/resources/images/carousel1.png b/src/site/resources/images/carousel1.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ee0e0e364ac5fd3156ffe8a18d70ecb190e3397
Binary files /dev/null and b/src/site/resources/images/carousel1.png differ
diff --git a/src/site/resources/images/carousel2.png b/src/site/resources/images/carousel2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b7edfa3b4ac8d823bad84db9f05ab3716bf9bcf
Binary files /dev/null and b/src/site/resources/images/carousel2.png differ
diff --git a/src/site/resources/images/carousel3.png b/src/site/resources/images/carousel3.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e02fde75d42d22767ff67007881cf91716a93bd
Binary files /dev/null and b/src/site/resources/images/carousel3.png differ
diff --git a/src/site/resources/images/teetime.svg b/src/site/resources/images/teetime.svg
deleted file mode 100644
index f813d90ce52d8239ceb3e35abdffff17a7c74f98..0000000000000000000000000000000000000000
--- a/src/site/resources/images/teetime.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- version="1.1"
- width="217.95876"
- height="59.462502"
- id="svg2"
- xml:space="preserve"><metadata
- id="metadata8"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
- id="defs6" /><g
- transform="matrix(1.25,0,0,-1.25,-337.7625,408.2075)"
- id="g10"><text
- transform="matrix(1,0,0,-1,296.8051,284.4477)"
- id="text12"><tspan
- x="0 19.920059 39.840118 59.260681 68.371559 100.2956"
- y="0"
- id="tspan14"
- style="font-size:39.95999908px;font-variant:normal;font-weight:normal;font-stretch:normal;writing-mode:lr-tb;fill:#3e3e3e;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Calibri;-inkscape-font-specification:Calibri">eeTime</tspan></text>
-<text
- transform="matrix(1,0,0,-1,274.8372,284.4074)"
- id="text16"><tspan
- x="0"
- y="0"
- id="tspan18"
- style="font-size:60px;font-variant:normal;font-weight:normal;font-stretch:normal;writing-mode:lr-tb;fill:#3e3e3e;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Calibri;-inkscape-font-specification:Calibri">T</tspan></text>
-<text
- transform="matrix(1,0,0,-1,421.0963,282.5633)"
- id="text20"><tspan
- x="0"
- y="0"
- id="tspan22"
- style="font-size:39.95999908px;font-variant:normal;font-weight:normal;font-stretch:normal;writing-mode:lr-tb;fill:#3e3e3e;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Calibri;-inkscape-font-specification:Calibri">≡</tspan></text>
-</g></svg>
\ No newline at end of file
diff --git a/src/site/resources/wiki/.htaccess b/src/site/resources/wiki/.htaccess
index 74959ccfe1d4fbefec3900a270ef0e2e2846b5d4..4f7a733dfde9146dca239af64e03c687587176b4 100644
--- a/src/site/resources/wiki/.htaccess
+++ b/src/site/resources/wiki/.htaccess
@@ -1,2 +1,2 @@
Options MultiViews
-DirectoryIndex home.html
\ No newline at end of file
+DirectoryIndex home.html
diff --git a/src/site/site.xml b/src/site/site.xml
index 002468b42fdef6b00e1675a6cc6ff0e3f0610d46..0dacc58e779000124355f1717b9b8f89367fb6c4 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -47,9 +47,9 @@
</head>
<links>
+ <item name="News" href="news.html" />
<item name="Download" href="download.html" />
- <item name="Wiki"
- href="https://build.se.informatik.uni-kiel.de/gitlab/chw/teetime/wikis/home" />
+ <item name="Wiki" href="wiki/" />
</links>
<menu name="Documentation">
<item name="JavaDoc" href="apidocs/index.html" />
@@ -65,6 +65,7 @@
</menu>
<menu name="Main">
<item name="Home" href="index.html" />
+ <item name="News" href="news.html" />
<item name="Download" href="download.html" />
<item name="Wiki"
href="https://build.se.informatik.uni-kiel.de/gitlab/chw/teetime/wikis/home" />
@@ -74,10 +75,10 @@
<!-- <menu ref="reports"/> -->
</body>
<publishDate position="navigation-bottom" />
- <version position="navigation-bottom" />
+ <version position="none" />
<custom>
<reflowSkin>
- <topNav>Download|Wiki|Documentation|Get Involved</topNav>
+ <topNav>News|Download|Wiki|Documentation|Get Involved</topNav>
<!-- <toc>sidebar</toc> -->
<!-- <tocTopMax>4</tocTopMax> -->
<absoluteResourceURL>http://teetime.sourceforge.net
@@ -103,9 +104,11 @@
<column>Get Involved</column>
</bottomNav>
<bottomDescription>
- TeeTime is a Pipes-And-Filters-Framework for Java.
- It provides a simple way
- of analysis tooling.
+ <![CDATA[
+ <a href="https://sourceforge.net/p/teetime/" rel="nofollow"><img alt="Download TeeTime" src="https://sourceforge.net/sflogo.php?type=11&group_id=2244303"></a>
+ <br />
+ <a href="http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22net.sourceforge.teetime%22%20AND%20a%3A%22teetime%22"><img alt="Maven Central Repository" src="https://img.shields.io/maven-central/v/net.sourceforge.teetime/teetime.svg?style=flat-square"></a>
+ ]]>
</bottomDescription>
<pages>
<index>