You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by mw...@apache.org on 2016/07/11 08:57:21 UTC
[1/3] incubator-eagle git commit: [EAGLE-355] fix advanced sql parse
logic [Forced Update!]
Repository: incubator-eagle
Updated Branches:
refs/heads/branch-0.4.0 2e4b6ac22 -> eac0f2795 (forced update)
[EAGLE-355] fix advanced sql parse logic
Adjust the logic of expression parse
Author: jiljiang <ji...@ebay.com>
Closes #251 from zombieJ/branch-0.4.
Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/2f901888
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/2f901888
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/2f901888
Branch: refs/heads/branch-0.4.0
Commit: 2f9018881fc29a6cefd557352d8d436770bfa1fb
Parents: 6a3f152
Author: jiljiang <ji...@ebay.com>
Authored: Mon Jul 11 16:43:57 2016 +0800
Committer: anyway1021 <mw...@apache.org>
Committed: Mon Jul 11 16:43:57 2016 +0800
----------------------------------------------------------------------
.../main/webapp/app/public/feature/common/controller.js | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/2f901888/eagle-webservice/src/main/webapp/app/public/feature/common/controller.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/app/public/feature/common/controller.js b/eagle-webservice/src/main/webapp/app/public/feature/common/controller.js
index b23d53b..e926e36 100644
--- a/eagle-webservice/src/main/webapp/app/public/feature/common/controller.js
+++ b/eagle-webservice/src/main/webapp/app/public/feature/common/controller.js
@@ -644,15 +644,16 @@
// >> Parse expression
$scope.policy.__.conditions = {};
var _condition = _policyUnit.expression.match(/from\s+(\w+)(\[(.*)])?(#window[^\)]*\))?\s+(select (\w+, )?(\w+)\((\w+)\) as [\w\d_]+ (group by (\w+) )?having ([\w\d_]+) ([<>=]+) ([^\s]+))?/);
+ var _cond_stream, _cond_query, _cond_window, _cond_group, _cond_groupUnit;
if(!_condition) {
$scope.policy.__.advanced = true;
} else {
- var _cond_stream = _condition[1];
- var _cond_query = _condition[3] || "";
- var _cond_window = _condition[4];
- var _cond_group = _condition[5];
- var _cond_groupUnit = _condition.slice(7,14);
+ _cond_stream = _condition[1];
+ _cond_query = _condition[3] || "";
+ _cond_window = _condition[4];
+ _cond_group = _condition[5];
+ _cond_groupUnit = _condition.slice(7,14);
// > StreamName
var _streamName = _cond_stream;
[2/3] incubator-eagle git commit: EAGLE-365 delete .jar files to fix
the issue found in voting of 0.4.0-incubating-rc2
Posted by mw...@apache.org.
EAGLE-365 delete .jar files to fix the issue found in voting of 0.4.0-incubating-rc2
https://issues.apache.org/jira/browse/EAGLE-365
- delete eagle-assembly/src/main/lib/tomcat/bin/bootstrap.jar
- delete eagle-assembly/src/main/lib/tomcat/bin/commons-daemon.jar
- delete eagle-assembly/src/main/lib/tomcat/bin/tomcat-juli.jar
author: anyway1021 <mw...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/9cd75b18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/9cd75b18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/9cd75b18
Branch: refs/heads/branch-0.4.0
Commit: 9cd75b188941bf476878a2210984546e4e257c7a
Parents: 2f90188
Author: anyway1021 <mw...@apache.org>
Authored: Mon Jul 11 14:53:01 2016 +0800
Committer: anyway1021 <mw...@apache.org>
Committed: Mon Jul 11 16:54:52 2016 +0800
----------------------------------------------------------------------
.../src/main/lib/tomcat/bin/bootstrap.jar | Bin 28052 -> 0 bytes
.../src/main/lib/tomcat/bin/commons-daemon.jar | Bin 24283 -> 0 bytes
.../src/main/lib/tomcat/bin/tomcat-juli.jar | Bin 38222 -> 0 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/9cd75b18/eagle-assembly/src/main/lib/tomcat/bin/bootstrap.jar
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/bin/bootstrap.jar b/eagle-assembly/src/main/lib/tomcat/bin/bootstrap.jar
deleted file mode 100644
index 8f43864..0000000
Binary files a/eagle-assembly/src/main/lib/tomcat/bin/bootstrap.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/9cd75b18/eagle-assembly/src/main/lib/tomcat/bin/commons-daemon.jar
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/bin/commons-daemon.jar b/eagle-assembly/src/main/lib/tomcat/bin/commons-daemon.jar
deleted file mode 100644
index 2b6b9c6..0000000
Binary files a/eagle-assembly/src/main/lib/tomcat/bin/commons-daemon.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/9cd75b18/eagle-assembly/src/main/lib/tomcat/bin/tomcat-juli.jar
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/lib/tomcat/bin/tomcat-juli.jar b/eagle-assembly/src/main/lib/tomcat/bin/tomcat-juli.jar
deleted file mode 100644
index e1b80ad..0000000
Binary files a/eagle-assembly/src/main/lib/tomcat/bin/tomcat-juli.jar and /dev/null differ
[3/3] incubator-eagle git commit: [EAGLE-367] update CHANGELOG.txt
appending bug-info of: EAGLE-355, EAGLE-356
Posted by mw...@apache.org.
[EAGLE-367] update CHANGELOG.txt appending bug-info of: EAGLE-355, EAGLE-356
Author: anyway1021 <mw...@apache.org>
Closes #259 from anyway1021/EAGLE-367.
Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/eac0f279
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/eac0f279
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/eac0f279
Branch: refs/heads/branch-0.4.0
Commit: eac0f27958f2ed8c6842938dad0a995a87fd0715
Parents: 9cd75b1
Author: anyway1021 <mw...@apache.org>
Authored: Mon Jul 11 15:21:16 2016 +0800
Committer: anyway1021 <mw...@apache.org>
Committed: Mon Jul 11 16:54:52 2016 +0800
----------------------------------------------------------------------
CHANGELOG.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eac0f279/CHANGELOG.txt
----------------------------------------------------------------------
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 657e31d..42072bb 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -102,6 +102,8 @@ Release Notes - Apache Eagle 0.4.0 (incubating)
* [EAGLE-330] - Hive ql.Parser can't parser a hive query sql with keywords
* [EAGLE-338] - fix topology-assembly build issue because of module name change
* [EAGLE-346] - ClassNotFoundException thrown out when topology is executing
+ * [EAGLE-355] - UI advanced policy expression can't parse
+ * [EAGLE-356] - Fix Authentication problem to query resource manager web service
** Task
* [EAGLE-73] - Put docker steps to site tutorial