This is an automated email from the ASF dual-hosted git repository.

pdesai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-website.git


The following commit(s) were added to refs/heads/master by this push:
     new a2c96d2  Update Java hello world example with updated instructions 
(#437)
a2c96d2 is described below

commit a2c96d2954537c44aa3e4ed6b780af7f4f1dc4f4
Author: Matt Rutkowski <mrutk...@us.ibm.com>
AuthorDate: Mon Jul 6 22:38:30 2020 -0500

    Update Java hello world example with updated instructions (#437)
    
    * Update Java hello world example with updated instructions
    
    * Update Java hello world example with updated instructions
    
    * Update Java hello world example with updated instructions
---
 _includes/code/Hello.java                   |   2 --
 _layouts/documentation.html                 |  49 +++++++++++++++++-----------
 images/runtimes/icon-rust-mono.png          | Bin 0 -> 17729 bytes
 images/runtimes/logo-scala-notext-color.png | Bin 0 -> 47880 bytes
 4 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/_includes/code/Hello.java b/_includes/code/Hello.java
index 9801e88..a76cba0 100644
--- a/_includes/code/Hello.java
+++ b/_includes/code/Hello.java
@@ -1,5 +1,3 @@
-package hello;
-
 import com.google.gson.JsonObject;
 
 public class Hello {
diff --git a/_layouts/documentation.html b/_layouts/documentation.html
index 6b02d58..848a6b1 100644
--- a/_layouts/documentation.html
+++ b/_layouts/documentation.html
@@ -489,7 +489,7 @@ layout: default
         <!-- OpenWhisk CLI                                              -->
         <!-- ********************************************************** -->
         <a class="indexable" id="wsk-cli"></a>
-        <h4>OpenWhisk CLI (wsk)</h4>
+        <h4>OpenWhisk CLI <em>(wsk)</em></h4>
         <p>OpenWhisk offers the <code>wsk</code> Command Line Interface
           (CLI) to easily create, run, and manage OpenWhisk entities.
         </p>
@@ -661,19 +661,18 @@ $ wsk list -v
         <!-- Whisk Deploy                                               -->
         <!-- ********************************************************** -->
         <a class="indexable" id="wskdeploy"></a>
-        <h4>Whisk Deploy (wskdeploy)</h4>
+        <h4>Whisk Deploy <em>(wskdeploy)</em></h4>
         <p>
           <a 
href="https://github.com/apache/openwhisk-wskdeploy/blob/master/README.md";>Whisk
 Deploy</a>
           is a utility, named <em>wskdeploy</em>, to help deploy and
           manage all your OpenWhisk Packages, Actions, Triggers, Rules
-          and APIs using a single command using an application manifest.
+          and APIs from a single command using an application manifest.
         </p>
 
+        <h5>Whisk deploy in the <em>wsk</em> CLI</h5>
+
         <p>
-          The functionality of wskdeploy is also embedded as a subcommand 
-          of wsk in the CLI. You can use the <code>wsk deploy</code> 
-          subcommand or follow the instructions below on installing the 
-          wskdeploy utility.
+          The functionality of <em>wskdeploy</em> is also embedded as the 
<code>deploy</code> subcommand within the <em>wsk</em> CLI. The functionality 
is identical and supports all the same parameters and flags. This means that 
you can use the <code>wsk deploy</code> subcommand if you already have the CLI 
installed or follow the instructions below on installing the wskdeploy utility 
for standalone use.
         </p>
 
         <h5>Installing</h5>
@@ -1180,6 +1179,11 @@ $ wsk list -v
               </div>
             </li>
             <li style="list-style-type: decimal">
+              <p>
+              Assure that you have downloaded the JAR file for the imported 
`com.google.gson.JsonObject` library (i.e., <a  target="_blank" 
href="https://mvnrepository.com/artifact/com.google.code.gson/gson/2.8.5";>google-gson-2.8.5.jar</a>
 from Maven) to your Java `CLASSPATH`.
+              </p>
+            </li>
+            <li style="list-style-type: decimal">
               Compile <i>Hello.Java</i> into a JAR file
               <i>hello.jar</i> as follows
               <div class="terminal">
@@ -1188,9 +1192,16 @@ $ javac Hello.java
 $ jar cvf hello.jar Hello.class
 {% endhighlight %}
               </div>
+              <div>Please note that the current default JVM for OpenWhisk is 
Java 8. If you are using a newer version, you must specify that release version 
when you compile:
+              </div>
+              <div class="terminal">
+{% highlight bash %}
+$ javac --release 8 Hello.java
+{% endhighlight %}
+              </div>
             </li>
             <li style="list-style-type: decimal">
-              Create an action called <i>helloJava</i> using <i>hello.jar</i>:
+              Create an action called <i>helloJava</i> using <i>hello.jar</i> 
specifying the Java class where the `main` entry point you wish to invoke:
               <div class="terminal">
 {% highlight bash %}$ wsk action create helloJava hello.jar --main Hello{% 
endhighlight %}
               </div>
@@ -2548,9 +2559,9 @@ abcd.... locationUpdate
           <a class="indexable" id="quick_start"></a>
           <h5>Quick Start</h5>
           <p>
-            The easiest way to start using OpenWhisk is to install the 
"Standalone" 
-            OpenWhisk stack. This is a full-featured OpenWhisk stack running 
as a Java process 
-            for convenience. Serverless functions run within Docker 
containers. 
+            The easiest way to start using OpenWhisk is to install the 
"Standalone"
+            OpenWhisk stack. This is a full-featured OpenWhisk stack running 
as a Java process
+            for convenience. Serverless functions run within Docker containers.
             You will need <a 
href="https://docs.docker.com/installDocker";>Docker</a>,
             <a 
href="https://java.com/en/download/help/download_options.xml";>Java</a> and
             <a href="https://nodejs.org/Node.js";>Node.js</a> available on your 
machine.
@@ -2567,16 +2578,16 @@ $ ./gradlew core:standalone:bootRun
           </div>
           <p>
             <ul>
-              <li>When the OpenWhisk stack is up, it will open your browser to 
a functions Playground, 
-                  typically served from <a 
href="http://localhost:3232";>http://localhost:3232</a>. 
+              <li>When the OpenWhisk stack is up, it will open your browser to 
a functions Playground,
+                  typically served from <a 
href="http://localhost:3232";>http://localhost:3232</a>.
                   The Playground allows you create and run functions directly 
from your browser.
               </li>
               <li>To make use of all OpenWhisk features, you will need the 
OpenWhisk command line tool
-                  called wsk which you can download from <a 
href="https://s.apache.org/openwhisk-cli-download";>https://s.apache.org/openwhisk-cli-download</a>.
 
-                  Please refer to the <a 
href="https://github.com/apache/openwhisk/blob/master/docs/cli.md";>CLI 
configuration</a> for additional details. Typically you configure the CLI for 
+                  called wsk which you can download from <a 
href="https://s.apache.org/openwhisk-cli-download";>https://s.apache.org/openwhisk-cli-download</a>.
+                  Please refer to the <a 
href="https://github.com/apache/openwhisk/blob/master/docs/cli.md";>CLI 
configuration</a> for additional details. Typically you configure the CLI for
                   Standalone OpenWhisk as follows:
               </li>
-            </ul> 
+            </ul>
           </p>
             <div class="terminal">
 {% highlight bash %}
@@ -2587,11 +2598,11 @@ wsk property set \
             </div>
             <p>
               <ul>
-              <li> Standalone OpenWhisk can be configured to deploy additional 
capabilities when 
+              <li> Standalone OpenWhisk can be configured to deploy additional 
capabilities when
                 that is desirable. Additional resources are available <a 
href="https://github.com/apache/openwhisk/blob/master/core/standalone/README.md";>here</a>.
               </li>
-              </ul> 
-            </p>   
+              </ul>
+            </p>
         </div>
         <!-- TODO: add left margin for all these alt. options. -->
         <div>
diff --git a/images/runtimes/icon-rust-mono.png 
b/images/runtimes/icon-rust-mono.png
new file mode 100644
index 0000000..db5b8f8
Binary files /dev/null and b/images/runtimes/icon-rust-mono.png differ
diff --git a/images/runtimes/logo-scala-notext-color.png 
b/images/runtimes/logo-scala-notext-color.png
new file mode 100644
index 0000000..b95a090
Binary files /dev/null and b/images/runtimes/logo-scala-notext-color.png differ

Reply via email to