This repository has been archived by the owner on Sep 1, 2022. It is now read-only.
Remove duplicate ToolsUI WebStart file #779
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 3 commits
March 16, 2017 15:16
Fixes MPS-625937. Previously, we had both netCDFtools.jnlp and ToolsUI.jnlp, and they only differed in the 'application-desc' element. Rather than maintain both and try to keep them in sync, we're nuking ToolsUI.jnlp and modifying netCDFtools.jnlp as necessary.
* Maven is out of the picture, so we don't have to use Maven-style placeholders anymore. * Figured out a way to filter tds.properties without removing it from the CopySpec first.
cwardgar
commented
Mar 16, 2017
| doLast { | ||
| GPathResult jnlp = new XmlSlurper().parse(inputFile) | ||
|
|
||
| // Add "<argument>{catalog}#{dataset}</argument>" to the "application-desc" node |
There was a problem hiding this comment.
This tiny bit of Groovy code changes
<application-desc main-class="ucar.nc2.ui.ToolsUI"/>to
<application-desc main-class="ucar.nc2.ui.ToolsUI">
<argument>{catalog}#{dataset}</argument>
</application-desc>Cool, right?
There was a problem hiding this comment.
👍 - Groovy is awesome!
|
Looks nice to me. Would you mind updating the copyright blocks on the java files with the following? /*
* Copyright (c) 1998-2017 University Corporation for Atmospheric Research/Unidata
*/ |
|
Oops...meant to comment, not close. |
* Minor tweaks to filterWebStartFile task.
|
Done. |
|
Thanks @cwardgar! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes MPS-625937.
Previously, we had both
netCDFtools.jnlpandToolsUI.jnlp, and they only differed in theapplication-descelement. Rather than maintain both and try to keep them in sync, we're nukingToolsUI.jnlpand programmatically modifyingnetCDFtools.jnlpas necessary.I also simplified the other filtered resources that are included in thredds.war.