Update README.md with new information

README.md

@@ -12,7 +12,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use
      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.
-        
+
 ## Pushing the app using Eclipse ##
 
 ### Step 1: Prerequisites ###
@@ -25,34 +25,23 @@ The source for this app is at GitHub so, you can either download the zip file or
 |-----------|----------------------------------------------------------------------------------------|
 | Git Clone:| `git clone https://github.com/ibmjstart/bluemix-java-sample-twitter-influence-app.git` |
 
-#### • Download Cloud Foundry Plug-in ####
+#### • Download IBM Bluemix Plug-in ####
 
 You will also need to download the Cloud Foundry plug-in for Eclipse.  To do this, go to Eclipse and follow the instructions below:
 
   1. Click: Help > Eclipse Marketplace...
-  2. Search: "Cloud Foundry"
-  3. Look for the item titled: "Cloud Foundry Integration for Eclipse x.x.x" (It should be the first listing)
+  2. Search: "Bluemix"
+  3. Look for the item titled: "IBM Eclipse Tools for Bluemix" (It should be the first listing)
   4. Click: Install
-    
-![logo](http://docs.cloudfoundry.com/images/sts/eclipse-marketplace.png)
+
+![logo](images/bluemix_plugin.png)
 
 ### Step 2. Import the project into Eclipse ###
-		
+
 Next, you will need to import the project into [**Eclipse**](https://www.eclipse.org/downloads/packages/eclipse-ide-java-ee-developers/keplersr2).  Recommendation is to use the Eclipse IDE for Java EE Developers.  
 
 There are two ways you can get the source into Eclipse:
 
-Option A. Import the Eclipse project by following these instructions:
-  1. Start by cloning the repository, as described above
-  2. Open Eclipse
-  3. Select File->Import
-  4. Under the header labeled "General", click "Existing Projects Into Workspace" and click Next
-  5. Click "Browse" next to the first text field, and navigate to the cloned repository and find the folder labeled "app" and click ok.
-  6. Under Projects you should now see a project called "twitter_influence_analyzer", make sure the checkbox next to the "twitter_influence_analyzer" project is checked and then click Finish
-  7. You should now see the "twitter_influence_analyzer" project in your list of projects in Eclipse.
-
- -OR-
-
 Option B. Import the WAR File
   1. Navigate to https://github.com/ibmjstart/bluemix-java-sample-twitter-influence-app/releases
   2. Click the green button labeled "twitter_influence_analyzer.war" and that will download the WAR file.
@@ -61,6 +50,17 @@ Option B. Import the WAR File
   5. Scroll down to the "Web" section, expand that section and click WAR File then click Next.
   6. Click next and then Finish and the project should be imported into Eclipse
 
+  -OR-
+
+Option A. Import the Eclipse project by following these instructions:
+  1. Start by cloning the repository, as described above
+  2. Open Eclipse
+  3. Select File->Import
+  4. Under the header labeled "General", click "Existing Projects Into Workspace" and click Next
+  5. Click "Browse" next to the first text field, and navigate to the cloned repository and find the folder labeled "app" and click ok.
+  6. Under Projects you should now see a project called "twitter_influence_analyzer", make sure the checkbox next to the "twitter_influence_analyzer" project is checked and then click Finish
+  7. You should now see the "twitter_influence_analyzer" project in your list of projects in Eclipse.  
+
 ### Step 3. Acquiring External and Public APIs ###
 
 This app uses some external APIs. You need to register the app with Twitter and Klout to get the keys and tokens.
@@ -71,25 +71,21 @@ To access the Twitter API you need the consumer keys and access tokens, so you m
 
 [More information on how to register the app with Twitter](registerTwitter.md)
 
-#### • Klout API ####
-
-You can register the app with Klout [here](http://developer.klout.com/member/). When you register with Klout, you'll get a Klout Key, which you can use to create a Klout Object as shown in the code.
-
 #### • Google Maps v3 API ####
 
 This app uses the Google Maps v3 APIs. Google APIs are open for the developers and you do not need to register the app with Google. Here's the [link](https://developers.google.com/maps/documentation/javascript/tutorial) for the Google Maps APIs.
 
 
 ### Step 4. Configuring the Project Files###
 
-There are two files that need to be edited.  You can do this directly in Eclipse or using your favorite text editor.
+Edit the twitter4j.properties file with your API and access token credentials. You can do this directly in Eclipse or using your favorite text editor.
 
 |                    Filenames                 |                              Path                               |
 |----------------------------------------------|-----------------------------------------------------------------|
-| `twitter4j.properties`<br>`klout.properties` | Local: `.../bluemix-java-sample-twitter-influence-app/app/src/` |
-| `twitter4j.properties`<br>`klout.properties` | Eclipse: `Project_Name > Java Resources > src`                  |            
+| `twitter4j.properties` | Local: `.../bluemix-java-sample-twitter-influence-app/app/src/` |
+| `twitter4j.properties` | Eclipse: `Project_Name > Java Resources > src`                  |
 
-The twitter credentials are entered in the file called `twitter4j.properties`. Simply copy and paste the credentials from your new app on twitter into the appropriate categories in the file. Additionally, the Klout API key is entered in the file called `klout.properties`.
+The twitter credentials are entered in the file called `twitter4j.properties`. Simply copy and paste the credentials from your new app on twitter into the appropriate categories in the file.
 
 ### Step 5. Deploying the app ###
 
@@ -99,29 +95,31 @@ Make sure you are in the Java EE [perspective](http://help.eclipse.org/juno/inde
 
   1. In the bottom window section, select the **Servers** tab.  (Alternatively, you can click: `Window > Show View > Servers`)
   2. Right-Click inside the Servers panel and select `New > Server`
-  3. Select, `Pivotal > Cloud Foundry` and click Next.
-  4. Click Manage Cloud, then click Add
-  5. Enter: `Bluemix` as the name, and `https://api.ng.bluemix.net` as the URL
-  6. Click Finish, then click, OK
-  7. Enter your login information for Bluemix in the email and password sections.
-  8. From the URL dropdown menu, choose: Bluemix
-  9. Click: Validate Account
-  10. Click: Finish
+  3. Select, `IBM > IBM Bluemix` and click `Next`.
+  4. Enter your login information for Bluemix in the email and password sections.
+  5. From the URL dropdown menu, choose: `IBM Bluemix`
+  6. Hit `Next` and Bluemix will automatically validate your account credentials.
+  7. Optional: Select the Organization within your Bluemix account that you would like to deploy to.
+  8. Click: Finish
 
 #### • Push the app ####
   1. Right-Click on the Bluemix server and click: `Connect`  (Optional)
   2. Right-Click on the Bluemix server and select: `Add and Remove...`
   3. Select your Twitter Influence Analyzer project from the window on the left and click: `Add >`
   4. Click: `Finish`
-  5. Enter a Name and select: Next
-  6. Enter a THE SAME hostname that you used to register with Twitter. (e.g. `https://`**`myTwitterApp`**`.mybluemix.net`)
+  5. Enter a Name for your app and select: `Next`
+  6. Enter THE SAME subdomain that you used to register with Twitter. (e.g. `https://`**`myTwitterApp`**`.mybluemix.net`)
   7. Click: Finish
 
 **CONGRATS!**  Your app is now published to Bluemix.  
 (Note: It can take a few minutes to upload everything and deploy all of the services.)
 
 ### Step 6. Create a Cloudant service ###
 
+There are two ways to create and bind the cloudant service to your application.
+
+Option A. Using the ACE UI:
+
   1. In your web browser, go to: [https://ace.ng.bluemix.net](https://ace.ng.bluemix.net)
   2. Login and scroll down to the **Services** section
   3. Click: `Add a service`
@@ -130,6 +128,15 @@ Make sure you are in the Java EE [perspective](http://help.eclipse.org/juno/inde
   6. From the drop down menu, select your new app.
   7. Click: `Create`
 
+Option B. Using the Eclipse plugin for Bluemix
+  1. Double click your application under the IBM Bluemix server.
+  2. Under the services selection, select the "add a service icon" in the top right.
+  3. Search for cloudantNoSQLDB, and select the first option. Give it a name and pick the shared plan.
+  ![image](images/cloudant_service.png)
+  4. Select `Finish`. This will create the service in your Bluemix organization.
+  5. Under services, where your new service (with the name you specified) shows, drag the new service to "Application Services" on the right side of Eclipse. (Verify that you have the right application with the application name.)
+  6. Click `Update and Restart` to restart your app with the new service.
+
 ### Step 7. Explore your app ####
 
   1. Navigate to the main dashboard view in Bluemix
@@ -140,12 +147,12 @@ Make sure you are in the Java EE [perspective](http://help.eclipse.org/juno/inde
 
 This is the home screen of the app. You can enter a twitter screen name in the text box and click the Analyze button to see their influence. You can also view any records saved in the database by clicking on the 'View Database' button.
 
-![image](images/home.png)
+![image](images/home_page.png)
 
 After entering the twitter name and clicking the Analyze button, you'll be able to see the influence analysis of that person on the left side. You will also see their last 10 tweets and any recent mentions in the tweets plotted on Google Maps (if there is geolocation data for a tweet).
 
-![image](images/results.png)
+![image](images/search_results.png)
 
 These are the records of the Influencers in the database. The user can also delete the records.
 
-![image](images/saved_records.png)
+![image](images/saved_record.png)