From 4572645713c5b9f546c5f06c613af84314377799 Mon Sep 17 00:00:00 2001 From: ju Date: Wed, 6 Jun 2018 11:08:27 +0800 Subject: [PATCH] =?UTF-8?q?CORE-76=20Activator=E9=87=8D=E5=A4=8D=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E5=86=85=E7=BD=AE=E6=9C=8D=E5=8A=A1=E5=99=A8=E3=80=81?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=8E=AF=E5=A2=83=E7=9A=84=E6=94=AF=E6=8C=81?= =?UTF-8?q?=201=E3=80=81=E9=87=8D=E5=86=99=E4=B8=80=E4=B8=8B=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E7=9A=84=E5=86=85=E7=BD=AEtomcat=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=EF=BC=8C=E7=9B=B4=E6=8E=A5=E6=8C=87=E5=AE=9Ainitializer?= =?UTF-8?q?=EF=BC=8C=E7=9C=81=E7=9A=84tomcat=E4=B9=9F=E8=A6=81=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E4=B8=80=E9=81=8Dclass=202=E3=80=81tomcat=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=97=B6=EF=BC=8C=E5=85=B3=E9=97=ADactivator=20?= =?UTF-8?q?=E8=BF=98=E6=9C=89=E4=B8=80=E4=BA=9B=E5=BE=85=E5=AE=8C=E5=96=84?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E9=98=BB=E5=A1=9E=EF=BC=8C=E5=85=88=E4=BC=A0?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=96=B9=E4=BE=BF=E5=90=84=E4=B8=AA=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9A=84Activator=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/com/fr/design/DesignerEnvManager.java | 2 +- .../src/com/fr/design/actions/file/PreferencePane.java | 2 +- designer-base/src/com/fr/design/utils/DesignUtils.java | 2 +- designer-base/src/com/fr/start/ServerStarter.java | 4 ++-- designer-base/src/com/fr/start/server/FineEmbedServer.java | 2 +- .../src/com/fr/van/chart/map/server/ChartMapEditorAction.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/designer-base/src/com/fr/design/DesignerEnvManager.java b/designer-base/src/com/fr/design/DesignerEnvManager.java index 998c241e0..8a157d7b0 100644 --- a/designer-base/src/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/com/fr/design/DesignerEnvManager.java @@ -740,7 +740,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { /** * 返回Jetty服务器的端口号 */ - public int getInnerServerPort() { + public int getEmbedServerPort() { return this.jettyServerPort; } diff --git a/designer-base/src/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/com/fr/design/actions/file/PreferencePane.java index 3ba725252..f24a014ca 100644 --- a/designer-base/src/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/com/fr/design/actions/file/PreferencePane.java @@ -550,7 +550,7 @@ public class PreferencePane extends BasicPane { this.pageLengthComboBox.setSelectedIndex(designerEnvManager.getPageLengthUnit()); this.reportLengthComboBox.setSelectedIndex(designerEnvManager.getReportLengthUnit()); - this.portEditor.setValue(new Integer(designerEnvManager.getInnerServerPort())); + this.portEditor.setValue(new Integer(designerEnvManager.getEmbedServerPort())); this.jdkHomeTextField.setText(designerEnvManager.getJdkHome()); diff --git a/designer-base/src/com/fr/design/utils/DesignUtils.java b/designer-base/src/com/fr/design/utils/DesignUtils.java index 7429535a0..10573dd0e 100644 --- a/designer-base/src/com/fr/design/utils/DesignUtils.java +++ b/designer-base/src/com/fr/design/utils/DesignUtils.java @@ -351,7 +351,7 @@ public class DesignUtils { } else { try { String web = GeneralContext.getCurrentAppNameOfEnv(); - String url = "http://localhost:" + DesignerEnvManager.getEnvManager().getInnerServerPort() + String url = "http://localhost:" + DesignerEnvManager.getEnvManager().getEmbedServerPort() + "/" + web + "/" + ServerConfig.getInstance().getServletName() + baseRoute + postfixOfUri; ServerStarter.browserURLWithLocalEnv(url); diff --git a/designer-base/src/com/fr/start/ServerStarter.java b/designer-base/src/com/fr/start/ServerStarter.java index 01d16b98d..880a33774 100644 --- a/designer-base/src/com/fr/start/ServerStarter.java +++ b/designer-base/src/com/fr/start/ServerStarter.java @@ -42,7 +42,7 @@ public class ServerStarter { } if (ComparatorUtils.equals(StableUtils.getInstallHome(), ".")) {//august:供代码使用 String web = GeneralContext.getCurrentAppNameOfEnv(); - browserURLWithLocalEnv("http://localhost:" + DesignerEnvManager.getEnvManager().getInnerServerPort() + "/" + web + "/" + ServerConfig.getInstance().getServletName()); + browserURLWithLocalEnv("http://localhost:" + DesignerEnvManager.getEnvManager().getEmbedServerPort() + "/" + web + "/" + ServerConfig.getInstance().getServletName()); return; } DesignerEnvManager envManager = DesignerEnvManager.getEnvManager(); @@ -75,7 +75,7 @@ public class ServerStarter { FineEmbedServer.getInstance().start(); } finally { //先访问Demo, 后访问报表, 不需要重置服务器. - browser("http://localhost:" + DesignerEnvManager.getEnvManager().getInnerServerPort() + "/" + GeneralContext.getCurrentAppNameOfEnv() + "/" + ServerConfig.getInstance().getServletName()); + browser("http://localhost:" + DesignerEnvManager.getEnvManager().getEmbedServerPort() + "/" + GeneralContext.getCurrentAppNameOfEnv() + "/" + ServerConfig.getInstance().getServletName()); } } diff --git a/designer-base/src/com/fr/start/server/FineEmbedServer.java b/designer-base/src/com/fr/start/server/FineEmbedServer.java index 81ca3793f..b078309b8 100644 --- a/designer-base/src/com/fr/start/server/FineEmbedServer.java +++ b/designer-base/src/com/fr/start/server/FineEmbedServer.java @@ -53,7 +53,7 @@ public class FineEmbedServer extends AbstractLifecycle { tomcat = new Tomcat(); //覆盖tomcat的WebAppClassLoader - tomcat.setPort(DesignerEnvManager.getEnvManager().getInnerServerPort()); + tomcat.setPort(DesignerEnvManager.getEnvManager().getEmbedServerPort()); String docBase = new File(FRContext.getCurrentEnv().getPath()).getParent(); String appName = "/" + FRContext.getCurrentEnv().getAppName(); Context context = tomcat.addContext(appName, docBase); diff --git a/designer-chart/src/com/fr/van/chart/map/server/ChartMapEditorAction.java b/designer-chart/src/com/fr/van/chart/map/server/ChartMapEditorAction.java index 560bfafca..fb0ef8372 100644 --- a/designer-chart/src/com/fr/van/chart/map/server/ChartMapEditorAction.java +++ b/designer-chart/src/com/fr/van/chart/map/server/ChartMapEditorAction.java @@ -23,7 +23,7 @@ public class ChartMapEditorAction extends UpdateAction { } public void actionPerformed(ActionEvent evt) { - int port = DesignerEnvManager.getEnvManager().getInnerServerPort(); + int port = DesignerEnvManager.getEnvManager().getEmbedServerPort(); String web = GeneralContext.getCurrentAppNameOfEnv(); String serverlet = ServerConfig.getInstance().getReportServletName(); Env env = FRContext.getCurrentEnv();