jnlp 0.7.3 → 0.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6c33d798b24f4f92dd32d9f9d5b3b12d9808641e
+  data.tar.gz: e4226eb182d0e4b7cd265fd9f27bcb996682746f
+SHA512:
+  metadata.gz: f557631722dbc7c482648504b105e545137b39a95c19d9f94448177c5de33cac6f2be7dfa48b820e3cb3879fa1b6c97fde1586dd5149d6993b4c62a48e136deb
+  data.tar.gz: 791f1026ce0ed38c0aa5b202d2501b8ea151ac216ad204ddb6b6dcb8182058634b656b65db8940deb97f76a2d63b396c57b0b958b639bf9f97483df0eb4e6058

data/History.txt

@@ -1,3 +1,7 @@
+== 0.7.4 2012-10-14
+
+Refactor classes into their own files. Thanks scytacki!
+
 == 0.7.3 2011-08-28
 
 Extend support for Nokogiri to include 1.5.x series

data/README.rdoc

@@ -98,31 +98,40 @@ the versions of the jnlp urls to get for one family.
 
 === The source code
 
-The source code for the jnlp gem is on github[http://github.com/stepheneb/jnlp/tree/master].
+The source code for the jnlp gem is on github[http://github.com/stepheneb/jnlp/tree/master] and the gem dependencies are managed with [bundler](http://gembundler.com/)
 
   git clone git://github.com/stepheneb/jnlp.git
+  cd jnlp
+  gem install nokogiri
+  bundle install
+
+Bundler should install nokogiri but can't because of this bug: {can't find gem specified in gemspec with a range}[https://github.com/carlhuda/bundler/issues/1397]
 
 === Runtime dependencies
 
-  nokogiri '~> 1.4.0'
+  nokogiri    ">= 1.4.4", "<= 1.5"
 
 === Development dependencies
 
+  rake
   rspec        '~> 2.5.0'
   ci_reporter  '~> 1.6.4'
+  rdoc         '~> 3.9.4'
+  yard         '~> 0.7.2'
 
 === rake tasks
 
-  $ rake -T
-  rake doc:clobber_rdoc  # Remove RDoc HTML files
-  rake doc:rdoc          # Build RDoc HTML files
-  rake doc:rerdoc        # Rebuild RDoc HTML files
-  rake doc:yard          # Generate YARD Documentation
-  rake hudson:spec       # run the spec tests and generate JUnit XML reports (for integrating with a Hudson CIS server)
-  rake package           # generate the gem package: pkg/jnlp-0.7.0.gem
-  rake release           # push the packaged gem: jnlp-0.7.0.gem to rubygems.org
-  rake spec              # run spec tests (the default task)
-  
+  $ bundle exec rake -T
+  rake build         # Build jnlp-0.7.3.gem into the pkg directory
+  rake clobber_rdoc  # Remove RDoc HTML files
+  rake hudson:spec   # run the spec tests and generate JUnit XML reports (for integrating with a Hudson CIS server)
+  rake install       # Build and install jnlp-0.7.3.gem into system gems
+  rake rdoc          # Build RDoc HTML files
+  rake release       # Create tag v0.7.3 and build and push jnlp-0.7.3.gem to Rubygems
+  rake rerdoc        # Rebuild RDoc HTML files
+  rake spec          # Run RSpec
+  rake yard          # Generate YARD Documentation
+
 === Running the tests
 
 JRuby:
@@ -131,11 +140,11 @@ JRuby:
 
 MRI:
 
-  rake spec
+  bundle exec rake spec
 
 Generating JUnit XML output for integrating with the Hudson CIS server:
 
-  rake hudson:spec
+  bundle exec rake hudson:spec
 
 === Running adhoc tests using the source code directly
 
@@ -144,13 +153,12 @@ Run an adhoc test in the file sample.rb in the same top-level directory as this
 
 === Building and installing the gem locally
 
-  rake package
+  bundle exec rake build
   gem install pkg/jnlp-<version>.gem
 
 === Releasing a new version to http://rubygems.org/
 
-  rake package
-  gem push pkg/jnlp-<version>.gem
+  bundle exec rake release
 
 === TODO
 
@@ -158,3 +166,9 @@ Add tests for:
 * MavenJnlp features.
 * downloading and caching jars
 * re-generating original and local jnlps
+
+=== Changes
+
+* June 22, 2015 (NP) – Version 0.8.0
+  Nokogiri dependency has been updated to ~> 1.6.4.
+  As of Nokogiri 1.6.4 libxml2 and libxslt are bundled with nokogiri, for simpler installs.

data/lib/jnlp.rb

@@ -3,9 +3,13 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 require 'rubygems'
 
-gem 'nokogiri', '>= 1.4.4', "<= 1.5"
+gem 'nokogiri', '>= 1.4.4'
 
 module Jnlp
+  require 'jnlp/property.rb'
+  require 'jnlp/j2se.rb'
+  require 'jnlp/icon.rb'
+  require 'jnlp/resource.rb'
   require 'jnlp/jnlp.rb'
   require 'jnlp/otrunk.rb'
   require 'jnlp/maven_jnlp.rb'

data/lib/jnlp/icon.rb

@@ -0,0 +1,48 @@
+module Jnlp #:nodoc:
+
+  #
+  # Icon objects encapsulate the <icon> element optionally present in
+  # the Java Web Start jnlp <information> element.
+  #
+  class Icon
+    #
+    # Contains the Hpricot element parsed from the orginal Jnlp
+    # that was used to create the Icon
+    #
+    attr_reader :icon
+    #
+    # Contains the href attribute of the <icon> element.
+    #
+    # Example:
+    #
+    #   "http://itsi.concord.org/images/itsi-logo-64x64.png"
+    #
+    attr_reader :href
+    #
+    # Contains the height attribute of the <icon> element
+    #
+    # Example:
+    #
+    #   64
+    #
+    attr_reader :height
+    #
+    # Contains the width attribute of the <icon> element
+    #
+    # Example:
+    #
+    #   64
+    #
+    attr_reader :width
+    #
+    # Creates a new Icon object
+    # * _icon_: pass in a Hpricot parse of the <icon> element
+    #
+    def initialize(icon)
+      @icon = icon
+      @href = icon.attr('href').value
+      @height = icon.attr('height').value.to_i
+      @width = icon.attr('width').value.to_i
+    end
+  end
+end

data/lib/jnlp/j2se.rb

@@ -0,0 +1,79 @@
+module Jnlp
+  class J2se
+    #
+    # Contains the Hpricot element parsed from the orginal Jnlp
+    # that was used to create the Property
+    #
+    attr_reader :j2se
+    #
+    # Contains the version of the J2SE element:
+    #
+    # Example:
+    #
+    #   "1.5+"
+    #
+    attr_reader :version
+    #
+    # Contains the max-heap-size specified in the J2SE element:
+    #
+    # Example:
+    #
+    #   "128m"
+    #
+    attr_reader :max_heap_size
+    #
+    # Contains the initial-heap-size specified in the J2SE element:
+    #
+    # Example:
+    #
+    #   "32m"
+    #
+    attr_reader :initial_heap_size
+    #
+    # Contains the value of the optional java-vm-args attribute in
+    # in the J2SE element, the value is nil if not present:
+    #
+    # Example:
+    #
+    #   "-d32"
+    #
+    attr_reader :java_vm_args
+    #
+    # Contains the value of the os attribute in the
+    # parent <resources> element that contains this property
+    # if the attribute was set in the parent. The attribute is normalized
+    # by converting to lowercase and changing ' ' characters to '_'
+    #
+    # Example:
+    #
+    #   "Mac OS X" => "mac_os_x"
+    #
+    attr_reader :os
+    #
+    # Contains the value of the arch attribute in the
+    # parent <resources> element that contains this property
+    # if the attribute was set in the parent.The attribute is normalized
+    # by converting to lowercase and changing ' ' characters to '_'
+    #
+    # Examples:
+    #
+    #   "ppc i386" => "ppc_i386"
+    #   "x86_64"   => "x86_64"
+    #
+    attr_reader :arch
+    #
+    # Creates a new Jnlp::Property object.
+    # * _prop_: the Hpricot parsing of the specific jnlp/resources/property element
+    # * _os_: optional: include it if the resources parent element that contains the property has this attribute set
+    #
+    def initialize(j2se, os=nil, arch=nil)
+      @j2se = j2se
+      @version = j2se['version']
+      @max_heap_size = j2se['max-heap-size']
+      @initial_heap_size = j2se['initial-heap-size']
+      @java_vm_args = j2se['java-vm-args']
+      @os = os
+      @arch = arch
+    end
+  end
+end

data/lib/jnlp/jnlp.rb

@@ -38,606 +38,13 @@ unless Net::HTTP::Get.new('/')['User-Agent'] # unless a 'User-Agent' is already
 end
 
 module Jnlp #:nodoc:
-  #  
-  # Property objects encapsulate <property> elements present in a
-  # Java Web Start Jnlp <resources> element.
   #
-  class Property
-    #
-    # Contains the Hpricot element parsed from the orginal Jnlp
-    # that was used to create the Property
-    #
-    attr_reader :property
-    #
-    # Contains the name of the Property
-    #
-    #
-    # Example:
-    #
-    #   "maven.jnlp.version"
-    #
-    attr_reader :name
-    #
-    # Contains the value of the Property
-    #
-    #
-    # Example:
-    #
-    #   "all-otrunk-snapshot-0.1.0-20080310.211515"
-    #
-    attr_reader :value
-    #
-    # Contains the value of the os attribute in the 
-    # parent <resources> element that contains this property 
-    # if the attribute was set in the parent.
-    # Example: 
-    #
-    #   "Mac OS X"
-    #
-    attr_reader :os
-    #
-    # Creates a new Jnlp::Property object.
-    # * _prop_: the Hpricot parsing of the specific jnlp/resources/property element
-    # * _os_: optional: include it if the resources parent element that contains the property has this attribute set
-    #
-    def initialize(prop, os=nil)
-      @property = prop
-      @name = prop['name']
-      @value = prop['value']
-      @os = os
-    end
-  end
-
-  class J2se
-    #
-    # Contains the Hpricot element parsed from the orginal Jnlp
-    # that was used to create the Property
-    #
-    attr_reader :j2se
-    #
-    # Contains the version of the J2SE element:
-    #
-    # Example:
-    #
-    #   "1.5+"
-    #
-    attr_reader :version
-    #
-    # Contains the max-heap-size specified in the J2SE element:
-    #
-    # Example:
-    #
-    #   "128m"
-    #
-    attr_reader :max_heap_size
-    #
-    # Contains the initial-heap-size specified in the J2SE element:
-    #
-    # Example:
-    #
-    #   "32m"
-    #
-    attr_reader :initial_heap_size
-    #
-    # Contains the value of the optional java-vm-args attribute in
-    # in the J2SE element, the value is nil if not present:
-    # 
-    # Example:
-    #
-    #   "-d32"
-    #
-    attr_reader :java_vm_args
-    #
-    # Contains the value of the os attribute in the 
-    # parent <resources> element that contains this property 
-    # if the attribute was set in the parent. The attribute is normalized
-    # by converting to lowercase and changing ' ' characters to '_'
-    #
-    # Example: 
-    #
-    #   "Mac OS X" => "mac_os_x"
-    #
-    attr_reader :os
-    #
-    # Contains the value of the arch attribute in the 
-    # parent <resources> element that contains this property 
-    # if the attribute was set in the parent.The attribute is normalized
-    # by converting to lowercase and changing ' ' characters to '_'
-    #
-    # Examples: 
-    #
-    #   "ppc i386" => "ppc_i386"
-    #   "x86_64"   => "x86_64"
-    #
-    attr_reader :arch
-    #
-    # Creates a new Jnlp::Property object.
-    # * _prop_: the Hpricot parsing of the specific jnlp/resources/property element
-    # * _os_: optional: include it if the resources parent element that contains the property has this attribute set
-    #
-    def initialize(j2se, os=nil, arch=nil)
-      @j2se = j2se
-      @version = j2se['version']
-      @max_heap_size = j2se['max-heap-size']
-      @initial_heap_size = j2se['initial-heap-size']
-      @java_vm_args = j2se['java-vm-args']
-      @os = os
-      @arch = arch
-    end
-  end
-
-  #
-  # Icon objects encapsulate the <icon> element optionally present in
-  # the Java Web Start jnlp <information> element.
-  #
-  class Icon
-    #
-    # Contains the Hpricot element parsed from the orginal Jnlp
-    # that was used to create the Icon
-    #
-    attr_reader :icon    
-    #
-    # Contains the href attribute of the <icon> element.
-    #
-    # Example:
-    #
-    #   "http://itsi.concord.org/images/itsi-logo-64x64.png"
-    #
-    attr_reader :href
-    #
-    # Contains the height attribute of the <icon> element
-    #
-    # Example:
-    #
-    #   64
-    #
-    attr_reader :height
-    #
-    # Contains the width attribute of the <icon> element
-    #
-    # Example:
-    #
-    #   64
-    #
-    attr_reader :width
-    #
-    # Creates a new Icon object
-    # * _icon_: pass in a Hpricot parse of the <icon> element
-    #
-    def initialize(icon)
-      @icon = icon
-      @href = icon.attr('href').value
-      @height = icon.attr('height').value.to_i
-      @width = icon.attr('width').value.to_i
-    end
-  end
-  #
-  # Jnlp::Resource objects encapsulate both jar and nativelib elements present in a 
-  # Java Web Start Jnlp <resources> element.
-  #
-  class Resource
-    #
-    # Contains the Hpricot element parsed from the orginal Jnlp
-    # that was used to create the resource
-    #
-    attr_reader :resource
-    #
-    # Contains the path to the resource taken from the href attribute
-    #
-    # Example:
-    #
-    #   "org/concord/httpclient/" || ""
-    #
-    attr_reader :href_path
-    #
-    # Contains the kind of the resource
-    #
-    # Example:
-    #
-    #   "jar" || "nativelib"
-    #
-    attr_reader :kind
-    #
-    # Contains the base name of the resource
-    #
-    # Example:
-    #
-    #   "httpclient"
-    #
-    attr_reader :name
-    #
-    # Contains the Java Web Start specification of the OS for 
-    # the <resources> parent of this resource if the attribute
-    # value exists
-    #
-    # Example:
-    #
-    #   ""
-    #
-    attr_reader :os
-    #
-    # Contains the href attribute of the resource
-    #
-    # Example:
-    #
-    #   "net/sf/sail/webstart-proxy/jetty-proxy/jetty-proxy.jar"
-    #
-    attr_reader :main
-    #
-    # Contains a boolean that repesents whether the main_class for this
-    # jnlp is contained within this jar.
-    # This attribute is optional in a jnlp and if present should 
-    # only be present and set to true on one jar resource in a jnlp.
-    #
-    attr_reader :href
-    #
-    # Contains the url reference to the resource
-    #
-    # Example:
-    #
-    #   "http://jnlp.concord.org/dev/org/concord/httpclient/httpclient.jar?version-id=0.1.0-20071212.220020-17"
-    #
-    attr_reader :url
-    #
-    # Contains the url reference to the gzipped pack200 version of the resource
-    #
-    # Example:
-    #
-    #   "http://jnlp.concord.org/dev/org/concord/httpclient/httpclient__V0.1.0-20071212.220020-17.jar.pack.gz"
-    #
-    attr_reader :url_pack_gz 
-    #
-    # Contains the filename of the resource
-    #
-    # Example:
-    #
-    #   "httpclient__V0.1.0-20071212.220020-17.jar"
-    #
-    attr_reader :suffix
-    #
-    # Contains the suffix of the resource
-    #
-    # Example:
-    #
-    #   "__V0.1.0.jar"
-    #
-    attr_reader :filename
-    #
-    # Contains the filename of the gzipped pack200 version of the resource
-    #
-    # Example:
-    #
-    #   "httpclient__V0.1.0-20071212.220020-17.jar.pack.gz"
-    #
-    attr_reader :filename_pack
-    #
-    # Contains the filename of the pack200 version of the resource
-    #
-    # Example:
-    #
-    #   "httpclient__V0.1.0-20071212.220020-17.jar.pack"
-    #
-    attr_reader :filename_pack_gz
-    #
-    # Contains the size of the resource
-    #
-    # Example:
-    #
-    #   294248
-    #
-    attr_reader :size
-    #
-    # Contains the size of the gzipped pack200 version of the resource
-    #
-    # Example:
-    #
-    #   112213
-    #
-    attr_reader :size_pack_gz
-    #
-    # Contains boolean value indicating whether the signature of the
-    # cached local copy of the resource verified successfully
-    #
-    # The value is nil if no local cache has been created.
-    #
-    # Example:
-    #
-    #   true || false || nil
-    #
-    attr_reader :signature_verified
-    #
-    # Contains the absolute local path of cache directory
-    #
-    # Example:
-    #
-    #   "/Users/stephen/dev/jetty-jnlp-proxy/cache"
-    #
-    attr_reader :local_cache_dir
-    #
-    # Contains the relative local path of the resource
-    #
-    # Example:
-    #
-    #   "net/sf/sail/webstart-proxy/jetty-proxy/jetty-proxy__V0.1.0-20080318.093629-72.jar"
-    #
-    attr_reader :relative_local_path
-    #
-    # Contains the absolute local path of the resource
-    #
-    # Example:
-    #
-    #   "/Users/stephen/dev/jetty-jnlp-proxy/cache/net/sf/sail/webstart-proxy/jetty-proxy/jetty-proxy__V0.1.0-20080318.093629-72.jar"
-    #
-    attr_reader :local_path
-    #
-    # Contains the relative local path of the packed, gzipped resource
-    #
-    # Example:
-    #
-    #   "net/sf/sail/webstart-proxy/jetty-proxy/jetty-proxy__V0.1.0-20080318.093629-72.jar.pack.gz"
-    #
-    attr_reader :relative_local_path_pack_gz
-    #
-    # Contains the absolute local path of the resource
-    #
-    # Example:
-    #
-    #   "/Users/stephen/dev/jetty-jnlp-proxy/cache/net/sf/sail/webstart-proxy/jetty-proxy/jetty-proxy__V0.1.0-20080318.093629-72.jar.pack.gz"
-    #
-    attr_reader :local_path_pack_gz
-    #
-    # Contains the version string of the resource
-    #
-    # Example:
-    #
-    #   "0.1.0-20080318.093629-72"
-    #
-    attr_reader :version_str
-    #
-    # Contains the version of the resource
-    #
-    # Example:
-    #
-    #   "0.1.0"
-    #
-    attr_reader :version
-    #
-    # Contains the date string of the resource
-    #
-    # Example:
-    #
-    #   "20080318.093629"
-    #
-    attr_reader :date_str
-    #
-    # Contains a Ruby DateTime object representation of the resource's date string 
-    #
-    # Example:
-    #
-    #   #<DateTime: 85338394589/86400,0,2299161>
-    #
-    attr_reader :date_time
-    #
-    # Contains the revision of the resource
-    #
-    # Example:
-    #
-    #   72
-    #
-    attr_reader :revision
-    #
-    # Contains the certificate version of the resource
-    # if one exists, otherwize it is nil
-    #
-    # Example:
-    #
-    #   "s1"
-    #
-    attr_reader :certificate_version
-    #
-    def initialize(res, codebase, os)
-      @resource = res
-      @kind = res.name
-      @main = res['main'] && res['main'] == 'true'
-      @href = res['href']
-      @href_path = File.dirname(@href)
-      if @href_path == '.'
-        @href_path = ''
-      else
-        @href_path = @href_path + '/'
-      end
-      @name = File.basename(@href).chomp('.jar')
-      @version_str = res['version']
-      if @version_str
-        @suffix = "__V#{@version_str}.jar"
-      else
-        @suffix = ".jar"        
-      end
-      @filename = "#{@name}#{@suffix}"
-      @filename_pack = @filename + ".pack"
-      @filename_pack_gz = @filename_pack + ".gz"
-
-      @url = "#{codebase}/#{@href_path}#{@name}.jar"
-      @url << "?version-id=#{@version_str}" if @version_str
-      # example: data-util__V0.1.0-20070926.155656-107.jar.pack
-      # @url_pack = "#{codebase}/#{@href_path}#{@filename}.pack"
-      # example: data-util__V0.1.0-20070926.155656-107.jar.pack.gz
-      @url_pack_gz = "#{codebase}/#{@href_path}#{@filename}.pack.gz"
-      @version, @revision, @date_str, @date_time, @certificate_version = parse_version_str(@version_str)
-      @os = os
-    end
-    #
-    # parse_version_str
-    #
-    # input examples:
-    # 
-    #  "0.1.0-20070926.155656-107"
-    #
-    # or a newer example:
-    #
-    #  "0.1.0-20090618.143130-890-s1"
-    #
-    # but ... some version strings just look like this:
-    # 
-    #  "0.1.0"
-    #
-    # or this:
-    #
-    #  "2.1.7-r2"
-    #
-    # results:
-    #
-    # version                # => '0.1.0'
-    # revision               # => 20
-    # date_str               # => '20070926.155656'
-    # date_time              # => #<DateTime: 10673317777/10800,0,2299161>
-    # certificate_version    # => 's1'
-    #
-    def parse_version_str(version_str)      
-      version = date_str = certificate_version = ''
-      revision = date_time = nil
-      if version_str && version_str.length > 0
-        if md = version_str.match(/(\d|\.)+/)
-          version = md[0]
-          # date_str
-          if md2 = md.post_match.match(/-([\d]{8}.[\d]{6})(-|$)/)
-            date_str = md2[1]
-            d, t = date_str.scan(/\d+/)              # => ["20070926", "155656"]
-            d1 = "#{d[0..3]}-#{d[4..5]}-#{d[6..7]}"   # => "2007-09-26"
-            t1 = "#{t[0..1]}:#{t[2..3]}:#{t[4..5]}"   # => "15:56:56"
-            dt = "#{d1}T#{t1}Z"                      # => "2007-09-26T15:56:56Z"
-            date_time = DateTime.parse(dt)           # => #<DateTime: 10673317777/10800,0,2299161>
-            # revision
-            if md3 = md2.post_match.match(/\d+/)
-              revision = md3[0].to_i
-            end
-          else
-            if match = md.post_match[/\d+/]
-              revision = match.to_i
-            end
-          end
-          # certificate_version
-          if match = md.post_match[/-(s\d+)/, 1]
-            certificate_version = match
-          end
-        end
-      end
-      [version, revision, date_str, date_time, certificate_version]
-    end
-    #
-    # Set's up the local cache directory references
-    #
-    def local_cache_dir=(dir_path)
-      @local_cache_dir = File.expand_path(dir_path)
-      @relative_local_path = "#{@href_path}#{@filename}"
-      @local_path = "#{@local_cache_dir}/#{@relative_local_path}"
-    end
-    #
-    # Copies the file referenced in _source_ to _destination_
-    # _source_ can be a url or local file path
-    # _destination_ must be a local path
-    #
-    # Will copy file if the file does not exists 
-    # OR if the the file exists but the signature has
-    # not been successfully verified.
-    #
-    # Returns file size if cached succesfully, false otherwise.
-    # 
-    def update_cache(source=@url, destination=@local_path, options={})
-      unless destination
-        raise ArgumentError, "Must specify destination directory when updatng resource", caller
-      end
-      file_exists = File.exists?(destination)
-      if file_exists && @signature_verified == nil
-        verify_signature
-      end
-      unless file_exists && @signature_verified
-        FileUtils.mkdir_p(File.dirname(destination))
-        puts "reading:     #{source}" if options[:verbose]
-        tried_to_read = 0
-        begin
-          jarfile = open(source)
-        rescue OpenURI::HTTPError => e
-          puts e
-          if tried_to_read < 1
-            tried_to_read += 1
-            retry
-          end
-        end
-        if jarfile.class == Tempfile
-          FileUtils.cp(jarfile.path, destination)
-          puts "copying to:  #{destination}" if options[:verbose]
-        else
-          File.open(destination, 'w') {|f| f.write jarfile.read }
-          puts "writing to:  #{destination}" if options[:verbose]
-        end
-        puts "#{jarfile.size} bytes written" if options[:verbose]
-        verify_signature ? jarfile.size : false
-      else
-        File.size(destination)
-      end
-    end
-    #
-    # Verifies signature of locallly cached resource
-    #
-    # Returns boolean value indicating whether the signature of the
-    # cached local copy of the resource verified successfully
-    #
-    # The value return is nil if no local cache has been created.
-    #
-    # Example:
-    #
-    #   true || false || nil
-    #
-    def verify_signature
-      if @local_path
-        if RUBY_PLATFORM =~ /java/
-          begin
-            jarfile = java.util.jar.JarInputStream.new(FileInputStream.new(@local_path), true)
-            @signature_verified = true
-          rescue NativeException
-            @signature_verified = false
-          end
-        else
-          # Use IO.popen instead of system() to absorb
-          # jarsigners messages to $stdout
-          response = IO.popen("jarsigner -verify #{@local_path}"){|io| io.gets}
-          @signature_verified = ($?.exitstatus == 0)
-        end
-      else
-        nil
-      end
-    end
-    #    
-    # Copies the resource referenced in Resource#url
-    # to the local cache.
-    #
-    # If the resource is successully cached locally and the
-    # signature is verified the size of the resource is retured.
-    #
-    # If the signature is not verified then false is returned.
-    #
-    def cache_resource(dest_dir=@local_cache_dir, options={})
-      unless dest_dir
-        raise ArgumentError, "Must specify destination directory when creating resource", caller
-      end
-      self.local_cache_dir=dest_dir
-      @size = update_cache(@url, @local_path, options)
-      if options[:include_pack_gz]
-        @relative_local_path_pack_gz = "#{@relative_local_path}.pack.gz"
-        @local_path_pack_gz = "#{dest_dir}/#{@relative_local_path_pack_gz}"
-        @size_pack_gz = update_cache(@url_pack_gz, @local_path_pack_gz, options)
-      end
-      @signature_verified ? @size : @signature_verified
-    end
-  end
-  #  
   #
   # == Jnlp
   #
   # A gem for encapsulating the content and resources referenced by Java Web Start jnlps
   #
-  # For more information about the structure of Java Web Start see: 
+  # For more information about the structure of Java Web Start see:
   # * http://java.sun.com/javase/6/docs/technotes/guides/javaws/developersguide/contents.html
   #
   # To create a new Jnlp call Jnlp#new with a string that contains either a local path or a url.
@@ -652,15 +59,15 @@ module Jnlp #:nodoc:
   # Once the Jnlp object is created you can call Jnlp#cache_resources to create a local
   # cache of all the jar and nativelib resources. The structure of the cache directory
   # and the naming using for the jar and nativelib files is the same as that used
-  # by the Java Web Start Download Servlet, see: 
+  # by the Java Web Start Download Servlet, see:
   # * http://java.sun.com/javase/6/docs/technotes/guides/javaws/developersguide/downloadservletguide.html
-  # 
+  #
   # === Example: Creating an jnlp object and caching all the resources
-  # 
+  #
   #   j = Jnlp::Jnlp.new("http://jnlp.concord.org/dev/org/concord/maven-jnlp/otrunk-sensor/otrunk-sensor.jnlp", 'web_start_cache')
   #
   # Will populate the local directory: web_start_cache with the following files:
-  # 
+  #
   #   avalon-framework/avalon-framework/avalon-framework__V4.1.3.jar
   #   commons-beanutils/commons-beanutils/commons-beanutils__V1.7.0.jar
   #   commons-collections/commons-collections/commons-collections__V3.1.jar
@@ -728,10 +135,10 @@ module Jnlp #:nodoc:
   #
   # The jnlp gem has a dependency on hpricot version 0.6.164.
   # The most recent version of hpricot, version 0.7.0 does not yet work with JRuby.
-  # 
+  #
   class Jnlp
     #
-    # Sets the Java Classpath delimiter used when generating 
+    # Sets the Java Classpath delimiter used when generating
     # a Classpath string
     CLASSPATH_DELIMETER = ':' unless defined? CLASSPATH_DELIMETER
     #
@@ -787,7 +194,7 @@ module Jnlp #:nodoc:
     #
     attr_reader :version_str
     #
-    # Contains the local file-based href attribute of the 
+    # Contains the local file-based href attribute of the
     # local jnlp if it has been created.
     #
     # Example:
@@ -796,7 +203,7 @@ module Jnlp #:nodoc:
     #
     attr_reader :local_jnlp_href
     #
-    # Contains the local file-based name attribute of the 
+    # Contains the local file-based name attribute of the
     # of the local jnlp if it has been created.
     #
     # Example:
@@ -804,7 +211,7 @@ module Jnlp #:nodoc:
     #    otrunk-sensor.jnlp"
     #
     attr_reader :local_jnlp_name
-    # 
+    #
     # Contains the relative path to local cache directory if it has been set
     #
     # Example:
@@ -812,7 +219,7 @@ module Jnlp #:nodoc:
     #   "cache"
     #
     attr_reader :relative_local_cache_dir
-    # 
+    #
     # Contains the absolute path to the local cache directory if it has been set
     #
     # Example:
@@ -820,7 +227,7 @@ module Jnlp #:nodoc:
     #   "/Users/stephen/dev/jetty-jnlp-proxy/cache"
     #
     attr_reader :local_cache_dir
-    # 
+    #
     # Contains a boolean value indicating if the signatures of all
     # resources copied to local cache have been verified.
     #
@@ -832,88 +239,88 @@ module Jnlp #:nodoc:
     #
     attr_accessor :local_resource_signatures_verified
     #
-    # contans the boolean attribute determining whether 
-    # gzipped pack200 resources should be copied to the 
+    # contans the boolean attribute determining whether
+    # gzipped pack200 resources should be copied to the
     # local cache when the cache is updated
     #
     attr_accessor :include_pack_gz
     #
-    # Contains the spec attribute in the jnlp element 
-    # Example: 
+    # Contains the spec attribute in the jnlp element
+    # Example:
     #
     #   "1.0+"
     #
     attr_reader :spec
     #
-    # Contains the codebase attribute in the jnlp element 
-    # Example: 
+    # Contains the codebase attribute in the jnlp element
+    # Example:
     #
     #   "http://jnlp.concord.org/dev"
     #
     attr_reader :codebase
     #
-    # Contains the href attribute in the jnlp element 
-    # Example: 
+    # Contains the href attribute in the jnlp element
+    # Example:
     #
     #   "http://jnlp.concord.org/dev/org/concord/maven-jnlp/all-otrunk-snapshot/all-otrunk-snapshot.jnlp"
     #
     attr_reader :href
     #
     # Contains the value of the jnlp/information/title element
-    # Example: 
+    # Example:
     #
     #   "All OTrunk snapshot"
     #
     attr_reader :title
     #
     # Contains the value of the jnlp/information/vendor element
-    # Example: 
+    # Example:
     #
     #   "Concord Consortium"
     #
     attr_reader :vendor
     #
     # Contains the value of the href attribute in the jnlp/information/homepage element
-    # Example: 
+    # Example:
     #
     #   "http://www.concord.org"
     #
     attr_reader :homepage
     #
     # Contains the value of the jnlp/information/description element
-    # Example: 
+    # Example:
     #
     #   "http://www.concord.org"
     #
     attr_reader :description
     #
     # Contains a Jnlp::Icon object encapsulating the
-    # jnlp/information/icon element if it exists in the 
+    # jnlp/information/icon element if it exists in the
     # original jnlp
     #
     attr_reader :icon
     #
-    # Contains a boolean value indictating the presence of the 
+    # Contains a boolean value indictating the presence of the
     # jnlp/information/offline-allowed element
     #
     attr_reader :offline_allowed
     #
-    # Contains an array of Jnlp::J2se objects encapsulating 
+    # Contains an array of Jnlp::J2se objects encapsulating
     # jnlp/resources/j2se elements
     #
     attr_reader :j2ses
     #
-    # Contains an array of Jnlp::Property objects encapsulating 
+    # Contains an array of Jnlp::Property objects encapsulating
     # jnlp/resources/property elements
     #
     attr_reader :properties
     #
-    # Contains an array of Jnlp::Resource objects encapsulating 
+    # Contains an array of Jnlp::Resource objects encapsulating
     # jnlp/resources/jar elements
     #
     attr_reader :jars
     #
-    # Contains an array of Jnlp::Resource objects encapsulating 
+    # Contains an array of Jnlp::Resource objects encapsulating
     # jnlp/resources/nativelib elements
     #
     attr_reader :nativelibs
@@ -927,7 +334,7 @@ module Jnlp #:nodoc:
     # Example: "http://www.concord.org"
     #
     attr_reader :argument
-    #    
+    #
     # Create a new Jnlp by loading and parsing the Java Web Start
     # Jnlp located at url -- url can be a local path or a url.
     # * if you include _cache_dir_ then the jnlp resources will be cached locally when the object is created
@@ -944,28 +351,28 @@ module Jnlp #:nodoc:
       @verbose = options[:verbose]
       import_jnlp(@url) unless @url.empty?
     end
-    
+
     def j2se_version(os=nil, arch=nil)
       j2se = j2ses.detect { |j2se| j2se.os == os && j2se.arch == arch}
       j2se ? j2se.version : nil
     end
-    
+
     def max_heap_size(os=nil, arch=nil)
       j2se = j2ses.detect { |j2se| j2se.os == os && j2se.arch == arch }
-      j2se ? j2se.max_heap_size : nil      
+      j2se ? j2se.max_heap_size : nil
     end
-    
+
     def initial_heap_size(os=nil, arch=nil)
       j2se = j2ses.detect { |j2se| j2se.os == os && j2se.arch == arch }
-      j2se ? j2se.initial_heap_size : nil            
+      j2se ? j2se.initial_heap_size : nil
     end
 
     def java_vm_args(os=nil, arch=nil)
       j2se = j2ses.detect { |j2se| j2se.os == os && j2se.arch == arch }
-      j2se ? j2se.java_vm_args : nil            
+      j2se ? j2se.java_vm_args : nil
     end
-    
-    
+
+
     #
     # Saves a YAML version of the jnlp object.
     #
@@ -975,7 +382,7 @@ module Jnlp #:nodoc:
     #
     def save(filename="saved_jnlp_object")
       File.open(filename, 'w') {|f| f.write YAML.dump(self)}
-    end    
+    end
     #
     # set
     #
@@ -1000,19 +407,19 @@ module Jnlp #:nodoc:
       @name = File.basename(url)
       #
       # @local_jnlp_href and @local_jnlp_name are only placeholders
-      # values so far-- they will become valid when a local jnlp file 
+      # values so far-- they will become valid when a local jnlp file
       # is written to the filesystem with this method:
       #
       #   Jnlp#write_local_jnlp
-      # 
+      #
       @local_jnlp_name = "local-#{@name}"
-      @local_jnlp_href = File.expand_path("#{Dir.pwd}/#{@local_jnlp_name}")    
+      @local_jnlp_href = File.expand_path("#{Dir.pwd}/#{@local_jnlp_name}")
       @jnlp = Nokogiri::XML(open(url).read)
       @spec = (@jnlp/"jnlp").attr('spec').value
       @codebase = (@jnlp/"jnlp").attr('codebase').value
       @path = @url.gsub(@codebase, '')
       @family = File.basename(File.dirname(@path))
-      @href = (@jnlp/"jnlp").attr('href').value
+      @href = (@jnlp/"jnlp").attr('href').value unless (@jnlp/"jnlp").attr('href').nil?
       @title, @vendor, @homepage, @description, @icon = nil, nil, nil, nil, nil
       unless (info = (@jnlp/"information")).empty?
         @title = (info/"title").inner_html.strip
@@ -1051,7 +458,7 @@ module Jnlp #:nodoc:
     # Copy all the jars and nativelib resources referenced in the Jnlp to
     # a local cache dir passed in _dest_dir_. The structure of the cache directory
     # and the naming using for the jar and nativelib files is the same as that used
-    # by the Java Web Start Download Servlet, see: 
+    # by the Java Web Start Download Servlet, see:
     # * http://java.sun.com/javase/6/docs/technotes/guides/javaws/developersguide/downloadservletguide.html
     #
     def cache_resources(dest_dir=@local_cache_dir, options=@options)
@@ -1077,7 +484,7 @@ module Jnlp #:nodoc:
     #
     def generate_local_jnlp(options={})
       #
-      # get a copy of the existing jnlp 
+      # get a copy of the existing jnlp
       # (it should be easier than this)
       #
       @local_jnlp = Nokogiri::XML(@jnlp.to_s)
@@ -1089,7 +496,7 @@ module Jnlp #:nodoc:
       # set the new codebase
       #
       jnlp_elem[:codebase] = "file:#{@local_cache_dir}"
-      #      
+      #
       # set the new href
       #
       jnlp_elem[:href] = @local_jnlp_href
@@ -1120,14 +527,14 @@ module Jnlp #:nodoc:
     # Returns an array containing all the local paths for this jnlp's resources.
     #
     # Pass in the options hash: (:remove_jruby => true) and
-    # the first resource that contains the string /jruby/ will 
+    # the first resource that contains the string /jruby/ will
     # be removed from the returned array.
     #
     # Example:
     #
     #   resource_paths(:remove_jruby => true)
     #
-    # This is useful when the jruby-complete jar has been included 
+    # This is useful when the jruby-complete jar has been included
     # in the jnlp and you don't want to require that jruby into this
     # specific instance which is already running jruby.
     #
@@ -1149,7 +556,7 @@ module Jnlp #:nodoc:
         resources = cp_jars + cp_nativelibs
       end
       #
-      # FIXME: this should probably be more discriminatory 
+      # FIXME: this should probably be more discriminatory
       #
       if options[:remove_jruby]
         resources = resources.reject {|r| r =~ /\/jruby\//}
@@ -1158,11 +565,11 @@ module Jnlp #:nodoc:
     end
     #
     # Returns a string in Java classpath format for all the jars for this jnlp
-    # The delimiter used is the ':' which is valid for MacOS X and Linux. 
+    # The delimiter used is the ':' which is valid for MacOS X and Linux.
     # Windows uses the ';' as a delimeter.
     #
     # Pass in the optional hash: (:remove_jruby => true) and
-    # the first resource that contains the string /jruby/ will 
+    # the first resource that contains the string /jruby/ will
     # be removed from the returned classapath string.
     #
     # Example:
@@ -1174,15 +581,15 @@ module Jnlp #:nodoc:
     end
     #
     # Writes a shell script to the local filesystem
-    # that will export a modified CLASSPATH environmental 
+    # that will export a modified CLASSPATH environmental
     # variable with the paths to the resources used by
     # this jnlp.
     #
-    # Writes a jnlp to current working directory 
+    # Writes a jnlp to current working directory
     # using name of original jnlp.
-    #   
+    #
     # Pass in the optional hash: (:remove_jruby => true) and
-    # the first resource that contains the string /jruby/ will 
+    # the first resource that contains the string /jruby/ will
     # be removed from the classapath shell script.
     #
     # Example:
@@ -1207,7 +614,7 @@ module Jnlp #:nodoc:
     end
     #
     # returns the local file-based jnlp as a string
-    #    
+    #
     def to_local_jnlp
       @local_jnlp.to_s
     end
@@ -1230,7 +637,7 @@ module Jnlp #:nodoc:
     # In addition a duplicate of the versioned jnlp is written without the version string as a snapshot
     # jnlp and the version string is written to this file:
     #
-    #   jnlp-name-CURRENT_VERSION.txt 
+    #   jnlp-name-CURRENT_VERSION.txt
     #
     def write_jnlp(options={})
       dir = options[:dir] || '.'
@@ -1249,9 +656,9 @@ module Jnlp #:nodoc:
     #
     # Writes a local file-based jnlp.
     #
-    # Will write jnlp to current working directory 
+    # Will write jnlp to current working directory
     # using name of original jnlp with "local-" prefix.
-    #   
+    #
     def write_local_jnlp(filename=@local_jnlp_name)
       destination = File.expand_path(filename)
       unless @local_jnlp_href == destination
@@ -1264,8 +671,8 @@ module Jnlp #:nodoc:
     #
     # This will add all the jars for this jnlp to the effective
     # classpath for this Java process.
-    # 
-    # *If* you are already running in JRuby *AND* the jnlp references a 
+    #
+    # *If* you are already running in JRuby *AND* the jnlp references a
     # JRuby resource the JRuby resource will not be required.
     #
     def require_resources