You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ra...@apache.org on 2014/11/15 21:03:50 UTC
thrift git commit: THRIFT-2823: grunt jsjq test fail Client: JS
Patch: Randy Abernethy
Repository: thrift
Updated Branches:
refs/heads/master 8c12b19eb -> b2652300c
THRIFT-2823: grunt jsjq test fail
Client: JS
Patch: Randy Abernethy
Node no longer supports loading thrift.js from
parent dir, moved to test/build
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/b2652300
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/b2652300
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/b2652300
Branch: refs/heads/master
Commit: b2652300c0eabfd375786e3733c3c90b810fdb34
Parents: 8c12b19
Author: Randy Abernethy <ra...@apache.org>
Authored: Sat Nov 15 12:02:57 2014 -0800
Committer: Randy Abernethy <ra...@apache.org>
Committed: Sat Nov 15 12:02:57 2014 -0800
----------------------------------------------------------------------
lib/js/README.md | 9 +++-
lib/js/package.json | 2 +-
lib/js/test/test.html | 114 ++++++++++++++++++++++-----------------------
3 files changed, 66 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/b2652300/lib/js/README.md
----------------------------------------------------------------------
diff --git a/lib/js/README.md b/lib/js/README.md
index 8c4340b..dfa6e82 100644
--- a/lib/js/README.md
+++ b/lib/js/README.md
@@ -40,11 +40,18 @@ of Apache Thrift execute the command:
grunt
-This runs therunt build tool, linting all of the source
+This runs the grunt build tool, linting all of the source
files, setting up and running the tests, concatenating and
minifying the main libraries and generating the html
documentation.
+If grunt is not installed you can install it with npm
+like this:
+
+ sudo npm install -g grunt-cli
+ npm install grunt --save-dev
+
+
Tree
----
The following directories are present (some only after the
http://git-wip-us.apache.org/repos/asf/thrift/blob/b2652300/lib/js/package.json
----------------------------------------------------------------------
diff --git a/lib/js/package.json b/lib/js/package.json
index 5cdd145..e1df9f0 100644
--- a/lib/js/package.json
+++ b/lib/js/package.json
@@ -2,7 +2,7 @@
"name": "thrift",
"version": "1.0.0",
"devDependencies": {
- "grunt": "~0.4.1",
+ "grunt": "~0.4.5",
"grunt-contrib-uglify": "~0.2.2",
"grunt-contrib-jshint": "~0.6.3",
"grunt-contrib-qunit": "~0.2.2",
http://git-wip-us.apache.org/repos/asf/thrift/blob/b2652300/lib/js/test/test.html
----------------------------------------------------------------------
diff --git a/lib/js/test/test.html b/lib/js/test/test.html
index cf9874f..2723814 100755
--- a/lib/js/test/test.html
+++ b/lib/js/test/test.html
@@ -1,57 +1,57 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!--
- 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.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>Thrift Javascript Bindings: Unit Test</title>
-
- <script src="../src/thrift.js" type="text/javascript" charset="utf-8"></script>
- <script src="gen-js/ThriftTest_types.js" type="text/javascript" charset="utf-8"></script>
- <script src="gen-js/ThriftTest.js" type="text/javascript" charset="utf-8"></script>
-
- <!-- jQuery -->
- <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.js" charset="utf-8"></script>
-
- <!-- QUnit Test framework-->
- <script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.14.0.js" charset="utf-8"></script>
- <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.14.0.css" type="text/css" media="screen" />
-
- <!-- the Test Suite-->
- <script>
- var transport = new Thrift.Transport("/service");
- var protocol = new Thrift.Protocol(transport);
- var client = new ThriftTest.ThriftTestClient(protocol);
- </script>
- <script type="text/javascript" src="test.js" charset="utf-8"></script>
- <script type="text/javascript" src="test-jq.js" charset="utf-8"></script>
-</head>
-<body>
- <h1 id="qunit-header">Thrift Javascript Bindings: Unit Test (<a href="https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=blob;f=test/ThriftTest.thrift;hb=HEAD">ThriftTest.thrift</a>)</h1>
- <h2 id="qunit-banner"></h2>
- <div id="qunit-testrunner-toolbar"></div>
- <h2 id="qunit-userAgent"></h2>
- <ol id="qunit-tests"><li><!-- get valid xhtml strict--></li></ol>
- <p>
- <a href="http://validator.w3.org/check/referer"><img
- src="http://www.w3.org/Icons/valid-xhtml10"
- alt="Valid XHTML 1.0!" height="31" width="88" /></a>
- </p>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+ 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.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>Thrift Javascript Bindings: Unit Test</title>
+
+ <script src="build/js/thrift.js" type="text/javascript" charset="utf-8"></script>
+ <script src="gen-js/ThriftTest_types.js" type="text/javascript" charset="utf-8"></script>
+ <script src="gen-js/ThriftTest.js" type="text/javascript" charset="utf-8"></script>
+
+ <!-- jQuery -->
+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.js" charset="utf-8"></script>
+
+ <!-- QUnit Test framework-->
+ <script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.14.0.js" charset="utf-8"></script>
+ <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.14.0.css" type="text/css" media="screen" />
+
+ <!-- the Test Suite-->
+ <script>
+ var transport = new Thrift.Transport("/service");
+ var protocol = new Thrift.Protocol(transport);
+ var client = new ThriftTest.ThriftTestClient(protocol);
+ </script>
+ <script type="text/javascript" src="test.js" charset="utf-8"></script>
+ <script type="text/javascript" src="test-jq.js" charset="utf-8"></script>
+</head>
+<body>
+ <h1 id="qunit-header">Thrift Javascript Bindings: Unit Test (<a href="https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=blob;f=test/ThriftTest.thrift;hb=HEAD">ThriftTest.thrift</a>)</h1>
+ <h2 id="qunit-banner"></h2>
+ <div id="qunit-testrunner-toolbar"></div>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"><li><!-- get valid xhtml strict--></li></ol>
+ <p>
+ <a href="http://validator.w3.org/check/referer"><img
+ src="http://www.w3.org/Icons/valid-xhtml10"
+ alt="Valid XHTML 1.0!" height="31" width="88" /></a>
+ </p>
+</body>
+</html>