[brooklyn-library] branch master updated (961d062 -> 215e010)

[iu...@apache.org]

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

iuliana pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git.


    from 961d062  Merge pull request #183 from jcabrerizo/feature/bump-karaf
     new 5495d8f  Added Tomcat9 type and modified logos to see the difference between brooklyn types
     new 8826815  Added license for new files
     new 94d65ee  Added Tomcat 9 to the catalog
     new 773598d  Added anotation in the proper place
     new 9130174  added server and web XML config for Tomcat9
     new 57e9371  Added interface to be imported
     new 215e010  Merge pull request #184 from iuliana/feature/tomcat9

The 3776 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../entity/webapp/tomcat/Tomcat8Server.java        |    8 +-
 .../{Tomcat8Server.java => Tomcat9Server.java}     |   26 +-
 ...mcat8ServerImpl.java => Tomcat9ServerImpl.java} |    2 +-
 .../entity/webapp/tomcat/TomcatServer.java         |    9 +-
 software/webapp/src/main/resources/catalog.bom     |    9 +-
 .../entity/webapp/tomcat/tomcat8-server.xml        |   53 +-
 .../{tomcat8-server.xml => tomcat9-server.xml}     |    0
 .../tomcat/{tomcat8-web.xml => tomcat9-web.xml}    | 1018 +++++++++++---------
 software/webapp/src/main/resources/tomcat-logo.png |  Bin 18612 -> 0 bytes
 .../webapp/src/main/resources/tomcat7-logo.png     |  Bin 0 -> 29579 bytes
 .../webapp/src/main/resources/tomcat8-logo.png     |  Bin 0 -> 31537 bytes
 .../webapp/src/main/resources/tomcat9-logo.png     |  Bin 0 -> 30956 bytes
 12 files changed, 637 insertions(+), 488 deletions(-)
 copy software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/{Tomcat8Server.java => Tomcat9Server.java} (76%)
 copy software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/{Tomcat8ServerImpl.java => Tomcat9ServerImpl.java} (92%)
 copy software/webapp/src/main/resources/org/apache/brooklyn/entity/webapp/tomcat/{tomcat8-server.xml => tomcat9-server.xml} (100%)
 copy software/webapp/src/main/resources/org/apache/brooklyn/entity/webapp/tomcat/{tomcat8-web.xml => tomcat9-web.xml} (77%)
 delete mode 100644 software/webapp/src/main/resources/tomcat-logo.png
 create mode 100644 software/webapp/src/main/resources/tomcat7-logo.png
 create mode 100644 software/webapp/src/main/resources/tomcat8-logo.png
 create mode 100644 software/webapp/src/main/resources/tomcat9-logo.png