.fixtures.yml

@@ -1,9 +1,8 @@
 fixtures:
   repositories:
-    stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git" 
+    stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
     concat:
       repo:   "https://github.com/puppetlabs/puppetlabs-concat.git"
-      branch: "1.2.x"
     staging: "https://github.com/nanliu/puppet-staging.git"
   symlinks:
     tomcat: "#{source_dir}"

.gitattributes

@@ -0,0 +1,5 @@
+#This file is generated by ModuleSync, do not edit.
+*.rb  eol=lf
+*.erb eol=lf
+*.pp  eol=lf
+*.sh  eol=lf

.gitignore

@@ -1,10 +1,11 @@
+#This file is generated by ModuleSync, do not edit.
 pkg/
 Gemfile.lock
 vendor/
 spec/fixtures/
 .vagrant/
 .bundle/
 coverage/
+log/
 .idea/
 *.iml
-log/

.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

.travis.yml

@@ -1,18 +1,20 @@
+#This file is generated by ModuleSync, do not edit.
 ---
 sudo: false
 language: ruby
+cache: bundler
 bundler_args: --without system_tests
-script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+script: "bundle exec rake validate lint spec"
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.6
     env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.0"
 notifications:
   email: false

CHANGELOG.md

@@ -1,5 +1,51 @@
+## Supported Release 1.5.0
+### Summary
+General rewrite of the installation and instance management code, and better
+service management. Plus a handful of new configuration defined types and actual
+resource dependency ordering.
+
+The primary improvement is that you may now use `tomcat::install` for installing
+various versions of tomcat into various directories (`CATALINA_HOME`), then use
+`tomcat::instance` to create instances from those installs (`CATALINA_BASE`).
+Previously `tomcat::instance` treated both `CATALINA_HOME` and `CATALINA_BASE` as identical and thus only allowed a single tomcat instance per tomcat installation.
+
+Additionally, `tomcat::service` allows `use_init => true, use_jsvc => true` to
+create an init script for service management of source-based installs. And
+`tomcat::instance` can declare a `tomcat::service` resource for your instance to
+make life easier.
+
+#### Features
+- Added `tomcat::config::properties::property` define
+- Added `tomcat::config::server::globalnamingresource` define
+- Added `tomcat::config::context` define
+- Added `tomcat::config::context::resource` define
+- Added `tomcat::config::context::resourcelink` define
+- Added `tomcat::install` define
+- Added `tomcat::config::server::host::aliases` parameter
+- Added `tomcat::service::user` parameter
+- Added `tomcat::setenv::entry` parameters:
+  - `catalina_home`
+  - `addto`
+- Added `tomcat::instance` parameters for multi-instance management:
+  - `user`
+  - `group`
+  - `manage_user`
+  - `manage_group`
+  - `manage_service`
+  - `java_home`
+  - `use_jsvc`
+  - `use_init`
+- Added Debian 8 compatibility
+
+#### Bugfixes
+- Fixed conflating `CATALINA_BASE` with `CATALINA_HOME`
+- Made `tomcat::config::server::connector` protocol default to `$name`
+- Lots of additional validation
+- Added resource dependency declaration (so no more `<-` `->` needed)
+- Undeprecated `tomcat::setenv::entry::order` parameter
+
 ## Supported Release 1.4.1
-###Summary
+### Summary
 
 Small release for bug with multiple Realms in the same parent path.
 

CONTRIBUTING.md

@@ -159,7 +159,7 @@ If you already have those gems installed, make sure they are up-to-date:
 With all dependencies in place and up-to-date we can now run the tests:
 
 ```shell
-% rake spec
+% bundle exec rake spec
 ```
 
 This will execute all the [rspec tests](http://rspec-puppet.com/) tests
@@ -178,8 +178,8 @@ installed on your system.
 You can run them by issuing the following command
 
 ```shell
-% rake spec_clean
-% rspec spec/acceptance
+% bundle exec rake spec_clean
+% bundle exec rspec spec/acceptance
 ```
 
 This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),

Gemfile

@@ -1,48 +1,39 @@
+#This file is generated by ModuleSync, do not edit.
+
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-def location_for(place, fake_version = nil)
-  if place =~ /^(git:[^#]*)#(.*)/
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+def location_for(place, version = nil)
+  if place =~ /^(git[:@][^#]*)#(.*)/
+    [version, { :git => $1, :branch => $2, :require => false}].compact
   elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
+    ['>= 0', { :path => File.expand_path($1), :require => false}]
   else
-    [place, { :require => false }]
+    [place, version, { :require => false}].compact
   end
 end
 
 group :development, :unit_tests do
-  gem 'rspec-core', '3.1.7',     :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'simplecov',               :require => false
-  gem 'puppet_facts',            :require => false
-  gem 'json',                    :require => false
+  gem 'json',                      :require => false
+  gem 'metadata-json-lint',        :require => false
+  gem 'puppet_facts',              :require => false
+  gem 'puppet-blacksmith',         :require => false
+  gem 'puppetlabs_spec_helper',    :require => false
+  gem 'rspec-puppet', '>= 2.3.2',  :require => false
+  gem 'simplecov',                 :require => false
 end
-
 group :system_tests do
-  if beaker_version = ENV['BEAKER_VERSION']
-    gem 'beaker', *location_for(beaker_version)
-  end
-  if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
-    gem 'beaker-rspec', *location_for(beaker_rspec_version)
-  else
-    gem 'beaker-rspec',  :require => false
-  end
-  gem 'serverspec',    :require => false
-  gem 'beaker-puppet_install_helper', :require => false
+  gem 'beaker-rspec',                  *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
+  gem 'beaker',                        *location_for(ENV['BEAKER_VERSION'])
+  gem 'serverspec',                    :require => false
+  gem 'beaker-puppet_install_helper',  :require => false
+  gem 'master_manipulator',            :require => false
+  gem 'beaker-hostgenerator',          *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
 end
 
+gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
+gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
 
 
-if facterversion = ENV['FACTER_GEM_VERSION']
-  gem 'facter', facterversion, :require => false
-else
-  gem 'facter', :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
+if File.exists? "#{__FILE__}.local"
+  eval(File.read("#{__FILE__}.local"), binding)
 end
-
-# vim:ft=ruby