You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by ol...@apache.org on 2012/07/07 16:23:02 UTC
svn commit: r1358573 - in /incubator/directmemory/trunk: LICENSE NOTICE
examples/server-example/src/main/webapp/index.html
Author: olamy
Date: Sat Jul 7 14:23:02 2012
New Revision: 1358573
URL: http://svn.apache.org/viewvc?rev=1358573&view=rev
Log:
use a cdn for bootstrap and jquery
Modified:
incubator/directmemory/trunk/LICENSE
incubator/directmemory/trunk/NOTICE
incubator/directmemory/trunk/examples/server-example/src/main/webapp/index.html
Modified: incubator/directmemory/trunk/LICENSE
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/LICENSE?rev=1358573&r1=1358572&r2=1358573&view=diff
==============================================================================
--- incubator/directmemory/trunk/LICENSE (original)
+++ incubator/directmemory/trunk/LICENSE Sat Jul 7 14:23:02 2012
@@ -204,44 +204,3 @@
APPENDIX II: Licenses for Incorporated Works.
-------
-jQuery, Jquery tmpl, jQuery JSON Plugin
-
-Copyright (c) 2011 John Resig, http://jquery.com/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-------
-Bootstrap
-
-Copyright 2012 Twitter, Inc.
-
-Licensed 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.
-
Modified: incubator/directmemory/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/NOTICE?rev=1358573&r1=1358572&r2=1358573&view=diff
==============================================================================
--- incubator/directmemory/trunk/NOTICE (original)
+++ incubator/directmemory/trunk/NOTICE Sat Jul 7 14:23:02 2012
@@ -4,8 +4,3 @@ Copyright 2001-2012 The Apache Software
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
-This product includes software (bootstrap) developed by
-Twitter (http://twitter.github.com/bootstrap/).
-
-This product includes software (jquery) developed by
-Jquery (http://jquery.org/).
Modified: incubator/directmemory/trunk/examples/server-example/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/examples/server-example/src/main/webapp/index.html?rev=1358573&r1=1358572&r2=1358573&view=diff
==============================================================================
--- incubator/directmemory/trunk/examples/server-example/src/main/webapp/index.html (original)
+++ incubator/directmemory/trunk/examples/server-example/src/main/webapp/index.html Sat Jul 7 14:23:02 2012
@@ -19,10 +19,10 @@
<!DOCTYPE html>
<html>
<head>
- <link rel="stylesheet" href="css/bootstrap.2.0.4.css">
+ <link rel="stylesheet" href="http://current.bootstrapcdn.com/bootstrap-v204/css/bootstrap.css">
- <script type="text/javascript" src="js/jquery-1.7.2.js"></script>
- <script type="text/javascript" src="js/bootstrap.2.0.4.js"></script>
+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.min.js"></script>
+ <script type="text/javascript" src="http://current.bootstrapcdn.com/bootstrap-v204/js/bootstrap.js"></script>
<script type="text/javascript" src="js/sample.js"></script>
<script type="text/javascript" src="js/jquery.json-2.3.js"></script>
<script type="text/javascript" src="js/jquery-tmpl.js"></script>