caterpillar 1.0.5 → 1.0.6

data/ChangeLog

@@ -1,3 +1,6 @@
+= 1.0.6
+	- include rails-portlet 0.7.0
+
 = 1.0.5
 	- comply XML with Liferay 5.2.3 - output more XML with default values
 	- cleanup program output

data/lib/caterpillar.rb

@@ -6,7 +6,7 @@
 #++
 
 module Caterpillar
-  VERSION='1.0.5'
+  VERSION='1.0.6'
 end
 
 this_file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__

data/lib/caterpillar/liferay.rb

@@ -283,8 +283,9 @@ module Caterpillar # :nodoc:
     def portletapp_template(portlet)
       xml =  "  <portlet>\n"
       xml << "    <portlet-name>%s</portlet-name>\n" % portlet[:name]
-      # portlet icon is favicon - FIXME: use proper host
-      xml << "    <icon>/%s/favicon.ico</icon>\n" % portlet[:servlet]
+      xml << "    <icon>%s</icon>\n" % [
+          portlet[:host], portlet[:servlet], 'favicon.png' # .ico does not work on Firefox 3.0
+        ].join('/').gsub(/([^:])\/\//,'\1/')
 
       # define the control panel category for Liferay 5.2 and newer -
       #

data/lib/caterpillar/task.rb

@@ -352,9 +352,9 @@ module Caterpillar
           portlet_jar = nil
           version = (
             if container_v and container_v[/^5.1/]
-              '0.6.0' #'0.5.2' # FIXME: branch properly
+              '0.6.0' # FIXME: branch properly
             else
-              '0.6.1'
+              '0.7.0'
             end
           )
           require 'find'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: caterpillar
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Mikael Lammentausta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 +03:00
+date: 2009-10-06 00:00:00 +03:00
 default_executable: caterpillar
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ files:
 - install.rb
 - init.rb
 - lib/java/rails-portlet-0.6.0.jar
-- lib/java/rails-portlet-0.6.1.jar
+- lib/java/rails-portlet-0.7.0.jar
 - lib/caterpillar/config.rb
 - lib/caterpillar/helpers/liferay.rb
 - lib/caterpillar/navigation.rb