caterpillar 1.0.5 → 1.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. data/ChangeLog +3 -0
  2. data/lib/caterpillar.rb +1 -1
  3. data/lib/caterpillar/liferay.rb +3 -2
  4. data/lib/caterpillar/task.rb +2 -2
  5. data/lib/java/rails-portlet-0.7.0.jar +0 -0
  6. metadata +3 -3
  7. data/lib/java/rails-portlet-0.6.1.jar +0 -0
data/ChangeLog CHANGED
@@ -1,3 +1,6 @@
1
+ = 1.0.6
2
+ - include rails-portlet 0.7.0
3
+
1
4
  = 1.0.5
2
5
  - comply XML with Liferay 5.2.3 - output more XML with default values
3
6
  - cleanup program output
data/lib/caterpillar.rb CHANGED
@@ -6,7 +6,7 @@
6
6
  #++
7
7
 
8
8
  module Caterpillar
9
- VERSION='1.0.5'
9
+ VERSION='1.0.6'
10
10
  end
11
11
 
12
12
  this_file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
data/lib/caterpillar/liferay.rb CHANGED
@@ -283,8 +283,9 @@ module Caterpillar # :nodoc:
283
283
  def portletapp_template(portlet)
284
284
  xml = " <portlet>\n"
285
285
  xml << " <portlet-name>%s</portlet-name>\n" % portlet[:name]
286
- # portlet icon is favicon - FIXME: use proper host
287
- xml << " <icon>/%s/favicon.ico</icon>\n" % portlet[:servlet]
286
+ xml << " <icon>%s</icon>\n" % [
287
+ portlet[:host], portlet[:servlet], 'favicon.png' # .ico does not work on Firefox 3.0
288
+ ].join('/').gsub(/([^:])\/\//,'\1/')
288
289
 
289
290
  # define the control panel category for Liferay 5.2 and newer -
290
291
  #
data/lib/caterpillar/task.rb CHANGED
@@ -352,9 +352,9 @@ module Caterpillar
352
352
  portlet_jar = nil
353
353
  version = (
354
354
  if container_v and container_v[/^5.1/]
355
- '0.6.0' #'0.5.2' # FIXME: branch properly
355
+ '0.6.0' # FIXME: branch properly
356
356
  else
357
- '0.6.1'
357
+ '0.7.0'
358
358
  end
359
359
  )
360
360
  require 'find'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caterpillar
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.5
4
+ version: 1.0.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mikael Lammentausta
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-10-05 00:00:00 +03:00
12
+ date: 2009-10-06 00:00:00 +03:00
13
13
  default_executable: caterpillar
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -47,7 +47,7 @@ files:
47
47
  - install.rb
48
48
  - init.rb
49
49
  - lib/java/rails-portlet-0.6.0.jar
50
- - lib/java/rails-portlet-0.6.1.jar
50
+ - lib/java/rails-portlet-0.7.0.jar
51
51
  - lib/caterpillar/config.rb
52
52
  - lib/caterpillar/helpers/liferay.rb
53
53
  - lib/caterpillar/navigation.rb