Merge lp:~johnsca/charms/trusty/tomcat/explicit into lp:charms/trusty/tomcat

[Cory Johns]

Added explicit relation for charms to provide webapps to Tomcat.
Added instruction to the README on how to manually deploy webapps.

[Matt Bruzek (mbruzek)]

+1 LGTM

Please recommend the same change for the precise version of tomcat so we can get this for the precise series as well.

review: Approve

=== modified file 'README.md'
--- README.md	2014-03-21 15:07:22 +0000
+++ README.md	2015-01-22 23:31:26 +0000
@@ -103,6 +103,23 @@
     # set bio connector
     juju set tomcat http_connector=bio
 
+## Deploying a WebApp to Tomcat
+
+A webapp can be deployed with the Tomcat charm in one of two ways: it can
+be provided by another charm, or you can manually upload it.
+
+For another charm to provide a webapp, it must be a subordinate charm that
+supports the `java-webapp` relation.
+
+To upload a webapp to Tomcat, simply use the following:
+
+    juju scp webapp.war tomcat/0:
+    juju ssh tomcat/0 'sudo mv webapp.war /var/lib/tomcat7/webapps'
+
+(If you changed the version of tomcat being deployed, you will need to adjust
+the path appropriately.)
+
+
 ## Java Debugger (JDB)
 
 Remote debugging can be useful for application development and diagnosing 

=== added file 'hooks/webapp-relation-joined'
--- hooks/webapp-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/webapp-relation-joined	2015-01-22 23:31:26 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -ex
+
+VERSION=`config-get tomcat_version`
+relation-set webapp-path /var/lib/$VERSION/webapps

=== modified file 'metadata.yaml'
--- metadata.yaml	2014-03-21 01:33:15 +0000
+++ metadata.yaml	2015-01-22 23:31:26 +0000
@@ -2,14 +2,17 @@
 summary: Apache Tomcat 6 or 7 Servlet and JSP engine
 maintainer: Matthew Bruzek <[e-mail]>
 description: |
-  Apache Tomcat is an open source implementation of the Java Servlet and 
-  JavaServer Pages (JSP) specifications, and provides a "pure Java" HTTP 
+  Apache Tomcat is an open source implementation of the Java Servlet and
+  JavaServer Pages (JSP) specifications, and provides a "pure Java" HTTP
   web server environment for Java web applications to run.
 
 categories: ["app-servers"]
 provides:
   website:
     interface: http
+  webapp:
+    interface: java-webapp
+    scope: container
 requires:
   jndi-memcached:
     interface: memcache