Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

align to code conventions and minor java5 updates, also added more lo…

…gging of exceptions
  • Loading branch information...
commit 25630f9f4b7b8939bc34cb2cf03419a4c2bcb051 1 parent 111b08d
Jesse McConnell jmcc0nn3ll authored
Showing with 572 additions and 465 deletions.
  1. +1 −0  VERSION.txt
  2. +7 −7 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/JettyPlugin.java
  3. +12 −12 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/WebModule.java
  4. +10 −11 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/command/AddModuleCommand.java
  5. +6 −6 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/command/AddWebModuleCommand.java
  6. +7 −2 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/command/ConfigurationCommand.java
  7. +14 −11 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/command/ModifyPortCommand.java
  8. +8 −8 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/command/ModifyWebModuleCommand.java
  9. +10 −10 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/command/RemoveModuleCommand.java
  10. +6 −6 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/command/RemoveWebModuleCommand.java
  11. +4 −6 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/FileUtil.java
  12. +18 −5 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyConfiguration.java
  13. +6 −8 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyConstants.java
  14. +8 −8 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyHandler.java
  15. +1 −0  ....jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyLaunchConfigurationDelegate.java
  16. +15 −3 ...se.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyLaunchableAdapterDelegate.java
  17. +35 −21 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyRuntime.java
  18. +2 −2 ...pse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyRuntimeClasspathProvider.java
  19. +1 −0  org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyRuntimeLocator.java
  20. +36 −32 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyServer.java
  21. +57 −26 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyServerBehaviour.java
  22. +1 −0  org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyServerLocator.java
  23. +16 −11 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyVersionManager.java
  24. +26 −25 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/PingThread.java
  25. +50 −49 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/PublishOperation2.java
  26. +6 −6 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/config/PathFileConfig.java
  27. +24 −24 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/config/StartIni.java
  28. +44 −42 ...clipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty7/Jetty7Configuration.java
  29. +10 −3 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty7/Jetty7Handler.java
  30. +3 −3 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty7/Jetty7Provider.java
  31. +8 −1 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty8/Jetty8Handler.java
  32. +3 −3 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty8/Jetty8Provider.java
  33. +2 −2 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/util/IOUtils.java
  34. +1 −1  org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/util/JettyVersionHelper.java
  35. +15 −15 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/Factory.java
  36. +38 −38 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/XMLElement.java
  37. +5 −5 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/XMLUtil.java
  38. +27 −24 ...eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/ServerInstance.java
  39. +5 −5 ...lipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/server/Connector.java
  40. +6 −6 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/server/Server.java
  41. +6 −6 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/server/WebApp.java
  42. +12 −12 ...e.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/webapp/WebAppContext.java
