• R/O
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision187 (tree)
Time2016-01-01 18:59:00
Authort_nakayama1971

Log Message

add Tomcat9

Change Summary

Incremental Difference

--- trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/Tomcat9Bootstrap.java (nonexistent)
+++ trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/Tomcat9Bootstrap.java (revision 187)
@@ -0,0 +1,29 @@
1+package com.sysdeo.eclipse.tomcat;
2+
3+import org.eclipse.core.runtime.IPath;
4+
5+/**
6+ * Tomcat9Bootstrap
7+ *
8+ */
9+public class Tomcat9Bootstrap extends Tomcat7Bootstrap {
10+
11+ /**
12+ * Constructor
13+ * @param xml isServerXmlMode
14+ * @param cf TomcatConfigFile
15+ * @param manager isSecurityManagerEnabled
16+ * @param home TomcatClasspathVariable
17+ */
18+ public Tomcat9Bootstrap(final boolean xml, final String cf, final boolean manager, final IPath home) {
19+ super(xml, cf, manager, home);
20+ }
21+
22+ /**
23+ * @see com.sysdeo.eclipse.tomcat.Tomcat6Bootstrap#getLabel()
24+ */
25+ @Override
26+ public String getLabel() {
27+ return "Tomcat 9.x";
28+ }
29+}
--- trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/TomcatPreferencePage.java (revision 186)
+++ trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/TomcatPreferencePage.java (revision 187)
@@ -14,6 +14,7 @@
1414 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_SERVERXML_LABEL;
1515 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_VERSION7_LABEL;
1616 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_VERSION8_LABEL;
17+import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_VERSION9_LABEL;
1718
1819 import java.io.File;
1920
@@ -91,7 +92,8 @@
9192 // {PREF_PAGE_VERSION6_LABEL, TomcatLauncherPlugin.TOMCAT_VERSION6},
9293
9394 {PREF_PAGE_VERSION7_LABEL, TomcatPluginResources.TOMCAT_VERSION7},
94- {PREF_PAGE_VERSION8_LABEL, TomcatPluginResources.TOMCAT_VERSION8}
95+ {PREF_PAGE_VERSION8_LABEL, TomcatPluginResources.TOMCAT_VERSION8},
96+ {PREF_PAGE_VERSION9_LABEL, TomcatPluginResources.TOMCAT_VERSION9}
9597 },
9698 composite, true);
9799
--- trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/TomcatLauncherPlugin.java (revision 186)
+++ trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/TomcatLauncherPlugin.java (revision 187)
@@ -310,40 +310,27 @@
310310 // tomcatBootsrap = new Tomcat6Bootstrap();
311311 // }
312312
313- String[] classpath = addPreferenceJvmToClasspath(new String[0]);
314- classpath = addPreferenceProjectListToClasspath(classpath);
315- String[] vArgs = addPreferenceParameters(new String[0]);
316- String[] bootClasspath = addPreferenceJvmToBootClasspath(new String[0]);
317-
318313 if (getTomcatVersion().equals(TomcatPluginResources.TOMCAT_VERSION7)) {
319314
320315 tomcatBootstrap = new Tomcat7Bootstrap(
321316 getConfigMode().equals(TomcatPluginResources.SERVERXML_MODE), getConfigFile(),
322317 isSecurityManagerEnabled(), getTomcatIPath());
323- tomcatBootstrap.setDebugMode(isDebugMode());
324- tomcatBootstrap.setTomcatDir(getTomcatDir());
325- tomcatBootstrap.setTomcatBase(getTomcatBase());
326- tomcatBootstrap.setProjects(getProjectMap());
327- tomcatBootstrap.setClasspath(classpath);
328- tomcatBootstrap.setVmArgs(vArgs);
329- tomcatBootstrap.setBootClasspath(bootClasspath);
330- tomcatBootstrap.setVmInstalled(getVMInstall());
331- tomcatBootstrap.setElements(PLUGIN.getProjectsInSourcePath());
318+ setProperties(tomcatBootstrap);
332319
333320 } else if (getTomcatVersion().equals(TomcatPluginResources.TOMCAT_VERSION8)) {
321+
334322 tomcatBootstrap = new Tomcat8Bootstrap(
335323 getConfigMode().equals(TomcatPluginResources.SERVERXML_MODE), getConfigFile(),
336324 isSecurityManagerEnabled(), getTomcatIPath());
337- tomcatBootstrap.setDebugMode(isDebugMode());
338- tomcatBootstrap.setTomcatDir(getTomcatDir());
339- tomcatBootstrap.setTomcatBase(getTomcatBase());
340- tomcatBootstrap.setProjects(getProjectMap());
341- tomcatBootstrap.setClasspath(classpath);
342- tomcatBootstrap.setVmArgs(vArgs);
343- tomcatBootstrap.setBootClasspath(bootClasspath);
344- tomcatBootstrap.setVmInstalled(getVMInstall());
345- tomcatBootstrap.setElements(PLUGIN.getProjectsInSourcePath());
325+ setProperties(tomcatBootstrap);
346326
327+ } else if (getTomcatVersion().equals(TomcatPluginResources.TOMCAT_VERSION9)) {
328+
329+ tomcatBootstrap = new Tomcat9Bootstrap(
330+ getConfigMode().equals(TomcatPluginResources.SERVERXML_MODE), getConfigFile(),
331+ isSecurityManagerEnabled(), getTomcatIPath());
332+ setProperties(tomcatBootstrap);
333+
347334 }
348335
349336 return tomcatBootstrap;
@@ -350,6 +337,27 @@
350337 }
351338
352339 /**
340+ * パラメータ設定
341+ * @param tomcatBootstrap TomcatBootstrap
342+ */
343+ private static void setProperties(final TomcatBootstrap tomcatBootstrap) {
344+ String[] classpath = addPreferenceJvmToClasspath(new String[0]);
345+ classpath = addPreferenceProjectListToClasspath(classpath);
346+ String[] vArgs = addPreferenceParameters(new String[0]);
347+ String[] bootClasspath = addPreferenceJvmToBootClasspath(new String[0]);
348+
349+ tomcatBootstrap.setDebugMode(isDebugMode());
350+ tomcatBootstrap.setTomcatDir(getTomcatDir());
351+ tomcatBootstrap.setTomcatBase(getTomcatBase());
352+ tomcatBootstrap.setProjects(getProjectMap());
353+ tomcatBootstrap.setClasspath(classpath);
354+ tomcatBootstrap.setVmArgs(vArgs);
355+ tomcatBootstrap.setBootClasspath(bootClasspath);
356+ tomcatBootstrap.setVmInstalled(getVMInstall());
357+ tomcatBootstrap.setElements(PLUGIN.getProjectsInSourcePath());
358+ }
359+
360+ /**
353361 *
354362 * @return ManagerAppUrl
355363 */
--- trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/TomcatPluginResources.java (revision 186)
+++ trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/TomcatPluginResources.java (revision 187)
@@ -48,6 +48,8 @@
4848 public static final String TOMCAT_VERSION7 = "tomcatV7";
4949 /** TOMCAT_VERSION8 */
5050 public static final String TOMCAT_VERSION8 = "tomcatV8";
51+ /** TOMCAT_VERSION9 */
52+ public static final String TOMCAT_VERSION9 = "tomcatV9";
5153 /** TOMCAT_PREF_CONFMODE_KEY */
5254 public static final String TOMCAT_PREF_CONFMODE_KEY = "configMode";
5355 /** SERVERXML_MODE */
@@ -123,6 +125,9 @@
123125 /** PREF_PAGE_VERSION8_LABEL */
124126 public static final String PREF_PAGE_VERSION8_LABEL =
125127 TomcatLauncherPlugin.getResourceString("pref.page.version8.label");
128+ /** PREF_PAGE_VERSION9_LABEL */
129+ public static final String PREF_PAGE_VERSION9_LABEL =
130+ TomcatLauncherPlugin.getResourceString("pref.page.version9.label");
126131 /** PREF_PAGE_HOME_LABEL */
127132 public static final String PREF_PAGE_HOME_LABEL =
128133 TomcatLauncherPlugin.getResourceString("pref.page.home.label");