Permalink
Browse files

Actually attempt to install when opportunistic installer is enabled

Conflicts:

	app/views/shared/_installer.jnlp.builder
  • Loading branch information...
1 parent 80d1c89 commit 739ad3d6da53a38433de10cf50eb828b4cb64845 @psndcsrv psndcsrv committed Apr 17, 2012
Showing with 5 additions and 1 deletion.
  1. +5 −1 app/views/shared/_installer.jnlp.builder
@@ -32,7 +32,7 @@ xml.jnlp(:spec => "1.0+", :codebase => "http://jnlp.concord.org/dev3") {
xml.j2se :version => jnlp.j2se_version, 'max-heap-size' => "#{jnlp.max_heap_size}m", 'initial-heap-size' => "#{jnlp.initial_heap_size}m"
# do not use version attributes so we can totally avoid all the jnlp jar versioning issues
xml.jar :href=> "org/concord/utilities/response-cache/response-cache-0.1.0-20110101.051026-218.jar"
- xml.jar :href=> "org/concord/jnlp2shell/jnlp2shell-1.0-20120313.184507-420.jar", :main =>"true"
+ xml.jar :href=> "org/concord/jnlp2shell/jnlp2shell-1.0-20120417.220208-427.jar", :main =>"true"
system_properties(local_assigns).each do |property|
xml.property(:name => property[0], :value => property[1])
end
@@ -58,6 +58,10 @@ xml.jnlp(:spec => "1.0+", :codebase => "http://jnlp.concord.org/dev3") {
xml.property :name=> "skip_not_found_dialog", :value => "true"
xml.property :name=> "not_found_url", :value => polymorphic_url(url_target, {:format => :jnlp}.merge(url_options))
xml.property :name=> "test_jar_saving", :value => installer_report_url
+ xml.property :name=> "install_on_not_found", :value => "true"
+
+ # include wrapped_jnlp so we know what jnlp to install from
+ xml.property :name=> "wrapped_jnlp", :value => maven_jnlp_info[:href]
end
}
if(!opportunistic_installer)

0 comments on commit 739ad3d

Please sign in to comment.