You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by mm...@apache.org on 2012/07/26 10:52:40 UTC
[2/16] git commit: Minor fixes for license text encoding and readme
text
Minor fixes for license text encoding and readme text
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/3e3133cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/3e3133cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/3e3133cd
Branch: refs/heads/piper
Commit: 3e3133cd41cc1974755b527780a37627e18a769b
Parents: 17de52d
Author: Matthieu Morel <mm...@apache.org>
Authored: Thu Jul 26 12:33:05 2012 +0200
Committer: Matthieu Morel <mm...@apache.org>
Committed: Thu Jul 26 12:35:12 2012 +0200
----------------------------------------------------------------------
LICENSE | 16 ++++++++--------
README.md | 25 ++++++++++++++++++-------
2 files changed, 26 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3e3133cd/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 66486af..810a231 100644
--- a/LICENSE
+++ b/LICENSE
@@ -247,7 +247,7 @@ published by the Free Software Foundation.
Eclipse Public License - v 1.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE
TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT�S ACCEPTANCE OF THIS
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
AGREEMENT.
1. DEFINITIONS
@@ -265,7 +265,7 @@ ii)additions to the Program;
where such changes and/or additions to the Program originate from and are
distributed by that particular Contributor. A Contribution 'originates' from a
Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor�s behalf. Contributions do not include additions to
+acting on such Contributor's behalf. Contributions do not include additions to
the Program which: (i) are separate modules of software distributed in
conjunction with the Program under their own license agreement, and (ii) are not
derivative works of the Program.
@@ -308,7 +308,7 @@ intellectual property rights or otherwise. As a condition to exercising the
rights and licenses granted hereunder, each Recipient hereby assumes sole
responsibility to secure any other intellectual property rights needed, if any.
For example, if a third party patent license is required to allow Recipient to
-distribute the Program, it is Recipient�s responsibility to acquire that license
+distribute the Program, it is Recipient's responsibility to acquire that license
before distributing the Program.
d) Each Contributor represents that to its knowledge it has sufficient copyright
@@ -379,7 +379,7 @@ For example, a Contributor might include the Program in a commercial product
offering, Product X. That Contributor is then a Commercial Contributor. If that
Commercial Contributor then makes performance claims, or offers warranties
related to Product X, those performance claims and warranties are such
-Commercial Contributor�s responsibility alone. Under this section, the
+Commercial Contributor's responsibility alone. Under this section, the
Commercial Contributor would have to defend claims against the other
Contributors related to those performance claims and warranties, and if a court
requires any other Contributor to pay any damages as a result, the Commercial
@@ -418,15 +418,15 @@ provision valid and enforceable.
If Recipient institutes patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Program itself
(excluding combinations of the Program with other software or hardware)
-infringes such Recipient�s patent(s), then such Recipient�s rights granted under
+infringes such Recipient's patent(s), then such Recipient's rights granted under
Section 2(b) shall terminate as of the date such litigation is filed.
-All Recipient�s rights under this Agreement shall terminate if it fails to
+All Recipient's rights under this Agreement shall terminate if it fails to
comply with any of the material terms or conditions of this Agreement and does
not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient�s rights under this Agreement terminate,
+such noncompliance. If all Recipient's rights under this Agreement terminate,
Recipient agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient�s obligations under this Agreement
+reasonably practicable. However, Recipient's obligations under this Agreement
and any licenses granted by Recipient relating to the Program shall continue and
survive.
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3e3133cd/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 4a0682c..2bd8ad0 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,13 @@ Apache S4
Overview
--------
-S4 is a general-purpose, distributed, scalable, partially fault-tolerant, pluggable platform that allows programmers to easily develop applications for processing continuous unbounded streams of data.
+S4 is a general-purpose, distributed, scalable, partially fault-tolerant, pluggable
+platform that allows programmers to easily develop applications for processing continuous
+unbounded streams of data.
-S4 0.5.0 is a complete refactoring of the previous version of S4. It grounds on the same concepts (partitioning inspired by map-reduce, actors-like distribution model), but with the following objectives:
+S4 0.5.0 is a complete refactoring of the previous version of S4. It grounds on the same
+concepts (partitioning inspired by map-reduce, actors-like distribution model),
+but with the following objectives:
- cleaner and simpler API
- robust configuration through statically defined modules
@@ -19,7 +23,7 @@ We added the following core features:
- state recovery through a flexible checkpointing mechanism
- inter-cluster/app communications through a pub-sub model
- dynamic application deployment
-- toolset for creating nodes, adding
+- toolset for easily starting S4 nodes, testing, packaging, deploying and monitoring S4 apps
Documentation
@@ -41,12 +45,15 @@ Source code is available here: https://git-wip-us.apache.org/repos/asf?p=incubat
Requirements
------------
* JDK 6 or higher
-* *nix or macosx (you may build the project and develop S4 applications with microsoft windows though, the only limitation is that the "s4" script has not been ported to windows yet)
+* *nix or macosx (you may build the project and develop S4 applications with
+microsoft windows though, the only limitation is that the "s4" script has not
+been ported to windows yet)
How to build
------------
-This only applies if you checkout from the source repository or if you download a released source package.
+This only applies if you checkout from the source repository or if you download a
+released source package.
We use gradle http://gradle.org as the build system.
@@ -72,8 +79,10 @@ Directory structure
- doc/ directory contains the javadoc
- gradle/ directory contains libraries used by the gradle build tool
- lib/ directory contains some other gradle libraries
- - subproject/ directory contains the plaftorm subprojects: base, comm, core, tools, as well as example (example is not fully ported to 0.5.0)
- - test-apps/ directory contains some examples (some of them very trivial are used in regression tests)
+ - subproject/ directory contains the plaftorm subprojects: base, comm, core, tools,
+ as well as example (example is not fully ported to 0.5.0)
+ - test-apps/ directory contains some examples (some of them very trivial are used
+ in regression tests)
@@ -83,6 +92,8 @@ Directory structure
- lib/ directory contains :
* the platform libraries (prefixed with "s4")
* the dependencies
+ - bin/ directory contains some scripts that are used by the s4 script
+ - gradle/ directory contains libraries used for building S4 projects