Merge branch 'master' into danielsdeleo/COOK-276

.gitignore

@@ -1,2 +1,5 @@
 tmp/*
 .rake_test_cache
+*.swp
+*.swo
+*~

NOTICE

@@ -9,7 +9,8 @@ Contributors and Copyright holders:
  * Copyright 2008-2009, Opscode <legal@opscode.com>
  * Copyright 2008-2009, Adam Jacob <adam@opscode.com>
  * Copyright 2008-2009, Joshua Timberman <joshua@opscode.com>
+ * Copyright 2009-2010, Barry Steinglass <barry@opscode.com>
  * Copyright 2009, Joe Williams <joe@joetify.com>
  * Copyright 2009, Joshua Sierles <joshua@37signals.com>
  * Copyright 2009, Matthew Kent <mkent@magoazul.com>
-
+ * Copyright 2010, Benjamin Black <b@b3k.us>

activemq/metadata.json

@@ -1,16 +1,8 @@
 {
-    "dependencies": {
-      "java": [
-
-      ],
-      "runit": [
-
-      ]
-    },
-    "replacing": {
+    "maintainer": "Opscode, Inc.",
+    "attributes": {
     },
-    "description": "Installs activemq and sets it up as a runit service",
-    "groupings": {
+    "suggestions": {
     },
     "platforms": {
       "ubuntu": [
@@ -20,22 +12,30 @@
 
       ]
     },
-    "version": "0.2.0",
-    "recommendations": {
+    "dependencies": {
+      "java": [
+
+      ],
+      "runit": [
+
+      ]
     },
+    "maintainer_email": "cookbooks@opscode.com",
+    "conflicting": {
+    },
+    "version": "0.3.0",
     "name": "activemq",
-    "maintainer": "Opscode, Inc.",
-    "long_description": "= DESCRIPTION:\n\nInstalls activemq and sets up a runit service.\n\n= REQUIREMENTS:\n\nTested on Ubuntu 9.04.\n\nOpscode cookbooks:\n\n* java\n* runit\n\n= ATTRIBUTES:\n\n* activemq[:mirror] - download URL up to the apache/activemq/apache-activemq directory.\n* activemq[:version] - version to install.\n\n= USAGE:\n\nInclude the default recipe on systems where you want to run activemq. At this time the cookbook doesn't use any custom configuration for activemq.\n\n= LICENSE AND AUTHOR:\n\nAuthor:: Joshua Timberman (<joshua@opscode.com>)\n\nCopyright:: 2009, Opscode, Inc\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
     "recipes": {
     },
-    "suggestions": {
+    "providing": {
     },
-    "maintainer_email": "cookbooks@opscode.com",
-    "attributes": {
+    "license": "Apache 2.0",
+    "replacing": {
     },
-    "conflicting": {
+    "groupings": {
     },
-    "license": "Apache 2.0",
-    "providing": {
-    }
+    "long_description": "= DESCRIPTION:\n\nInstalls activemq and sets up a runit service.\n\n= REQUIREMENTS:\n\nTested on Ubuntu 9.04.\n\nOpscode cookbooks:\n\n* java\n* runit\n\n= ATTRIBUTES:\n\n* activemq[:mirror] - download URL up to the apache/activemq/apache-activemq directory.\n* activemq[:version] - version to install.\n\n= USAGE:\n\nInclude the default recipe on systems where you want to run activemq. At this time the cookbook doesn't use any custom configuration for activemq.\n\n= LICENSE AND AUTHOR:\n\nAuthor:: Joshua Timberman (<joshua@opscode.com>)\n\nCopyright:: 2009, Opscode, Inc\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
+    "recommendations": {
+    },
+    "description": "Installs activemq and sets it up as a runit service"
   }

activemq/metadata.rb

@@ -3,7 +3,7 @@
 license          "Apache 2.0"
 description      "Installs activemq and sets it up as a runit service"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version          "0.2"
+version          "0.3"
 
 %w{ubuntu debian}.each do |os|
   supports os