Removed duplicate ActiveMQ formula

2 files changed, 35 insertions, 49 deletions

diff --git a/Library/Formula/activemq.rb b/Library/Formula/activemq.rb
index b1025ef18..9f6519017 100644
--- a/Library/Formula/activemq.rb
+++ b/Library/Formula/activemq.rb
@@ -1,18 +1,44 @@
 require 'formula'
 
 class Activemq <Formula
-  url 'http://www.apache.org/dist/activemq/apache-activemq/5.3.0/apache-activemq-5.3.0-bin.tar.gz'
+  url 'http://www.gossipcheck.com/mirrors/apache/activemq/apache-activemq/5.3.1/apache-activemq-5.3.1-bin.tar.gz'
   homepage 'http://activemq.apache.org/'
-  md5 'f4b88a2b4ffd21cb804cdbd4f2e0152f'
+  md5 '6c75db75987bfab40724d41f6a6373c7'
   
+  aka 'apache-activemq'
+  
+  def skip_clean? path
+    path == libexec + 'webapps/admin/WEB-INF/jsp'
+  end
+  
+  def startup_script
+    <<-EOS.undent
+    #!/usr/bin/env bash
+    # This is a startup script for Apache ActiveMQ that calls the 
+    # real startup script installed to Homebrew's cellar.
+    
+    cd #{libexec}
+    bin/activemq
+    EOS
+  end
+
   def install
-    prefix.install Dir['*']
+    rm_rf 'bin/linux-x86-32'
+    rm_rf 'bin/linux-x86-64'
+    
+    prefix.install %w{ LICENSE NOTICE README.txt }
+    libexec.install Dir['*']
+    
+    (bin+'activemq').write startup_script
+  end
+  
+  def caveats
+    <<-EOS.undent
+    ActiveMQ was installed to:
+      #{libexec}
 
-    # this tar comes with linux binaries as well, so lets make macosx the default
-    macosx = bin+'macosx'
-    bin.install macosx.children
-    (bin+'linux-x86-64').rmtree
-    (bin+'linux-x86-32').rmtree
-    macosx.rmdir
+    `activemq` is a startup script that will run the server
+    from its installed location.
+    EOS
   end
 end
diff --git a/Library/Formula/apache-activemq.rb b/Library/Formula/apache-activemq.rb
deleted file mode 100644
index f66abab41..000000000
--- a/Library/Formula/apache-activemq.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'formula'
-
-class ApacheActivemq <Formula
-  url 'http://www.gossipcheck.com/mirrors/apache/activemq/apache-activemq/5.3.1/apache-activemq-5.3.1-bin.tar.gz'
-  homepage 'http://activemq.apache.org/'
-  md5 '6c75db75987bfab40724d41f6a6373c7'
-  
-  def skip_clean? path
-    path == libexec + 'webapps/admin/WEB-INF/jsp'
-  end
-  
-  def startup_script
-    <<-EOS.undent
-    #!/usr/bin/env bash
-    # This is a startup script for Apache ActiveMQ that calls the 
-    # real startup script installed to Homebrew's cellar.
-    
-    pushd #{libexec}
-    bin/activemq
-    popd
-    EOS
-  end
-
-  def install
-    rm_rf 'bin/linux-x86-32'
-    rm_rf 'bin/linux-x86-64'
-    
-    prefix.install %w{ LICENSE NOTICE README.txt }
-    libexec.install Dir['*']
-    
-    (bin+'activemq').write startup_script
-  end
-  
-  def caveats
-    <<-EOS.undent
-    Software was installed to:
-      #{libexec}
-    EOS
-  end
-end