Re: [jira] [Commented] (EDGENT-262) origin and disposition of console/servlets/webapp_content/js/ext
Hi, > For where I got d3.min.js, it is available here now, but it no longer seems > to have a BSD license. > > https://github.com/d3/d3/releases/tag/v3.5.9 Looks like 3 clause BSD to me [1], but even it it changes to/from MIT that’s fine as both are permissive licenses. Just make sure you use the licenses associated with the version you use. > Here is the sankey license, which also was changed: > > https://github.com/d3/d3-sankey/blob/master/LICENSE Also 3 clause BSD which is fine to bundled in a source release. Thanks, Justin 1. https://github.com/d3/d3/blob/master/LICENSE
[jira] [Commented] (EDGENT-262) origin and disposition of console/servlets/webapp_content/js/ext
[ https://issues.apache.org/jira/browse/EDGENT-262?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15553635#comment-15553635 ] Susan L. Cline commented on EDGENT-262: --- I looked around a bit more about that jar being pointed to in a script and talked to a colleague at work and I don't think it is doable. For where I got d3.min.js, it is available here now, but it no longer seems to have a BSD license. https://github.com/d3/d3/releases/tag/v3.5.9 When I downloaded it previously they were BSD licenses. See this thread: https://groups.google.com/forum/#!topic/d3-js/MVZ3ft0UvSs Here is the sankey license, which also was changed: https://github.com/d3/d3-sankey/blob/master/LICENSE With regard to d3.legend.js, I got it from here: https://github.com/jieter/d3-legend/blob/master/d3.legend.js and inside d3.legend.js is this text: // d3.legend.js // (C) 2012 ziggy.jonsson@gmail.com // MIT licence wrt stuff I have changed, yes, it kind of seems like we are stuck in that regard. Sorry if this complicates things. > origin and disposition of console/servlets/webapp_content/js/ext > > > Key: EDGENT-262 > URL: https://issues.apache.org/jira/browse/EDGENT-262 > Project: Edgent > Issue Type: Task >Reporter: Dale LaBossiere > > Working towards removal of external dependencies from the Edgent repository > (EDGENT-261, EDGENT-139) I encountered > console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom. > [~slc] what's the origin of these files? > Looking at the name I had hoped it was the same as > org.webjars:jquery-ui:1.11.4 (@ > https://mvnrepository.com/artifact/org.webjars/jquery-ui/1.11.4) but no such > luck. > Ultimately, will we be able to remove those files from the repository and > download them from a maven repository to build Edgent and include in a > generated console.war and binary release? > If not, that seems to imply needing to augment various files to capture the > included content's license/notice info: >console.war/{LICENSE,NOTICE} >edgent-repository/LICENSE,NOTICE >binary-release-{license,notice} > looking for some guidance. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (EDGENT-262) origin and disposition of console/servlets/webapp_content/js/ext
[ https://issues.apache.org/jira/browse/EDGENT-262?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15553356#comment-15553356 ] Dale LaBossiere commented on EDGENT-262: Regarding the referencing js/css resources in jars, at a high level I think the issue is independent of maven. Assume the build downloads the jar where you need it, and we can tweak our generated war's manifest classpath if needed. Being ignorant of all of this html/js stuff, I can't tell if that stackoverflow item has any relevance to the console :-) Ultimately, I guess we can still get that jar out of the repository by letting gradle download it and then we can unpack it when we're building the release area. ugh :-) Re: https://github.com/mbostock/d3, I don't see d3.min.js there and the LICENSE there isn't BSD??? Re: sankey, the LICENSE in that github repo isn't a BSD license??? Of course for anything we've modified, unless there's some scripting we could run over buildtime-downloaded-original-source to yield what you need it seems we must retain these modified files in our repo along with the correct license... percolated up into Edgent's repo's LICENSE? > origin and disposition of console/servlets/webapp_content/js/ext > > > Key: EDGENT-262 > URL: https://issues.apache.org/jira/browse/EDGENT-262 > Project: Edgent > Issue Type: Task >Reporter: Dale LaBossiere > > Working towards removal of external dependencies from the Edgent repository > (EDGENT-261, EDGENT-139) I encountered > console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom. > [~slc] what's the origin of these files? > Looking at the name I had hoped it was the same as > org.webjars:jquery-ui:1.11.4 (@ > https://mvnrepository.com/artifact/org.webjars/jquery-ui/1.11.4) but no such > luck. > Ultimately, will we be able to remove those files from the repository and > download them from a maven repository to build Edgent and include in a > generated console.war and binary release? > If not, that seems to imply needing to augment various files to capture the > included content's license/notice info: >console.war/{LICENSE,NOTICE} >edgent-repository/LICENSE,NOTICE >binary-release-{license,notice} > looking for some guidance. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (EDGENT-262) origin and disposition of console/servlets/webapp_content/js/ext
[ https://issues.apache.org/jira/browse/EDGENT-262?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15553063#comment-15553063 ] Susan L. Cline commented on EDGENT-262: --- I have never tried that - referencing js files that are contained in a jar file. I got one hit on it here: http://stackoverflow.com/questions/38153716/can-we-refer-to-a-javascript-inside-the-jar-file-of-a-maven-dependency but it sounds like you need to use maven? I'm not sure. WRT the other js files here is where they came : https://github.com/mbostock/d3 - d3.min.js The d3.BSD.LICENSE is in ext. https://github.com/d3/d3-plugins/tree/master/sankey - I modified sankey.ds and renamed it sankey_edgent.js the license file is in that ext directory. https://github.com/jieter/d3-legend (Inside the d3.legend.js file is this note: // d3.legend.js // (C) 2012 ziggy.jonsson@gmail.com // MIT licence License: ps://github.com/mbostock/d3/blob/master/LICENSE) I also slightly modified d3.legend.js to fit our needs. > origin and disposition of console/servlets/webapp_content/js/ext > > > Key: EDGENT-262 > URL: https://issues.apache.org/jira/browse/EDGENT-262 > Project: Edgent > Issue Type: Task >Reporter: Dale LaBossiere > > Working towards removal of external dependencies from the Edgent repository > (EDGENT-261, EDGENT-139) I encountered > console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom. > [~slc] what's the origin of these files? > Looking at the name I had hoped it was the same as > org.webjars:jquery-ui:1.11.4 (@ > https://mvnrepository.com/artifact/org.webjars/jquery-ui/1.11.4) but no such > luck. > Ultimately, will we be able to remove those files from the repository and > download them from a maven repository to build Edgent and include in a > generated console.war and binary release? > If not, that seems to imply needing to augment various files to capture the > included content's license/notice info: >console.war/{LICENSE,NOTICE} >edgent-repository/LICENSE,NOTICE >binary-release-{license,notice} > looking for some guidance. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (EDGENT-262) origin and disposition of console/servlets/webapp_content/js/ext
[ https://issues.apache.org/jira/browse/EDGENT-262?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15552769#comment-15552769 ] Dale LaBossiere commented on EDGENT-262: and what's the scoop with the other files in servlets/webapp_content/js/ext: d3*, sankey*? they're modified "external" files... originally from... ? > origin and disposition of console/servlets/webapp_content/js/ext > > > Key: EDGENT-262 > URL: https://issues.apache.org/jira/browse/EDGENT-262 > Project: Edgent > Issue Type: Task >Reporter: Dale LaBossiere > > Working towards removal of external dependencies from the Edgent repository > (EDGENT-261, EDGENT-139) I encountered > console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom. > [~slc] what's the origin of these files? > Looking at the name I had hoped it was the same as > org.webjars:jquery-ui:1.11.4 (@ > https://mvnrepository.com/artifact/org.webjars/jquery-ui/1.11.4) but no such > luck. > Ultimately, will we be able to remove those files from the repository and > download them from a maven repository to build Edgent and include in a > generated console.war and binary release? > If not, that seems to imply needing to augment various files to capture the > included content's license/notice info: >console.war/{LICENSE,NOTICE} >edgent-repository/LICENSE,NOTICE >binary-release-{license,notice} > looking for some guidance. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (EDGENT-262) origin and disposition of console/servlets/webapp_content/js/ext
[ https://issues.apache.org/jira/browse/EDGENT-262?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15552742#comment-15552742 ] Dale LaBossiere commented on EDGENT-262: it would be way more convenient if everything could just remain in the downloaded jars and the html referenced the js/css files in them. is that sort of thing possible? > origin and disposition of console/servlets/webapp_content/js/ext > > > Key: EDGENT-262 > URL: https://issues.apache.org/jira/browse/EDGENT-262 > Project: Edgent > Issue Type: Task >Reporter: Dale LaBossiere > > Working towards removal of external dependencies from the Edgent repository > (EDGENT-261, EDGENT-139) I encountered > console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom. > [~slc] what's the origin of these files? > Looking at the name I had hoped it was the same as > org.webjars:jquery-ui:1.11.4 (@ > https://mvnrepository.com/artifact/org.webjars/jquery-ui/1.11.4) but no such > luck. > Ultimately, will we be able to remove those files from the repository and > download them from a maven repository to build Edgent and include in a > generated console.war and binary release? > If not, that seems to imply needing to augment various files to capture the > included content's license/notice info: >console.war/{LICENSE,NOTICE} >edgent-repository/LICENSE,NOTICE >binary-release-{license,notice} > looking for some guidance. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Resolved] (EDGENT-263) Add source tgz generation
[ https://issues.apache.org/jira/browse/EDGENT-263?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Dale LaBossiere resolved EDGENT-263. Resolution: Fixed > Add source tgz generation > - > > Key: EDGENT-263 > URL: https://issues.apache.org/jira/browse/EDGENT-263 > Project: Edgent > Issue Type: Task > Components: Miscellaneous >Reporter: Dale LaBossiere >Assignee: Dale LaBossiere > -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (EDGENT-263) Add source tgz generation
[ https://issues.apache.org/jira/browse/EDGENT-263?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15552666#comment-15552666 ] ASF GitHub Bot commented on EDGENT-263: --- Github user asfgit closed the pull request at: https://github.com/apache/incubator-edgent/pull/212 > Add source tgz generation > - > > Key: EDGENT-263 > URL: https://issues.apache.org/jira/browse/EDGENT-263 > Project: Edgent > Issue Type: Task > Components: Miscellaneous >Reporter: Dale LaBossiere >Assignee: Dale LaBossiere > -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[GitHub] incubator-edgent pull request #212: EDGENT-263 add source tgz generation
Github user asfgit closed the pull request at: https://github.com/apache/incubator-edgent/pull/212 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[jira] [Commented] (EDGENT-262) origin and disposition of console/servlets/webapp_content/js/ext
[ https://issues.apache.org/jira/browse/EDGENT-262?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15552629#comment-15552629 ] Susan L. Cline commented on EDGENT-262: --- Here are the files I need/took from the jquery-ui.jar file: LICENSE.txt jquery-ui.structure.min.css ui-icons_44_256x240.png ui-icons_cc_256x240.png jquery-ui.jsjquery-ui.theme.min.css ui-icons_55_256x240.png ui-icons_ff_256x240.png jquery-ui.min.css ui-icons_777620_256x240.png jquery-ui.min.js ui-icons_77_256x240.png Here are the two files i got from the jquery.jar file: jquery.js jquery.min.js I only modified one file actually, to console/servlets/webapp_content/html/index.html. Note that I created a new directory structure and shoved jquery.js under jquery-ui-1.12.1 .. It does not matter to me if you prefer to have a separate jquery directory from the jquery-ui-1.12.1: incubator-edgent/console/servlets/webapp_content/js/ext/jquery-ui-1.12.1 Susans-MBP-795:html susancline$ git diff index.html diff --git a/console/servlets/webapp_content/html/index.html b/console/servlets/webapp_content/html/index.html index f310059..774e0be 100644 --- a/console/servlets/webapp_content/html/index.html +++ b/console/servlets/webapp_content/html/index.html @@ -4,9 +4,9 @@ Apache Edgent Console - - - + + + @@ -98,8 +98,8 @@ - - + + Another thing to note is that included in the jquery-ui.jar file is a LICENSE.txt, in the jquery.jar file there is no LICENSE. Also, the link here to the license is broken: https://mvnrepository.com/artifact/org.webjars/jquery/3.1.1 license url: https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt Thanks, Susan > origin and disposition of console/servlets/webapp_content/js/ext > > > Key: EDGENT-262 > URL: https://issues.apache.org/jira/browse/EDGENT-262 > Project: Edgent > Issue Type: Task >Reporter: Dale LaBossiere > > Working towards removal of external dependencies from the Edgent repository > (EDGENT-261, EDGENT-139) I encountered > console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom. > [~slc] what's the origin of these files? > Looking at the name I had hoped it was the same as > org.webjars:jquery-ui:1.11.4 (@ > https://mvnrepository.com/artifact/org.webjars/jquery-ui/1.11.4) but no such > luck. > Ultimately, will we be able to remove those files from the repository and > download them from a maven repository to build Edgent and include in a > generated console.war and binary release? > If not, that seems to imply needing to augment various files to capture the > included content's license/notice info: >console.war/{LICENSE,NOTICE} >edgent-repository/LICENSE,NOTICE >binary-release-{license,notice} > looking for some guidance. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (EDGENT-253) [gradle] upgrade gradle wrapper to use 3.1
[ https://issues.apache.org/jira/browse/EDGENT-253?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15552535#comment-15552535 ] ASF GitHub Bot commented on EDGENT-253: --- GitHub user dlaboss opened a pull request: https://github.com/apache/incubator-edgent/pull/212 EDGENT-253 add source tgz generation You can merge this pull request into a Git repository by running: $ git pull https://github.com/dlaboss/incubator-edgent edgent-263-srctgz Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-edgent/pull/212.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #212 commit a444936100f37001ee922d9671d78b1cb78903c6 Author: Dale LaBossiereDate: 2016-10-06T17:00:18Z EDGENT-253 add source tgz generation > [gradle] upgrade gradle wrapper to use 3.1 > -- > > Key: EDGENT-253 > URL: https://issues.apache.org/jira/browse/EDGENT-253 > Project: Edgent > Issue Type: Task >Reporter: Dale LaBossiere >Assignee: Dale LaBossiere > -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[GitHub] incubator-edgent pull request #212: EDGENT-253 add source tgz generation
GitHub user dlaboss opened a pull request: https://github.com/apache/incubator-edgent/pull/212 EDGENT-253 add source tgz generation You can merge this pull request into a Git repository by running: $ git pull https://github.com/dlaboss/incubator-edgent edgent-263-srctgz Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-edgent/pull/212.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #212 commit a444936100f37001ee922d9671d78b1cb78903c6 Author: Dale LaBossiereDate: 2016-10-06T17:00:18Z EDGENT-253 add source tgz generation --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[jira] [Created] (EDGENT-263) Add source tgz generation
Dale LaBossiere created EDGENT-263: -- Summary: Add source tgz generation Key: EDGENT-263 URL: https://issues.apache.org/jira/browse/EDGENT-263 Project: Edgent Issue Type: Task Components: Miscellaneous Reporter: Dale LaBossiere Assignee: Dale LaBossiere -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (EDGENT-262) origin and disposition of console/servlets/webapp_content/js/ext
[ https://issues.apache.org/jira/browse/EDGENT-262?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15552421#comment-15552421 ] Susan L. Cline commented on EDGENT-262: --- [~dlaboss] - I downloaded the content of two jar files at the URL you suggested: https://mvnrepository.com/artifact/org.webjars/jquery-ui/1.11.4 for the jquery-ui requirements, and then I went here: https://mvnrepository.com/artifact/org.webjars/jquery/3.1.1 for the main jquery.js file. I put them under ncubator-edgent/console/servlets/webapp_content/js/ext/jquery-ui-1.12.1 and built using gradle, then modified a couple of files under the console directory to point to the new files and everything worked fine. Please let me know how to proceed to replace this stuff. Or if you need additional info! Thanks > origin and disposition of console/servlets/webapp_content/js/ext > > > Key: EDGENT-262 > URL: https://issues.apache.org/jira/browse/EDGENT-262 > Project: Edgent > Issue Type: Task >Reporter: Dale LaBossiere > > Working towards removal of external dependencies from the Edgent repository > (EDGENT-261, EDGENT-139) I encountered > console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom. > [~slc] what's the origin of these files? > Looking at the name I had hoped it was the same as > org.webjars:jquery-ui:1.11.4 (@ > https://mvnrepository.com/artifact/org.webjars/jquery-ui/1.11.4) but no such > luck. > Ultimately, will we be able to remove those files from the repository and > download them from a maven repository to build Edgent and include in a > generated console.war and binary release? > If not, that seems to imply needing to augment various files to capture the > included content's license/notice info: >console.war/{LICENSE,NOTICE} >edgent-repository/LICENSE,NOTICE >binary-release-{license,notice} > looking for some guidance. -- This message was sent by Atlassian JIRA (v6.3.4#6332)