1  VERSION.txt
View
@@ -1,3 +1,4 @@
1.0.0-SNAPSHOT
+ + Bug 331163 disabled Download and Install button
+ Bug 330525 address license display from html -> txt
+ Bug 329144 modify websocket template to generate WebSocket #onFragment
14 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/JettyPlugin.java
View
@@ -34,7 +34,7 @@
public static final String PLUGIN_ID = "org.eclipse.jst.server.jetty.core"; //$NON-NLS-1$
// The shared instance
- private static JettyPlugin plugin;
+ private static JettyPlugin _plugin;
/**
* The constructor
@@ -51,7 +51,7 @@ public JettyPlugin()
public void start(BundleContext context) throws Exception
{
super.start(context);
- plugin = this;
+ _plugin = this;
}
/*
@@ -61,7 +61,7 @@ public void start(BundleContext context) throws Exception
*/
public void stop(BundleContext context) throws Exception
{
- plugin = null;
+ _plugin = null;
super.stop(context);
}
@@ -72,7 +72,7 @@ public void stop(BundleContext context) throws Exception
*/
public static JettyPlugin getDefault()
{
- return plugin;
+ return _plugin;
}
/**
@@ -153,17 +153,17 @@ public static void log(Throwable e)
public static IJettyVersionHandler getJettyVersionHandler(String id)
{
- return JettyVersionManager.INSTANCE.getJettyVersionHandler(id);
+ return JettyVersionManager.__INSTANCE.getJettyVersionHandler(id);
}
public static IJettyConfiguration getJettyConfiguration(String id, IFolder path)
{
- return JettyVersionManager.INSTANCE.getJettyConfiguration(id,path);
+ return JettyVersionManager.__INSTANCE.getJettyConfiguration(id,path);
}
public static Collection<String> getRuntimeTypes()
{
- return JettyVersionManager.INSTANCE.getRuntimeTypes();
+ return JettyVersionManager.__INSTANCE.getRuntimeTypes();
}
}
24 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/WebModule.java
View
@@ -18,10 +18,10 @@
*/
public class WebModule implements IJettyWebModule
{
- private String docBase;
- private String path;
- private String memento;
- private boolean reloadable;
+ private String _docBase;
+ private String _path;
+ private String _memento;
+ private boolean _reloadable;
/**
* WebModule constructor comment.
@@ -38,10 +38,10 @@
public WebModule(String path, String docBase, String memento, boolean reloadable)
{
super();
- this.path = path;
- this.docBase = docBase;
- this.memento = memento;
- this.reloadable = reloadable;
+ this._path = path;
+ this._docBase = docBase;
+ this._memento = memento;
+ this._reloadable = reloadable;
}
/**
@@ -51,7 +51,7 @@ public WebModule(String path, String docBase, String memento, boolean reloadable
*/
public String getDocumentBase()
{
- return docBase;
+ return _docBase;
}
/**
@@ -61,7 +61,7 @@ public String getDocumentBase()
*/
public String getPath()
{
- return path;
+ return _path;
}
/**
@@ -71,7 +71,7 @@ public String getPath()
*/
public String getMemento()
{
- return memento;
+ return _memento;
}
/**
@@ -81,7 +81,7 @@ public String getMemento()
*/
public boolean isReloadable()
{
- return reloadable;
+ return _reloadable;
}
public int hashCode()
21 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/command/AddModuleCommand.java
View
@@ -17,6 +17,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.server.jetty.core.JettyPlugin;
import org.eclipse.jst.server.jetty.core.internal.Messages;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServerWorkingCopy;
@@ -26,9 +27,9 @@
*/
public class AddModuleCommand extends AbstractOperation
{
- protected IServerWorkingCopy server;
- protected IModule module;
- protected int modules = -1;
+ protected IServerWorkingCopy _server;
+ protected IModule _module;
+ protected int _moduleCount = -1;
/**
* AddModuleCommand constructor comment.
@@ -41,20 +42,19 @@
public AddModuleCommand(IServerWorkingCopy server, IModule module)
{
super(Messages.configurationEditorActionAddWebModule);
- this.server = server;
- this.module = module;
+ this._server = server;
+ this._module = module;
}
public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
{
try
{
- server.modifyModules(new IModule[]
- { module },null,monitor);
+ _server.modifyModules(new IModule[]{ _module },null,monitor);
}
catch (Exception e)
{
- // ignore
+ JettyPlugin.log(e);
}
return Status.OK_STATUS;
}
@@ -68,12 +68,11 @@ public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionE
{
try
{
- server.modifyModules(null,new IModule[]
- { module },monitor);
+ _server.modifyModules(null,new IModule[]{ _module },monitor);
}
catch (Exception e)
{
- // ignore
+ JettyPlugin.log(e);
}
return Status.OK_STATUS;
}
12 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/command/AddWebModuleCommand.java
View
@@ -20,8 +20,8 @@
*/
public class AddWebModuleCommand extends ConfigurationCommand
{
- protected WebModule module;
- protected int modules = -1;
+ protected WebModule _module;
+ protected int _moduleCount = -1;
/**
* AddWebModuleCommand constructor comment.
@@ -34,7 +34,7 @@
public AddWebModuleCommand(IJettyConfigurationWorkingCopy configuration, WebModule module)
{
super(configuration,Messages.configurationEditorActionAddWebModule);
- this.module = module;
+ this._module = module;
}
/**
@@ -42,8 +42,8 @@ public AddWebModuleCommand(IJettyConfigurationWorkingCopy configuration, WebModu
*/
public void execute()
{
- modules = configuration.getWebModules().size();
- configuration.addWebModule(-1,module);
+ _moduleCount = getWorkingCopy().getWebModules().size();
+ getWorkingCopy().addWebModule(-1,_module);
}
/**
@@ -51,6 +51,6 @@ public void execute()
*/
public void undo()
{
- configuration.removeWebModule(modules);
+ getWorkingCopy().removeWebModule(_moduleCount);
}
}
9 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/command/ConfigurationCommand.java
View
@@ -23,7 +23,7 @@
*/
public abstract class ConfigurationCommand extends AbstractOperation
{
- protected IJettyConfigurationWorkingCopy configuration;
+ private IJettyConfigurationWorkingCopy _configuration;
/**
* ConfigurationCommand constructor comment.
@@ -36,7 +36,7 @@
public ConfigurationCommand(IJettyConfigurationWorkingCopy configuration, String label)
{
super(label);
- this.configuration = configuration;
+ this._configuration = configuration;
}
public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
@@ -54,6 +54,11 @@ public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws Executi
public abstract void undo();
+ public IJettyConfigurationWorkingCopy getWorkingCopy()
+ {
+ return _configuration;
+ }
+
public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
{
undo();
25 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/command/ModifyPortCommand.java
View
@@ -22,9 +22,9 @@
*/
public class ModifyPortCommand extends ConfigurationCommand
{
- protected String id;
- protected int port;
- protected int oldPort;
+ protected String _id;
+ protected int _port;
+ protected int _oldPort;
/**
* ModifyPortCommand constructor.
@@ -39,8 +39,8 @@
public ModifyPortCommand(IJettyConfigurationWorkingCopy configuration, String id, int port)
{
super(configuration,Messages.configurationEditorActionModifyPort);
- this.id = id;
- this.port = port;
+ this._id = id;
+ this._port = port;
}
/**
@@ -49,16 +49,19 @@ public ModifyPortCommand(IJettyConfigurationWorkingCopy configuration, String id
public void execute()
{
// find old port number
- Iterator iterator = configuration.getServerPorts().iterator();
+ Iterator<ServerPort> iterator = getWorkingCopy().getServerPorts().iterator();
while (iterator.hasNext())
{
- ServerPort temp = (ServerPort)iterator.next();
- if (id.equals(temp.getId()))
- oldPort = temp.getPort();
+ ServerPort temp = iterator.next();
+
+ if (_id.equals(temp.getId()))
+ {
+ _oldPort = temp.getPort();
+ }
}
// make the change
- configuration.modifyServerPort(id,port);
+ getWorkingCopy().modifyServerPort(_id,_port);
}
/**
@@ -66,6 +69,6 @@ public void execute()
*/
public void undo()
{
- configuration.modifyServerPort(id,oldPort);
+ getWorkingCopy().modifyServerPort(_id,_oldPort);
}
}
16 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/command/ModifyWebModuleCommand.java
View
@@ -20,15 +20,15 @@
*/
public class ModifyWebModuleCommand extends ConfigurationCommand
{
- protected int index;
- protected WebModule oldModule;
- protected WebModule newModule;
+ protected int _index;
+ protected WebModule _oldModule;
+ protected WebModule _newModule;
public ModifyWebModuleCommand(IJettyConfigurationWorkingCopy configuration, int index, WebModule module)
{
super(configuration,Messages.configurationEditorActionModifyWebModule);
- this.index = index;
- newModule = module;
+ _index = index;
+ _newModule = module;
}
/**
@@ -36,8 +36,8 @@ public ModifyWebModuleCommand(IJettyConfigurationWorkingCopy configuration, int
*/
public void execute()
{
- oldModule = (WebModule)configuration.getWebModules().get(index);
- configuration.modifyWebModule(index,newModule.getDocumentBase(),newModule.getPath(),newModule.isReloadable());
+ _oldModule = getWorkingCopy().getWebModules().get(_index);
+ getWorkingCopy().modifyWebModule(_index,_newModule.getDocumentBase(),_newModule.getPath(),_newModule.isReloadable());
}
/**
@@ -45,6 +45,6 @@ public void execute()
*/
public void undo()
{
- configuration.modifyWebModule(index,oldModule.getDocumentBase(),oldModule.getPath(),oldModule.isReloadable());
+ getWorkingCopy().modifyWebModule(_index,_oldModule.getDocumentBase(),_oldModule.getPath(),_oldModule.isReloadable());
}
}
20 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/command/RemoveModuleCommand.java
View
@@ -17,6 +17,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.server.jetty.core.JettyPlugin;
import org.eclipse.jst.server.jetty.core.internal.Messages;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServerWorkingCopy;
@@ -26,8 +27,8 @@
*/
public class RemoveModuleCommand extends AbstractOperation
{
- protected IServerWorkingCopy server;
- protected IModule module;
+ protected IServerWorkingCopy _server;
+ protected IModule _module;
/**
* AddModuleCommand constructor comment.
@@ -40,20 +41,19 @@
public RemoveModuleCommand(IServerWorkingCopy server, IModule module)
{
super(Messages.configurationEditorActionRemoveWebModule);
- this.server = server;
- this.module = module;
+ this._server = server;
+ this._module = module;
}
public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
{
try
{
- server.modifyModules(null,new IModule[]
- { module },monitor);
+ _server.modifyModules(null,new IModule[]{ _module },monitor);
}
catch (Exception e)
{
- // ignore
+ JettyPlugin.log(e);
}
return Status.OK_STATUS;
}
@@ -67,13 +67,13 @@ public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionE
{
try
{
- server.modifyModules(new IModule[]
- { module },null,monitor);
+ _server.modifyModules(new IModule[]{ _module },null,monitor);
}
catch (Exception e)
{
- // ignore
+ JettyPlugin.log(e);
}
+
return Status.OK_STATUS;
}
}
12 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/command/RemoveWebModuleCommand.java
View
@@ -20,8 +20,8 @@
*/
public class RemoveWebModuleCommand extends ConfigurationCommand
{
- protected int index;
- protected WebModule module;
+ protected int _index;
+ protected WebModule _module;
/**
* RemoveWebModuleCommand constructor comment.
@@ -34,7 +34,7 @@
public RemoveWebModuleCommand(IJettyConfigurationWorkingCopy configuration, int index)
{
super(configuration,Messages.configurationEditorActionRemoveWebModule);
- this.index = index;
+ this._index = index;
}
/**
@@ -42,8 +42,8 @@ public RemoveWebModuleCommand(IJettyConfigurationWorkingCopy configuration, int
*/
public void execute()
{
- module = (WebModule)configuration.getWebModules().get(index);
- configuration.removeWebModule(index);
+ _module = getWorkingCopy().getWebModules().get(_index);
+ getWorkingCopy().removeWebModule(_index);
}
/**
@@ -51,6 +51,6 @@ public void execute()
*/
public void undo()
{
- configuration.addWebModule(index,module);
+ getWorkingCopy().addWebModule(_index,_module);
}
}
10 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/FileUtil.java
View
@@ -90,8 +90,7 @@ public static void copyDirectory(String from, String to, IProgressMonitor monito
}
else if (current.isDirectory())
{
- monitor.subTask(NLS.bind(Messages.copyingTask,new String[]
- { fromFile, toFile }));
+ monitor.subTask(NLS.bind(Messages.copyingTask,new String[] { fromFile, toFile }));
copyDirectory(fromFile,toFile,ProgressUtil.getSubMonitorFor(monitor,50));
}
if (monitor.isCanceled())
@@ -145,7 +144,7 @@ public static IStatus copyFile(InputStream in, String to)
}
catch (Exception ex)
{
- // ignore
+ JettyPlugin.log(ex);
}
try
{
@@ -154,7 +153,7 @@ public static IStatus copyFile(InputStream in, String to)
}
catch (Exception ex)
{
- // ignore
+ JettyPlugin.log(ex);
}
}
}
@@ -309,8 +308,7 @@ public static void smartCopyDirectory(String from, String to, IProgressMonitor m
}
else if (current.isDirectory())
{
- monitor.subTask(NLS.bind(Messages.copyingTask,new String[]
- { fromFile, toFile }));
+ monitor.subTask(NLS.bind(Messages.copyingTask,new String[] { fromFile, toFile }));
smartCopyDirectory(fromFile,toFile,ProgressUtil.getSubMonitorFor(monitor,dw));
}
}
23 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyConfiguration.java
View
@@ -39,7 +39,7 @@
public abstract class JettyConfiguration implements IJettyConfiguration, IJettyConfigurationWorkingCopy
{
- private IFolder configPath;
+ private IFolder _configPath;
/**
* JettyConfiguration constructor.
@@ -50,12 +50,12 @@
public JettyConfiguration(IFolder path)
{
super();
- this.configPath = path;
+ this._configPath = path;
}
protected IFolder getFolder()
{
- return configPath;
+ return _configPath;
}
/**
@@ -66,12 +66,16 @@ protected IFolder getFolder()
public ServerPort getMainPort()
{
Collection<ServerPort> serverPorts = getServerPorts();
+
for (ServerPort serverPort : serverPorts)
{
// Return only an HTTP port from the selected Service
if (serverPort.getProtocol().toLowerCase().equals("http") && serverPort.getId().indexOf('/') < 0)
+ {
return serverPort;
+ }
}
+
return null;
}
@@ -85,10 +89,14 @@ public ServerPort getMainPort()
public String getWebModuleURL(IModule webModule)
{
WebModule module = getWebModule(webModule);
+
if (module != null)
+ {
return module.getPath();
+ }
IWebModule webModule2 = (IWebModule)webModule.loadAdapter(IWebModule.class,null);
+
return "/" + webModule2.getContextRoot();
}
@@ -102,7 +110,9 @@ public String getWebModuleURL(IModule webModule)
public WebModule getWebModule(IModule module)
{
if (module == null)
+ {
return null;
+ }
String memento = module.getId();
@@ -144,8 +154,12 @@ public String getDocBasePrefix()
public IStatus backupAndPublish(IPath jettyDir, boolean doBackup, IProgressMonitor monitor)
{
MultiStatus ms = new MultiStatus(JettyPlugin.PLUGIN_ID,0,Messages.publishConfigurationTask,null);
+
if (Trace.isTraceEnabled())
+ {
Trace.trace(Trace.FINER,"Backup and publish");
+ }
+
monitor = ProgressUtil.getMonitorFor(monitor);
try
@@ -163,8 +177,7 @@ public IStatus backupAndPublish(IPath jettyDir, boolean doBackup, IProgressMonit
catch (Exception e)
{
Trace.trace(Trace.SEVERE,"backupAndPublish() error",e);
- IStatus s = new Status(IStatus.ERROR,JettyPlugin.PLUGIN_ID,0,NLS.bind(Messages.errorPublishConfiguration,new String[]
- { e.getLocalizedMessage() }),e);
+ IStatus s = new Status(IStatus.ERROR,JettyPlugin.PLUGIN_ID,0,NLS.bind(Messages.errorPublishConfiguration,new String[]{ e.getLocalizedMessage() }),e);
ms.add(s);
}
14 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyConstants.java
View
@@ -12,12 +12,10 @@
public interface JettyConstants
{
-
- String START_JAR = "start.jar";
- String START_INI = "start.ini";
- String LIB_FOLDER = "lib";
- String JSP_FOLDER = "jsp";
- String JAR_EXT = "jar";
-
- String HTTP = "http";
+ public static final String __START_JAR = "start.jar";
+ public static final String __START_INI = "start.ini";
+ public static final String __LIB_FOLDER = "lib";
+ public static final String __JSP_FOLDER = "jsp";
+ public static final String __JAR_EXT = "jar";
+ public static final String __HTTP = "http";
}
16 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyHandler.java
View
@@ -24,14 +24,14 @@
{
/** configuration attribute for the full class name of the bootstrap class. */
- private static final String BOOTSTRAP_CLASS_NAME = "org.eclipse.jetty.start.Main";
+ private static final String __BOOTSTRAP_CLASS_NAME = "org.eclipse.jetty.start.Main";
/**
* @see IJettyVersionHandler#getRuntimeClass()
*/
public String getRuntimeClass()
{
- return BOOTSTRAP_CLASS_NAME;
+ return __BOOTSTRAP_CLASS_NAME;
}
public Collection<IRuntimeClasspathEntry> getRuntimeClasspath(IPath installPath, IPath configPath)
@@ -39,11 +39,11 @@ public String getRuntimeClass()
Collection<IRuntimeClasspathEntry> cp = new ArrayList<IRuntimeClasspathEntry>();
// Add ${jetty.home}/start.jar
- IPath startJAR = installPath.append(START_JAR);
+ IPath startJAR = installPath.append(__START_JAR);
cp.add(JavaRuntime.newArchiveRuntimeClasspathEntry(startJAR));
// add all jars from the Jetty ${jetty.home}/lib directory
- IPath libPath = installPath.append(LIB_FOLDER);
+ IPath libPath = installPath.append(__LIB_FOLDER);
File libDir = libPath.toFile();
if (libDir.exists())
{
@@ -51,22 +51,22 @@ public String getRuntimeClass()
String[] libs = libDir.list();
for (int i = 0; i < libs.length; i++)
{
- if (libs[i].endsWith(JAR_EXT))
+ if (libs[i].endsWith(__JAR_EXT))
{
- IPath path = installPath.append(LIB_FOLDER).append(libs[i]);
+ IPath path = installPath.append(__LIB_FOLDER).append(libs[i]);
cp.add(JavaRuntime.newArchiveRuntimeClasspathEntry(path));
}
}
// add all jars from the Jetty ${jetty.home}/lib/jsp directory
- IPath jspLibPath = libPath.append(JSP_FOLDER);
+ IPath jspLibPath = libPath.append(__JSP_FOLDER);
File jspLibDir = jspLibPath.toFile();
if (jspLibDir.exists())
{
libs = jspLibDir.list();
for (int i = 0; i < libs.length; i++)
{
- if (libs[i].endsWith(JAR_EXT))
+ if (libs[i].endsWith(__JAR_EXT))
{
IPath path = jspLibPath.append(libs[i]);
cp.add(JavaRuntime.newArchiveRuntimeClasspathEntry(path));
1  ...t.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyLaunchConfigurationDelegate.java
View
@@ -25,6 +25,7 @@
import org.eclipse.jdt.launching.IVMRunner;
import org.eclipse.jdt.launching.VMRunnerConfiguration;
import org.eclipse.jst.server.core.ServerProfilerDelegate;
+import org.eclipse.jst.server.jetty.core.JettyPlugin;
import org.eclipse.jst.server.jetty.core.internal.JettyServerBehaviour;
import org.eclipse.jst.server.jetty.core.internal.Trace;
import org.eclipse.wst.server.core.IServer;
18 ...jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyLaunchableAdapterDelegate.java
View
@@ -15,6 +15,7 @@
import org.eclipse.jst.server.core.IWebModule;
import org.eclipse.jst.server.core.Servlet;
+import org.eclipse.jst.server.jetty.core.JettyPlugin;
import org.eclipse.wst.server.core.IModuleArtifact;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.model.IURLProvider;
@@ -28,7 +29,7 @@
public class JettyLaunchableAdapterDelegate extends LaunchableAdapterDelegate
{
- private static final String SERVLET_PATH = "servlet/";
+ private static final String __SERVLET_PATH = "servlet/";
/*
* @see LaunchableAdapterDelegate#getLaunchable(IServer, IModuleArtifact)
@@ -36,12 +37,21 @@
public Object getLaunchable(IServer server, IModuleArtifact moduleObject)
{
Trace.trace(Trace.FINER,"JettyLaunchableAdapter " + server + "-" + moduleObject);
+
if (server.getAdapter(JettyServer.class) == null)
+ {
return null;
+ }
+
if (!(moduleObject instanceof Servlet) && !(moduleObject instanceof WebResource))
+ {
return null;
+ }
+
if (moduleObject.getModule().loadAdapter(IWebModule.class,null) == null)
+ {
return null;
+ }
try
{
@@ -60,7 +70,7 @@ public Object getLaunchable(IServer server, IModuleArtifact moduleObject)
url = new URL(url,path);
}
else
- url = new URL(url,SERVLET_PATH + servlet.getServletClassName());
+ url = new URL(url,__SERVLET_PATH + servlet.getServletClassName());
}
else if (moduleObject instanceof WebResource)
{
@@ -77,7 +87,9 @@ else if (moduleObject instanceof WebResource)
catch (Exception e)
{
Trace.trace(Trace.SEVERE,"Error getting URL for " + moduleObject,e);
- return null;
+ JettyPlugin.log(e);
}
+
+ return null;
}
}
56 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyRuntime.java
View
@@ -47,17 +47,19 @@
{
// private static final String TOOLS_JAR_PATH = "lib" + File.separator + "tools.jar";
- private static final String JAVAC_MAIN = "com.sun.tools.javac.Main";
- private static final String CLASS_DETECTOR = "org.eclipse.jst.server.Jetty.core.internal.ClassDetector";
+ private static final String __JAVAC_MAIN = "com.sun.tools.javac.Main";
+ private static final String __CLASS_DETECTOR = "org.eclipse.jst.server.jetty.core.internal.ClassDetector";
- protected static final String PROP_VM_INSTALL_TYPE_ID = "vm-install-type-id";
- protected static final String PROP_VM_INSTALL_ID = "vm-install-id";
+ protected static final String __PROP_VM_INSTALL_TYPE_ID = "vm-install-type-id";
+ protected static final String __PROP_VM_INSTALL_ID = "vm-install-id";
- protected final static Map<File, Boolean> sdkMap = new HashMap<File, Boolean>(2);
- private static Map<String, Integer> javaVersionMap = new ConcurrentHashMap<String, Integer>();
+ protected final static Map<File, Boolean> __SDK_MAP = new HashMap<File, Boolean>(2);
+
+ private static Map<String, Integer> __JAVA_VERSION_MAP = new ConcurrentHashMap<String, Integer>();
public JettyRuntime()
{
+ super(); // possible error
// do nothing
}
@@ -69,12 +71,12 @@ public IJettyVersionHandler getVersionHandler()
protected String getVMInstallTypeId()
{
- return getAttribute(PROP_VM_INSTALL_TYPE_ID,(String)null);
+ return getAttribute(__PROP_VM_INSTALL_TYPE_ID,(String)null);
}
protected String getVMInstallId()
{
- return getAttribute(PROP_VM_INSTALL_ID,(String)null);
+ return getAttribute(__PROP_VM_INSTALL_ID,(String)null);
}
public boolean isUsingDefaultJRE()
@@ -100,8 +102,9 @@ public IVMInstall getVMInstall()
}
catch (Exception e)
{
- // ignore
+ JettyPlugin.log(e);
}
+
return null;
}
@@ -119,7 +122,7 @@ public IVMInstall getVMInstall()
}
catch (IOException e)
{
- // Ignore if there is a problem
+ JettyPlugin.log(e);
}
}
return getVersionHandler().getRuntimeClasspath(installPath,configPath);
@@ -165,6 +168,7 @@ public IStatus validate()
// }
status = getVersionHandler().validate(getRuntime().getLocation(),getVMInstall());
+
if (status != null)
{
return status;
@@ -245,20 +249,30 @@ public void setVMInstall(IVMInstall vmInstall)
setVMInstall(null,null);
}
else
+ {
setVMInstall(vmInstall.getVMInstallType().getId(),vmInstall.getId());
+ }
}
protected void setVMInstall(String typeId, String id)
{
if (typeId == null)
- setAttribute(PROP_VM_INSTALL_TYPE_ID,(String)null);
+ {
+ setAttribute(__PROP_VM_INSTALL_TYPE_ID,(String)null);
+ }
else
- setAttribute(PROP_VM_INSTALL_TYPE_ID,typeId);
+ {
+ setAttribute(__PROP_VM_INSTALL_TYPE_ID,typeId);
+ }
if (id == null)
- setAttribute(PROP_VM_INSTALL_ID,(String)null);
+ {
+ setAttribute(__PROP_VM_INSTALL_ID,(String)null);
+ }
else
- setAttribute(PROP_VM_INSTALL_ID,id);
+ {
+ setAttribute(__PROP_VM_INSTALL_ID,id);
+ }
}
/**
@@ -272,9 +286,10 @@ protected boolean checkForCompiler()
{
// first try the cache
File javaHome = getVMInstall().getInstallLocation();
+
try
{
- Boolean b = (Boolean)sdkMap.get(javaHome);
+ Boolean b = (Boolean)__SDK_MAP.get(javaHome);
return b.booleanValue();
}
catch (Exception e)
@@ -287,10 +302,10 @@ protected boolean checkForCompiler()
if (file != null && file.exists())
{
IVMRunner vmRunner = getVMInstall().getVMRunner(ILaunchManager.RUN_MODE);
- VMRunnerConfiguration config = new VMRunnerConfiguration(CLASS_DETECTOR,new String[]
+ VMRunnerConfiguration config = new VMRunnerConfiguration(__CLASS_DETECTOR,new String[]
{ file.getAbsolutePath() });
config.setProgramArguments(new String[]
- { JAVAC_MAIN });
+ { __JAVAC_MAIN });
ILaunch launch = new Launch(null,ILaunchManager.RUN_MODE,null);
try
{
@@ -323,7 +338,7 @@ protected boolean checkForCompiler()
if (StringUtils.isTrue(text))
found = true;
- sdkMap.put(javaHome,Boolean.valueOf(found));
+ __SDK_MAP.put(javaHome,Boolean.valueOf(found));
return found;
}
}
@@ -355,7 +370,7 @@ protected boolean checkForCompiler()
private boolean isVMMinimumVersion(String javaVersion, int minimumVersion)
{
- Integer version = (Integer)javaVersionMap.get(javaVersion);
+ Integer version = (Integer)__JAVA_VERSION_MAP.get(javaVersion);
if (version == null)
{
int index = javaVersion.indexOf('.');
@@ -370,7 +385,7 @@ private boolean isVMMinimumVersion(String javaVersion, int minimumVersion)
{
int minor = Integer.parseInt(javaVersion.substring(index,index2));
version = Integer.valueOf(major + minor);
- javaVersionMap.put(javaVersion,version);
+ __JAVA_VERSION_MAP.put(javaVersion,version);
}
}
catch (NumberFormatException e)
@@ -386,5 +401,4 @@ private boolean isVMMinimumVersion(String javaVersion, int minimumVersion)
}
return true;
}
-
}
4 ....jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyRuntimeClasspathProvider.java
View
@@ -35,14 +35,14 @@
// TODO : switch Jetty version, is there different classpath?
List<IClasspathEntry> entries = new ArrayList<IClasspathEntry>();
- IPath libPath = installPath.append(LIB_FOLDER);
+ IPath libPath = installPath.append(__LIB_FOLDER);
File libDir = libPath.toFile();
if (libDir.exists())
{
// add all jars from the Jetty ${jetty.home}/lib
RuntimeClasspathProviderDelegate.addLibraryEntries(entries,libDir,true);
// add all jars from the Jetty ${jetty.home}/lib/jsp directory
- IPath jspLibPath = libPath.append(JSP_FOLDER);
+ IPath jspLibPath = libPath.append(__JSP_FOLDER);
File jspLibDir = jspLibPath.toFile();
if (jspLibDir.exists())
{
1  org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyRuntimeLocator.java
View
@@ -129,6 +129,7 @@ protected static IRuntimeWorkingCopy getRuntimeFromDir(File dir, IProgressMonito
catch (Exception e)
{
Trace.trace(Trace.SEVERE,"Could not find runtime",e);
+ JettyPlugin.log(e);
}
}
return null;
68 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyServer.java
View
@@ -42,15 +42,15 @@
public class JettyServer extends ServerDelegate implements IJettyServer, IJettyServerWorkingCopy
{
- private static final ServerPort[] EMPTY_SERVER_PORTS = new ServerPort[0];
- public static final String PROPERTY_SECURE = "secure";
- public static final String PROPERTY_DEBUG = "debug";
+ private static final ServerPort[] _EMPTY_SERVER_PORTS = new ServerPort[0];
+ public static final String __PROPERTY_SECURE = "secure";
+ public static final String __PROPERTY_DEBUG = "debug";
- private static final String JST_WEB_MODULETYPE = "jst.web";
+ private static final String __JST_WEB_MODULETYPE = "jst.web";
- private static final IModule[] EMPTY_MODULES = new IModule[0];
- protected transient IJettyConfiguration configuration;
- protected transient IJettyVersionHandler versionHandler;
+ private static final IModule[] __EMPTY_MODULES = new IModule[0];
+ protected transient IJettyConfiguration _configuration;
+ protected transient IJettyVersionHandler _versionHandler;
/**
* JettyServer.
@@ -68,7 +68,9 @@ public JettyServer()
public JettyRuntime getJettyRuntime()
{
if (getServer().getRuntime() == null)
+ {
return null;
+ }
return (JettyRuntime)getServer().getRuntime().loadAdapter(JettyRuntime.class,null);
}
@@ -80,19 +82,21 @@ public JettyRuntime getJettyRuntime()
*/
public IJettyVersionHandler getJettyVersionHandler()
{
- if (versionHandler == null)
+ if (_versionHandler == null)
{
if (getServer().getRuntime() == null || getJettyRuntime() == null)
+ {
return null;
+ }
- versionHandler = getJettyRuntime().getVersionHandler();
+ _versionHandler = getJettyRuntime().getVersionHandler();
}
- return versionHandler;
+ return _versionHandler;
}
public IJettyConfiguration getJettyConfiguration() throws CoreException
{
- if (configuration == null)
+ if (_configuration == null)
{
IFolder folder = getServer().getServerConfiguration();
if (folder == null || !folder.exists())
@@ -110,25 +114,25 @@ public IJettyConfiguration getJettyConfiguration() throws CoreException
}
String id = getServer().getServerType().getId();
- configuration = JettyPlugin.getJettyConfiguration(id,folder);
+ _configuration = JettyPlugin.getJettyConfiguration(id,folder);
try
{
- configuration.load(folder,getRuntimeBaseDirectory(),null);
+ _configuration.load(folder,getRuntimeBaseDirectory(),null);
}
catch (CoreException ce)
{
// ignore
- configuration = null;
+ _configuration = null;
throw ce;
}
}
- return configuration;
+ return _configuration;
}
@Override
public void configurationChanged()
{
- configuration = null;
+ _configuration = null;
}
@Override
@@ -136,22 +140,22 @@ public void importRuntimeConfiguration(IRuntime runtime, IProgressMonitor monito
{
if (runtime == null)
{
- configuration = null;
+ _configuration = null;
return;
}
IPath path = runtime.getLocation();
String id = getServer().getServerType().getId();
IPath runtimeBaseDirectory = getRuntimeBaseDirectory();
IFolder folder = getServer().getServerConfiguration();
- configuration = JettyPlugin.getJettyConfiguration(id,folder);
+ _configuration = JettyPlugin.getJettyConfiguration(id,folder);
try
{
- configuration.importFromPath(path,runtimeBaseDirectory,isTestEnvironment(),monitor);
+ _configuration.importFromPath(path,runtimeBaseDirectory,isTestEnvironment(),monitor);
}
catch (CoreException ce)
{
// ignore
- configuration = null;
+ _configuration = null;
throw ce;
}
}
@@ -159,16 +163,16 @@ public void importRuntimeConfiguration(IRuntime runtime, IProgressMonitor monito
@Override
public void saveConfiguration(IProgressMonitor monitor) throws CoreException
{
- if (configuration == null)
+ if (_configuration == null)
return;
- configuration.save(getServer().getServerConfiguration(),monitor);
+ _configuration.save(getServer().getServerConfiguration(),monitor);
}
@Override
public ServerPort[] getServerPorts()
{
if (getServer().getServerConfiguration() == null)
- return EMPTY_SERVER_PORTS;
+ return _EMPTY_SERVER_PORTS;
try
{
@@ -179,7 +183,7 @@ public void saveConfiguration(IProgressMonitor monitor) throws CoreException
}
catch (Exception e)
{
- return EMPTY_SERVER_PORTS;
+ return _EMPTY_SERVER_PORTS;
}
}
@@ -200,7 +204,7 @@ public void setDefaults(IProgressMonitor monitor)
*/
public void setDebug(boolean b)
{
- setAttribute(PROPERTY_DEBUG,b);
+ setAttribute(__PROPERTY_DEBUG,b);
}
/**
@@ -211,7 +215,7 @@ public void setDebug(boolean b)
*/
public void setSecure(boolean b)
{
- setAttribute(PROPERTY_SECURE,b);
+ setAttribute(__PROPERTY_SECURE,b);
}
/**
@@ -297,7 +301,7 @@ public IStatus canModifyModules(IModule[] add, IModule[] remove)
for (int i = 0; i < size; i++)
{
IModule module = add[i];
- if (!JST_WEB_MODULETYPE.equals(module.getModuleType().getId()))
+ if (!__JST_WEB_MODULETYPE.equals(module.getModuleType().getId()))
return new Status(IStatus.ERROR,JettyPlugin.PLUGIN_ID,0,Messages.errorWebModulesOnly,null);
if (getJettyVersionHandler() == null)
@@ -382,7 +386,7 @@ public void modifyModules(IModule[] add, IModule[] remove, IProgressMonitor moni
IModuleType moduleType = module[0].getModuleType();
- if (module.length == 1 && moduleType != null && JST_WEB_MODULETYPE.equals(moduleType.getId()))
+ if (module.length == 1 && moduleType != null && __JST_WEB_MODULETYPE.equals(moduleType.getId()))
{
IWebModule webModule = (IWebModule)module[0].loadAdapter(IWebModule.class,null);
if (webModule != null)
@@ -393,7 +397,7 @@ public void modifyModules(IModule[] add, IModule[] remove, IProgressMonitor moni
return modules;
}
}
- return EMPTY_MODULES;
+ return __EMPTY_MODULES;
}
/**
@@ -407,7 +411,7 @@ public void modifyModules(IModule[] add, IModule[] remove, IProgressMonitor moni
@Override
public IModule[] getRootModules(IModule module) throws CoreException
{
- if (JST_WEB_MODULETYPE.equals(module.getModuleType().getId()))
+ if (__JST_WEB_MODULETYPE.equals(module.getModuleType().getId()))
{
IStatus status = canModifyModules(new IModule[]
{ module },null);
@@ -466,7 +470,7 @@ public URL getModuleRootURL(IModule module)
*/
public boolean isDebug()
{
- return getAttribute(PROPERTY_DEBUG,false);
+ return getAttribute(__PROPERTY_DEBUG,false);
}
/**
@@ -486,7 +490,7 @@ public boolean isTestEnvironment()
*/
public boolean isSecure()
{
- return getAttribute(PROPERTY_SECURE,false);
+ return getAttribute(__PROPERTY_SECURE,false);
}
public String getInstanceDirectory()
83 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyServerBehaviour.java
View
@@ -64,15 +64,17 @@
public class JettyServerBehaviour extends ServerBehaviourDelegate implements IJettyServerBehaviour, IModulePublishHelper
{
- private static final String ATTR_STOP = "stop-server";
+ private static final String __ATTR_STOP = "stop-server";
- private static final String[] JMX_EXCLUDE_ARGS = new String[]
- { "-Dcom.sun.management.jmxremote", "-Dcom.sun.management.jmxremote.port=", "-Dcom.sun.management.jmxremote.ssl=",
- "-Dcom.sun.management.jmxremote.authenticate=" };
+ private static final String[] __JMX_EXCLUDE_ARGS = new String[]{
+ "-Dcom.sun.management.jmxremote",
+ "-Dcom.sun.management.jmxremote.port=",
+ "-Dcom.sun.management.jmxremote.ssl=",
+ "-Dcom.sun.management.jmxremote.authenticate=" };
// the thread used to ping the server to check for startup
- protected transient PingThread ping = null;
- protected transient IDebugEventSetListener processListener;
+ protected transient PingThread _ping = null;
+ protected transient IDebugEventSetListener _processListener;
/**
* JettyServerBehaviour.
@@ -90,7 +92,9 @@ public void initialize(IProgressMonitor monitor)
public JettyRuntime getJettyRuntime()
{
if (getServer().getRuntime() == null)
+ {
return null;
+ }
return (JettyRuntime)getServer().getRuntime().loadAdapter(JettyRuntime.class,null);
}
@@ -211,13 +215,18 @@ protected String getRuntimePolicyFile()
protected static String renderCommandLine(String[] commandLine, String separator)
{
if (commandLine == null || commandLine.length < 1)
+ {
return "";
+ }
+
StringBuffer buf = new StringBuffer(commandLine[0]);
+
for (int i = 1; i < commandLine.length; i++)
{
buf.append(separator);
buf.append(commandLine[i]);
}
+
return buf.toString();
}
@@ -235,14 +244,19 @@ protected static String renderCommandLine(String[] commandLine, String separator
*/
public void setupLaunch(ILaunch launch, String launchMode, IProgressMonitor monitor) throws CoreException
{
- if (StringUtils.isTrue(launch.getLaunchConfiguration().getAttribute(ATTR_STOP,StringUtils.FALSE)))
+ if (StringUtils.isTrue(launch.getLaunchConfiguration().getAttribute(__ATTR_STOP,StringUtils.FALSE)))
+ {
return;
+ }
// if (getJettyRuntime() == null)
// throw new CoreException();
IStatus status = getJettyRuntime().validate();
+
if (status != null && status.getSeverity() == IStatus.ERROR)
+ {
throw new CoreException(status);
+ }
// setRestartNeeded(false);
IJettyConfiguration configuration = getJettyConfiguration();
@@ -308,7 +322,7 @@ else if (usedPorts.size() > 1)
int port = configuration.getMainPort().getPort();
if (port != 80)
url += ":" + port;
- ping = new PingThread(getServer(),url,-1,this);
+ _ping = new PingThread(getServer(),url,-1,this);
}
catch (Exception e)
{
@@ -353,13 +367,13 @@ else if (state == IServer.STATE_STARTING)
String args = renderCommandLine(getRuntimeProgramArguments(false)," ");
// Remove JMX arguments if present
String existingVMArgs = wc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,(String)null);
- if (existingVMArgs.indexOf(JMX_EXCLUDE_ARGS[0]) >= 0)
+ if (existingVMArgs.indexOf(__JMX_EXCLUDE_ARGS[0]) >= 0)
{
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,mergeArguments(existingVMArgs,new String[] {},JMX_EXCLUDE_ARGS,false));
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,mergeArguments(existingVMArgs,new String[] {},__JMX_EXCLUDE_ARGS,false));
}
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,args);
wc.setAttribute("org.eclipse.debug.ui.private",true);
- wc.setAttribute(ATTR_STOP,"true");
+ wc.setAttribute(__ATTR_STOP,"true");
wc.launch(ILaunchManager.RUN_MODE,new NullProgressMonitor());
}
catch (Exception e)
@@ -599,12 +613,14 @@ else if (ind2 >= 0)
* @param cp
* @param entry
*/
- public static void replaceJREContainer(List cp, IRuntimeClasspathEntry entry)
+ public static void replaceJREContainer(List<IRuntimeClasspathEntry> cp, IRuntimeClasspathEntry entry)
{
int size = cp.size();
+
for (int i = 0; i < size; i++)
{
- IRuntimeClasspathEntry entry2 = (IRuntimeClasspathEntry)cp.get(i);
+ IRuntimeClasspathEntry entry2 = cp.get(i);
+
if (entry2.getPath().uptoSegment(2).isPrefixOf(entry.getPath()))
{
cp.set(i,entry);
@@ -621,12 +637,12 @@ public static void replaceJREContainer(List cp, IRuntimeClasspathEntry entry)
* @param cp
* @param entry
*/
- public static void mergeClasspath(List cp, IRuntimeClasspathEntry entry)
+ public static void mergeClasspath(List<IRuntimeClasspathEntry> cp, IRuntimeClasspathEntry entry)
{
- Iterator iterator = cp.iterator();
+ Iterator<IRuntimeClasspathEntry> iterator = cp.iterator();
while (iterator.hasNext())
{
- IRuntimeClasspathEntry entry2 = (IRuntimeClasspathEntry)iterator.next();
+ IRuntimeClasspathEntry entry2 = iterator.next();
if (entry2.getPath().equals(entry.getPath()))
return;
@@ -708,17 +724,23 @@ else if (null != parsedVMArgs)
IJettyRuntime runtime = getJettyRuntime();
IVMInstall vmInstall = runtime.getVMInstall();
if (vmInstall != null)
+ {
workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH,JavaRuntime.newJREContainerPath(vmInstall).toPortableString());
+ }
// update classpath
IRuntimeClasspathEntry[] originalClasspath = JavaRuntime.computeUnresolvedRuntimeClasspath(workingCopy);
int size = originalClasspath.length;
List<IRuntimeClasspathEntry> oldCp = new ArrayList<IRuntimeClasspathEntry>(originalClasspath.length + 2);
+
for (int i = 0; i < size; i++)
+ {
oldCp.add(originalClasspath[i]);
+ }
Collection<IRuntimeClasspathEntry> cp2 = runtime.getRuntimeClasspath(getRuntimeBaseDirectory());
Iterator<IRuntimeClasspathEntry> iterator = cp2.iterator();
+
while (iterator.hasNext())
{
IRuntimeClasspathEntry entry = (IRuntimeClasspathEntry)iterator.next();
@@ -730,12 +752,14 @@ else if (null != parsedVMArgs)
try
{
String typeId = vmInstall.getVMInstallType().getId();
+
replaceJREContainer(oldCp,JavaRuntime.newRuntimeContainerClasspathEntry(
new Path(JavaRuntime.JRE_CONTAINER).append(typeId).append(vmInstall.getName()),IRuntimeClasspathEntry.BOOTSTRAP_CLASSES));
+
}
catch (Exception e)
{
- // ignore
+ JettyPlugin.log(e);
}
IPath jrePath = new Path(vmInstall.getInstallLocation().getAbsolutePath());
@@ -747,6 +771,7 @@ else if (null != parsedVMArgs)
IRuntimeClasspathEntry toolsJar = JavaRuntime.newArchiveRuntimeClasspathEntry(toolsPath);
// Search for index to any existing tools.jar entry
int toolsIndex;
+
for (toolsIndex = 0; toolsIndex < oldCp.size(); toolsIndex++)
{
IRuntimeClasspathEntry entry = (IRuntimeClasspathEntry)oldCp.get(toolsIndex);
@@ -758,15 +783,20 @@ else if (null != parsedVMArgs)
// If existing tools.jar found, replace in case it's
// different. Otherwise add.
if (toolsIndex < oldCp.size())
+ {
oldCp.set(toolsIndex,toolsJar);
+ }
else
+ {
mergeClasspath(oldCp,toolsJar);
+ }
}
}
}
iterator = oldCp.iterator();
List<String> list = new ArrayList<String>();
+
while (iterator.hasNext())
{
IRuntimeClasspathEntry entry = iterator.next();
@@ -786,10 +816,10 @@ else if (null != parsedVMArgs)
protected void addProcessListener(final IProcess newProcess)
{
- if (processListener != null || newProcess == null)
+ if (_processListener != null || newProcess == null)
return;
- processListener = new IDebugEventSetListener()
+ _processListener = new IDebugEventSetListener()
{
public void handleDebugEvents(DebugEvent[] events)
{
@@ -806,7 +836,8 @@ public void handleDebugEvents(DebugEvent[] events)
}
}
};
- DebugPlugin.getDefault().addDebugEventListener(processListener);
+
+ DebugPlugin.getDefault().addDebugEventListener(_processListener);
}
protected void setServerStarted()
@@ -816,15 +847,15 @@ protected void setServerStarted()
protected void stopImpl()
{
- if (ping != null)
+ if (_ping != null)
{
- ping.stop();
- ping = null;
+ _ping.stop();
+ _ping = null;
}
- if (processListener != null)
+ if (_processListener != null)
{
- DebugPlugin.getDefault().removeDebugEventListener(processListener);
- processListener = null;
+ DebugPlugin.getDefault().removeDebugEventListener(_processListener);
+ _processListener = null;
}
setServerState(IServer.STATE_STOPPED);
}
1  org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyServerLocator.java
View
@@ -43,6 +43,7 @@ public void runtimeFound(IRuntimeWorkingCopy runtime)
}
}
};
+
JettyRuntimeLocator.searchForRuntimes2(null,listener2,monitor);
}
27 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyVersionManager.java
View
@@ -26,11 +26,11 @@
public class JettyVersionManager
{
- public static final JettyVersionManager INSTANCE = new JettyVersionManager();
+ public static final JettyVersionManager __INSTANCE = new JettyVersionManager();
- private Map<String, IJettyVersionProvider> versionProviders = new HashMap<String, IJettyVersionProvider>();
+ private Map<String, IJettyVersionProvider> _versionProviders = new HashMap<String, IJettyVersionProvider>();
- private List<String> runtimeTypes = new ArrayList<String>();
+ private List<String> _runtimeTypes = new ArrayList<String>();
public enum JettyVersion
{
@@ -40,25 +40,26 @@
private JettyVersionManager()
{
// Jetty 7.1
- register(JettyVersion.V71,Jetty7Provider.INSTANCE);
+ register(JettyVersion.V71, Jetty7Provider.__INSTANCE);
// Jetty 7.2
- register(JettyVersion.V72,Jetty7Provider.INSTANCE);
+ register(JettyVersion.V72, Jetty7Provider.__INSTANCE);
// Jetty 8.0, same than Jetty7.0
- register(JettyVersion.V80,Jetty8Provider.INSTANCE);
+ register(JettyVersion.V80, Jetty8Provider.__INSTANCE);
}
public void register(JettyVersion version, IJettyVersionProvider versionProvider)
{
- versionProviders.put(version.name(),versionProvider);
+ _versionProviders.put(version.name(),versionProvider);
String versionNumber = version.name().substring(1,version.name().length());
- runtimeTypes.add("org.eclipse.jst.server.jetty.runtime." + versionNumber);
+
+ _runtimeTypes.add("org.eclipse.jst.server.jetty.runtime." + versionNumber);
}
public IJettyVersionHandler getJettyVersionHandler(String id)
{
String version = getVersion(id);
- IJettyVersionProvider versionProvider = versionProviders.get(version);
+ IJettyVersionProvider versionProvider = _versionProviders.get(version);
if (versionProvider == null)
{
throw new JettyVersionHandlerNotFoundException(version);
@@ -69,7 +70,7 @@ public IJettyVersionHandler getJettyVersionHandler(String id)
public IJettyConfiguration getJettyConfiguration(String id, IFolder path)
{
String version = getVersion(id);
- IJettyVersionProvider versionProvider = versionProviders.get(version);
+ IJettyVersionProvider versionProvider = _versionProviders.get(version);
if (versionProvider == null)
{
throw new JettyVersionHandlerNotFoundException(version);
@@ -80,15 +81,19 @@ public IJettyConfiguration getJettyConfiguration(String id, IFolder path)
private String getVersion(String id)
{
String version = id;
+
int index = version.lastIndexOf('.');
+
if (index != -1)
{
version = version.substring(index + 1,version.length());
}
+
if (!version.startsWith("v"))
{
version = "v" + version;
}
+
version = version.toUpperCase();
return version;
}
@@ -107,7 +112,7 @@ public JettyVersionHandlerNotFoundException(String serverType)
public Collection<String> getRuntimeTypes()
{
- return runtimeTypes;
+ return _runtimeTypes;
}
}
51 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/PingThread.java
View
@@ -24,18 +24,18 @@
public class PingThread
{
// delay before pinging starts
- private static final int PING_DELAY = 2000;
+ private static final int __PING_DELAY = 2000;
// delay between pings
- private static final int PING_INTERVAL = 250;
+ private static final int __PING_INTERVAL = 250;
// maximum number of pings before giving up
- private int maxPings;
+ private int _maxPings;
- private boolean stop = false;
- private String url;
- private IServer server;
- private JettyServerBehaviour behaviour;
+ private boolean _stop = false;
+ private String _url;
+ private IServer _server;
+ private JettyServerBehaviour _behaviour;
/**
* Create a new PingThread.
@@ -49,10 +49,11 @@
public PingThread(IServer server, String url, int maxPings, JettyServerBehaviour behaviour)
{
super();
- this.server = server;
- this.url = url;
- this.maxPings = maxPings;
- this.behaviour = behaviour;
+
+ this._server = server;
+ this._url = url;
+ this._maxPings = maxPings;
+ this._behaviour = behaviour;
Thread t = new Thread("Jetty Ping Thread")
{
public void run()
@@ -72,44 +73,44 @@ protected void ping()
int count = 0;
try
{
- Thread.sleep(PING_DELAY);
+ Thread.sleep(__PING_DELAY);
}
catch (Exception e)
{
// ignore
}
- while (!stop)
+ while (!_stop)
{
try
{
- if (count == maxPings)
+ if (count == _maxPings)
{
try
{
- server.stop(false);
+ _server.stop(false);
}
catch (Exception e)
{
Trace.trace(Trace.FINEST,"Ping: could not stop server");
}
- stop = true;
+ _stop = true;
break;
}
count++;
Trace.trace(Trace.FINEST,"Ping: pinging " + count);
- URL pingUrl = new URL(url);
+ URL pingUrl = new URL(_url);
URLConnection conn = pingUrl.openConnection();
((HttpURLConnection)conn).getResponseCode();
// ping worked - server is up
- if (!stop)
+ if (!_stop)
{
Trace.trace(Trace.FINEST,"Ping: success");
Thread.sleep(200);
- behaviour.setServerStarted();
+ _behaviour.setServerStarted();
}
- stop = true;
+ _stop = true;
}
catch (FileNotFoundException fe)
{
@@ -121,18 +122,18 @@ protected void ping()
{
// ignore
}
- behaviour.setServerStarted();
- stop = true;
+ _behaviour.setServerStarted();
+ _stop = true;
}
catch (Exception e)
{
Trace.trace(Trace.FINEST,"Ping: failed");
// pinging failed
- if (!stop)
+ if (!_stop)
{
try
{
- Thread.sleep(PING_INTERVAL);
+ Thread.sleep(__PING_INTERVAL);
}
catch (InterruptedException e2)
{
@@ -149,6 +150,6 @@ protected void ping()
public void stop()
{
Trace.trace(Trace.FINEST,"Ping: stopping");
- stop = true;
+ _stop = true;
}
}
99 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/PublishOperation2.java
View
@@ -38,11 +38,11 @@
*/
public class PublishOperation2 extends PublishOperation
{
- protected JettyServerBehaviour server;
- protected IModule[] module;
- protected int kind;
- protected int deltaKind;
- private PublishHelper helper;
+ protected JettyServerBehaviour _server;
+ protected IModule[] _module;
+ protected int _kind;
+ protected int _deltaKind;
+ private PublishHelper _helper;
/**
* Construct the operation object to publish the specified module to the specified server.
@@ -59,20 +59,21 @@
public PublishOperation2(JettyServerBehaviour server, int kind, IModule[] module, int deltaKind)
{
super("Publish to server","Publish Web module to Jetty server");
- this.server = server;
- this.module = module;
- this.kind = kind;
- this.deltaKind = deltaKind;
+
+ this._server = server;
+ this._module = module;
+ this._kind = kind;
+ this._deltaKind = deltaKind;
IPath base = server.getRuntimeBaseDirectory();
if (base != null)
{
- helper = new PublishHelper(base.append("temp").toFile());
+ _helper = new PublishHelper(base.append("temp").toFile());
}
else
{
// We are doomed without a base directory. However, allow the catastrophe
// to occur elsewhere and hope for a useful error message.
- helper = new PublishHelper(null);
+ _helper = new PublishHelper(null);
}
}
@@ -99,24 +100,24 @@ public void execute(IProgressMonitor monitor, IAdaptable info) throws CoreExcept
{
List<IStatus> status = new ArrayList<IStatus>();
// If parent web module
- if (module.length == 1)
+ if (_module.length == 1)
{
- publishDir(module[0],status,monitor);
+ publishDir(_module[0],status,monitor);
}
// Else a child module
else
{
- Properties p = server.loadModulePublishLocations();
+ Properties p = _server.loadModulePublishLocations();
// Try to determine the URI for the child module
- IWebModule webModule = (IWebModule)module[0].loadAdapter(IWebModule.class,monitor);
+ IWebModule webModule = (IWebModule)_module[0].loadAdapter(IWebModule.class,monitor);
String childURI = null;
if (webModule != null)
{
- childURI = webModule.getURI(module[1]);
+ childURI = webModule.getURI(_module[1]);
}
// Try to determine if child is binary
- IJ2EEModule childModule = (IJ2EEModule)module[1].loadAdapter(IJ2EEModule.class,monitor);
+ IJ2EEModule childModule = (IJ2EEModule)_module[1].loadAdapter(IJ2EEModule.class,monitor);
boolean isBinary = false;
if (childModule != null)
{
@@ -131,18 +132,18 @@ public void execute(IProgressMonitor monitor, IAdaptable info) throws CoreExcept
{
publishJar(childURI,p,status,monitor);
}
- server.saveModulePublishLocations(p);
+ _server.saveModulePublishLocations(p);
}
throwException(status);
- server.setModulePublishState2(module,IServer.PUBLISH_STATE_NONE);
+ _server.setModulePublishState2(_module,IServer.PUBLISH_STATE_NONE);
}
private void publishDir(IModule module2, List status, IProgressMonitor monitor) throws CoreException
{
- IPath path = server.getModuleDeployDirectory(module2);
+ IPath path = _server.getModuleDeployDirectory(module2);
// Remove if requested or if previously published and are now serving without publishing
- if (kind == IServer.PUBLISH_CLEAN || deltaKind == ServerBehaviourDelegate.REMOVED || server.getJettyServer().isServeModulesWithoutPublish())
+ if (_kind == IServer.PUBLISH_CLEAN || _deltaKind == ServerBehaviourDelegate.REMOVED || _server.getJettyServer().isServeModulesWithoutPublish())
{
File f = path.toFile();
if (f.exists())
@@ -151,34 +152,34 @@ private void publishDir(IModule module2, List status, IProgressMonitor monitor)
addArrayToList(status,stat);
}
- if (deltaKind == ServerBehaviourDelegate.REMOVED || server.getJettyServer().isServeModulesWithoutPublish())
+ if (_deltaKind == ServerBehaviourDelegate.REMOVED || _server.getJettyServer().isServeModulesWithoutPublish())
return;
}
- if (kind == IServer.PUBLISH_CLEAN || kind == IServer.PUBLISH_FULL)
+ if (_kind == IServer.PUBLISH_CLEAN || _kind == IServer.PUBLISH_FULL)
{
- IModuleResource[] mr = server.getResources(module);
- IStatus[] stat = helper.publishFull(mr,path,monitor);
+ IModuleResource[] mr = _server.getResources(_module);
+ IStatus[] stat = _helper.publishFull(mr,path,monitor);
addArrayToList(status,stat);
return;
}
- IModuleResourceDelta[] delta = server.getPublishedResourceDelta(module);
+ IModuleResourceDelta[] delta = _server.getPublishedResourceDelta(_module);
int size = delta.length;
for (int i = 0; i < size; i++)
{
- IStatus[] stat = helper.publishDelta(delta[i],path,monitor);
+ IStatus[] stat = _helper.publishDelta(delta[i],path,monitor);
addArrayToList(status,stat);
}
}
private void publishJar(String jarURI, Properties p, List status, IProgressMonitor monitor) throws CoreException
{
- IPath path = server.getModuleDeployDirectory(module[0]);
+ IPath path = _server.getModuleDeployDirectory(_module[0]);
boolean moving = false;
// Get URI used for previous publish, if known
- String oldURI = (String)p.get(module[1].getId());
+ String oldURI = (String)p.get(_module[1].getId());
if (oldURI != null)
{
// If old URI found, detect if jar is moving or changing its name
@@ -190,7 +191,7 @@ private void publishJar(String jarURI, Properties p, List status, IProgressMonit
// If we don't have a jar URI, make a guess so we have one if we need it
if (jarURI == null)
{
- jarURI = "WEB-INF/lib/" + module[1].getName() + ".jar";
+ jarURI = "WEB-INF/lib/" + _module[1].getName() + ".jar";
}
IPath jarPath = path.append(jarURI);
// Make our best determination of the path to the old jar
@@ -203,20 +204,20 @@ private void publishJar(String jarURI, Properties p, List status, IProgressMonit
path = jarPath.removeLastSegments(1);
// Remove if requested or if previously published and are now serving without publishing
- if (moving || kind == IServer.PUBLISH_CLEAN || deltaKind == ServerBehaviourDelegate.REMOVED || server.getJettyServer().isServeModulesWithoutPublish())
+ if (moving || _kind == IServer.PUBLISH_CLEAN || _deltaKind == ServerBehaviourDelegate.REMOVED || _server.getJettyServer().isServeModulesWithoutPublish())
{
File file = oldJarPath.toFile();
if (file.exists())
file.delete();
- p.remove(module[1].getId());
+ p.remove(_module[1].getId());
- if (deltaKind == ServerBehaviourDelegate.REMOVED || server.getJettyServer().isServeModulesWithoutPublish())
+ if (_deltaKind == ServerBehaviourDelegate.REMOVED || _server.getJettyServer().isServeModulesWithoutPublish())
return;
}
- if (!moving && kind != IServer.PUBLISH_CLEAN && kind != IServer.PUBLISH_FULL)
+ if (!moving && _kind != IServer.PUBLISH_CLEAN && _kind != IServer.PUBLISH_FULL)
{
// avoid changes if no changes to module since last publish
- IModuleResourceDelta[] delta = server.getPublishedResourceDelta(module);
+ IModuleResourceDelta[] delta = _server.getPublishedResourceDelta(_module);
if (delta == null || delta.length == 0)
return;
}
@@ -225,18 +226,18 @@ private void publishJar(String jarURI, Properties p, List status, IProgressMonit
if (!path.toFile().exists())
path.toFile().mkdirs();
- IModuleResource[] mr = server.getResources(module);
- IStatus[] stat = helper.publishZip(mr,jarPath,monitor);
+ IModuleResource[] mr = _server.getResources(_module);
+ IStatus[] stat = _helper.publishZip(mr,jarPath,monitor);
addArrayToList(status,stat);
- p.put(module[1].getId(),jarURI);
+ p.put(_module[1].getId(),jarURI);
}
private void publishArchiveModule(String jarURI, Properties p, List status, IProgressMonitor monitor)
{
- IPath path = server.getModuleDeployDirectory(module[0]);
+ IPath path = _server.getModuleDeployDirectory(_module[0]);
boolean moving = false;
// Get URI used for previous publish, if known
- String oldURI = (String)p.get(module[1].getId());
+ String oldURI = (String)p.get(_module[1].getId());
if (oldURI != null)
{
// If old URI found, detect if jar is moving or changing its name
@@ -248,7 +249,7 @@ private void publishArchiveModule(String jarURI, Properties p, List status, IPro
// If we don't have a jar URI, make a guess so we have one if we need it
if (jarURI == null)
{
- jarURI = "WEB-INF/lib/" + module[1].getName();
+ jarURI = "WEB-INF/lib/" + _module[1].getName();
}
IPath jarPath = path.append(jarURI);
// Make our best determination of the path to the old jar
@@ -261,22 +262,22 @@ private void publishArchiveModule(String jarURI, Properties p, List status, IPro
path = jarPath.removeLastSegments(1);
// Remove if requested or if previously published and are now serving without publishing
- if (moving || kind == IServer.PUBLISH_CLEAN || deltaKind == ServerBehaviourDelegate.REMOVED || server.getJettyServer().isServeModulesWithoutPublish())
+ if (moving || _kind == IServer.PUBLISH_CLEAN || _deltaKind == ServerBehaviourDelegate.REMOVED || _server.getJettyServer().isServeModulesWithoutPublish())
{
File file = oldJarPath.toFile();
if (file.exists())
{
file.delete();
}
- p.remove(module[1].getId());
+ p.remove(_module[1].getId());
- if (deltaKind == ServerBehaviourDelegate.REMOVED || server.getJettyServer().isServeModulesWithoutPublish())
+ if (_deltaKind == ServerBehaviourDelegate.REMOVED || _server.getJettyServer().isServeModulesWithoutPublish())
return;
}
- if (!moving && kind != IServer.PUBLISH_CLEAN && kind != IServer.PUBLISH_FULL)
+ if (!moving && _kind != IServer.PUBLISH_CLEAN && _kind != IServer.PUBLISH_FULL)
{
// avoid changes if no changes to module since last publish
- IModuleResourceDelta[] delta = server.getPublishedResourceDelta(module);
+ IModuleResourceDelta[] delta = _server.getPublishedResourceDelta(_module);
if (delta == null || delta.length == 0)
return;
}
@@ -285,10 +286,10 @@ private void publishArchiveModule(String jarURI, Properties p, List status, IPro
if (!path.toFile().exists())
path.toFile().mkdirs();
- IModuleResource[] mr = server.getResources(module);
- IStatus[] stat = helper.publishToPath(mr,jarPath,monitor);
+ IModuleResource[] mr = _server.getResources(_module);
+ IStatus[] stat = _helper.publishToPath(mr,jarPath,monitor);
addArrayToList(status,stat);
- p.put(module[1].getId(),jarURI);
+ p.put(_module[1].getId(),jarURI);
}
/**
12 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/config/PathFileConfig.java
View
@@ -17,22 +17,22 @@
public class PathFileConfig
{
- private File file;
- private IPath path;
+ private File _file;
+ private IPath _path;
public PathFileConfig(File file, IPath path)
{
- this.file = file;
- this.path = path;
+ this._file = file;
+ this._path = path;
}
public File getFile()
{
- return file;
+ return _file;
}
public IPath getPath()
{
- return path;
+ return _path;
}
}
48 org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/config/StartIni.java
View
@@ -33,13 +33,13 @@
public class StartIni implements JettyConstants
{
- private List<PathFileConfig> jettyXMLFiles = new ArrayList<PathFileConfig>();
- private List<PathFileConfig> otherConfigs = new ArrayList<PathFileConfig>();
- private PathFileConfig startConfig = null;
- private PathFileConfig webdefaultXMLConfig = null;
- private File startIniFile;
+ private List<PathFileConfig> _jettyXMLFiles = new ArrayList<PathFileConfig>();
+ private List<PathFileConfig> _otherConfigs = new ArrayList<PathFileConfig>();
+ private PathFileConfig _startConfig = null;
+ private PathFileConfig _webdefaultXMLConfig = null;
+ private File _startIniFile;
- private boolean isStartIniDirty;
+ private boolean _isStartIniDirty;
public StartIni(IPath baseDirPath)
{
@@ -58,14 +58,14 @@ public StartIni(IFolder baseDirFolder)
List<String> args = new ArrayList<String>();
if (baseDirPath != null)
{
- IPath startIniPath = baseDirPath.append(START_INI);
- this.startIniFile = startIniPath.toFile();
+ IPath startIniPath = baseDirPath.append(__START_INI);
+ this._startIniFile = startIniPath.toFile();
}
else
{
try
{
- this.startIniFile = IOUtils.toLocalFile(baseDirFolder.getFile(START_INI),null);