Merge lp:~mbruzek/charms/trusty/tomcat/trunk into lp:charms/trusty/tomcat

[Matt Bruzek]

A user suggested adding the relation type that is in the precise charm to the trusty one with a slight rename to make it more idiomatic. This involved updating the metadata.yaml and creating the relation file (which now matches precise).

I added instructions in the README.md on how to use the relation.

Also updated the tests to use our latest best practices.

[Cory Johns (johnsca)]

LGTM

review: Approve

[Matt Bruzek (mbruzek)]

Related bug: https://bugs.launchpad.net/charms/+source/tomcat/+bug/1538715

[Kevin W Monroe (kwmonroe)]

Thanks for this MP! This has been merged into trusty/tomcat and should show up in the charmstore within an hour.

review: Approve

=== modified file 'README.md'
--- README.md	2014-03-21 15:07:22 +0000
+++ README.md	2016-01-27 22:07:58 +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-container-relation-joined'
--- hooks/webapp-container-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/webapp-container-relation-joined	2016-01-27 22:07:58 +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	2016-01-27 22:07:58 +0000
@@ -2,14 +2,21 @@
 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"]
+tags:
+  - application_development
+  - java
+  - webapp
+
 provides:
   website:
     interface: http
+  webapp-container:
+    interface: java-webapp
+    scope: container
 requires:
   jndi-memcached:
     interface: memcache

=== modified file 'tests/10-configured-deploy.py'
--- tests/10-configured-deploy.py	2014-10-10 08:56:18 +0000
+++ tests/10-configured-deploy.py	2016-01-27 22:07:58 +0000
@@ -55,7 +55,7 @@
     'cluster_enabled': True
 }
 
-d = amulet.Deployment()
+d = amulet.Deployment(series='trusty')
 # Add the tomcat charm to the deployment.
 d.add('tomcat', units=scale)
 d.add('memcached')
@@ -83,18 +83,18 @@
     raise
 
 # Get the sentry unit for tomcat0.
-tomcat_unit = d.sentry.unit['tomcat/0']
+tomcat_unit = d.sentry['tomcat'][0]
 # Get the public address for tomcat0.
 tomcat0_address = tomcat_unit.info['public-address']
 # Get the terracotta unit.
-terracotta_unit = d.sentry.unit['terracotta/0']
+terracotta_unit = d.sentry['terracotta'][0]
 # Get the relation to terracotta.
 terracotta_relation = terracotta_unit.relation('dso', 'tomcat:jndi-terracotta')
 # Get the private address of terracotta to ensure the relation has that data.
 terracotta_private_address = terracotta_relation['private-address']
 print("terracotta private address " + terracotta_private_address)
 # Get the memcached unit.
-memcached_unit = d.sentry.unit['memcached/0']
+memcached_unit = d.sentry['memcached'][0]
 # Get the relation to memcached.
 memcached_relation = memcached_unit.relation('cache', 'tomcat:jndi-memcached')
 # Get the private address of memcached to ensure the relation has that data.
@@ -118,7 +118,7 @@
 tomcat1_address = address.decode().rstrip('\n')
 
 ###############################################################################
-## Read the /etc/tomcatX/default file to verifiy configuration settings.
+## Read the /etc/tomcatX/default file to verify configuration settings.
 ###############################################################################
 # Read in the default file from the tomcat unit.
 default_tomcat = tomcat_unit.file_contents('/etc/default/{0}'.format(
@@ -169,7 +169,7 @@
 static_member = server_xml[index:].split('\n')[0]
 print(static_member)
 print(tomcat1_address)
-# Search for tomcat1 address in the tomcat0 server.xml to verifiy clustered.
+# Search for tomcat1 address in the tomcat0 server.xml to verify clustered.
 static_member.index(tomcat1_address)
 
 ###############################################################################