[EAGLE-612] Use LOCAL when app provider is from class file and use Cluster when from jar file
When jarFile is jar file and use CLUSTER by default. (end with *.jar) When jarFile is class and use LOCAL by default. (end with *.class) Author: zombieJ <smith3...@gmail.com> Closes #506 from zombieJ/EAGLE-612. Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/f3204bca Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/f3204bca Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/f3204bca Branch: refs/heads/master Commit: f3204bcafc345edc9b600715776af77d0d1f4496 Parents: 649adb1 Author: zombieJ <smith3...@gmail.com> Authored: Fri Oct 14 13:51:10 2016 +0800 Committer: zombieJ <smith3...@gmail.com> Committed: Fri Oct 14 13:51:10 2016 +0800 ---------------------------------------------------------------------- eagle-dev/merge-eagle-pr.py | 2 ++ .../main/webapp/app/dev/partials/integration/site.html | 2 +- .../webapp/app/dev/public/js/ctrls/integrationCtrl.js | 10 ++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f3204bca/eagle-dev/merge-eagle-pr.py ---------------------------------------------------------------------- diff --git a/eagle-dev/merge-eagle-pr.py b/eagle-dev/merge-eagle-pr.py index 01661d5..9243265 100755 --- a/eagle-dev/merge-eagle-pr.py +++ b/eagle-dev/merge-eagle-pr.py @@ -105,9 +105,11 @@ def clean_up(): print "Restoring head pointer to %s" % original_head run_cmd("git checkout %s" % original_head) + ansi_escape = re.compile(r'\x1b[^m]*m') branches = run_cmd("git branch").replace(" ", "").split("\n") for branch in filter(lambda x: x.startswith(BRANCH_PREFIX), branches): + branch = ansi_escape.sub('', branch) print "Deleting local branch %s" % branch run_cmd("git branch -D %s" % branch) http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f3204bca/eagle-server/src/main/webapp/app/dev/partials/integration/site.html ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/partials/integration/site.html b/eagle-server/src/main/webapp/app/dev/partials/integration/site.html index e320c48..98e7d97 100644 --- a/eagle-server/src/main/webapp/app/dev/partials/integration/site.html +++ b/eagle-server/src/main/webapp/app/dev/partials/integration/site.html @@ -237,7 +237,7 @@ </div> <div class="form-group"> <label>jar Path</label> - <input type="text" class="form-control" ng-model="tmpApp.jarPath" /> + <input type="text" class="form-control" ng-model="tmpApp.jarPath" ng-change="checkJarPath()" /> </div> </div> <div class="tab-pane" data-id="configuration"> http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f3204bca/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js index ca6c92e..e53a11e 100644 --- a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js +++ b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js @@ -188,6 +188,15 @@ return pass; }; + $scope.checkJarPath = function () { + var jarPath = ($scope.tmpApp || {}).jarPath; + if(/\.jar$/.test(jarPath)) { + $scope.tmpApp.mode = "CLUSTER"; + } else if(/\.class/.test(jarPath)) { + $scope.tmpApp.mode = "LOCAL"; + } + }; + $scope.installAppConfirm = function () { $scope.installLock = true; @@ -236,6 +245,7 @@ siteId: $scope.site.siteId, appType: application.type }); + $scope.checkJarPath(); } var fields = $scope.tmpAppConfigFields = common.getValueByPath(application, "configuration.properties", []).concat();