| Revision | 187 (tree) |
|---|---|
| Time | 2016-01-01 18:59:00 |
| Author | t_nakayama1971 |
add Tomcat9
| @@ -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 | +} |
| @@ -14,6 +14,7 @@ | ||
| 14 | 14 | import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_SERVERXML_LABEL; |
| 15 | 15 | import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_VERSION7_LABEL; |
| 16 | 16 | import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_VERSION8_LABEL; |
| 17 | +import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_VERSION9_LABEL; | |
| 17 | 18 | |
| 18 | 19 | import java.io.File; |
| 19 | 20 |
| @@ -91,7 +92,8 @@ | ||
| 91 | 92 | // {PREF_PAGE_VERSION6_LABEL, TomcatLauncherPlugin.TOMCAT_VERSION6}, |
| 92 | 93 | |
| 93 | 94 | {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} | |
| 95 | 97 | }, |
| 96 | 98 | composite, true); |
| 97 | 99 |
| @@ -310,40 +310,27 @@ | ||
| 310 | 310 | // tomcatBootsrap = new Tomcat6Bootstrap(); |
| 311 | 311 | // } |
| 312 | 312 | |
| 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 | - | |
| 318 | 313 | if (getTomcatVersion().equals(TomcatPluginResources.TOMCAT_VERSION7)) { |
| 319 | 314 | |
| 320 | 315 | tomcatBootstrap = new Tomcat7Bootstrap( |
| 321 | 316 | getConfigMode().equals(TomcatPluginResources.SERVERXML_MODE), getConfigFile(), |
| 322 | 317 | 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); | |
| 332 | 319 | |
| 333 | 320 | } else if (getTomcatVersion().equals(TomcatPluginResources.TOMCAT_VERSION8)) { |
| 321 | + | |
| 334 | 322 | tomcatBootstrap = new Tomcat8Bootstrap( |
| 335 | 323 | getConfigMode().equals(TomcatPluginResources.SERVERXML_MODE), getConfigFile(), |
| 336 | 324 | 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); | |
| 346 | 326 | |
| 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 | + | |
| 347 | 334 | } |
| 348 | 335 | |
| 349 | 336 | return tomcatBootstrap; |
| @@ -350,6 +337,27 @@ | ||
| 350 | 337 | } |
| 351 | 338 | |
| 352 | 339 | /** |
| 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 | + /** | |
| 353 | 361 | * |
| 354 | 362 | * @return ManagerAppUrl |
| 355 | 363 | */ |
| @@ -48,6 +48,8 @@ | ||
| 48 | 48 | public static final String TOMCAT_VERSION7 = "tomcatV7"; |
| 49 | 49 | /** TOMCAT_VERSION8 */ |
| 50 | 50 | public static final String TOMCAT_VERSION8 = "tomcatV8"; |
| 51 | + /** TOMCAT_VERSION9 */ | |
| 52 | + public static final String TOMCAT_VERSION9 = "tomcatV9"; | |
| 51 | 53 | /** TOMCAT_PREF_CONFMODE_KEY */ |
| 52 | 54 | public static final String TOMCAT_PREF_CONFMODE_KEY = "configMode"; |
| 53 | 55 | /** SERVERXML_MODE */ |
| @@ -123,6 +125,9 @@ | ||
| 123 | 125 | /** PREF_PAGE_VERSION8_LABEL */ |
| 124 | 126 | public static final String PREF_PAGE_VERSION8_LABEL = |
| 125 | 127 | 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"); | |
| 126 | 131 | /** PREF_PAGE_HOME_LABEL */ |
| 127 | 132 | public static final String PREF_PAGE_HOME_LABEL = |
| 128 | 133 | TomcatLauncherPlugin.getResourceString("pref.page.home.label"); |