bugfixed

Author: zhangjunfeng

modules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java

@@ -236,7 +236,7 @@ private boolean configSingletonJetty() throws IgniteCheckedException {
         try {
 
             String jettyPath = config().getJettyPath();
-	        final URL cfgUrl;
+	        URL cfgUrl;
 
 	        if (jettyPath == null) {
 	            cfgUrl = null;
@@ -246,7 +246,9 @@ private boolean configSingletonJetty() throws IgniteCheckedException {
 	        }
 	        else {
 	            cfgUrl = U.resolveIgniteUrl(jettyPath);
-	
+                if (cfgUrl == null && (jettyPath.startsWith("http://") || jettyPath.startsWith("https://"))){
+                    cfgUrl = new URL(jettyPath);
+                }
 	            if (cfgUrl == null)
 	                throw new IgniteSpiException("Invalid Vertx configuration file: " + jettyPath);
 	            else if (log.isDebugEnabled())

web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts

@@ -834,7 +834,7 @@ export class NotebookCtrl {
 
         const _startWatch = () => {
             const finishLoading$ = defer(() => {
-                if (!this.Demo.enabled)
+                //-if (!this.Demo.enabled)
                     Loading.finish('sqlLoading');
             }).pipe(take(1));
 

web-console/frontend/app/components/web-console-header/components/demo-mode-button/controller.ts

@@ -25,7 +25,7 @@ export default class DemoModeButton {
 
     async startDemo() {
         const connectionState = this.agentMgr.connectionSbj.getValue();
-        const disconnected = _.get(connectionState, 'state') === 'AGENT_DISCONNECTED';
+        const disconnected = _.get(connectionState, 'state') === 'AGENT_DISCONNECTED' ||  _.get(connectionState, 'state') === 'CLUSTER_DISCONNECTED';
         const demoEnabled = _.get(connectionState, 'hasDemo');
         const user = await this.User.current$.pipe(take(1)).toPromise();
 

web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/WebSocketRouter.java

@@ -461,13 +461,14 @@ private JsonObject processClusterStart(WebSocketRequest evt) {
 
         try {
             String work = U.workDirectory(null, null);
+            String configPath = work+"/config/";
             if(isDemo){
-                work = work + "/demo-work";
+                configPath = work + "/demo-config/";
             }
-            boolean success = IgniteClusterLauncher.saveBlobToFile(json,work+"/config/",messages);
+            boolean success = IgniteClusterLauncher.saveBlobToFile(json,configPath,messages);
             if(success){
                 if(json.containsKey("crudui")) {
-                    String descDir = work+"/config/" + clusterName+"/";
+                    String descDir = configPath + clusterName+"/";
                     CrudUICodeGenerator codeGen = new CrudUICodeGenerator();
                     List<String> codeMessages = codeGen.generator(descDir,json.getMap(),validTokens);
                     messages.addAll(codeMessages);
@@ -515,7 +516,7 @@ else if(!success) {
 				}
 				else {
 
-		        	String cfgFile = String.format("%s/config/%s/src/main/resources/META-INF/%s-server.xml", work, clusterName,clusterName);
+		        	String cfgFile = String.format("%s%s/src/main/resources/META-INF/%s-server.xml", configPath, clusterName,clusterName);
 		        	File configWorkFile = new File(cfgFile);
 
 		        	if(configWorkFile.exists() && configFile.exists()) {
@@ -551,7 +552,7 @@ else if(configFile.exists()) {
 			else {
 				// 启动一个内存型的node，有多少个Agent就有多少个Demo Node
                 AgentMetadataDemo.bindTestDatasource();
-				String cfgFile = String.format("%s/config/%s/src/main/resources/META-INF/%s-server.xml", work, clusterName,clusterName);
+				String cfgFile = String.format("%s%s/src/main/resources/META-INF/%s-server.xml", configPath, clusterName,clusterName);
 				// 启动Demo节点，并且在最后一个节点部署服务
 	        	ignite = AgentClusterDemo.tryStart(clusterName,cfgFile,cfg.serverId(),isLastNode);
 	        	if(ignite!=null) {