From f71c3a3639b7357b54303505d1874221e6c4cea4 Mon Sep 17 00:00:00 2001
From: Anthony Carlucci <carlucci@apache.org>
Date: Thu, 5 Apr 2012 13:42:04 +0000
Subject: [PATCH] RAVE-545: Upgrade to jQuery 1.7.2 and jQueryUI 1.8.17

git-svn-id: https://svn.apache.org/repos/asf/rave/trunk@1309856 13f79535-47bb-0310-9956-ffa450edef68
---
 .../WEB-INF/jsp/templates/base_layout.jsp     |  2 +-
 .../src/main/webapp/WEB-INF/tags/rave_js.tag  | 12 +------
 .../webapp/WEB-INF/tags/third_party_js.tag    | 34 +++++++++++++++++++
 3 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag

diff --git a/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp b/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
index 08a847c5..1e159277 100644
--- a/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
+++ b/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
@@ -54,7 +54,7 @@ under the License.
             <c:out value="${portalSettings['titleSuffix'].value}"/>
         </c:if>
     </title>
-    <link rel="stylesheet" href="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.13/themes/base/jquery-ui.css"/>
+    <link rel="stylesheet" href="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.17/themes/base/jquery-ui.css"/>
     <link rel="stylesheet" href="<c:url value="/css/default.css" />"/>
     <rave:custom_css/>
 </head>
diff --git a/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag b/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
index 7b4191f5..59bdf0ec 100644
--- a/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
+++ b/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
@@ -18,18 +18,8 @@
 
 --%>
 <%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
-
 <portal:render-script location="${'BEFORE_LIB'}" />
-<%-- json script --%>
-<script src="//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
-<%-- jquery scripts --%>
-<script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.4.min.js"></script>
-<script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js"></script>
-<script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.8.1/jquery.validate.min.js"></script>
-<%-- google css3 mediaqueries script --%>
-<!--[if lt IE 9]><script src=//css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js></script><![endif]-->
-<%-- google html5 script --%>
-<!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+<rave:third_party_js />
 <portal:render-script location="${'AFTER_LIB'}" />
 <%-- local rave scripts --%>
 <portal:render-script location="${'BEFORE_RAVE'}" />
diff --git a/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag b/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag
new file mode 100644
index 00000000..2126de1a
--- /dev/null
+++ b/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag
@@ -0,0 +1,34 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+
+--%>
+<%--
+     This file includes references to all external third party javascript libraries required by rave
+     Overlay this file in custom extensions of Rave if you host these libraries internally and don't need
+     to pull them in externally.
+--%>
+<%-- json script --%>
+<script src="//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
+<%-- jquery scripts --%>
+<script src="//ajax.aspnetcdn.com/ajax/jquery/jquery-1.7.2.min.js"></script>
+<script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.17/jquery-ui.min.js"></script>
+<script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.8.1/jquery.validate.min.js"></script>
+<%-- google css3 mediaqueries script --%>
+<!--[if lt IE 9]><script src=//css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js></script><![endif]-->
+<%-- google html5 script --%>
+<!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->