update after subproject rename, using rake-helper now, small changes …

…in appliances

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "lib/jboss-cloud-support"]
-	path = lib/jboss-cloud-support
-	url = git://github.com/goldmann/jboss-cloud-support.git
+[submodule "lib/jboss-appliance-support"]
+	path = lib/jboss-appliance-support
+	url = git://github.com/goldmann/jboss-appliance-support.git

Rakefile

@@ -1,36 +1,5 @@
 $: << 'lib/jboss-cloud-support/lib'
 
-require 'jboss-cloud/validator/errors'
-require 'jboss-cloud/image-builder'
-require 'jboss-cloud/defaults'
+require 'jboss-cloud/helpers/rake-helper'
 
-$stderr.reopen("/dev/null")
-
-module Rake
-  class Task
-    alias_method :execute_original, :execute
-
-    def execute( args=nil )
-      begin
-        execute_original( args )
-      rescue => e
-        JBossCloud::LOG.fatal e
-        JBossCloud::LOG.fatal e.message
-        abort
-      end
-    end
-  end
-end
-
-begin
-  JBossCloud::LOG.debug "Running new Rake session..."
-
-  JBossCloud::ImageBuilder.new
-rescue JBossCloud::ValidationError => e
-  JBossCloud::LOG.fatal "ValidationError: #{e.message}."
-  abort
-rescue => e
-  JBossCloud::LOG.fatal e
-  JBossCloud::LOG.fatal "Aborting: #{e.message}. See previous errors for more information."
-  abort
-end
+JBossCloud::RakeHelper.new

appliances/back-end-appliance/back-end-appliance.appl

@@ -3,3 +3,6 @@ summary: JBoss Cloud back-end appliance
 
 appliances:
   - jboss-as5-appliance
+
+packages:
+  - jboss-cloud-management

appliances/front-end-appliance/front-end-appliance.appl

@@ -4,3 +4,6 @@ summary: JBoss Cloud front-end appliance
 appliances:
   - httpd-appliance
   - jboss-jgroups-appliance
+
+packages:
+  - jboss-cloud-management

appliances/management-appliance/management-appliance.appl

@@ -4,4 +4,4 @@ summary: JBoss Cloud management appliance
 packages:
   - dhcp
   - sudo
-
+  - jboss-cloud-management

appliances/meta-appliance/meta-appliance.appl

@@ -22,5 +22,6 @@ packages:
   - jboss-cloud-environment
   - glib2-devel
   - ruby-devel
+  - ruby-libguestfs
 
 

appliances/postgis-appliance/postgis-appliance.appl

@@ -11,3 +11,4 @@ packages:
   - postgresql
   - postgresql-server
   - postgis
+  - jboss-cloud-management

specs/extras/jboss-cloud-management.spec

@@ -8,9 +8,6 @@ Requires:       shadow-utils
 Requires:       ruby
 Requires:       rubygems
 Source0:        thin-ruby-env.patch
-Source1:        http://rubyforge.org/frs/download.php/52464/xml-simple-1.0.12.gem
-Source2:        http://rubyforge.org/frs/download.php/52548/mime-types-1.16.gem
-Source3:        http://rubyforge.org/frs/download.php/21724/builder-2.1.2.gem
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -40,13 +37,6 @@ pushd $RPM_BUILD_ROOT/usr/share/%{name}/lib/thin/ext/thin_parser
 /usr/bin/make clean
 popd
 
-%install
-
-mkdir -p $RPM_BUILD_ROOT/usr/share/%{name}-gems
-cp %{SOURCE1} $RPM_BUILD_ROOT/usr/share/%{name}-gems
-cp %{SOURCE2} $RPM_BUILD_ROOT/usr/share/%{name}-gems
-cp %{SOURCE3} $RPM_BUILD_ROOT/usr/share/%{name}-gems
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,12 +46,6 @@ rm -rf $RPM_BUILD_ROOT
 /usr/sbin/useradd -m -r -g thin thin 2>/dev/null || :
 
 %post
-# install additional gems
-
-/usr/bin/gem install -q /usr/share/%{name}-gems/xml-simple-1.0.12.gem
-/usr/bin/gem install -q /usr/share/%{name}-gems/builder-2.1.2.gem
-/usr/bin/gem install -q /usr/share/%{name}-gems/mime-types-1.16.gem
-
 /bin/mkdir -p /var/log/jboss-cloud-management
 /bin/chown thin:thin /var/log/jboss-cloud-management
 echo "sh /usr/share/%{name}/src/network-setup.sh" >> /etc/rc.local