beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1729954 [1/4] - in /incubator/beam/website: ./ css/ images/ img/ js/
Date Fri, 12 Feb 2016 08:08:39 GMT
Author: jbonofre
Date: Fri Feb 12 08:08:38 2016
New Revision: 1729954

URL: http://svn.apache.org/viewvc?rev=1729954&view=rev
Log:
[scm-publish] Updating Beam website

Added:
    incubator/beam/website/building-and-deploying.html
    incubator/beam/website/clustering.html
    incubator/beam/website/configuration.html
    incubator/beam/website/css/
    incubator/beam/website/css/bootswatch.css
    incubator/beam/website/css/docs.css
    incubator/beam/website/css/lightbox.css
    incubator/beam/website/css/print.css
    incubator/beam/website/css/reflow-skin.css
    incubator/beam/website/css/site.css
    incubator/beam/website/dependency-convergence.html
    incubator/beam/website/dependency-info.html
    incubator/beam/website/distribution-management.html
    incubator/beam/website/getting-started.html
    incubator/beam/website/images/
    incubator/beam/website/images/beam-123x43.png   (with props)
    incubator/beam/website/images/beam-349x124.png   (with props)
    incubator/beam/website/img/
    incubator/beam/website/img/close.png   (with props)
    incubator/beam/website/img/glyphicons-halflings-white.png   (with props)
    incubator/beam/website/img/glyphicons-halflings.png   (with props)
    incubator/beam/website/img/loading.gif   (with props)
    incubator/beam/website/img/next.png   (with props)
    incubator/beam/website/img/prev.png   (with props)
    incubator/beam/website/index.html
    incubator/beam/website/integration.html
    incubator/beam/website/issue-tracking.html
    incubator/beam/website/js/
    incubator/beam/website/js/lightbox.min.js
    incubator/beam/website/js/reflow-scroll.js
    incubator/beam/website/js/reflow-skin.js
    incubator/beam/website/license.html
    incubator/beam/website/mail-lists.html
    incubator/beam/website/plugin-management.html
    incubator/beam/website/plugins.html
    incubator/beam/website/privacy-policy.html
    incubator/beam/website/project-info.html
    incubator/beam/website/project-summary.html
    incubator/beam/website/source-repository.html
    incubator/beam/website/team-list.html

