[ 
https://issues.apache.org/jira/browse/EDGENT-262?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=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_444444_256x240.png     ui-icons_cc0000_256x240.png
jquery-ui.js                    jquery-ui.theme.min.css         
ui-icons_555555_256x240.png     ui-icons_ffffff_256x240.png
jquery-ui.min.css                                                               
ui-icons_777620_256x240.png
jquery-ui.min.js                                                                
ui-icons_777777_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 @@
 <head>
 <title>Apache Edgent Console</title>
 
-<link rel="stylesheet" type="text/css" 
href="js/ext/jquery-ui-1.11.4.custom/jquery-ui.min.css">
-<link rel="stylesheet" type="text/css" 
href="js/ext/jquery-ui-1.11.4.custom/jquery-ui.theme.min.css">
-<link rel="stylesheet" type="text/css" 
href="js/ext/jquery-ui-1.11.4.custom/jquery-ui.structure.min.css">
+<link rel="stylesheet" type="text/css" 
href="js/ext/jquery-ui-1.12.1/jquery-ui.min.css">
+<link rel="stylesheet" type="text/css" 
href="js/ext/jquery-ui-1.12.1/jquery-ui.theme.min.css">
+<link rel="stylesheet" type="text/css" 
href="js/ext/jquery-ui-1.12.1/jquery-ui.structure.min.css">
 <link rel="stylesheet" type="text/css" href="resources/css/main.css">
 <link rel="stylesheet" type="text/css" href="resources/css/metrics.css">
 <link rel="shortcut icon" href="resources/images/favicon.png" />
@@ -98,8 +98,8 @@
 </div>
 </div>
 <script src="js/ext/d3.min.js" charset="utf-8"></script>
-<script 
src="js/ext/jquery-ui-1.11.4.custom/external/jquery/jquery.js"></script>
-<script src="js/ext/jquery-ui-1.11.4.custom/jquery-ui.min.js"></script>

+<script src="js/ext/jquery-ui-1.12.1/jquery.js"></script>
+<script src="js/ext/jquery-ui-1.12.1/jquery-ui.min.js"></script>


 <script src="js/ext/sankey_edgent.js"></script>
 <script src="js/streamtags.js"></script>
 <script src="js/ext/d3.legend.js"></script>


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)

Reply via email to