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 2013/03/18 12:01:35 UTC
svn commit: r1457723 - in /incubator/s4/site: ./ contrib/ doc/0.6.0/
doc/0.6.0/application_dependencies/ doc/0.6.0/configuration/
doc/0.6.0/dev_tips/ doc/0.6.0/event_dispatch/ doc/0.6.0/event_injection/
doc/0.6.0/fault_tolerance/ doc/0.6.0/metrics/ doc...
Author: mmorel
Date: Mon Mar 18 12:01:35 2013
New Revision: 1457723
URL: http://svn.apache.org/r1457723
Log:
updates for s4 0.6.0 rc3
Modified:
incubator/s4/site/contrib/index.html
incubator/s4/site/doc/0.6.0/application_dependencies/index.html
incubator/s4/site/doc/0.6.0/configuration/index.html
incubator/s4/site/doc/0.6.0/dev_tips/index.html
incubator/s4/site/doc/0.6.0/event_dispatch/index.html
incubator/s4/site/doc/0.6.0/event_injection/index.html
incubator/s4/site/doc/0.6.0/fault_tolerance/index.html
incubator/s4/site/doc/0.6.0/index.html
incubator/s4/site/doc/0.6.0/metrics/index.html
incubator/s4/site/doc/0.6.0/overview/index.html
incubator/s4/site/doc/0.6.0/recommended_practices/index.html
incubator/s4/site/doc/0.6.0/tools/index.html
incubator/s4/site/doc/0.6.0/twitter_trending_example/index.html
incubator/s4/site/doc/0.6.0/walkthrough/index.html
incubator/s4/site/download/index.html
incubator/s4/site/index.html
incubator/s4/site/style/nav.css
incubator/s4/site/style/style.css
incubator/s4/site/team/index.html
Modified: incubator/s4/site/contrib/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/contrib/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/contrib/index.html (original)
+++ incubator/s4/site/contrib/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
Modified: incubator/s4/site/doc/0.6.0/application_dependencies/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/doc/0.6.0/application_dependencies/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/doc/0.6.0/application_dependencies/index.html (original)
+++ incubator/s4/site/doc/0.6.0/application_dependencies/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
Modified: incubator/s4/site/doc/0.6.0/configuration/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/doc/0.6.0/configuration/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/doc/0.6.0/configuration/index.html (original)
+++ incubator/s4/site/doc/0.6.0/configuration/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -138,6 +138,11 @@
<p>Example:
<code>./s4 node -c=cluster1 -zk=host.domain.com</code></p>
+<h2 id="overriding-node-configuration">Overriding node configuration</h2>
+<p>By default, nodes read configuration from configuration files in the classpath <code>default.s4.base.properties</code>, <code>default.s4.comm.properties</code> and <code>default.s4.core.properties</code>.</p>
+
+<p>It is possible to override these parameters by using the <code>-p</code> option when starting a node.</p>
+
<h1 id="application-configuration">Application configuration</h1>
<p>Deploying applications is easier when we can define both the parameters of the application <strong>and</strong> the target environment.</p>
@@ -199,7 +204,7 @@
<span class="kt">int</span> <span class="n">port</span></code></pre>
<ul>
-<li>specifying the parameter value at node startup (using <code>-p</code> inline with the node command, or with the â<code>@</code>â syntax)</li>
+<li>specifying the parameter value when deploying the application (using <code>-p</code> inline with the node command, or with the â<code>@</code>â syntax)</li>
</ul>
<p>S4 uses an internal Guice module that automatically injects configuration parameters passed through the deploy command to matching <code>@Named</code> parameters.</p>
@@ -210,6 +215,10 @@
-p=s4.checkpointing.filesystem.storageRootPath=/custom/path
</code></pre>
+<blockquote>
+ <p>Make sure you pass overriding <strong>platform</strong> parameters through the <code>-p</code> option in the <code>node</code> command, and pass <strong>application</strong> parameters through the <code>-p</code> option in the <code>deploy</code> command.</p>
+</blockquote>
+
<h2 id="file-based-configuration">File-based configuration</h2>
<p>Instead of specifying node parameters inline, you may refer to a file with the â@â notation:
Modified: incubator/s4/site/doc/0.6.0/dev_tips/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/doc/0.6.0/dev_tips/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/doc/0.6.0/dev_tips/index.html (original)
+++ incubator/s4/site/doc/0.6.0/dev_tips/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
Modified: incubator/s4/site/doc/0.6.0/event_dispatch/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/doc/0.6.0/event_dispatch/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/doc/0.6.0/event_dispatch/index.html (original)
+++ incubator/s4/site/doc/0.6.0/event_dispatch/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -77,7 +77,7 @@
<pre><code class="language-java"><span class="n">Stream</span><span class="o"><</span><span class="n">TopicEvent</span><span class="o">></span> <span class="n">topicSeenStream</span> <span class="o">=</span> <span class="n">createStream</span><span class="o">(</span><span class="s">"TopicSeen"</span><span class="o">,</span> <span class="k">new</span> <span class="n">KeyFinder</span><span class="o"><</span><span class="n">TopicEvent</span><span class="o">>()</span> <span class="o">{</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">List</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="n">get</span><span class="o">(</span><span class="kd">final</span> <span class="n">TopicEvent</span> <span class="n">arg0</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="n">List</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="nf">get</span><span class="o">(</span><span class="kd">final</span> <span class="n">TopicEvent</span> <span class="n">arg0</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="n">ImmutableList</span><span class="o">.</span><span class="na">of</span><span class="o">(</span><span class="n">arg0</span><span class="o">.</span><span class="na">getTopic</span><span class="o">());</span>
<span class="o">}</span>
<span class="o">},</span> <span class="n">topicCountAndReportPE</span><span class="o">);</span></code></pre>
@@ -93,7 +93,7 @@
<span class="o">...</span>
<span class="n">remoteStreamKeyFinder</span> <span class="o">=</span> <span class="k">new</span> <span class="n">KeyFinder</span><span class="o"><</span><span class="n">Event</span><span class="o">>()</span> <span class="o">{</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">List</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="n">get</span><span class="o">(</span><span class="n">Event</span> <span class="n">event</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="n">List</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="nf">get</span><span class="o">(</span><span class="n">Event</span> <span class="n">event</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="n">ImmutableList</span><span class="o">.</span><span class="na">of</span><span class="o">(</span><span class="n">event</span><span class="o">.</span><span class="na">get</span><span class="o">(</span><span class="s">"theKeyField"</span><span class="o">));</span>
<span class="o">}</span>
<span class="o">};</span>
@@ -113,7 +113,7 @@
<pre><code class="language-java"><span class="n">createInputStream</span><span class="o">(</span><span class="s">"names"</span><span class="o">,</span> <span class="k">new</span> <span class="n">KeyFinder</span><span class="o"><</span><span class="n">Event</span><span class="o">>()</span> <span class="o">{</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">List</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="n">get</span><span class="o">(</span><span class="n">Event</span> <span class="n">event</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="n">List</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="nf">get</span><span class="o">(</span><span class="n">Event</span> <span class="n">event</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="n">Arrays</span><span class="o">.</span><span class="na">asList</span><span class="o">(</span><span class="k">new</span> <span class="n">String</span><span class="o">[]</span> <span class="o">{</span> <span class="n">event</span><span class="o">.</span><span class="na">get</span><span class="o">(</span><span class="s">"name"</span><span class="o">)</span> <span class="o">});</span>
<span class="o">}</span>
<span class="o">},</span> <span class="n">helloPE</span><span class="o">);</span></code></pre>
Modified: incubator/s4/site/doc/0.6.0/event_injection/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/doc/0.6.0/event_injection/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/doc/0.6.0/event_injection/index.html (original)
+++ incubator/s4/site/doc/0.6.0/event_injection/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
Modified: incubator/s4/site/doc/0.6.0/fault_tolerance/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/doc/0.6.0/fault_tolerance/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/doc/0.6.0/fault_tolerance/index.html (original)
+++ incubator/s4/site/doc/0.6.0/fault_tolerance/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
Modified: incubator/s4/site/doc/0.6.0/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/doc/0.6.0/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/doc/0.6.0/index.html (original)
+++ incubator/s4/site/doc/0.6.0/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
Modified: incubator/s4/site/doc/0.6.0/metrics/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/doc/0.6.0/metrics/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/doc/0.6.0/metrics/index.html (original)
+++ incubator/s4/site/doc/0.6.0/metrics/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -80,7 +80,7 @@
<p>By default, metrics are exposed by each node through JMX.</p>
-<p>The <code>s4.metrics.config</code> parameter enables periodic dumps of aggregated statistics to the <strong>console</strong> or to <strong>files</strong> in csv format. This parameter is specified as an application parameter, and must match the following regular expression: </p>
+<p>The <code>s4.metrics.config</code> parameter enables periodic dumps of aggregated statistics to the <strong>console</strong> or to <strong>files</strong> in csv format. This parameter is specified as a node or application parameter <sup id="fnref:1"><a href="#fn:1" rel="footnote">1</a></sup>, and must match the following regular expression: </p>
<pre><code>(csv:.+|console):(\d+):(DAYS|HOURS|MICROSECONDS|MILLISECONDS|MINUTES|NANOSECONDS|SECONDS)
</code></pre>
@@ -88,13 +88,22 @@
<p>Examples:</p>
<pre><code># dump metrics to csv files to /path/to/directory every 10 seconds
-csv:file://path/to/directory:10:SECONDS
+# (recommendation: use a different and clean directory for each of the nodes)
+csv:/path/to/directory:10:SECONDS
# dump metrics to the console every minute
console:1:MINUTES
</code></pre>
<p>Reporting to Ganglia or Graphite is not provided out of the box with S4, but itâs quite easy to add. You simply have to add the corresponding dependencies to your project and enable reporting to these systems during the initialization of your application. See the <a href="http://metrics.codahale.com">metrics</a> documentation for more information.</p>
+
+<div class="footnotes">
+ <ol>
+<li id="fn:1">
+ <p>csv-based metrics logging are usually specified as a node configuration, and must point to a clean directory, different for each node. Otherwise the metrics logging system will try to create multiple new files with the same name, and depending on your setup, that may not be possible.<a href="#fnref:1" rel="reference">â©</a></p>
+ </li>
+ </ol>
+</div>
</div>
</div>
<div id="footer">
Modified: incubator/s4/site/doc/0.6.0/overview/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/doc/0.6.0/overview/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/doc/0.6.0/overview/index.html (original)
+++ incubator/s4/site/doc/0.6.0/overview/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
Modified: incubator/s4/site/doc/0.6.0/recommended_practices/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/doc/0.6.0/recommended_practices/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/doc/0.6.0/recommended_practices/index.html (original)
+++ incubator/s4/site/doc/0.6.0/recommended_practices/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
Modified: incubator/s4/site/doc/0.6.0/tools/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/doc/0.6.0/tools/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/doc/0.6.0/tools/index.html (original)
+++ incubator/s4/site/doc/0.6.0/tools/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
Modified: incubator/s4/site/doc/0.6.0/twitter_trending_example/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/doc/0.6.0/twitter_trending_example/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/doc/0.6.0/twitter_trending_example/index.html (original)
+++ incubator/s4/site/doc/0.6.0/twitter_trending_example/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -120,14 +120,16 @@ password=<matching password>
<p>Build and deploy twitter-counter app</p>
<pre><code> ./s4 s4r -b=`pwd`/test-apps/twitter-counter/build.gradle -appClass=org.apache.s4.example.twitter.TwitterCounterApp twitter-counter
+
./s4 deploy -appName=twitter-counter -c=cluster1 -s4r=`pwd`/test-apps/twitter-counter/build/libs/twitter-counter.s4r
</code></pre>
</li>
<li>
- <p>Build and deploy twitter-adapter app. In this example, we donât directly specify the app class of the adapter, we use the deployment approach for apps (remember, the adapter is also an app). Notice that the twitter-adapter package also has a different naming scheme. <sup id="fnref:1"><a href="#fn:1" class="footnote">1</a></sup></p>
+ <p>Build and deploy twitter-adapter app. In this example, we donât directly specify the app class of the adapter, we use the deployment approach for apps (remember, the adapter is also an app). </p>
<pre><code> ./s4 s4r -b=`pwd`/test-apps/twitter-adapter/build.gradle -appClass=org.apache.s4.example.twitter.TwitterInputAdapter twitter-adapter
- ./s4 deploy -appName=twitter-adapter -c=cluster2 -s4r=`pwd`/test-apps/twitter-adapter/build/libs/twitter-adapter-0.0.0-SNAPSHOT.s4r -p=s4.adapter.output.stream=RawStatus
+
+ ./s4 deploy -appName=twitter-adapter -c=cluster2 -s4r=`pwd`/test-apps/twitter-adapter/build/libs/twitter-adapter.s4r -p=s4.adapter.output.stream=RawStatus
</code></pre>
</li>
<li>
@@ -159,15 +161,6 @@ password=<matching password>
<p>We hope this will help you start rapidly, and remember: weâre happy to help!</p>
<hr>
-<h3 id="footnotes">Footnotes</h3>
-
-<div class="footnotes">
- <ol>
-<li id="fn:1">
- <p>Modifying the <code>build.gradle</code> script you can change several aspects of the build process. By default the name of the <code>s4r</code> package is the application name provided in the packaging step, but you can attach the version automatically as in this example.<a href="#fnref:1" class="reversefootnote">â©</a></p>
- </li>
- </ol>
-</div>
</div>
</div>
<div id="footer">
Modified: incubator/s4/site/doc/0.6.0/walkthrough/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/doc/0.6.0/walkthrough/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/doc/0.6.0/walkthrough/index.html (original)
+++ incubator/s4/site/doc/0.6.0/walkthrough/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -163,7 +163,7 @@
<span class="n">createInputStream</span><span class="o">(</span><span class="s">"names"</span><span class="o">,</span> <span class="k">new</span> <span class="n">KeyFinder</span><span class="o"><</span><span class="n">Event</span><span class="o">>()</span> <span class="o">{</span>
<span class="c1">// the KeyFinder is used to identify keys</span>
<span class="nd">@Override</span>
- <span class="kd">public</span> <span class="n">List</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="n">get</span><span class="o">(</span><span class="n">Event</span> <span class="n">event</span><span class="o">)</span> <span class="o">{</span>
+ <span class="kd">public</span> <span class="n">List</span><span class="o"><</span><span class="n">String</span><span class="o">></span> <span class="nf">get</span><span class="o">(</span><span class="n">Event</span> <span class="n">event</span><span class="o">)</span> <span class="o">{</span>
<span class="k">return</span> <span class="n">Arrays</span><span class="o">.</span><span class="na">asList</span><span class="o">(</span><span class="k">new</span> <span class="n">String</span><span class="o">[]</span> <span class="o">{</span> <span class="n">event</span><span class="o">.</span><span class="na">get</span><span class="o">(</span><span class="s">"name"</span><span class="o">)</span> <span class="o">});</span>
<span class="o">}</span>
<span class="o">},</span> <span class="n">helloPE</span><span class="o">);</span>
Modified: incubator/s4/site/download/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/download/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/download/index.html (original)
+++ incubator/s4/site/download/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
Modified: incubator/s4/site/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/index.html (original)
+++ incubator/s4/site/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -60,7 +60,7 @@
<div class="span-18 colborder" id="main">
<div class="span-18 last" id="about">
<div class="span-17 last" id="notice">
- <div id="notice_text">March 2013: <b>S4 0.6.0 Release Candidate</b> <a href="http://people.apache.org/~mmorel/s4-0.6.0-incubating-release-candidate-2/">available for download</a>. Check the <a href="doc/0.6.0">improved documentation</a>!.</div>
+ <div id="notice_text">March 2013: <b>S4 0.6.0 Release Candidate</b> <a href="http://people.apache.org/~mmorel/s4-0.6.0-incubating-release-candidate-3/">available for download</a>. Check the <a href="doc/0.6.0">improved documentation</a>!.</div>
</div>
<div class="span-17 last" id="notice">
<div id="notice_text">August 2012: <b>S4 0.5.0 has been released!</b> Get it <a href="download">here</a>!.</div>
Modified: incubator/s4/site/style/nav.css
URL: http://svn.apache.org/viewvc/incubator/s4/site/style/nav.css?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/style/nav.css (original)
+++ incubator/s4/site/style/nav.css Mon Mar 18 12:01:35 2013
@@ -85,7 +85,7 @@
/* for webkit browsers */
background: -moz-linear-gradient(top, #04acec, #0186ba) !important;
/* for firefox 3.6+ */
- color: #fff !important;
+ color: white !important;
-webkit-border-radius: 0;
-moz-border-radius: 0;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
Modified: incubator/s4/site/style/style.css
URL: http://svn.apache.org/viewvc/incubator/s4/site/style/style.css?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/style/style.css (original)
+++ incubator/s4/site/style/style.css Mon Mar 18 12:01:35 2013
@@ -22,7 +22,7 @@ body code, body pre {
a {
color: #000;
text-decoration: none;
- border-bottom: 1px dotted #222;
+ border-bottom: 1px dotted #222222;
}
/* line 30, content/style/style.scss */
@@ -39,8 +39,8 @@ a:visited {
/* line 33, content/style/style.scss */
#wrapper {
- border-top: 1px solid #bbb;
- border-bottom: 1px solid #bbb;
+ border-top: 1px solid #bbbbbb;
+ border-bottom: 1px solid #bbbbbb;
background: #fff;
padding-bottom: 3em;
padding-top: 3em;
@@ -143,14 +143,14 @@ a:visited {
/* line 125, content/style/style.scss */
span.copyright {
- text-shadow: 1px 1px 0 #FFFFFF;
+ text-shadow: 1px 1px 0 white;
color: #999;
}
/* line 134, content/style/style.scss */
.titleheader {
font-size: 30px;
- text-shadow: #fff 0px 1px 0;
+ text-shadow: white 0px 1px 0;
/* color: #C17878; */
color: #7e2217;
margin-bottom: 20px;
@@ -159,7 +159,7 @@ span.copyright {
/* line 142, content/style/style.scss */
.secheader, h1 {
font-size: 25px;
- text-shadow: #fff 0px 1px 0;
+ text-shadow: white 0px 1px 0;
/* color: #C17878; */
color: #7e2217;
margin-top: 20px;
@@ -168,7 +168,7 @@ span.copyright {
/* line 150, content/style/style.scss */
.subsecheader, h2 {
font-size: 20px;
- text-shadow: #fff 0px 1px 0;
+ text-shadow: white 0px 1px 0;
/* color: #C17878; */
color: #7e2217;
margin-top: 20px;
@@ -182,7 +182,7 @@ span.copyright {
/* line 162, content/style/style.scss */
.subssubecheader, h3 {
font-size: 16px;
- text-shadow: #fff 0px 1px 0;
+ text-shadow: white 0px 1px 0;
/* color: #C17878; */
color: #7e2217;
margin-top: 20px;
@@ -191,7 +191,7 @@ span.copyright {
/* line 172, content/style/style.scss */
.horrule {
margin-top: 30px;
- border-top: 1px solid #DDDDDD;
+ border-top: 1px solid #dddddd;
clear: both;
}
@@ -203,7 +203,7 @@ span.copyright {
/* line 183, content/style/style.scss */
.sidetext {
- border-left: 4px solid #ddd;
+ border-left: 4px solid #dddddd;
padding-left: 4px;
}
@@ -214,13 +214,13 @@ span.copyright {
-moz-border-radius: 3px;
border-radius: 3px;
text-align: center;
- border: 1px dotted #ddd;
+ border: 1px dotted #dddddd;
}
/* line 197, content/style/style.scss */
#latest_head {
font-size: 14px;
- text-shadow: #fff 0px 1px 0;
+ text-shadow: white 0px 1px 0;
margin: 0;
color: #7e2217;
}
@@ -258,7 +258,7 @@ span.copyright {
/* line 233, content/style/style.scss */
.greybar {
- border-left: 4px solid #ddd;
+ border-left: 4px solid #dddddd;
padding-left: 10px;
}
@@ -296,7 +296,7 @@ ul.greybar {
/* line 253, content/style/style.scss */
.tabular table {
background: #fff;
- border: 1px solid #ddd;
+ border: 1px solid #dddddd;
}
/* line 258, content/style/style.scss */
@@ -309,7 +309,7 @@ input[type="text"], input[type="password
padding: 5px;
font-size: 14px;
background-color: #fff;
- border: 1px solid #bbb;
+ border: 1px solid #bbbbbb;
color: #222;
}
Modified: incubator/s4/site/team/index.html
URL: http://svn.apache.org/viewvc/incubator/s4/site/team/index.html?rev=1457723&r1=1457722&r2=1457723&view=diff
==============================================================================
--- incubator/s4/site/team/index.html (original)
+++ incubator/s4/site/team/index.html Mon Mar 18 12:01:35 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">