Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into feature/10.0

designer-base/src/com/fr/env/RemoteEnvURL.java

@@ -205,7 +205,7 @@ public class RemoteEnvURL implements FCloneable {
             return cloned;
         } catch (CloneNotSupportedException e) {
             // this shouldn't happen, since we are Cloneable
-            throw new InternalError(e);
+            throw new InternalError(e.getMessage());
         }
     }
 

designer-base/src/com/fr/start/StartServer.java

@@ -50,7 +50,7 @@ public class StartServer {
      */
     public static void browserDemoURL() {
         if (FRContext.getCurrentEnv() instanceof RemoteEnv) {
-            browser(FRContext.getCurrentEnv().getPath() + "?op=fs");
+            browser(FRContext.getCurrentEnv().getPath());
             return;
         }
         if (ComparatorUtils.equals(StableUtils.getInstallHome(), ".")) {//august:供代码使用
@@ -102,7 +102,7 @@ public class StartServer {
         } finally {
             //先访问Demo, 后访问报表, 不需要重置服务器.
             NEED_LOAD_ENV = false;
-            browser("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + ProjectConstants.WEBAPP_NAME + "/" + ServerConfig.getInstance().getServletName());
+            browser("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + GeneralContext.getCurrentAppNameOfEnv() + "/" + ServerConfig.getInstance().getServletName());
         }
     }
 

designer-realize/src/com/fr/design/mainframe/bbs/UserInfoPane.java

@@ -4,7 +4,7 @@
 package com.fr.design.mainframe.bbs;
 
 import com.fr.base.FRContext;
-import com.fr.config.DBEnv;
+import com.fr.config.BaseDBEnv;
 import com.fr.config.MarketConfig;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.constants.UIConstants;
@@ -77,7 +77,7 @@ public class UserInfoPane extends BasicPane {
         GeneralContext.addEnvChangedListener(new EnvChangedListener() {
             @Override
             public void envChanged() {
-                if (DBEnv.isDBEnvAvailable()) {
+                if (BaseDBEnv.isDBEnvAvailable()) {
                     String username = MarketConfig.getInstance().getBbsUsername();
                     if (StringUtils.isEmpty(username)) {
                         markUnSignIn();