From b46f256b11cfe777726472f8357d56656ca29de2 Mon Sep 17 00:00:00 2001 From: Reid Vandewiele Date: Thu, 4 Apr 2013 19:53:44 -0700 Subject: [PATCH] Remove cruft and bumb version number --- CHANGELOG | 3 +++ LICENSE | 2 +- Modulefile | 2 +- README.markdown | 30 +----------------------------- spec/spec.opts | 6 ------ spec/spec_helper.rb | 18 ------------------ templates/sun-java6.preseed | 3 --- 7 files changed, 6 insertions(+), 58 deletions(-) delete mode 100644 spec/spec.opts delete mode 100644 spec/spec_helper.rb delete mode 100644 templates/sun-java6.preseed diff --git a/CHANGELOG b/CHANGELOG index 2c98ee2..e3eddad 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2013-04-04 Reid Vandewiele - 0.3.0 +* Refactor, introduce params pattern + 2012-11-15 Scott Schneider - 0.2.0 * Add Solaris support diff --git a/LICENSE b/LICENSE index 47c26bd..a33e812 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Puppet OpenNebula Module - Puppet module for managing OpenNebula +Puppet Java Module - Puppet module for managing Java Copyright (C) 2011 Puppet Labs Inc diff --git a/Modulefile b/Modulefile index 672bd0c..fbc1f39 100644 --- a/Modulefile +++ b/Modulefile @@ -1,5 +1,5 @@ name 'puppetlabs-java' -version '0.2.0' +version '0.3.0' source 'git://github.com/puppetlabs/puppetlabs-java' author 'puppetlabs' license 'Apache' diff --git a/README.markdown b/README.markdown index 4494835..545eacc 100644 --- a/README.markdown +++ b/README.markdown @@ -2,32 +2,4 @@ Manage the Java runtime for use with other application software. -Currently this simply deploys the package on Enterprise Linux based systems and Debian based systems. - -Tested on: - - * Centos 5.6 - * Ubuntu 10.04 Lucid - -# RedHat Support # - -The Java runtime this module is designed to configure are the RPM's provided by Oracle and obtained by extracting them from the "bin" installers. - -For example: - - ./jdk-6u25-linux-x64-rpm.bin -x - -Please download the installer from: - - * [Java Downloads](http://www.oracle.com/technetwork/java/javase/downloads/jdk-6u25-download-346242.html) - -# Ubuntu Support # - -## Lucid ## - -You need to have the partner repository enabled in order to install the Sun JDK or JRE. - - aptitude install python-software-properties - sudo add-apt-repository "deb http://archive.canonical.com/ lucid partner" - aptitude update - +Currently this deploys the correct Java package on a variety of platforms. diff --git a/spec/spec.opts b/spec/spec.opts deleted file mode 100644 index 91cd642..0000000 --- a/spec/spec.opts +++ /dev/null @@ -1,6 +0,0 @@ ---format -s ---colour ---loadby -mtime ---backtrace diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb deleted file mode 100644 index a4aeeae..0000000 --- a/spec/spec_helper.rb +++ /dev/null @@ -1,18 +0,0 @@ -require 'pathname' -dir = Pathname.new(__FILE__).parent -$LOAD_PATH.unshift(dir, dir + 'lib', dir + '../lib') - -require 'mocha' -require 'puppet' -gem 'rspec', '=1.2.9' -require 'spec/autorun' - -Spec::Runner.configure do |config| - config.mock_with :mocha -end - -# We need this because the RAL uses 'should' as a method. This -# allows us the same behaviour but with a different method name. -class Object - alias :must :should -end diff --git a/templates/sun-java6.preseed b/templates/sun-java6.preseed deleted file mode 100644 index b22f4b6..0000000 --- a/templates/sun-java6.preseed +++ /dev/null @@ -1,3 +0,0 @@ -sun-java6-bin shared/accepted-sun-dlj-v1-1 boolean true -sun-java6-jdk shared/accepted-sun-dlj-v1-1 boolean true -sun-java6-jre shared/accepted-sun-dlj-v1-1 boolean true