Added: incubator/beam/website/building-and-deploying.html
URL: http://svn.apache.org/viewvc/incubator/beam/website/building-and-deploying.html?rev=1729954&view=auto
==============================================================================
--- incubator/beam/website/building-and-deploying.html (added)
+++ incubator/beam/website/building-and-deploying.html Fri Feb 12 08:08:38 2016
@@ -0,0 +1,379 @@
+
+<!DOCTYPE html>
+<!--
+ Generated by Apache Maven Doxia at 2016-02-12
+ Rendered using Reflow Maven Skin 1.1.1 (http://andriusvelykis.github.io/reflow-maven-skin)
+-->
+<html  xml:lang="en" lang="en">
+
+	<head>
+		<meta charset="UTF-8" />
+		<title>Apache Beam | Building</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta name="description" content="" />
+		<meta http-equiv="content-language" content="en" />
+ 
+		<link href="http://netdna.bootstrapcdn.com/bootswatch/2.3.2/cosmo/bootstrap.min.css" rel="stylesheet" />
+		<link href="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet" />
+		<link href=".//css/bootswatch.css" rel="stylesheet" />
+		<link href=".//css/reflow-skin.css" rel="stylesheet" />
+
+		<link href="http://yandex.st/highlightjs/7.5/styles/github.min.css" rel="stylesheet" />
+
+		<link href=".//css/lightbox.css" rel="stylesheet" />
+
+		<link href=".//css/site.css" rel="stylesheet" />
+		<link href=".//css/print.css" rel="stylesheet" media="print" />
+
+		<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+		<!--[if lt IE 9]>
+			<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+		<![endif]-->
+
+
+
+		<!-- Google Analytics -->
+		<script type="text/javascript">
+
+			var _gaq = _gaq || [];
+			_gaq.push(['_setAccount', 'UA-73650088-1']);
+			_gaq.push(['_trackPageview']);
+
+			(function() {
+				var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+				ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+				var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+			})();
+
+		</script>
+		</head>
+
+	<body class="page-building-and-deploying project-site" data-spy="scroll" data-offset="60" data-target="#toc-scroll-target">
+
+		<div class="navbar navbar-fixed-top">
+			<div class="navbar-inner">
+				<div class="container">
+					<a class="btn btn-navbar" data-toggle="collapse" data-target="#top-nav-collapse">
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</a>
+					<a class="brand" href="./"><span>Apache Beam (incubating)</span></a>
+					<div class="nav-collapse collapse" id="top-nav-collapse">
+						<ul class="nav pull-right">
+							<li ><a href="./" title="About">About</a></li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="getting-started.html" title="Getting started">Getting started</a></li>
+									<li ><a href="https://goo.gl/ps8twC" title="Apache Beam technical docs" class="externalLink">Apache Beam technical docs</a></li>
+									<li ><a href="https://goo.gl/nk5OM0" title="Technical vision" class="externalLink">Technical vision</a></li>
+								</ul>
+							</li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Privacy <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
+								</ul>
+							</li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Contribute <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="mail-lists.html" title="Mailing lists">Mailing lists</a></li>
+									<li ><a href="source-repository.html" title="Source">Source</a></li>
+									<li ><a href="issue-tracking.html" title="Issues">Issues</a></li>
+								</ul>
+							</li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Community <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="mail-lists.html" title="Mailing lists">Mailing lists</a></li>
+									<li ><a href="team-list.html" title="Team">Team</a></li>
+								</ul>
+							</li>
+						</ul>
+					</div><!--/.nav-collapse -->
+				</div>
+			</div>
+		</div>
+
+	<div class="container">
+
+	<!-- Masthead
+	================================================== -->
+
+	<header>
+		<hr class="toc-separator" />
+		<div id="toc-bar" class="navbar" data-spy="affix" data-offset-top="250">
+			<div class="navbar-inner">
+				<div id="toc-scroll-target" class="container">
+					<a class="btn btn-navbar" data-toggle="collapse" data-target="#toc-nav-collapse">
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</a>
+					<div class="nav-collapse collapse" id="toc-nav-collapse">
+						<ul id="toc" class="nav">
+						<li class="toplevel"><a href="#building" title="Building">Building</a></li>
+						<li class="toplevel"><a href="#Deploying_the_generated_package" title="Deploying the generated package">Deploying the generated package</a></li>
+						<li class="toplevel"><a href="#Deploying_into_an_existing_Karaf_server" title="Deploying into an existing Karaf server">Deploying into an existing Karaf server</a></li>
+						<li class="toplevel"><a href="#JDK_Selection_on_Mac_OS_X" title="JDK Selection on Mac OS X">JDK Selection on Mac OS X</a></li>
+						<li class="toplevel"><a href="#Running_the_integration_tests" title="Running the integration tests">Running the integration tests</a></li>
+						<li class="toplevel"><a href="#Running_the_performance_tests" title="Running the performance tests">Running the performance tests</a></li>
+						<li class="toplevel"><a href="#Testing_with_an_example_page" title="Testing with an example page">Testing with an example page</a></li>
+						<li class="toplevel"><a href="#Integrating_onto_a_page" title="Integrating onto a page">Integrating onto a page</a></li>
+						</ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</header>
+
+	<div class="main-body">
+	<div class="row">
+		<div class="span12">
+			<div class="body-content">
+<!-- ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You 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. --> 
+<div class="page-header">
+ <h1 id="building">Building</h1>
+</div> 
+<p>Simply type at the root of the project:</p> 
+<div class="source"> 
+ <pre>mvn clean install
+</pre> 
+</div> 
+<p>The Maven build process will generate both a standalone package you can use directly to start the context server (see “Deploying the generated package”) or a KAR file that you can then deploy using a manual deployment process into an already installed Apache Karaf server (see “Deploying into an existing Karaf server”)</p> 
+<p>If you want to build and run the integration tests, you should instead use : </p> 
+<div class="source"> 
+ <pre>mvn -P integration-tests clean install
+</pre> 
+</div> 
+<div class="section"> 
+ <h2 id="Deploying_the_generated_package">Deploying the generated package</h2> 
+ <p>The “package” sub-project generates a pre-configured Apache Karaf installation that is the simplest way to get started. Simply uncompress the <tt>package/target/unomi-VERSION.tar.gz</tt> (for Linux or Mac OS X) or <tt>package/target/unomi-VERSION.zip</tt> (for Windows) archive into the directory of your choice.</p> 
+ <p>You can then start the server simply by using the command on UNIX/Linux/MacOS X : </p> 
+ <div class="source"> 
+  <pre>./bin/karaf start
+</pre> 
+ </div> 
+ <p>or on Windows shell : </p> 
+ <div class="source"> 
+  <pre>bin\karaf.bat start
+</pre> 
+ </div> 
+</div> 
+<div class="section"> 
+ <h2 id="Deploying_into_an_existing_Karaf_server">Deploying into an existing Karaf server</h2> 
+ <p>This is only needed if you didn’t use the generated package. Also, this is the preferred way to install a development environment if you intend to re-deploy the context server KAR iteratively.</p> 
+ <p>Additional requirements: - Apache Karaf 3.0.2+, <a class="externalLink" href="http://karaf.apache.org">http://karaf.apache.org</a> - Local copy of the Elasticsearch ZIP package, available here : <a class="externalLink" href="http://www.elasticsearch.org">http://www.elasticsearch.org</a></p> 
+ <ol style="list-style-type: decimal"> 
+  <li> <p>Before deploying, make sure that you have Apache Karaf properly installed. You will also have to increase the default maximum memory size and perm gen size by adjusting the following environment values in the bin/setenv(.bat) files (at the end of the file):</p> 
+   <div class="source"> 
+    <pre>   MY_DIRNAME=`dirname $0`
+   MY_KARAF_HOME=`cd &quot;$MY_DIRNAME/..&quot;; pwd`
+   export KARAF_OPTS=&quot;-Djava.library.path=$MY_KARAF_HOME/lib/sigar&quot;
+   export JAVA_MAX_MEM=3G
+   export JAVA_MAX_PERM_MEM=384M
+</pre> 
+   </div></li> 
+  <li> <p>You will also need to have the Hyperic Sigar native libraries in your Karaf installation, so in order to this go to the Elasticsearch website (<a class="externalLink" href="http://www.elasticsearch.org">http://www.elasticsearch.org</a>) and download the ZIP package. Decompress it somewhere on your disk and copy all the files from the lib/sigar directory into Karaf’s lib/sigar directory (must be created first) EXCEPT THE SIGAR.JAR file.</p></li> 
+  <li> <p>Install the WAR support, CXF into Karaf by doing the following in the Karaf command line:</p> 
+   <div class="source"> 
+    <pre>   feature:install -v war
+   feature:repo-add cxf 2.7.11
+   feature:install -v cxf/2.7.11
+</pre> 
+   </div></li> 
+  <li> <p>Create a new $MY_KARAF_HOME/etc/org.apache.cxf.osgi.cfg file and put the following property inside :</p> 
+   <div class="source"> 
+    <pre>   org.apache.cxf.servlet.context=/cxs
+</pre> 
+   </div></li> 
+  <li> <p>Copy the following KAR to the Karaf deploy directory, as in this example line:</p> 
+   <div class="source"> 
+    <pre>  cp kar/target/unomi-kar-1.0.0-SNAPSHOT.kar ~/java/deployments/unomi/apache-karaf-3.0.1/deploy/
+</pre> 
+   </div></li> 
+  <li> <p>If all went smoothly, you should be able to access the context script here : <a class="externalLink" href="http://localhost:8181/cxs/cluster">http://localhost:8181/cxs/cluster</a> . You should be able to login with karaf / karaf and see basic server information. If not something went wrong during the install.</p></li> 
+ </ol> 
+</div> 
+<div class="section"> 
+ <h2 id="JDK_Selection_on_Mac_OS_X">JDK Selection on Mac OS X</h2> 
+ <p>You might need to select the JDK to run the tests in the itests subproject. In order to do so you can list the installed JDKs with the following command : </p> 
+ <div class="source"> 
+  <pre>/usr/libexec/java_home -V
+</pre> 
+ </div> 
+ <p>which will output something like this : </p> 
+ <div class="source"> 
+  <pre>Matching Java Virtual Machines (7):
+    1.7.0_51, x86_64:   &quot;Java SE 7&quot;   /Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home
+    1.7.0_45, x86_64:   &quot;Java SE 7&quot;   /Library/Java/JavaVirtualMachines/jdk1.7.0_45.jdk/Contents/Home
+    1.7.0_25, x86_64:   &quot;Java SE 7&quot;   /Library/Java/JavaVirtualMachines/jdk1.7.0_25.jdk/Contents/Home
+    1.6.0_65-b14-462, x86_64:   &quot;Java SE 6&quot;   /Library/Java/JavaVirtualMachines/1.6.0_65-b14-462.jdk/Contents/Home
+    1.6.0_65-b14-462, i386: &quot;Java SE 6&quot; /Library/Java/JavaVirtualMachines/1.6.0_65-b14-462.jdk/Contents/Home
+    1.6.0_65-b14-462, x86_64:   &quot;Java SE 6&quot;   /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
+    1.6.0_65-b14-462, i386: &quot;Java SE 6&quot; /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
+</pre> 
+ </div> 
+ <p>You can then select the one you want using : </p> 
+ <div class="source"> 
+  <pre>export JAVA_HOME=`/usr/libexec/java_home -v 1.7.0_51`
+</pre> 
+ </div> 
+ <p>and then check that it was correctly referenced using: </p> 
+ <div class="source"> 
+  <pre>java -version
+</pre> 
+ </div> 
+ <p>which should give you a result such as this: </p> 
+ <div class="source"> 
+  <pre>java version &quot;1.7.0_51&quot;
+Java(TM) SE Runtime Environment (build 1.7.0_51-b13)
+Java HotSpot(TM) 64-Bit Server VM (build 24.51-b03, mixed mode)
+</pre> 
+ </div> 
+</div> 
+<div class="section"> 
+ <h2 id="Running_the_integration_tests">Running the integration tests</h2> 
+ <p>The integration tests are not executed by default to make build time minimal, but it is recommended to run the integration tests at least once before using the server to make sure that everything is ok in the build. Another way to use these tests is to run them from a continuous integration server such as Jenkins, Apache Gump, Atlassian Bamboo or others. </p> 
+ <p>Note : the integration tests require a JDK 7 or more recent !</p> 
+ <p>To run the tests simply activate the following profile : </p> 
+ <div class="source"> 
+  <pre>mvn -P integration-tests clean install
+</pre> 
+ </div> 
+</div> 
+<div class="section"> 
+ <h2 id="Running_the_performance_tests">Running the performance tests</h2> 
+ <p>Performance tests are based on Gatling. You need to have a running context server or cluster of servers before executing the tests.</p> 
+ <p>Test parameteres are editable in the performance-tests/src/test/scala/unomi/Parameters.scala file. baseUrls should contains the URLs of all your cluster nodes</p> 
+ <p>Run the test by using the gatling.conf file in performance-tests/src/test/resources :</p> 
+ <div class="source"> 
+  <pre>    export GATLING_CONF=&lt;path&gt;/performance-tests/src/test/resources
+    gatling.sh
+</pre> 
+ </div> 
+ <p>Reports are generated in performance-tests/target/results.</p> 
+</div> 
+<div class="section"> 
+ <h2 id="Testing_with_an_example_page">Testing with an example page</h2> 
+ <p>A default test page is provided at the following URL:</p> 
+ <div class="source"> 
+  <pre>   http://localhost:8181/index.html
+</pre> 
+ </div> 
+ <p>This test page will trigger the loading of the /context.js script, which will try to retrieving the user context or create a new one if it doesn’t exist yet. It also contains an experimental integration with Facebook Login, but it doesn’t yet save the context back to the context server.</p> 
+</div> 
+<div class="section"> 
+ <h2 id="Integrating_onto_a_page">Integrating onto a page</h2> 
+ <p>Simply reference the context script in your HTML as in the following example:</p> 
+ <div class="source"> 
+  <pre>&lt;script type=&quot;text/javascript&quot;&gt;
+    (function(){ var u=((&quot;https:&quot; == document.location.protocol) ? &quot;https://localhost:8181/&quot; : &quot;http://localhost:8181/&quot;);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; g.defer=true; g.async=true; g.src=u+'context.js';
+    s.parentNode.insertBefore(g,s); })();
+&lt;/script&gt;
+</pre> 
+ </div> 
+</div>
+			</div>
+		</div>
+	</div>
+	</div>
+
+	</div><!-- /container -->
+
+	<!-- Footer
+	================================================== -->
+	<footer class="well">
+		<div class="container">
+			<div class="row">
+				<div class="span3 bottom-nav">
+					<ul class="nav nav-list">
+						<li class="nav-header">Documentation</li>
+						<li >
+							<a href="getting-started.html" title="Getting started">Getting started</a>
+						</li>
+						<li >
+							<a href="https://goo.gl/ps8twC" title="Apache Beam technical docs" class="externalLink">Apache Beam technical docs</a>
+						</li>
+						<li >
+							<a href="https://goo.gl/nk5OM0" title="Technical vision" class="externalLink">Technical vision</a>
+						</li>
+					</ul>
+				</div>
+				<div class="span3 bottom-nav">
+					<ul class="nav nav-list">
+						<li class="nav-header">Contribute</li>
+						<li >
+							<a href="mail-lists.html" title="Mailing lists">Mailing lists</a>
+						</li>
+						<li >
+							<a href="source-repository.html" title="Source">Source</a>
+						</li>
+						<li >
+							<a href="issue-tracking.html" title="Issues">Issues</a>
+						</li>
+						<li class="nav-header">Community</li>
+						<li >
+							<a href="mail-lists.html" title="Mailing lists">Mailing lists</a>
+						</li>
+						<li >
+							<a href="team-list.html" title="Team">Team</a>
+						</li>
+					</ul>
+				</div>
+				<div class="span3 bottom-nav">
+					<ul class="nav nav-list">
+						<li class="nav-header">Privacy</li>
+						<li >
+							<a href="privacy-policy.html" title="Site policy">Site policy</a>
+						</li>
+					</ul>
+				</div>
+				<div class="span3 bottom-description">
+					<blockquote>© 2016 Apache Software Foundation</blockquote>
+				</div>
+			</div>
+		</div>
+	</footer>
+
+	<div class="container subfooter">
+		<div class="row">
+			<div class="span12">
+				<p class="pull-right"><a href="#">Back to top</a></p>
+				<p class="copyright">Copyright &copy;2016 <a href="http://www.apache.org">Apache Software Foundation</a>. All Rights Reserved.</p>
+				<p class="version-date"><span class="projectVersion">Version: 1.0.0-incubating-SNAPSHOT. </span><span class="publishDate">Last Published: 2016-02-12. </span></p>
+				<p><a href="http://github.com/andriusvelykis/reflow-maven-skin" title="Reflow Maven skin">Reflow Maven skin</a> by <a href="http://andrius.velykis.lt" target="_blank" title="Andrius Velykis">Andrius Velykis</a>.</p>
+			</div>
+		</div>
+	</div>
+
+	<!-- Le javascript
+	================================================== -->
+	<!-- Placed at the end of the document so the pages load faster -->
+	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+
+	<script src="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
+	<script src=".//js/lightbox.min.js"></script>
+	<script src=".//js/reflow-scroll.js"></script>
+	<script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
+
+	<script src=".//js/reflow-skin.js"></script>
+
+	</body>
+</html>
\ No newline at end of file

Added: incubator/beam/website/clustering.html
URL: http://svn.apache.org/viewvc/incubator/beam/website/clustering.html?rev=1729954&view=auto
==============================================================================
--- incubator/beam/website/clustering.html (added)
+++ incubator/beam/website/clustering.html Fri Feb 12 08:08:38 2016
@@ -0,0 +1,313 @@
+
+<!DOCTYPE html>
+<!--
+ Generated by Apache Maven Doxia at 2016-02-12
+ Rendered using Reflow Maven Skin 1.1.1 (http://andriusvelykis.github.io/reflow-maven-skin)
+-->
+<html  xml:lang="en" lang="en">
+
+	<head>
+		<meta charset="UTF-8" />
+		<title>Apache Beam | Cluster setup</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta name="description" content="" />
+		<meta http-equiv="content-language" content="en" />
+ 
+		<link href="http://netdna.bootstrapcdn.com/bootswatch/2.3.2/cosmo/bootstrap.min.css" rel="stylesheet" />
+		<link href="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet" />
+		<link href=".//css/bootswatch.css" rel="stylesheet" />
+		<link href=".//css/reflow-skin.css" rel="stylesheet" />
+
+		<link href="http://yandex.st/highlightjs/7.5/styles/github.min.css" rel="stylesheet" />
+
+		<link href=".//css/lightbox.css" rel="stylesheet" />
+
+		<link href=".//css/site.css" rel="stylesheet" />
+		<link href=".//css/print.css" rel="stylesheet" media="print" />
+
+		<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+		<!--[if lt IE 9]>
+			<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+		<![endif]-->
+
+
+
+		<!-- Google Analytics -->
+		<script type="text/javascript">
+
+			var _gaq = _gaq || [];
+			_gaq.push(['_setAccount', 'UA-73650088-1']);
+			_gaq.push(['_trackPageview']);
+
+			(function() {
+				var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+				ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+				var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+			})();
+
+		</script>
+		</head>
+
+	<body class="page-clustering project-site" data-spy="scroll" data-offset="60" data-target="#toc-scroll-target">
+
+		<div class="navbar navbar-fixed-top">
+			<div class="navbar-inner">
+				<div class="container">
+					<a class="btn btn-navbar" data-toggle="collapse" data-target="#top-nav-collapse">
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</a>
+					<a class="brand" href="./"><span>Apache Beam (incubating)</span></a>
+					<div class="nav-collapse collapse" id="top-nav-collapse">
+						<ul class="nav pull-right">
+							<li ><a href="./" title="About">About</a></li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="getting-started.html" title="Getting started">Getting started</a></li>
+									<li ><a href="https://goo.gl/ps8twC" title="Apache Beam technical docs" class="externalLink">Apache Beam technical docs</a></li>
+									<li ><a href="https://goo.gl/nk5OM0" title="Technical vision" class="externalLink">Technical vision</a></li>
+								</ul>
+							</li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Privacy <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
+								</ul>
+							</li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Contribute <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="mail-lists.html" title="Mailing lists">Mailing lists</a></li>
+									<li ><a href="source-repository.html" title="Source">Source</a></li>
+									<li ><a href="issue-tracking.html" title="Issues">Issues</a></li>
+								</ul>
+							</li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Community <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="mail-lists.html" title="Mailing lists">Mailing lists</a></li>
+									<li ><a href="team-list.html" title="Team">Team</a></li>
+								</ul>
+							</li>
+						</ul>
+					</div><!--/.nav-collapse -->
+				</div>
+			</div>
+		</div>
+
+	<div class="container">
+
+	<!-- Masthead
+	================================================== -->
+
+	<header>
+		<hr class="toc-separator" />
+		<div id="toc-bar" class="navbar" data-spy="affix" data-offset-top="250">
+			<div class="navbar-inner">
+				<div id="toc-scroll-target" class="container">
+					<a class="btn btn-navbar" data-toggle="collapse" data-target="#toc-nav-collapse">
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</a>
+					<div class="nav-collapse collapse" id="toc-nav-collapse">
+						<ul id="toc" class="nav">
+						<li class="toplevel"><a href="#cluster_setup" title="Cluster setup">Cluster setup</a></li>
+						<li class="dropdown">
+							<a href="#Recommended_configurations" title="Recommended configurations" class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#">Recommended configurations <b class="caret"></b></a>
+							<ul class="dropdown-menu" role="menu">
+								<!-- Repeat the item, otherwise it is not clickable as the dropdown root -->
+								<li><a href="#Recommended_configurations" title="Recommended configurations">Recommended configurations</a></li>
+								<li class="divider"></li>
+								<li><a href="#a2_nodes_configuration" title="2 nodes configuration">2 nodes configuration</a></li>
+								<li><a href="#a3_nodes_configuration" title="3 nodes configuration">3 nodes configuration</a></li>
+
+							</ul>
+						</li>
+						<li class="toplevel"><a href="#Specific_configuration" title="Specific configuration">Specific configuration</a></li>
+						</ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</header>
+
+	<div class="main-body">
+	<div class="row">
+		<div class="span12">
+			<div class="body-content">
+<!-- ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You 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. --> 
+<div class="page-header">
+ <h1 id="cluster_setup">Cluster setup</h1>
+</div> 
+<p>Context server relies on Elasticsearch to discover and configure its cluster. You just need to install multiple context servers on the same network, and enable the discovery protocol in $MY_KARAF_HOME/etc/org.apache.unomi.persistence.elasticsearch.cfg file :</p> 
+<div class="source"> 
+ <pre>discovery.zen.ping.multicast.enabled=true
+</pre> 
+</div> 
+<p>All nodes on the same network, sharing the same cluster name will be part of the same cluster.</p> 
+<div class="section"> 
+ <div class="section"> 
+  <h3 id="Recommended_configurations">Recommended configurations</h3> 
+  <p>It is recommended to have one node dedicated to the context server, where the other nodes take care of the Elasticsearch persistence. The node dedicated to the context server will have node.data set to false.</p> 
+  <div class="section"> 
+   <h4 id="a2_nodes_configuration">2 nodes configuration</h4> 
+   <p>One node dedicated to context server, 1 node for elasticsearch storage.</p> 
+   <p>Node A :</p> 
+   <div class="source"> 
+    <pre>node.data=true
+numberOfReplicas=0
+monthlyIndex.numberOfReplicas=0
+</pre> 
+   </div> 
+   <p>Node B :</p> 
+   <div class="source"> 
+    <pre>node.data=false
+numberOfReplicas=0
+monthlyIndex.numberOfReplicas=0
+</pre> 
+   </div> 
+  </div> 
+  <div class="section"> 
+   <h4 id="a3_nodes_configuration">3 nodes configuration</h4> 
+   <p>One node dedicated to context server, 2 nodes for elasticsearch storage with fault-tolerance</p> 
+   <p>Node A :</p> 
+   <div class="source"> 
+    <pre>node.data=false
+numberOfReplicas=1
+monthlyIndex.numberOfReplicas=1
+</pre> 
+   </div> 
+   <p>Node B :</p> 
+   <div class="source"> 
+    <pre>node.data=true
+numberOfReplicas=1
+monthlyIndex.numberOfReplicas=1
+</pre> 
+   </div> 
+   <p>Node C :</p> 
+   <div class="source"> 
+    <pre>node.data=true
+numberOfReplicas=1
+monthlyIndex.numberOfReplicas=1
+</pre> 
+   </div> 
+  </div> 
+ </div> 
+ <div class="section"> 
+  <h3 id="Specific_configuration">Specific configuration</h3> 
+  <p>If multicast is not allowed on your network, you’ll need to switch to unicast protocol and manually configure the server IPs. This can be done by disabling the elasticsearch automatic discovery in $MY_KARAF_HOME/etc/org.apache.unomi.persistence.elasticsearch.cfg :</p> 
+  <div class="source"> 
+   <pre>discovery.zen.ping.multicast.enabled=false
+</pre> 
+  </div> 
+  <p>And then set the property discovery.zen.ping.unicast.hosts in $MY_KARAF_HOME/etc/elasticsearch.yml files :</p> 
+  <div class="source"> 
+   <pre>discovery.zen.ping.unicast.hosts: [‘192.168.0.1:9300', ‘192.168.0.2:9300']
+</pre> 
+  </div> 
+  <p>More information and configuration options can be found at : <a class="externalLink" href="https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-discovery.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-discovery.html</a></p> 
+ </div> 
+</div>
+			</div>
+		</div>
+	</div>
+	</div>
+
+	</div><!-- /container -->
+
+	<!-- Footer
+	================================================== -->
+	<footer class="well">
+		<div class="container">
+			<div class="row">
+				<div class="span3 bottom-nav">
+					<ul class="nav nav-list">
+						<li class="nav-header">Documentation</li>
+						<li >
+							<a href="getting-started.html" title="Getting started">Getting started</a>
+						</li>
+						<li >
+							<a href="https://goo.gl/ps8twC" title="Apache Beam technical docs" class="externalLink">Apache Beam technical docs</a>
+						</li>
+						<li >
+							<a href="https://goo.gl/nk5OM0" title="Technical vision" class="externalLink">Technical vision</a>
+						</li>
+					</ul>
+				</div>
+				<div class="span3 bottom-nav">
+					<ul class="nav nav-list">
+						<li class="nav-header">Contribute</li>
+						<li >
+							<a href="mail-lists.html" title="Mailing lists">Mailing lists</a>
+						</li>
+						<li >
+							<a href="source-repository.html" title="Source">Source</a>
+						</li>
+						<li >
+							<a href="issue-tracking.html" title="Issues">Issues</a>
+						</li>
+						<li class="nav-header">Community</li>
+						<li >
+							<a href="mail-lists.html" title="Mailing lists">Mailing lists</a>
+						</li>
+						<li >
+							<a href="team-list.html" title="Team">Team</a>
+						</li>
+					</ul>
+				</div>
+				<div class="span3 bottom-nav">
+					<ul class="nav nav-list">
+						<li class="nav-header">Privacy</li>
+						<li >
+							<a href="privacy-policy.html" title="Site policy">Site policy</a>
+						</li>
+					</ul>
+				</div>
+				<div class="span3 bottom-description">
+					<blockquote>© 2016 Apache Software Foundation</blockquote>
+				</div>
+			</div>
+		</div>
+	</footer>
+
+	<div class="container subfooter">
+		<div class="row">
+			<div class="span12">
+				<p class="pull-right"><a href="#">Back to top</a></p>
+				<p class="copyright">Copyright &copy;2016 <a href="http://www.apache.org">Apache Software Foundation</a>. All Rights Reserved.</p>
+				<p class="version-date"><span class="projectVersion">Version: 1.0.0-incubating-SNAPSHOT. </span><span class="publishDate">Last Published: 2016-02-12. </span></p>
+				<p><a href="http://github.com/andriusvelykis/reflow-maven-skin" title="Reflow Maven skin">Reflow Maven skin</a> by <a href="http://andrius.velykis.lt" target="_blank" title="Andrius Velykis">Andrius Velykis</a>.</p>
+			</div>
+		</div>
+	</div>
+
+	<!-- Le javascript
+	================================================== -->
+	<!-- Placed at the end of the document so the pages load faster -->
+	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+
+	<script src="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
+	<script src=".//js/lightbox.min.js"></script>
+	<script src=".//js/reflow-scroll.js"></script>
+	<script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
+
+	<script src=".//js/reflow-skin.js"></script>
+
+	</body>
+</html>
\ No newline at end of file

Added: incubator/beam/website/configuration.html
URL: http://svn.apache.org/viewvc/incubator/beam/website/configuration.html?rev=1729954&view=auto
==============================================================================
--- incubator/beam/website/configuration.html (added)
+++ incubator/beam/website/configuration.html Fri Feb 12 08:08:38 2016
@@ -0,0 +1,438 @@
+
+<!DOCTYPE html>
+<!--
+ Generated by Apache Maven Doxia at 2016-02-12
+ Rendered using Reflow Maven Skin 1.1.1 (http://andriusvelykis.github.io/reflow-maven-skin)
+-->
+<html  xml:lang="en" lang="en">
+
+	<head>
+		<meta charset="UTF-8" />
+		<title>Apache Beam | Configuration</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta name="description" content="" />
+		<meta http-equiv="content-language" content="en" />
+ 
+		<link href="http://netdna.bootstrapcdn.com/bootswatch/2.3.2/cosmo/bootstrap.min.css" rel="stylesheet" />
+		<link href="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet" />
+		<link href=".//css/bootswatch.css" rel="stylesheet" />
+		<link href=".//css/reflow-skin.css" rel="stylesheet" />
+
+		<link href="http://yandex.st/highlightjs/7.5/styles/github.min.css" rel="stylesheet" />
+
+		<link href=".//css/lightbox.css" rel="stylesheet" />
+
+		<link href=".//css/site.css" rel="stylesheet" />
+		<link href=".//css/print.css" rel="stylesheet" media="print" />
+
+		<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+		<!--[if lt IE 9]>
+			<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+		<![endif]-->
+
+
+
+		<!-- Google Analytics -->
+		<script type="text/javascript">
+
+			var _gaq = _gaq || [];
+			_gaq.push(['_setAccount', 'UA-73650088-1']);
+			_gaq.push(['_trackPageview']);
+
+			(function() {
+				var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+				ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+				var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+			})();
+
+		</script>
+		</head>
+
+	<body class="page-configuration project-site" data-spy="scroll" data-offset="60" data-target="#toc-scroll-target">
+
+		<div class="navbar navbar-fixed-top">
+			<div class="navbar-inner">
+				<div class="container">
+					<a class="btn btn-navbar" data-toggle="collapse" data-target="#top-nav-collapse">
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</a>
+					<a class="brand" href="./"><span>Apache Beam (incubating)</span></a>
+					<div class="nav-collapse collapse" id="top-nav-collapse">
+						<ul class="nav pull-right">
+							<li ><a href="./" title="About">About</a></li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="getting-started.html" title="Getting started">Getting started</a></li>
+									<li ><a href="https://goo.gl/ps8twC" title="Apache Beam technical docs" class="externalLink">Apache Beam technical docs</a></li>
+									<li ><a href="https://goo.gl/nk5OM0" title="Technical vision" class="externalLink">Technical vision</a></li>
+								</ul>
+							</li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Privacy <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
+								</ul>
+							</li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Contribute <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="mail-lists.html" title="Mailing lists">Mailing lists</a></li>
+									<li ><a href="source-repository.html" title="Source">Source</a></li>
+									<li ><a href="issue-tracking.html" title="Issues">Issues</a></li>
+								</ul>
+							</li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Community <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="mail-lists.html" title="Mailing lists">Mailing lists</a></li>
+									<li ><a href="team-list.html" title="Team">Team</a></li>
+								</ul>
+							</li>
+						</ul>
+					</div><!--/.nav-collapse -->
+				</div>
+			</div>
+		</div>
+
+	<div class="container">
+
+	<!-- Masthead
+	================================================== -->
+
+	<header>
+		<hr class="toc-separator" />
+		<div id="toc-bar" class="navbar" data-spy="affix" data-offset-top="250">
+			<div class="navbar-inner">
+				<div id="toc-scroll-target" class="container">
+					<a class="btn btn-navbar" data-toggle="collapse" data-target="#toc-nav-collapse">
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</a>
+					<div class="nav-collapse collapse" id="toc-nav-collapse">
+						<ul id="toc" class="nav">
+						<li class="toplevel"><a href="#configuration" title="Configuration">Configuration</a></li>
+						<li class="toplevel"><a href="#Changing_the_default_configuration" title="Changing the default configuration">Changing the default configuration</a></li>
+						<li class="toplevel"><a href="#Installing_the_MaxMind_GeoIPLite2_IP_lookup_database" title="Installing the MaxMind GeoIPLite2 IP lookup database">Installing the MaxMind GeoIPLite2 IP lookup database</a></li>
+						<li class="toplevel"><a href="#Installing_Geonames_database" title="Installing Geonames database">Installing Geonames database</a></li>
+						<li class="toplevel"><a href="#REST_API_Security" title="REST API Security">REST API Security</a></li>
+						<li class="toplevel"><a href="#Automatic_profile_merging" title="Automatic profile merging">Automatic profile merging</a></li>
+						<li class="toplevel"><a href="#Securing_a_production_environment" title="Securing a production environment">Securing a production environment</a></li>
+						<li class="toplevel"><a href="#Integrating_with_an_Apache_HTTP_web_server" title="Integrating with an Apache HTTP web server">Integrating with an Apache HTTP web server</a></li>
+						</ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</header>
+
+	<div class="main-body">
+	<div class="row">
+		<div class="span12">
+			<div class="body-content">
+<!-- ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You 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. --> 
+<div class="page-header">
+ <h1 id="configuration">Configuration</h1>
+</div> 
+<div class="section"> 
+ <h2 id="Changing_the_default_configuration">Changing the default configuration</h2> 
+ <p>If you want to change the default configuration, you can perform any modification you want in the $MY_KARAF_HOME/etc directory.</p> 
+ <p>The context server configuration is kept in the $MY_KARAF_HOME/etc/org.apache.unomi.web.cfg . It defines the addresses and port where it can be found :</p> 
+ <div class="source"> 
+  <pre>contextserver.address=localhost
+contextserver.port=8181
+contextserver.secureAddress=localhost
+contextserver.securePort=9443
+contextserver.domain=apache.org
+</pre> 
+ </div> 
+ <p>If you need to specify an Elasticsearch cluster name that is different than the default, it is recommended to do this BEFORE you start the server for the first time, or you will loose all the data you have stored previously.</p> 
+ <p>To change the cluster name, first create a file called </p> 
+ <div class="source"> 
+  <pre>$MY_KARAF_HOME/etc/org.apache.unomi.persistence.elasticsearch.cfg
+</pre> 
+ </div> 
+ <p>with the following contents:</p> 
+ <div class="source"> 
+  <pre>cluster.name=contextElasticSearch
+index.name=context
+elasticSearchConfig=file:${karaf.etc}/elasticsearch.yml
+</pre> 
+ </div> 
+ <p>And replace the cluster.name parameter here by your cluster name.</p> 
+ <p>You can also put an elasticsearch configuration file in $MY_KARAF_HOME/etc/elasticsearch.yml , and put any standard Elasticsearch configuration options in this last file.</p> 
+ <p>If you want your context server to be a client only on a cluster of elasticsearch nodes, just set the node.data property to false.</p> 
+</div> 
+<div class="section"> 
+ <h2 id="Installing_the_MaxMind_GeoIPLite2_IP_lookup_database">Installing the MaxMind GeoIPLite2 IP lookup database</h2> 
+ <p>The Context Server requires an IP database in order to resolve IP addresses to user location. The GeoLite2 database can be downloaded from MaxMind here : <a class="externalLink" href="http://dev.maxmind.com/geoip/geoip2/geolite2/">http://dev.maxmind.com/geoip/geoip2/geolite2/</a></p> 
+ <p>Simply download the GeoLite2-City.mmdb file into the “etc” directory.</p> 
+</div> 
+<div class="section"> 
+ <h2 id="Installing_Geonames_database">Installing Geonames database</h2> 
+ <p>Context server includes a geocoding service based on the geonames database ( <a class="externalLink" href="http://www.geonames.org/">http://www.geonames.org/</a> ). It can be used to create conditions on countries or cities.</p> 
+ <p>In order to use it, you need to install the Geonames database into . Get the “allCountries.zip” database from here : <a class="externalLink" href="http://download.geonames.org/export/dump/">http://download.geonames.org/export/dump/</a></p> 
+ <p>Download it and put it in the “etc” directory, without unzipping it. Edit $MY_KARAF_HOME/etc/org.apache.unomi.geonames.cfg and set request.geonamesDatabase.forceImport to true, import should start right away. Otherwise, import should start at the next startup. Import runs in background, but can take about 15 minutes. At the end, you should have about 4 million entries in the geonames index.</p> 
+</div> 
+<div class="section"> 
+ <h2 id="REST_API_Security">REST API Security</h2> 
+ <p>The Context Server REST API is protected using JAAS authentication and using Basic or Digest HTTP auth. By default, the login/password for the REST API full administrative access is “karaf/karaf”.</p> 
+ <p>The generated package is also configured with a default SSL certificate. You can change it by following these steps :</p> 
+ <ol style="list-style-type: decimal"> 
+  <li> <p>Replace the existing keystore in $MY_KARAF_HOME/etc/keystore by your own certificate :</p> <p><a class="externalLink" href="http://wiki.eclipse.org/Jetty/Howto/Configure_SSL">http://wiki.eclipse.org/Jetty/Howto/Configure_SSL</a></p></li> 
+  <li> <p>Update the keystore and certificate password in $MY_KARAF_HOME/etc/custom.properties file :</p></li> 
+ </ol> 
+ <div class="source"> 
+  <pre>    org.osgi.service.http.secure.enabled = true
+    org.ops4j.pax.web.ssl.keystore=${karaf.etc}/keystore
+    org.ops4j.pax.web.ssl.password=changeme
+    org.ops4j.pax.web.ssl.keypassword=changeme
+    org.osgi.service.http.port.secure=9443
+</pre> 
+ </div> 
+ <p>You should now have SSL setup on Karaf with your certificate, and you can test it by trying to access it on port 9443.</p> 
+</div> 
+<div class="section"> 
+ <h2 id="Automatic_profile_merging">Automatic profile merging</h2> 
+ <p>The context server is capable of merging profiles based on a common property value. In order to use this, you must add the MergeProfileOnPropertyAction to a rule (such as a login rule for example), and configure it with the name of the property that will be used to identify the profiles to be merged. An example could be the “email” property, meaning that if two (or more) profiles are found to have the same value for the “email” property they will be merged by this action.</p> 
+ <p>Upon merge, the old profiles are marked with a “mergedWith” property that will be used on next profile access to delete the original profile and replace it with the merged profile (aka “master” profile). Once this is done, all cookie tracking will use the merged profile.</p> 
+ <p>To test, simply configure the action in the “login” or “facebookLogin” rules and set it up on the “email” property. Upon sending one of the events, all matching profiles will be merged.</p> 
+</div> 
+<div class="section"> 
+ <h2 id="Securing_a_production_environment">Securing a production environment</h2> 
+ <p>Before going live with a project, you should <i>absolutely</i> read the following section that will help you setup a proper secure environment for running your context server. </p> 
+ <p>Step 1: Install and configure a firewall </p> 
+ <p>You should setup a firewall around your cluster of context servers and/or Elasticsearch nodes. If you have an application-level firewall you should only allow the following connections open to the whole world : </p> 
+ <ul> 
+  <li><a class="externalLink" href="http://localhost:8181/context.js">http://localhost:8181/context.js</a></li> 
+  <li><a class="externalLink" href="http://localhost:8181/eventcollector">http://localhost:8181/eventcollector</a></li> 
+ </ul> 
+ <p>All other ports should not be accessible to the world.</p> 
+ <p>For your Context Server client applications (such as the Jahia CMS), you will need to make the following ports accessible : </p> 
+ <div class="source"> 
+  <pre>8181 (Context Server HTTP port) 
+9443 (Context Server HTTPS port)
+</pre> 
+ </div> 
+ <p>The context server actually requires HTTP Basic Auth for access to the Context Server administration REST API, so it is highly recommended that you design your client applications to use the HTTPS port for accessing the REST API.</p> 
+ <p>The user accounts to access the REST API are actually routed through Karaf’s JAAS support, which you may find the documentation for here : </p> 
+ <ul> 
+  <li><a class="externalLink" href="http://karaf.apache.org/manual/latest/users-guide/security.html">http://karaf.apache.org/manual/latest/users-guide/security.html</a></li> 
+ </ul> 
+ <p>The default username/password is </p> 
+ <div class="source"> 
+  <pre>karaf/karaf
+</pre> 
+ </div> 
+ <p>You should really change this default username/password as soon as possible. To do so, simply modify the following file : </p> 
+ <div class="source"> 
+  <pre>$MY_KARAF_HOME/etc/users.properties
+</pre> 
+ </div> 
+ <p>For your context servers, and for any standalone Elasticsearch nodes you will need to open the following ports for proper node-to-node communication : 9200 (Elasticsearch REST API), 9300 (Elasticsearch TCP transport)</p> 
+ <p>Of course any ports listed here are the default ports configured in each server, you may adjust them if needed.</p> 
+ <p>Step 2 : Adjust the Context Server IP filtering</p> 
+ <p>By default the Context Server limits to connections to port 9200 and 9300 to the following IP ranges</p> 
+ <div class="source"> 
+  <pre>- localhost
+- 127.0.0.1
+- ::1
+- the current subnet (i.e., 192.168.1.0-192.168.1.255)
+</pre> 
+ </div> 
+ <p>(this is done using a custom plugin for Elasticsearch, that you may find here : <a class="externalLink" href="https://git-wip-us.apache.org/repos/asf/incubator-unomi/context-server/persistence-elasticsearch/plugins/security">https://git-wip-us.apache.org/repos/asf/incubator-unomi/context-server/persistence-elasticsearch/plugins/security</a>)</p> 
+ <p>You can adjust this setting by using the following setting in the $MY_KARAF_HOME/etc/elasticsearch.yml file : </p> 
+ <div class="source"> 
+  <pre>security.ipranges: localhost,127.0.0.1,::1,10.0.1.0-10.0.1.255
+</pre> 
+ </div> 
+ <p>Step 3 : Follow industry recommended best practices for securing Elasticsearch</p> 
+ <p>You may find more valuable recommendations here : </p> 
+ <ul> 
+  <li><a class="externalLink" href="https://www.elastic.co/blog/found-elasticsearch-security">https://www.elastic.co/blog/found-elasticsearch-security</a></li> 
+  <li><a class="externalLink" href="https://www.elastic.co/blog/scripting-security">https://www.elastic.co/blog/scripting-security</a></li> 
+ </ul> 
+ <p>Step 4 : Setup a proxy in front of the context server</p> 
+ <p>As an alternative to an application-level firewall, you could also route all traffic to the context server through a proxy, and use it to filter any communication.</p> 
+</div> 
+<div class="section"> 
+ <h2 id="Integrating_with_an_Apache_HTTP_web_server">Integrating with an Apache HTTP web server</h2> 
+ <p>If you want to setup an Apache HTTP web server in from of Apache Unomi, here is an example configuration using mod_proxy.</p> 
+ <p>In your Unomi package directory, in /etc/org.apache.unomi.web.cfg for unomi.apache.org</p> 
+ <p>contextserver.address=unomi.apache.org contextserver.port=80 contextserver.secureAddress=unomi.apache.org contextserver.securePort=443 contextserver.domain=apache.org</p> 
+ <p>Main virtual host config:</p> 
+ <div class="source"> 
+  <pre>&lt;VirtualHost *:80&gt;
+        Include /var/www/vhosts/unomi.apache.org/conf/common.conf
+&lt;/VirtualHost&gt;
+
+&lt;IfModule mod_ssl.c&gt;
+    &lt;VirtualHost *:443&gt;
+        Include /var/www/vhosts/unomi.apache.org/conf/common.conf
+
+        SSLEngine on
+
+        SSLCertificateFile    /var/www/vhosts/unomi.apache.org/conf/ssl/24d5b9691e96eafa.crt
+        SSLCertificateKeyFile /var/www/vhosts/unomi.apache.org/conf/ssl/apache.org.key
+        SSLCertificateChainFile /var/www/vhosts/unomi.apache.org/conf/ssl/gd_bundle-g2-g1.crt
+
+
+        &lt;FilesMatch &quot;\.(cgi|shtml|phtml|php)$&quot;&gt;
+                SSLOptions +StdEnvVars
+        &lt;/FilesMatch&gt;
+        &lt;Directory /usr/lib/cgi-bin&gt;
+                SSLOptions +StdEnvVars
+        &lt;/Directory&gt;
+        BrowserMatch &quot;MSIE [2-6]&quot; \
+                nokeepalive ssl-unclean-shutdown \
+                downgrade-1.0 force-response-1.0
+        BrowserMatch &quot;MSIE [17-9]&quot; ssl-unclean-shutdown
+
+    &lt;/VirtualHost&gt;
+&lt;/IfModule&gt;
+</pre> 
+ </div> 
+ <p>common.conf:</p> 
+ <div class="source"> 
+  <pre>ServerName unomi.apache.org
+ServerAdmin webmaster@apache.org
+
+DocumentRoot /var/www/vhosts/unomi.apache.org/html
+CustomLog /var/log/apache2/access-unomi.apache.org.log combined
+&lt;Directory /&gt;
+        Options FollowSymLinks
+        AllowOverride None
+&lt;/Directory&gt;
+&lt;Directory /var/www/vhosts/unomi.apache.org/html&gt;
+        Options FollowSymLinks MultiViews
+        AllowOverride None
+        Order allow,deny
+        allow from all
+&lt;/Directory&gt;
+&lt;Location /cxs&gt;
+    Order deny,allow
+    deny from all
+    allow from 88.198.26.2
+    allow from www.apache.org
+&lt;/Location&gt;
+
+RewriteEngine On
+RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
+RewriteRule .* - [F]
+ProxyPreserveHost On
+ProxyPass /server-status !
+ProxyPass /robots.txt !
+
+RewriteCond %{HTTP_USER_AGENT} Googlebot [OR]
+RewriteCond %{HTTP_USER_AGENT} msnbot [OR]
+RewriteCond %{HTTP_USER_AGENT} Slurp
+RewriteRule ^.* - [F,L]
+
+ProxyPass / http://localhost:8181/ connectiontimeout=20 timeout=300 ttl=120
+ProxyPassReverse / http://localhost:8181/
+</pre> 
+ </div> 
+</div>
+			</div>
+		</div>
+	</div>
+	</div>
+
+	</div><!-- /container -->
+
+	<!-- Footer
+	================================================== -->
+	<footer class="well">
+		<div class="container">
+			<div class="row">
+				<div class="span3 bottom-nav">
+					<ul class="nav nav-list">
+						<li class="nav-header">Documentation</li>
+						<li >
+							<a href="getting-started.html" title="Getting started">Getting started</a>
+						</li>
+						<li >
+							<a href="https://goo.gl/ps8twC" title="Apache Beam technical docs" class="externalLink">Apache Beam technical docs</a>
+						</li>
+						<li >
+							<a href="https://goo.gl/nk5OM0" title="Technical vision" class="externalLink">Technical vision</a>
+						</li>
+					</ul>
+				</div>
+				<div class="span3 bottom-nav">
+					<ul class="nav nav-list">
+						<li class="nav-header">Contribute</li>
+						<li >
+							<a href="mail-lists.html" title="Mailing lists">Mailing lists</a>
+						</li>
+						<li >
+							<a href="source-repository.html" title="Source">Source</a>
+						</li>
+						<li >
+							<a href="issue-tracking.html" title="Issues">Issues</a>
+						</li>
+						<li class="nav-header">Community</li>
+						<li >
+							<a href="mail-lists.html" title="Mailing lists">Mailing lists</a>
+						</li>
+						<li >
+							<a href="team-list.html" title="Team">Team</a>
+						</li>
+					</ul>
+				</div>
+				<div class="span3 bottom-nav">
+					<ul class="nav nav-list">
+						<li class="nav-header">Privacy</li>
+						<li >
+							<a href="privacy-policy.html" title="Site policy">Site policy</a>
+						</li>
+					</ul>
+				</div>
+				<div class="span3 bottom-description">
+					<blockquote>© 2016 Apache Software Foundation</blockquote>
+				</div>
+			</div>
+		</div>
+	</footer>
+
+	<div class="container subfooter">
+		<div class="row">
+			<div class="span12">
+				<p class="pull-right"><a href="#">Back to top</a></p>
+				<p class="copyright">Copyright &copy;2016 <a href="http://www.apache.org">Apache Software Foundation</a>. All Rights Reserved.</p>
+				<p class="version-date"><span class="projectVersion">Version: 1.0.0-incubating-SNAPSHOT. </span><span class="publishDate">Last Published: 2016-02-12. </span></p>
+				<p><a href="http://github.com/andriusvelykis/reflow-maven-skin" title="Reflow Maven skin">Reflow Maven skin</a> by <a href="http://andrius.velykis.lt" target="_blank" title="Andrius Velykis">Andrius Velykis</a>.</p>
+			</div>
+		</div>
+	</div>
+
+	<!-- Le javascript
+	================================================== -->
+	<!-- Placed at the end of the document so the pages load faster -->
+	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+
+	<script src="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
+	<script src=".//js/lightbox.min.js"></script>
+	<script src=".//js/reflow-scroll.js"></script>
+	<script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
+
+	<script src=".//js/reflow-skin.js"></script>
+
+	</body>
+</html>
\ No newline at end of file

Added: incubator/beam/website/css/bootswatch.css
URL: http://svn.apache.org/viewvc/incubator/beam/website/css/bootswatch.css?rev=1729954&view=auto
==============================================================================
--- incubator/beam/website/css/bootswatch.css (added)
+++ incubator/beam/website/css/bootswatch.css Fri Feb 12 08:08:38 2016
@@ -0,0 +1,70 @@
+body {
+  padding-top: 80px;
+  padding-bottom: 20px;
+}
+
+.navbar a > i {
+  opacity: 0.5;
+}
+
+.navbar a:hover > i {
+  opacity: 1;
+}
+
+.subhead {
+  padding-bottom: 0;
+  margin-bottom: 9px;
+}
+
+.subhead h1 {
+  font-size: 54px;
+}
+
+
+@media (max-width: 480px) {
+
+  .modal {
+    position: fixed !important;
+    top: 25% !important;
+  }
+}
+
+
+@media (max-width: 767px) {
+
+  body {
+    padding-top: 0;
+  }
+}
+
+/* Portrait tablet to landscape and desktop */
+@media (min-width: 768px) and (max-width: 979px) {
+
+  .thumbnail p {
+    font-size: 12px;
+  }
+
+  .thumbnail .btn {
+    padding: 8px 12px;
+    font-size: 12px;
+  }
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+
+  /* Remove any padding from the body */
+  body {
+    padding-top: 0;
+  }
+}
+
+@media (max-width: 980px) {
+
+  /* Unfloat brand */
+  .navbar-fixed-top .brand {
+    float: left;
+    margin-left: 0;
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+}
\ No newline at end of file

Added: incubator/beam/website/css/docs.css
URL: http://svn.apache.org/viewvc/incubator/beam/website/css/docs.css?rev=1729954&view=auto
==============================================================================
--- incubator/beam/website/css/docs.css (added)
+++ incubator/beam/website/css/docs.css Fri Feb 12 08:08:38 2016
@@ -0,0 +1,150 @@
+/* Add additional stylesheets below
+-------------------------------------------------- */
+/*
+  Bootstrap's documentation styles
+  Special styles for presenting Bootstrap's documentation and examples
+*/
+
+/* Body and structure
+-------------------------------------------------- */
+
+body {
+  position: relative;
+  padding-top: 40px;
+}
+
+/* Code in headings */
+h3 code {
+  font-size: 14px;
+  font-weight: normal;
+}
+
+/* Jumbotrons
+-------------------------------------------------- */
+.jumbotron {
+  position: relative;
+  padding: 40px 0;
+}
+.jumbotron h1 {
+  font-size: 80px;
+  font-weight: bold;
+  letter-spacing: -1px;
+  line-height: 1;
+}
+.jumbotron p {
+  font-size: 24px;
+  font-weight: 300;
+  line-height: 30px;
+  margin-bottom: 30px;
+}
+.jumbotron .btn-large {
+  font-size: 20px;
+  font-weight: normal;
+  padding: 14px 24px;
+  margin-right: 10px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+.jumbotron .btn-large small {
+  font-size: 14px;
+}
+
+
+/* Specific jumbotrons
+------------------------- */
+/* supporting docs pages */
+.subhead {
+  padding-bottom: 0;
+  margin-bottom: 9px;
+}
+.subhead h1 {
+  font-size: 54px;
+}
+
+/* Responsive Docs
+-------------------------------------------------- */
+@media (max-width: 480px) {
+
+  /* Reduce padding above jumbotron */
+  body {
+    padding-top: 70px;
+  }
+
+  /* Adjust the jumbotron */
+  .jumbotron h1,
+  .jumbotron p {
+    text-align: center;
+    margin-right: 0;
+  }
+  .jumbotron h1 {
+    font-size: 45px;
+    margin-right: 0;
+  }
+  .jumbotron p {
+    margin-right: 0;
+    margin-left: 0;
+    font-size: 18px;
+    line-height: 24px;
+  }
+  .jumbotron .btn {
+    display: block;
+    font-size: 18px;
+    padding: 10px 14px;
+    margin: 0 auto 10px;
+  }
+
+}
+
+
+@media (max-width: 768px) {
+
+  /* Remove any padding from the body */
+  body {
+    padding-top: 0;
+  }
+
+  /* Jumbotron buttons */
+  .jumbotron .btn {
+    margin-bottom: 10px;
+  }
+}
+
+
+@media (min-width: 480px) and (max-width: 768px) {
+
+  /* Scale down the jumbotron content */
+  .jumbotron h1 {
+    font-size: 54px;
+  }
+  .jumbotron p {
+    margin-right: 0;
+    margin-left: 0;
+  }
+}
+
+
+@media (min-width: 768px) and (max-width: 980px) {
+
+  /* Remove any padding from the body */
+  body {
+    padding-top: 0;
+  }
+
+  /* Scale down the jumbotron content */
+  .jumbotron h1 {
+    font-size: 72px;
+  }
+}
+
+
+@media (max-width: 980px) {
+
+  /* Unfloat brand */
+  .navbar-fixed-top .brand {
+    float: left;
+    margin-left: 0;
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+}
\ No newline at end of file

Added: incubator/beam/website/css/lightbox.css
URL: http://svn.apache.org/viewvc/incubator/beam/website/css/lightbox.css?rev=1729954&view=auto
==============================================================================
--- incubator/beam/website/css/lightbox.css (added)
+++ incubator/beam/website/css/lightbox.css Fri Feb 12 08:08:38 2016
@@ -0,0 +1,210 @@
+/* Preload images */
+body:after {
+  content: url(../img/close.png) url(../img/loading.gif) url(../img/prev.png) url(../img/next.png);
+  display: none;
+}
+
+.lightboxOverlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 9999;
+  background-color: black;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
+  opacity: 0.8;
+  display: none;
+}
+
+.lightbox {
+  position: absolute;
+  left: 0;
+  width: 100%;
+  z-index: 10000;
+  text-align: center;
+  line-height: 0;
+  font-weight: normal;
+}
+
+.lightbox .lb-image {
+  display: block;
+  height: auto;
+  max-width: inherit;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+}
+
+.lightbox a img {
+  border: none;
+}
+
+.lb-outerContainer {
+  position: relative;
+  background-color: white;
+  *zoom: 1;
+  width: 250px;
+  height: 250px;
+  margin: 0 auto;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -o-border-radius: 4px;
+  border-radius: 4px;
+}
+
+.lb-outerContainer:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+
+.lb-container {
+  padding: 4px;
+}
+
+.lb-loader {
+  position: absolute;
+  top: 43%;
+  left: 0;
+  height: 25%;
+  width: 100%;
+  text-align: center;
+  line-height: 0;
+}
+
+.lb-cancel {
+  display: block;
+  width: 32px;
+  height: 32px;
+  margin: 0 auto;
+  background: url(../img/loading.gif) no-repeat;
+}
+
+.lb-nav {
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100%;
+  width: 100%;
+  z-index: 10;
+}
+
+.lb-container > .nav {
+  left: 0;
+}
+
+.lb-nav a {
+  outline: none;
+  background-image: url('data:image/gif;base64,R0lGODlhAQABAPAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==');
+}
+
+.lb-prev, .lb-next {
+  height: 100%;
+  cursor: pointer;
+  display: block;
+}
+
+.lb-nav a.lb-prev {
+  width: 34%;
+  left: 0;
+  float: left;
+  background: url(../img/prev.png) left 48% no-repeat;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+  opacity: 0;
+  -webkit-transition: opacity 0.6s;
+  -moz-transition: opacity 0.6s;
+  -o-transition: opacity 0.6s;
+  transition: opacity 0.6s;
+}
+
+.lb-nav a.lb-prev:hover {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
+  opacity: 1;
+}
+
+.lb-nav a.lb-next {
+  width: 64%;
+  right: 0;
+  float: right;
+  background: url(../img/next.png) right 48% no-repeat;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+  opacity: 0;
+  -webkit-transition: opacity 0.6s;
+  -moz-transition: opacity 0.6s;
+  -o-transition: opacity 0.6s;
+  transition: opacity 0.6s;
+}
+
+.lb-nav a.lb-next:hover {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
+  opacity: 1;
+}
+
+.lb-dataContainer {
+  margin: 0 auto;
+  padding-top: 5px;
+  *zoom: 1;
+  width: 100%;
+  -moz-border-radius-bottomleft: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+
+.lb-dataContainer:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+
+.lb-data {
+  padding: 0 4px;
+  color: #ccc;
+}
+
+.lb-data .lb-details {
+  width: 85%;
+  float: left;
+  text-align: left;
+  line-height: 1.1em;
+}
+
+.lb-data .lb-caption {
+  font-size: 13px;
+  font-weight: bold;
+  line-height: 1em;
+}
+
+.lb-data .lb-number {
+  display: block;
+  clear: left;
+  padding-bottom: 1em;
+  font-size: 12px;
+  color: #999999;
+}
+
+.lb-data .lb-close {
+  display: block;
+  float: right;
+  width: 30px;
+  height: 30px;
+  background: url(../img/close.png) top right no-repeat;
+  text-align: right;
+  outline: none;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70);
+  opacity: 0.7;
+  -webkit-transition: opacity 0.2s;
+  -moz-transition: opacity 0.2s;
+  -o-transition: opacity 0.2s;
+  transition: opacity 0.2s;
+}
+
+.lb-data .lb-close:hover {
+  cursor: pointer;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
+  opacity: 1;
+}
\ No newline at end of file

Added: incubator/beam/website/css/print.css
URL: http://svn.apache.org/viewvc/incubator/beam/website/css/print.css?rev=1729954&view=auto
==============================================================================
--- incubator/beam/website/css/print.css (added)
+++ incubator/beam/website/css/print.css Fri Feb 12 08:08:38 2016
@@ -0,0 +1,80 @@
+.navbar,
+.breadcrumb,
+.toc-separator
+#toc-bar,
+#toc-sidebar,
+footer,
+.subfooter {
+	display: none !important;
+}
+
+body {
+  padding-top: 0px !important;
+}
+
+/* CSS below taken from HTML5 Boilerplate */
+* {
+  background: transparent !important;
+  color: #000 !important; /* Black prints faster: h5bp.com/s */
+  box-shadow:none !important;
+  text-shadow: none !important;
+}
+
+a,
+a:visited {
+  text-decoration: underline;
+}
+
+a[href]:after {
+  content: " (" attr(href) ")";
+}
+
+abbr[title]:after {
+  content: " (" attr(title) ")";
+}
+
+/*
+ * Don't show links for images, or javascript/internal links, or header links
+ */
+
+header a:after,
+.ir a:after,
+a[href^="javascript:"]:after,
+a[href^="#"]:after {
+  content: "" !important;
+}
+
+pre,
+blockquote {
+  border: 1px solid #999;
+  page-break-inside: avoid;
+}
+
+thead {
+  display: table-header-group; /* h5bp.com/t */
+}
+
+tr,
+img {
+  page-break-inside: avoid;
+}
+
+img {
+  max-width: 100% !important;
+}
+
+@page {
+  margin: 0.5cm;
+}
+
+p,
+h2,
+h3 {
+  orphans: 3;
+  widows: 3;
+}
+
+h2,
+h3 {
+  page-break-after: avoid;
+}
\ No newline at end of file

Added: incubator/beam/website/css/reflow-skin.css
URL: http://svn.apache.org/viewvc/incubator/beam/website/css/reflow-skin.css?rev=1729954&view=auto
==============================================================================
--- incubator/beam/website/css/reflow-skin.css (added)
+++ incubator/beam/website/css/reflow-skin.css Fri Feb 12 08:08:38 2016
@@ -0,0 +1,99 @@
+/* Jumps to in-page links (e.g. page.html#foo) do not honor fixed navbar.
+   Use pseudo element to move them down.
+   Taken from http://nicolasgallagher.com/jump-links-and-viewport-positioning/demo/#method-B
+ */
+h1[id]:before,
+h2[id]:before,
+h3[id]:before,
+h4[id]:before,
+h5[id]:before,
+h6[id]:before,
+a[name]:before {
+    display:block; 
+    content:""; 
+    height:90px; 
+    margin:-90px 0 0; 
+}
+
+
+/* Fixed subnav support: */
+
+/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */
+@media (min-width: 980px) {
+  .navbar.affix {
+    position: fixed;
+    top: 40px;
+    right: 0;
+    left: 0;
+    z-index: 1020; /* 10 less than .navbar-fixed to prevent any overlap */
+    margin-bottom: 0;
+  }
+  
+  .navbar.affix .navbar-inner {
+    border-width: 0 0 1px;
+    padding-right: 0;
+    padding-left: 0;
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
+       -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
+            box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
+  }
+
+  .navbar.affix .container {
+    width: 940px;
+  }
+}
+
+/* Other screen sizes navbar container width */
+@media (min-width: 1200px) {
+  .navbar.affix .container {
+    width: 1170px;
+  }
+}
+
+@media (max-width: 979px) {
+  .navbar.affix {
+    position: static;
+  }
+
+  /* Give a positive z-index to ToC bar, otherwise the pseudo elements before may overlap and
+     make the button unclickable. */
+  #toc-bar {
+    position: relative;
+    z-index:1020;
+    margin-bottom: 20px;
+  }
+
+}
+
+/* Fix for header links - do not color/underline them */
+#banner a {
+	color: inherit;
+	text-decoration: inherit;
+}
+
+
+/* Footer */
+
+footer.well {
+  padding: 50px 0;
+  margin-top: 70px;
+  margin-bottom: 0;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+  border-right: 0;
+  border-left: 0;
+  font-size: 90%;
+}
+
+footer.well p,
+.subfooter p {
+  margin-bottom: 0;
+}
+
+.subfooter {
+  padding: 30px 0;
+}
\ No newline at end of file

Added: incubator/beam/website/css/site.css
URL: http://svn.apache.org/viewvc/incubator/beam/website/css/site.css?rev=1729954&view=auto
==============================================================================
--- incubator/beam/website/css/site.css (added)
+++ incubator/beam/website/css/site.css Fri Feb 12 08:08:38 2016
@@ -0,0 +1 @@
+/* You can override this file with your own styles */
\ No newline at end of file

Added: incubator/beam/website/dependency-convergence.html
URL: http://svn.apache.org/viewvc/incubator/beam/website/dependency-convergence.html?rev=1729954&view=auto
==============================================================================
--- incubator/beam/website/dependency-convergence.html (added)
+++ incubator/beam/website/dependency-convergence.html Fri Feb 12 08:08:38 2016
@@ -0,0 +1,279 @@
+
+<!DOCTYPE html>
+<!--
+ Generated by Apache Maven Doxia at 2016-02-12
+ Rendered using Reflow Maven Skin 1.1.1 (http://andriusvelykis.github.io/reflow-maven-skin)
+-->
+<html  xml:lang="en" lang="en">
+
+	<head>
+		<meta charset="UTF-8" />
+		<title>Apache Beam | Dependency Convergence</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta name="description" content="" />
+		<meta http-equiv="content-language" content="en" />
+ 
+		<link href="http://netdna.bootstrapcdn.com/bootswatch/2.3.2/cosmo/bootstrap.min.css" rel="stylesheet" />
+		<link href="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet" />
+		<link href=".//css/bootswatch.css" rel="stylesheet" />
+		<link href=".//css/reflow-skin.css" rel="stylesheet" />
+
+		<link href="http://yandex.st/highlightjs/7.5/styles/github.min.css" rel="stylesheet" />
+
+		<link href=".//css/lightbox.css" rel="stylesheet" />
+
+		<link href=".//css/site.css" rel="stylesheet" />
+		<link href=".//css/print.css" rel="stylesheet" media="print" />
+
+		<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+		<!--[if lt IE 9]>
+			<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+		<![endif]-->
+
+
+
+		<!-- Google Analytics -->
+		<script type="text/javascript">
+
+			var _gaq = _gaq || [];
+			_gaq.push(['_setAccount', 'UA-73650088-1']);
+			_gaq.push(['_trackPageview']);
+
+			(function() {
+				var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+				ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+				var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+			})();
+
+		</script>
+		</head>
+
+	<body class="page-dependency-convergence project-site" data-spy="scroll" data-offset="60" data-target="#toc-scroll-target">
+
+		<div class="navbar navbar-fixed-top">
+			<div class="navbar-inner">
+				<div class="container">
+					<a class="btn btn-navbar" data-toggle="collapse" data-target="#top-nav-collapse">
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</a>
+					<a class="brand" href="./"><span>Apache Beam (incubating)</span></a>
+					<div class="nav-collapse collapse" id="top-nav-collapse">
+						<ul class="nav pull-right">
+							<li ><a href="./" title="About">About</a></li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="getting-started.html" title="Getting started">Getting started</a></li>
+									<li ><a href="https://goo.gl/ps8twC" title="Apache Beam technical docs" class="externalLink">Apache Beam technical docs</a></li>
+									<li ><a href="https://goo.gl/nk5OM0" title="Technical vision" class="externalLink">Technical vision</a></li>
+								</ul>
+							</li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Privacy <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="privacy-policy.html" title="Site policy">Site policy</a></li>
+								</ul>
+							</li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Contribute <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="mail-lists.html" title="Mailing lists">Mailing lists</a></li>
+									<li ><a href="source-repository.html" title="Source">Source</a></li>
+									<li ><a href="issue-tracking.html" title="Issues">Issues</a></li>
+								</ul>
+							</li>
+							<li class="dropdown">
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Community <b class="caret"></b></a>
+								<ul class="dropdown-menu">
+									<li ><a href="mail-lists.html" title="Mailing lists">Mailing lists</a></li>
+									<li ><a href="team-list.html" title="Team">Team</a></li>
+								</ul>
+							</li>
+						</ul>
+					</div><!--/.nav-collapse -->
+				</div>
+			</div>
+		</div>
+
+	<div class="container">
+
+	<!-- Masthead
+	================================================== -->
+
+	<header>
+		<hr class="toc-separator" />
+		<div id="toc-bar" class="navbar" data-spy="affix" data-offset-top="250">
+			<div class="navbar-inner">
+				<div id="toc-scroll-target" class="container">
+					<a class="btn btn-navbar" data-toggle="collapse" data-target="#toc-nav-collapse">
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</a>
+					<div class="nav-collapse collapse" id="toc-nav-collapse">
+						<ul id="toc" class="nav">
+						<li class="toplevel"><a href="#Dependency_Convergence" title="Dependency Convergence">Dependency Convergence</a></li>
+						<li class="toplevel"><a href="#Dependencies_used_in_this_project" title="Dependencies used in this project">Dependencies used in this project</a></li>
+						</ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</header>
+
+	<div class="main-body">
+	<div class="row">
+		<div class="span12">
+			<div class="body-content">
+<div class="section"> 
+ <div class="page-header">
+  <h2 id="Dependency_Convergence">Dependency Convergence</h2>
+ </div> 
+ <table border="0" class="bodyTable table table-striped table-hover"> 
+  <caption> 
+   <b>Legend:</b> 
+  </caption> 
+  <tbody> 
+   <tr class="a"> 
+    <td><i class="icon-exclamation-sign"></i></td> 
+    <td>At least one dependency has a differing version of the dependency or has SNAPSHOT dependencies.</td> 
+   </tr> 
+  </tbody> 
+ </table> 
+ <br /> 
+ <table border="0" class="bodyTable table table-striped table-hover"> 
+  <thead> 
+   <tr class="a"> 
+    <th>Ready for release (100 % convergence and no SNAPSHOTS):</th> 
+    <td><i class="icon-exclamation-sign"></i>&nbsp;<b>Error</b><br />You do not have 100 % convergence.</td> 
+   </tr> 
+  </thead> 
+  <thead> 
+   <tr class="b"> 
+    <th>Convergence (NOD/NOA):</th> 
+    <td><i class="icon-exclamation-sign"></i>&nbsp;<b>0 %</b></td> 
+   </tr> 
+  </thead> 
+  <thead> 
+   <tr class="a"> 
+    <th>Number of SNAPSHOT artifacts (NOS):</th> 
+    <td>0</td> 
+   </tr> 
+  </thead> 
+  <thead> 
+   <tr class="b"> 
+    <th>Number of version-conflicting artifacts (NOC):</th> 
+    <td>0</td> 
+   </tr> 
+  </thead> 
+  <thead> 
+   <tr class="a"> 
+    <th>Number of unique artifacts (NOA):</th> 
+    <td>0</td> 
+   </tr> 
+  </thead> 
+  <thead> 
+   <tr class="b"> 
+    <th>Number of dependencies (NOD):</th> 
+    <td>0</td> 
+   </tr> 
+  </thead> 
+  <caption> 
+   <b>Statistics:</b> 
+  </caption> 
+  <tbody> 
+  </tbody> 
+ </table> 
+</div> 
+<div class="section"> 
+ <h3 id="Dependencies_used_in_this_project">Dependencies used in this project</h3> 
+</div>
+			</div>
+		</div>
+	</div>
+	</div>
+
+	</div><!-- /container -->
+
+	<!-- Footer
+	================================================== -->
+	<footer class="well">
+		<div class="container">
+			<div class="row">
+				<div class="span3 bottom-nav">
+					<ul class="nav nav-list">
+						<li class="nav-header">Documentation</li>
+						<li >
+							<a href="getting-started.html" title="Getting started">Getting started</a>
+						</li>
+						<li >
+							<a href="https://goo.gl/ps8twC" title="Apache Beam technical docs" class="externalLink">Apache Beam technical docs</a>
+						</li>
+						<li >
+							<a href="https://goo.gl/nk5OM0" title="Technical vision" class="externalLink">Technical vision</a>
+						</li>
+					</ul>
+				</div>
+				<div class="span3 bottom-nav">
+					<ul class="nav nav-list">
+						<li class="nav-header">Contribute</li>
+						<li >
+							<a href="mail-lists.html" title="Mailing lists">Mailing lists</a>
+						</li>
+						<li >
+							<a href="source-repository.html" title="Source">Source</a>
+						</li>
+						<li >
+							<a href="issue-tracking.html" title="Issues">Issues</a>
+						</li>
+						<li class="nav-header">Community</li>
+						<li >
+							<a href="mail-lists.html" title="Mailing lists">Mailing lists</a>
+						</li>
+						<li >
+							<a href="team-list.html" title="Team">Team</a>
+						</li>
+					</ul>
+				</div>
+				<div class="span3 bottom-nav">
+					<ul class="nav nav-list">
+						<li class="nav-header">Privacy</li>
+						<li >
+							<a href="privacy-policy.html" title="Site policy">Site policy</a>
+						</li>
+					</ul>
+				</div>
+				<div class="span3 bottom-description">
+					<blockquote>© 2016 Apache Software Foundation</blockquote>
+				</div>
+			</div>
+		</div>
+	</footer>
+
+	<div class="container subfooter">
+		<div class="row">
+			<div class="span12">
+				<p class="pull-right"><a href="#">Back to top</a></p>
+				<p class="copyright">Copyright &copy;2016 <a href="http://www.apache.org">Apache Software Foundation</a>. All Rights Reserved.</p>
+				<p class="version-date"><span class="projectVersion">Version: 1.0.0-incubating-SNAPSHOT. </span><span class="publishDate">Last Published: 2016-02-12. </span></p>
+				<p><a href="http://github.com/andriusvelykis/reflow-maven-skin" title="Reflow Maven skin">Reflow Maven skin</a> by <a href="http://andrius.velykis.lt" target="_blank" title="Andrius Velykis">Andrius Velykis</a>.</p>
+			</div>
+		</div>
+	</div>
+
+	<!-- Le javascript
+	================================================== -->
+	<!-- Placed at the end of the document so the pages load faster -->
+	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+
+	<script src="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
+	<script src=".//js/lightbox.min.js"></script>
+	<script src=".//js/reflow-scroll.js"></script>
+	<script src="http://yandex.st/highlightjs/7.5/highlight.min.js"></script>
+
+	<script src=".//js/reflow-skin.js"></script>
+
+	</body>
+</html>
\ No newline at end of file



Mime
View raw message