Skip to content

Commit

Permalink
SAMZA-520; update website with TLP changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
nickpan47 authored and Chris Riccomini committed Jan 24, 2015
1 parent a95eabf commit f89d6fc
Show file tree
Hide file tree
Showing 23 changed files with 42 additions and 69 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ notifications:
template:
- "%{repository} (%{branch}:%{commit} by %{author}): %{message} (%{build_url})"
email:
- dev@samza.incubator.apache.org
- [email protected]
1 change: 0 additions & 1 deletion DISCLAIMER

This file was deleted.

2 changes: 1 addition & 1 deletion KEYS
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Developers:
Releases will be signed using one of these keys in this file. This file will
be available with the distributed Apache Samza releases at:

https://dist.apache.org/repos/dist/release/incubator/samza/KEYS
https://dist.apache.org/repos/dist/release/samza/KEYS

********************************************************************************

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## What is Samza?

[Apache Incubator Samza](http://samza.incubator.apache.org/) is a distributed stream processing framework. It uses [Apache Kafka](http://kafka.apache.org) for messaging, and [Apache Hadoop YARN](http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/YARN.html) to provide fault tolerance, processor isolation, security, and resource management.
[Apache Samza](http://samza.apache.org/) is a distributed stream processing framework. It uses [Apache Kafka](http://kafka.apache.org) for messaging, and [Apache Hadoop YARN](http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/YARN.html) to provide fault tolerance, processor isolation, security, and resource management.

Samza's key features include:

Expand All @@ -12,7 +12,7 @@ Samza's key features include:
* **Pluggable:** Though Samza works out of the box with Kafka and YARN, Samza provides a pluggable API that lets you run Samza with other messaging systems and execution environments.
* **Processor isolation:** Samza works with Apache YARN, which supports Hadoop's security model, and resource isolation through Linux CGroups.

Check out [Hello Samza](https://samza.incubator.apache.org/startup/hello-samza/0.7.0/) to try Samza. Read the [Background](https://samza.incubator.apache.org/learn/documentation/0.7.0/introduction/background.html) page to learn more about Samza.
Check out [Hello Samza](https://samza.apache.org/startup/hello-samza/0.8/) to try Samza. Read the [Background](https://samza.apache.org/learn/documentation/0.8/introduction/background.html) page to learn more about Samza.

### Building Samza

Expand Down
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ First, clean any non-checked-in files from git (this removes all such files with

Alternatively, you can make a fresh clone of the repository to a separate directory:

git clone https://git-wip-us.apache.org/repos/asf/incubator-samza.git samza-release
git clone http://git-wip-us.apache.org/repos/asf/samza.git samza-release
cd samza-release

Then build the tarball:
Expand Down
4 changes: 2 additions & 2 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ If you're working with versioned content (anything in the learn or img directori

The local-site-test.sh script must be run every time a change is made to versioned content locally in order to trigger a refresh with Jekyll.

Keep in mind that versioned content in older versions links to samza.incubator.apache.org, not the localhost:4000. This is because they are not updated by your branch and are using the values in SVN instead.
Keep in mind that versioned content in older versions links to samza.apache.org, not the localhost:4000. This is because they are not updated by your branch and are using the values in SVN instead.

To add a new version, change the version number in _config.yml. All links in pages should use {{site.version}}, not hard-coded version number.

Expand All @@ -58,4 +58,4 @@ To build and publish the website to Samza's Apache SVN repository, run:

bin/publish-site.sh "updating welcome page" criccomini

This command will re-build the Javadocs and website, checkout https://svn.apache.org/repos/asf/incubator/samza/site/ locally, copy the site into the directory, and commit the changes.
This command will re-build the Javadocs and website, checkout https://svn.apache.org/repos/asf/samza/site/ locally, copy the site into the directory, and commit the changes.
4 changes: 2 additions & 2 deletions docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ exclude: ['_notes']
redcarpet:
extensions: ['with_toc_data', 'smart']
exclude: [_docs]
baseurl: http://samza.incubator.apache.org
baseurl: http://samza.apache.org
version: latest
# this is the version you will go if you click 'switch version' in "latest" pages.
latest-release: 0.8
latest-release: 0.8
4 changes: 2 additions & 2 deletions docs/_docs/local-site-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ _docs/replace-versioned.sh

echo "downloading SVN..."
SVN_TMP=`mktemp -d /tmp/samza-svn.XXXX`
svn co https://svn.apache.org/repos/asf/incubator/samza/ $SVN_TMP
svn co https://svn.apache.org/repos/asf/samza/ $SVN_TMP
cp -r _site/* $SVN_TMP/site/
cp -r $SVN_TMP/site/* _site
rm -rf $SVN_TMP
rm -rf $SVN_TMP
2 changes: 1 addition & 1 deletion docs/_layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<div class="masthead-icons">
<div class="pull-right">
<a href="/startup/download"><i class="fa fa-arrow-circle-o-down masthead-icon"></i></a>
<a href="https://git-wip-us.apache.org/repos/asf?p=incubator-samza.git;a=tree" target="_blank"><i class="fa fa-code masthead-icon" style="font-weight: bold;"></i></a>
<a href="https://git-wip-us.apache.org/repos/asf?p=samza.git;a=tree" target="_blank"><i class="fa fa-code masthead-icon" style="font-weight: bold;"></i></a>
<a href="https://twitter.com/samzastream" target="_blank"><i class="fa fa-twitter masthead-icon"></i></a>
<!-- this icon only shows in versioned pages -->
{% if page.url contains "versioned" %}
Expand Down
22 changes: 0 additions & 22 deletions docs/community/committers.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,25 +63,3 @@ Committer, and PMC member<br/>
Committer, and PMC member<br/>
<a href="https://www.linkedin.com/pub/chinmay-soman/5/610/35" target="_blank"><i class="fa fa-linkedin committer-icon"></i></a>
<a href="https://twitter.com/ChinmaySoman" target="_blank"><i class="fa fa-twitter committer-icon"></i></a>

### Mentors

**Chris Douglas**<br/>
Apache Member<br/>
<a href="http://www.linkedin.com/pub/chris-douglas/1/33a/733" target="_blank"><i class="fa fa-linkedin committer-icon"></i></a>
<a href="https://twitter.com/chris_douglas" target="_blank"><i class="fa fa-twitter committer-icon"></i></a>

**Jakob Homan**<br/>
Apache Member, Committer, and PMC member<br/>
<a href="http://www.linkedin.com/in/jghoman" target="_blank"><i class="fa fa-linkedin committer-icon"></i></a>
<a href="http://twitter.com/blueboxtraveler" target="_blank"><i class="fa fa-twitter committer-icon"></i></a>

**Arun C Murthy**<br/>
Apache Member<br/>
<a href="http://www.linkedin.com/in/acmurthy" target="_blank"><i class="fa fa-linkedin committer-icon"></i></a>
<a href="https://twitter.com/acmurthy" target="_blank"><i class="fa fa-twitter committer-icon"></i></a>

**Roman Shaposhnik**<br/>
Apache Incubator PMC Member<br/>
<a href="http://www.linkedin.com/in/shaposhnik" target="_blank"><i class="fa fa-linkedin committer-icon"></i></a>
<a href="https://twitter.com/rhatr" target="_blank"><i class="fa fa-twitter committer-icon"></i></a>
6 changes: 3 additions & 3 deletions docs/community/mailing-lists.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ title: Mailing Lists

We have a few mailing lists hosted by Apache:

* **dev@samza.incubator.apache.org** <small>([subscribe](mailto:dev-subscribe@samza.incubator.apache.org), [unsubscribe](mailto:dev-unsubscribe@samza.incubator.apache.org), [archive](http://mail-archives.apache.org/mod_mbox/incubator-samza-dev/))</small><br/>
* **[email protected]** <small>([subscribe](mailto:[email protected]), [unsubscribe](mailto:[email protected]), [archive](http://mail-archives.apache.org/mod_mbox/samza-dev/))</small><br/>
A list for discussion on Samza development. Email here for help.

* **commits@samza.incubator.apache.org** <small>([subscribe](mailto:commits-subscribe@samza.incubator.apache.org), [unsubscribe](mailto:commits-unsubscribe@samza.incubator.apache.org), [archive](http://mail-archives.apache.org/mod_mbox/incubator-samza-commits/))</small><br/>
A list to track Samza commits.
* **[email protected]** <small>([subscribe](mailto:[email protected]), [unsubscribe](mailto:[email protected]), [archive](http://mail-archives.apache.org/mod_mbox/samza-commits/))</small><br/>
A list to track Samza commits.
4 changes: 2 additions & 2 deletions docs/contribute/code.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ title: Code
limitations under the License.
-->

Samza's code is in an Apache Git repository located [here](https://git-wip-us.apache.org/repos/asf?p=incubator-samza.git;a=tree).
Samza's code is in an Apache Git repository located [here](https://git-wip-us.apache.org/repos/asf?p=samza.git;a=tree).

You can check out Samza's code by running:

```
git clone http://git-wip-us.apache.org/repos/asf/incubator-samza.git
git clone http://git-wip-us.apache.org/repos/asf/samza.git
```

Please see the [Rules](rules.html) page for information on how to contribute.
Expand Down
3 changes: 2 additions & 1 deletion docs/contribute/disclaimer.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ title: Disclaimer
limitations under the License.
-->

Apache Samza is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
Apache Samza is an TLP that has been fully endorsed by The Apache Software Foundation (ASF).

2 changes: 1 addition & 1 deletion docs/contribute/tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ On Mac, check-all.sh will default to the appropriate path for each environment v

### Travis CI

[Travis CI](https://travis-ci.org/apache/incubator-samza) has been configured to run Samza's unit tests after every commit to Samza's [master branch](https://git-wip-us.apache.org/repos/asf?p=incubator-samza.git;a=tree). The test results are mailed to the [developer mailing list](/community/mailing-lists.html), and posted in the [IRC channel](/community/irc.html).
[Travis CI](https://travis-ci.org/apache/incubator-samza) has been configured to run Samza's unit tests after every commit to Samza's [master branch](https://git-wip-us.apache.org/repos/asf?p=samza.git;a=tree). The test results are mailed to the [developer mailing list](/community/mailing-lists.html), and posted in the [IRC channel](/community/irc.html).

[![Build Status](https://travis-ci.org/apache/incubator-samza.svg?branch=master)](https://travis-ci.org/apache/incubator-samza)

Expand Down
5 changes: 0 additions & 5 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,3 @@ We are just moving our code to open source. This newly open sourced version has

* We have not yet fully implemented our plans around fault-tolerance semantics.

### Pardon our Dust

Apache Samza is currently undergoing incubation at the [Apache Software Foundation](http://www.apache.org/).

![Apache Incubator Logo](img/apache-egg-logo.png)
8 changes: 4 additions & 4 deletions docs/learn/tutorials/versioned/remote-debugging-samza.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@ Let's use Eclipse to attach a remote debugger to a Samza container. If you're an
Start by checking out Samza, so we have access to the source.

{% highlight bash %}
git clone http://git-wip-us.apache.org/repos/asf/incubator-samza.git
git clone http://git-wip-us.apache.org/repos/asf/samza.git
{% endhighlight %}

Next, grab hello-samza.

{% highlight bash %}
git clone git://git.apache.org/incubator-samza-hello-samza.git
git clone git://git.apache.org/samza-hello-samza.git
{% endhighlight %}

### Setup the Environment

Now, let's setup the Eclipse project files.

{% highlight bash %}
cd incubator-samza
cd samza
./gradlew eclipse
{% endhighlight %}

Expand All @@ -50,7 +50,7 @@ Let's also release Samza to Maven's local repository, so hello-samza has access
./gradlew -PscalaVersion=2.10 clean publishToMavenLocal
{% endhighlight %}

Next, open Eclipse, and import the Samza source code into your workspace: "File" &gt; "Import" &gt; "Existing Projects into Workspace" &gt; "Browse". Select 'incubator-samza' folder, and hit 'finish'.
Next, open Eclipse, and import the Samza source code into your workspace: "File" &gt; "Import" &gt; "Existing Projects into Workspace" &gt; "Browse". Select 'samza' folder, and hit 'finish'.

### Enable Remote Debugging

Expand Down
4 changes: 2 additions & 2 deletions docs/learn/tutorials/versioned/run-in-multi-node-yarn.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ Some of the following steps are exactlly identical to what you have seen in [hel

{% highlight bash %}
cd /tmp
git clone http://git-wip-us.apache.org/repos/asf/incubator-samza.git
cd incubator-samza
git clone http://git-wip-us.apache.org/repos/asf/samza.git
cd samza
./gradlew clean publishToMavenLocal
cd ..
{% endhighlight %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ title: Upgrading from 0.7.0 to 0.8.0
Samza's [checkpointing](../../documentation/{{site.version}}/container/checkpointing.html) implementation changed between Samza 0.7.0 and 0.8.0. If you are running a Samza job with 0.7.0, and upgrade to 0.8.0, your job's checkpoint offsets will be lost, and the job will start (by default) with the most recent message in its input streams. If this is undesirable, and a job needs to pick up where it left off, the following steps must be taken:

1. Shutdown your job.
2. Run the [CheckpointMigrationTool](https://git-wip-us.apache.org/repos/asf?p=incubator-samza.git;a=blob;f=samza-kafka/src/main/scala/org/apache/samza/util/CheckpointMigrationTool.scala;h=5c4b3c4c544ae4367377b1a84d9a85a3de671018;hb=0.8.0).
2. Run the [CheckpointMigrationTool](https://git-wip-us.apache.org/repos/asf?p=samza.git;a=blob;f=samza-kafka/src/main/scala/org/apache/samza/util/CheckpointMigrationTool.scala;h=5c4b3c4c544ae4367377b1a84d9a85a3de671018;hb=0.8.0).
3. Start your job.

The CheckpointMigrationTool is responsible for migrating your checkpoint topic from the 0.7.0 style format to the 0.8.0 style format. This tool works only against Kafka, so you must be storing your checkpoints in Kafka with the [KafkaCheckpointManager](https://git-wip-us.apache.org/repos/asf?p=incubator-samza.git;a=blob;f=samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManager.scala;h=1d5627d0c561a0be6b48ee307b755958e62b783e;hb=0.8.0).
The CheckpointMigrationTool is responsible for migrating your checkpoint topic from the 0.7.0 style format to the 0.8.0 style format. This tool works only against Kafka, so you must be storing your checkpoints in Kafka with the [KafkaCheckpointManager](https://git-wip-us.apache.org/repos/asf?p=samza.git;a=blob;f=samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManager.scala;h=1d5627d0c561a0be6b48ee307b755958e62b783e;hb=0.8.0).

### Running CheckpointMigrationTool

Checkout Samza 0.8.0:

git clone http://git-wip-us.apache.org/repos/asf/incubator-samza.git
cd incubator-samza
git clone http://git-wip-us.apache.org/repos/asf/samza.git
cd samza
git fetch origin 0.8.0
git checkout 0.8.0

Expand Down
6 changes: 3 additions & 3 deletions docs/sitemap.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ layout: nil
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">

<url>
<loc>http://samza.incubator.apache.org/</loc>
<loc>http://samza.apache.org/</loc>
<lastmod>{{ site.time | date: "%Y-%m-%d" }}</lastmod>
<changefreq>daily</changefreq>
<priority>1.0</priority>
</url>

{% for post in site.posts %}
<url>
<loc>http://samza.incubator.apache.org{{ post.url }}/</loc>
<loc>http://samza.apache.org{{ post.url }}/</loc>
<lastmod>{{ post.date | date: "%Y-%m-%d" }}</lastmod>
<changefreq>monthly</changefreq>
<priority>0.2</priority>
Expand All @@ -39,7 +39,7 @@ layout: nil

{% for page in site.html_pages %}
<url>
<loc>http://samza.incubator.apache.org{{ page.url }}</loc>
<loc>http://samza.apache.org{{ page.url }}</loc>
<lastmod>{{ site.time | date: "%Y-%m-%d" }}</lastmod>
{% if page.changefreq %}<changefreq>{{ page.changefreq }}</changefreq>{% endif %}
{% if page.priority %}<priority>{{ page.priority }}</priority>{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions docs/startup/download/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ Snapshot builds are available in the Apache Maven snapshot repository.
If you're interested in working on Samza, or building the JARs from scratch, then you'll need to checkout and build the code. Samza does not have a binary release at this time. To check out and build Samza, run these commands.

{% highlight bash %}
git clone http://git-wip-us.apache.org/repos/asf/incubator-samza.git
cd incubator-samza
git clone http://git-wip-us.apache.org/repos/asf/samza.git
cd samza
./gradlew clean build
{% endhighlight %}

Expand Down
4 changes: 2 additions & 2 deletions docs/startup/hello-samza/versioned/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ title: Hello Samza
See the License for the specific language governing permissions and
limitations under the License.
-->
The [hello-samza](https://github.com/apache/incubator-samza-hello-samza) project is a stand-alone project designed to help you run your first Samza job.
The [hello-samza](https://github.com/apache/samza-hello-samza) project is a stand-alone project designed to help you run your first Samza job.

### Get the Code

Check out the hello-samza project:

{% highlight bash %}
git clone git://git.apache.org/incubator-samza-hello-samza.git hello-samza
git clone git://git.apache.org/samza-hello-samza.git hello-samza
cd hello-samza
git checkout latest
{% endhighlight %}
Expand Down
8 changes: 4 additions & 4 deletions gradle/release.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ subprojects {
project {
name 'Apache Samza (incubating)'
description 'A distributed stream processing framework built upon Apache Kafka and Apache Hadoop YARN.'
url 'http://samza.incubator.apache.org/'
url 'http://samza.apache.org/'

scm {
url 'https://git-wip-us.apache.org/repos/asf?p=incubator-samza.git;a=tree'
connection 'scm:http://git-wip-us.apache.org/repos/asf/incubator-samza.git'
developerConnection 'scm:https://git-wip-us.apache.org/repos/asf/incubator-samza.git'
url 'https://git-wip-us.apache.org/repos/asf?p=samza.git;a=tree'
connection 'scm:http://git-wip-us.apache.org/repos/asf/samza.git'
developerConnection 'scm:https://git-wip-us.apache.org/repos/asf/samza.git'
}

licenses {
Expand Down
2 changes: 1 addition & 1 deletion samza-test/src/main/config/join/watcher.samsa
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ task.window.ms=300000

max.time.between.epochs.ms=600000
mail.smtp.host=TODO
mail.to=dev@samza.incubator.apache.org
[email protected]
[email protected]

0 comments on commit f89d6fc

Please sign in to comment.