Merge branch 'wls_servlet' of https://github.com/oracle/oracle-db-examples into wls_servlet

Nirmala Sundarappa · Nirmala Sundarappa · commit 5f0e6e6bbf25 · 2017-07-21T13:16:16.000-07:00
diff --git a/java/jdbc/Tomcat_Servlet/Readme.md b/java/jdbc/Tomcat_Servlet/Readme.md
@@ -1,21 +1,29 @@
 # Tomcat Java Servlet   
-The Oracle JDBC drivers allow Java applications to connect and process data in the Oracle Database. Apache Tomcat is the application server for building and deploying Java EE applications.  This repository contains a simple Java servlet along with the build scripts and instructions.  The Java servlet that connects to the Oracle Database and performs some database operations.  The 
+The Oracle JDBC drivers allow Java applications to connect and process data in the Oracle Database. **Apache Tomcat** is the application server for building and deploying Java EE applications.  This repository has code samples for a Java Servlet that connects to the Oracle Database using the Oracle JDBC driver.  We have furnished `build.xml` to compile the servlet and the `Readme.md` that has instructions to compile and deploy this servlet on Tomcat. If you have subscribed to any Oracle Database Service on Cloud such as DBCS, EECS, BMCS etc., follow these instructions to verify the database connectivity with Tomcat.  
  
 # What you need to install? 
 
-* **Apache Tomcat**: Download and install the [Apache Tomcat v](http://www.oracle.com/technetwork/middleware/weblogic/downloads/index.html)
+* **Apache Tomcat**: Download and install [Apache Tomcat](https://tomcat.apache.org/)
 * **Apache Ant**: Make sure you have [Apache ANT](http://ant.apache.org/) to compile the source code 
 * **JDBC driver**: Download the latest JDBC driver [ojdbc8.jar from OTN](http://www.oracle.com/technetwork/database/features/jdbc/jdbc-ucp-122-3110062.html)  
+* **Oracle Database**:  You need to have a working Oracle Database with the credentials to verify the successful connection.  Make sure either you have subscribed to Oracle Database Service on Cloud (DBCS, EECS, BMCS, ExaCS) or installed an Oracle Database on premise. 
 
 # Steps to compile the Java Servlet 
 
 * **Update build.xml**: Download the `build.xml` present in this repository.  Update TOMCAT_HOME to point to the location where Tomcat is installed. 
-* **Create a Resource  in context.xml**: Create an Oracle Datasource through the admin console.    Let us name this datasource as `orcljdbc_ds`
-* **Update JDBCSample_Servlet**: Download the `JDBCSample_Servlet` from this repository and make sure you are using the correct name of the Oracle datasource created through admin console. i.e., `orcljdbc_ds` in the method `getDataSource()`
+* **Create a Resource in context.xml**: Download the `context.xml` present in `META-INF` folder.  Update the database URL, username, and password to point to your Oracle Database.  Let us name this datasource as `orcljdbc_ds`
+* **Update JDBCSample_Servlet**: Download the `JDBCSample_Servlet` from this repository.  Update the method `getDataSource()` to use the correct Oracle datasource name. E.g.,`orcljdbc_ds` 
+* **JDBC driver**: Place the downloaded JDBC driver ojdbc8.jar in `WEB-INF/lib` folder. 
 * **Create the war file**: Go to the location where the `build.xml` is located.  Execute the command `ant` that will compile and also create the `JDBCSample.war` file in the `dist` folder. 
 
 # Steps to deploy and run the Java Servlet 
 
 * **Deploy the WAR file**: Copy the `JDBCSample.war` file to TOMCAT_HOME/webapps/ and Start the Tomcat Server  
 * **Invoke the Servlet**: Invoke the servlet at `https://localhost:8080/JDBCSample/JDBCSample_Servlet`
 * **Check the Results**: Check the results on the page and make sure that it prints driver information retrieved from the Oracle database.  
+
+
+# Other Resources 
+
+* [Connecting Java Applications to Database Cloud Services](https://blogs.oracle.com/dev2dev/connecting-java-applications-to-database-cloud-services)
+* [Using Java Containers with Exadata Express Cloud Service (EECS)](http://www.oracle.com/technetwork/database/application-development/jdbc/jdbc-eecontainers-cloud.html#tomcat)
diff --git a/java/jdbc/WebLogicServer_Servlet/Readme.md b/java/jdbc/WebLogicServer_Servlet/Readme.md
@@ -12,7 +12,7 @@ The Oracle JDBC drivers allow Java applications to connect and process data in t
 
 * **Update build.xml**: Download the `build.xml` present in this repository.  Update WLS_HOME to point to the location where WebLogic Server is installed. 
 * **Create a Datasource in WebLogicServer**: Create an Oracle Datasource through the admin console.  Refer to the blog for more details ["Create and Deploy a Java Servlet using WebLogic Server"](https://blogs.oracle.com/dev2dev/create-and-deploy-a-java-servlet-using-weblogic-server-wls).  Let us name this datasource as `orcljdbc_ds`
-* **Update JDBCSample_Servlet**: Download the `JDBCSample_Servlet` from this repository and make sure you are using the correct name of the Oracle datasource created through admin console. i.e., `orcljdbc_ds` in the method `getDataSource()`
+* **Update JDBCSample_Servlet**: Download the `JDBCSample_Servlet` from this repository and Update the method `getDataSource()` to use the correct Oracle datasource name. E.g.,`orcljdbc_ds` created through admin console. 
 * **Create the war file**: Go to the location where the `build.xml` is located.  Execute the command `ant` that will compile and also create the `JDBCSample.war` file in the `dist` folder. 
 
 # Steps to deploy and run the Java Servlet 
