diff options
Diffstat (limited to 'plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst')
8 files changed, 45 insertions, 36 deletions
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Configuration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Configuration.java index 20eb5b25d..8d2ae4911 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Configuration.java +++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Configuration.java @@ -56,7 +56,7 @@ public class Tomcat32Configuration extends TomcatConfiguration { /** * Tomcat32Configuration constructor comment. */ - public Tomcat32Configuration(IPath path) { + public Tomcat32Configuration(IFolder path) { super(path); } @@ -494,7 +494,7 @@ public class Tomcat32Configuration extends TomcatConfiguration { monitor = ProgressUtil.getMonitorFor(monitor); monitor.beginTask(TomcatPlugin.getResource("%updatingConfigurationTask"), 100); - Tomcat32Configuration config = new Tomcat32Configuration(path); + Tomcat32Configuration config = new Tomcat32Configuration(null); config.load(path, ProgressUtil.getSubMonitorFor(monitor, 30)); if (monitor.isCanceled()) diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Configuration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Configuration.java index 824d2d2f6..3dc4210eb 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Configuration.java +++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Configuration.java @@ -60,7 +60,7 @@ public class Tomcat40Configuration extends TomcatConfiguration { /** * Tomcat40Configuration constructor comment. */ - public Tomcat40Configuration(IPath path) { + public Tomcat40Configuration(IFolder path) { super(path); } @@ -489,7 +489,7 @@ public class Tomcat40Configuration extends TomcatConfiguration { monitor = ProgressUtil.getMonitorFor(monitor); monitor.beginTask(TomcatPlugin.getResource("%updatingConfigurationTask"), 100); - Tomcat40Configuration config = new Tomcat40Configuration(path); + Tomcat40Configuration config = new Tomcat40Configuration(null); config.load(path, ProgressUtil.getSubMonitorFor(monitor, 40)); if (monitor.isCanceled()) diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Configuration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Configuration.java index b14caed9a..1ff47c115 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Configuration.java +++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Configuration.java @@ -61,7 +61,7 @@ public class Tomcat41Configuration extends TomcatConfiguration { /** * Tomcat41Configuration constructor comment. */ - public Tomcat41Configuration(IPath path) { + public Tomcat41Configuration(IFolder path) { super(path); } @@ -506,7 +506,7 @@ public class Tomcat41Configuration extends TomcatConfiguration { monitor = ProgressUtil.getMonitorFor(monitor); monitor.beginTask(TomcatPlugin.getResource("%updatingConfigurationTask"), 100); - Tomcat41Configuration config = new Tomcat41Configuration(path); + Tomcat41Configuration config = new Tomcat41Configuration(null); config.load(path, ProgressUtil.getSubMonitorFor(monitor, 40)); if (monitor.isCanceled()) diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Configuration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Configuration.java index 1fea1d0b7..bbe71a927 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Configuration.java +++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Configuration.java @@ -48,7 +48,7 @@ public class Tomcat50Configuration extends TomcatConfiguration { /** * Tomcat50Configuration constructor comment. */ - public Tomcat50Configuration(IPath path) { + public Tomcat50Configuration(IFolder path) { super(path); } @@ -486,7 +486,7 @@ public class Tomcat50Configuration extends TomcatConfiguration { monitor = ProgressUtil.getMonitorFor(monitor); monitor.beginTask(TomcatPlugin.getResource("%updatingConfigurationTask"), 100); - Tomcat50Configuration config = new Tomcat50Configuration(path); + Tomcat50Configuration config = new Tomcat50Configuration(null); config.load(path, ProgressUtil.getSubMonitorFor(monitor, 40)); if (monitor.isCanceled()) diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55Configuration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55Configuration.java index dc367bf31..15be680f4 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55Configuration.java +++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55Configuration.java @@ -48,7 +48,7 @@ public class Tomcat55Configuration extends TomcatConfiguration { /** * Tomcat55Configuration constructor comment. */ - public Tomcat55Configuration(IPath path) { + public Tomcat55Configuration(IFolder path) { super(path); } @@ -486,7 +486,7 @@ public class Tomcat55Configuration extends TomcatConfiguration { monitor = ProgressUtil.getMonitorFor(monitor); monitor.beginTask(TomcatPlugin.getResource("%updatingConfigurationTask"), 100); - Tomcat55Configuration config = new Tomcat55Configuration(path); + Tomcat55Configuration config = new Tomcat55Configuration(null); config.load(path, ProgressUtil.getSubMonitorFor(monitor, 40)); if (monitor.isCanceled()) diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfiguration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfiguration.java index f34da6547..a35f52fda 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfiguration.java +++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfiguration.java @@ -47,7 +47,7 @@ public abstract class TomcatConfiguration implements ITomcatConfiguration, ITomc public static final String ADD_WEB_MODULE_PROPERTY = "addWebModule"; public static final String REMOVE_WEB_MODULE_PROPERTY = "removeWebModule"; - protected IPath configPath; + protected IFolder configPath; // property change listeners private transient List propertyListeners; @@ -55,7 +55,7 @@ public abstract class TomcatConfiguration implements ITomcatConfiguration, ITomc /** * TomcatConfiguration constructor comment. */ - public TomcatConfiguration(IPath path) { + public TomcatConfiguration(IFolder path) { super(); this.configPath = path; /*try { @@ -65,7 +65,7 @@ public abstract class TomcatConfiguration implements ITomcatConfiguration, ITomc }*/ } - protected IPath getPath() { + protected IFolder getFolder() { return configPath; } @@ -98,10 +98,10 @@ public abstract class TomcatConfiguration implements ITomcatConfiguration, ITomc if (folder != null) backupFolder(folder, confDir, backup, ms, monitor); else { - IPath path = config.getConfigurationDataPath();*/ - backupPath(configPath, confDir, backup, ms, monitor); + IPath path = config.getConfigurationDataPath(); + backupPath(configPath, confDir, backup, ms, monitor);*/ + backupFolder(getFolder(), confDir, backup, ms, monitor); //} - } catch (Exception e) { Trace.trace("backupAndPublish() error", e); IStatus s = new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorPublishConfiguration", new String[] {e.getLocalizedMessage()}), e); @@ -253,7 +253,9 @@ public abstract class TomcatConfiguration implements ITomcatConfiguration, ITomc * @param forceSave boolean * @exception java.io.IOException */ - protected abstract void save(IPath path, boolean forceSave, IProgressMonitor monitor) throws CoreException; + //protected abstract void save(IPath path, boolean forceSave, IProgressMonitor monitor) throws CoreException; + + protected abstract void save(IFolder folder, IProgressMonitor monitor) throws CoreException; protected void firePropertyChangeEvent(String propertyName, Object oldValue, Object newValue) { if (propertyListeners == null) @@ -304,9 +306,9 @@ public abstract class TomcatConfiguration implements ITomcatConfiguration, ITomc load(runtime.getLocation().append("conf"), monitor); }*/ - public abstract void load(IPath path, IProgressMonitor monitor) throws CoreException; + protected abstract void load(IPath path, IProgressMonitor monitor) throws CoreException; - //public abstract void load(IFolder folder, IProgressMonitor monitor) throws CoreException; + protected abstract void load(IFolder folder, IProgressMonitor monitor) throws CoreException; public abstract void addWebModule(int index, ITomcatWebModule module); diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServer.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServer.java index 19b2c5a6f..79514ae26 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServer.java +++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServer.java @@ -15,6 +15,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.core.resources.IFolder; import org.eclipse.core.runtime.*; import org.eclipse.debug.core.*; import org.eclipse.debug.core.model.IProcess; @@ -72,29 +73,28 @@ public class TomcatServer extends ServerDelegate implements ITomcatServer, ITomc public TomcatConfiguration getTomcatConfiguration() { if (configuration == null) { - //IPath path = getServer().getServerConfiguration(); - //if (path == null) - IPath path = null; + IFolder folder = getServer().getServerConfiguration(); + /*IPath path = null; if (getServerWC() != null && getServerWC().getRuntime() != null) path = getServerWC().getRuntime().getLocation().append("conf"); else if (getServer() != null && getServer().getRuntime() != null) path = getServer().getRuntime().getLocation().append("conf"); else - return null; + return null;*/ String id = getServer().getServerType().getId(); if (id.indexOf("32") > 0) - configuration = new Tomcat32Configuration(path); + configuration = new Tomcat32Configuration(folder); else if (id.indexOf("40") > 0) - configuration = new Tomcat40Configuration(path); + configuration = new Tomcat40Configuration(folder); else if (id.indexOf("41") > 0) - configuration = new Tomcat41Configuration(path); + configuration = new Tomcat41Configuration(folder); else if (id.indexOf("50") > 0) - configuration = new Tomcat50Configuration(path); + configuration = new Tomcat50Configuration(folder); else if (id.indexOf("55") > 0) - configuration = new Tomcat55Configuration(path); + configuration = new Tomcat55Configuration(folder); try { - configuration.load(path, null); + configuration.load(folder, null); } catch (CoreException ce) { // ignore } @@ -107,15 +107,15 @@ public class TomcatServer extends ServerDelegate implements ITomcatServer, ITomc String id = getServer().getServerType().getId(); if (id.indexOf("32") > 0) - configuration = new Tomcat32Configuration(path); + configuration = new Tomcat32Configuration(null); else if (id.indexOf("40") > 0) - configuration = new Tomcat40Configuration(path); + configuration = new Tomcat40Configuration(null); else if (id.indexOf("41") > 0) - configuration = new Tomcat41Configuration(path); + configuration = new Tomcat41Configuration(null); else if (id.indexOf("50") > 0) - configuration = new Tomcat50Configuration(path); + configuration = new Tomcat50Configuration(null); else if (id.indexOf("55") > 0) - configuration = new Tomcat55Configuration(path); + configuration = new Tomcat55Configuration(null); try { configuration.load(path, monitor); } catch (CoreException ce) { @@ -123,6 +123,11 @@ public class TomcatServer extends ServerDelegate implements ITomcatServer, ITomc } } + public void saveConfiguration(IProgressMonitor monitor) throws CoreException { + TomcatConfiguration config = getTomcatConfiguration(); + config.save(getServer().getServerConfiguration(), monitor); + } + /** * Return the root URL of this module. * @param module org.eclipse.wst.server.core.model.IModule @@ -133,7 +138,7 @@ public class TomcatServer extends ServerDelegate implements ITomcatServer, ITomc if (module == null || !(module instanceof IWebModule)) return null; - IPath serverConfig = getServer().getServerConfiguration(); + IFolder serverConfig = getServer().getServerConfiguration(); if (serverConfig == null) return null; @@ -495,6 +500,6 @@ public class TomcatServer extends ServerDelegate implements ITomcatServer, ITomc } } } - config.save(config.getPath(), true, monitor); + config.save(config.getFolder(), monitor); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerBehaviour.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerBehaviour.java index 5ac0abaee..88aaec51b 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerBehaviour.java +++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerBehaviour.java @@ -195,6 +195,8 @@ public class TomcatServerBehaviour extends ServerBehaviourDelegate implements IT IPath from = webModule.getLocation(); IPath to = getServer().getRuntime().getLocation().append("webapps").append(webModule.getContextRoot()); FileUtil.smartCopyDirectory(from.toOSString(), to.toOSString(), monitor); + + setModulePublishState(module, IServer.PUBLISH_STATE_NONE); } /** |