Merge branch 'master' into release-2.0.4-Alpha

wso2 · May 22, 2015 · 02bbcc9 · 02bbcc9
2 parents cfb781c + 1b4bda7
commit 02bbcc9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 21 deletions.
diff --git a/...so2.carbon.event.processor.ui/src/main/resources/web/eventprocessor/js/execution_plans.js b/...so2.carbon.event.processor.ui/src/main/resources/web/eventprocessor/js/execution_plans.js
@@ -152,26 +152,6 @@ function onSuccessCreateInflowStreamDefinition(streamId) {
 function onSuccessCreateOutflowStreamDefinition(streamId) {
     refreshStreamDefInfo("importedStreamId");
     refreshStreamDefInfo("exportedStreamId");
-
-    CARBON.customConfirmDialogBox("Defined event streams can publish out flow of events using event formatter.\nDo you want to  create an event formatter now? ", "Default LoggerAdaptor Event Formatter", "Custom Event Formatter", function (option) {
-        if (option == "custom") {
-            createEventFormatter(streamId);
-        } else {
-            new Ajax.Request('../eventformatter/add_default_event_formatter_ajaxprocessor.jsp', {
-                method:'POST',
-                asynchronous:false,
-                parameters:{eventStreamId:streamId},
-                onSuccess:function (response) {
-                    if ("true" == response.responseText.trim()) {
-                        CARBON.showInfoDialog("Default Event formatter added successfully!!");
-                    } else {
-                        CARBON.showErrorDialog("Failed to add event formatter, Exception: " + response.responseText.trim());
-                    }
-                }
-            });
-        }
-
-    }, null);
 }
 
 

diff --git a/.../org/wso2/carbon/event/execution/manager/core/internal/CarbonExecutionManagerService.java b/.../org/wso2/carbon/event/execution/manager/core/internal/CarbonExecutionManagerService.java
@@ -82,8 +82,8 @@ public void saveConfiguration(TemplateConfiguration configuration) throws Execut
                 registry.put(resourceCollectionPath, registry.newCollection());
             }
 
-            ExecutionManagerHelper.deployExecutionPlan(configuration, domains);
             ExecutionManagerHelper.deployStreams(domains.get(configuration.getFrom()));
+            ExecutionManagerHelper.deployExecutionPlan(configuration, domains);
 
             if (registry.resourceExists(resourcePath)) {
                 registry.delete(resourcePath);