You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2018/01/04 18:41:05 UTC
[5/6] incubator-taverna-server git commit: Use jquery as webjar
dependency, not in git
Use jquery as webjar dependency, not in git
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/29227ad8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/29227ad8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/29227ad8
Branch: refs/heads/master
Commit: 29227ad8031f2d0efdc3f8c2d3788a5cc4ffce11
Parents: 42beee1
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jan 4 18:40:12 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jan 4 18:40:12 2018 +0000
----------------------------------------------------------------------
taverna-server-webapp/pom.xml | 10 +
.../src/main/resources/admin.html | 6 +-
.../main/resources/static/jquery-1.8.0.min.js | 2 -
.../static/jquery-ui-1.8.23.custom.css | 563 -------------------
.../static/jquery-ui-1.8.23.custom.min.js | 125 ----
.../ui-bg_diagonals-small_25_c5ddfc_40x40.png | Bin 194 -> 0 bytes
.../ui-bg_diagonals-thick_20_e69700_40x40.png | Bin 257 -> 0 bytes
.../ui-bg_diagonals-thick_22_1484e6_40x40.png | Bin 384 -> 0 bytes
.../ui-bg_diagonals-thick_26_2293f7_40x40.png | Bin 259 -> 0 bytes
.../static/ui-bg_flat_0_e69700_40x100.png | Bin 181 -> 0 bytes
.../static/ui-bg_flat_0_e6b900_40x100.png | Bin 212 -> 0 bytes
.../ui-bg_highlight-soft_100_f9f9f9_1x100.png | Bin 88 -> 0 bytes
.../ui-bg_inset-hard_100_eeeeee_1x100.png | Bin 91 -> 0 bytes
.../static/ui-icons_0a82eb_256x240.png | Bin 4369 -> 0 bytes
.../static/ui-icons_0b54d5_256x240.png | Bin 4369 -> 0 bytes
.../static/ui-icons_5fa5e3_256x240.png | Bin 5355 -> 0 bytes
.../static/ui-icons_fcdd4a_256x240.png | Bin 4369 -> 0 bytes
.../static/ui-icons_ffffff_256x240.png | Bin 4369 -> 0 bytes
.../src/main/webapp/WEB-INF/web-nosec.xml | 17 +-
.../src/main/webapp/WEB-INF/web-partsec.xml | 17 +-
.../src/main/webapp/WEB-INF/web-sec.xml | 9 +
21 files changed, 48 insertions(+), 701 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/29227ad8/taverna-server-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/pom.xml b/taverna-server-webapp/pom.xml
index cb45bbf..d4817ba 100644
--- a/taverna-server-webapp/pom.xml
+++ b/taverna-server-webapp/pom.xml
@@ -42,6 +42,16 @@ limitations under the License.
<dependencies>
<dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>webjars-servlet-2.x</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery-ui</artifactId>
+ <version>1.9.2</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${version.cxf}</version>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/29227ad8/taverna-server-webapp/src/main/resources/admin.html
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/resources/admin.html b/taverna-server-webapp/src/main/resources/admin.html
index bc7f075..27f80ad 100644
--- a/taverna-server-webapp/src/main/resources/admin.html
+++ b/taverna-server-webapp/src/main/resources/admin.html
@@ -20,10 +20,10 @@ limitations under the License.
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Taverna Server ${project.version} Administration Interface</title>
<link id="admin" href="admin" />
-<script type="text/javascript" src="admin/static/jquery-1.8.0.min.js"></script>
-<script type="text/javascript" src="admin/static/jquery-ui-1.8.23.custom.min.js"></script>
+<script type="text/javascript" src="webjars/jquery/1.8.2/jquery.min.js"></script>
+<script type="text/javascript" src="/webjars/jquery-ui/1.9.2/js/jquery-ui-1.9.2.custom.min.js"></script>
<script type="text/javascript" src="admin/static/admin.js"></script>
-<link href="admin/static/jquery-ui-1.8.23.custom.css" rel="stylesheet" type="text/css" />
+<link href="webjars/jquery-ui/1.9.2/css/smoothness/jquery-ui-1.9.2.custom.css" rel="stylesheet" type="text/css" />
</head>
<body>