Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

This commit was manufactured by cvs2svn to create tag 'R1_0_2'.

  • Loading branch information...
commit 3701ba362bae61c71c9a57c8d041d1e824e9add7 4 parents 989b7c9 + 07b65c6 + 3af7868 + ebb2a4d
ndai authored
Showing with 105 additions and 1,184 deletions.
  1. +4 −4 features/org.eclipse.jst.server_adapters.feature/feature.xml
  2. +1 −1  features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/feature.xml
  3. +6 −6 features/org.eclipse.jst.server_core.feature/feature.xml
  4. +1 −1  features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/feature.xml
  5. +1 −1  features/org.eclipse.jst.server_sdk.feature/feature.xml
  6. +3 −3 features/org.eclipse.jst.server_ui.feature/feature.xml
  7. +1 −1  features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/feature.xml
  8. +2 −2 features/org.eclipse.jst.server_userdoc.feature/feature.xml
  9. +5 −0 features/org.eclipse.wst.server_core.feature/build.properties
  10. +4 −6 features/org.eclipse.wst.server_core.feature/feature.xml
  11. +1 −1  features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/feature.xml
  12. +1 −1  features/org.eclipse.wst.server_sdk.feature/feature.xml
  13. +3 −3 features/org.eclipse.wst.server_ui.feature/feature.xml
  14. +1 −1  features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/feature.xml
  15. +1 −1  features/org.eclipse.wst.server_userdoc.feature/feature.xml
  16. +1 −1  plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF
  17. +3 −3 plugins/org.eclipse.jst.server.core/plugin.xml
  18. +7 −7 plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
  19. +5 −6 plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/CorePlugin.java
  20. +2 −3 ...lipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ExternalServerBehaviour.java
  21. +1 −2  ...ins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
  22. +4 −5 ...clipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerBehaviour.java
  23. +1 −2  ....eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerRuntime.java
  24. +1 −2  ...lipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/AntPublisher.java
  25. +0 −5 plugins/org.eclipse.jst.server.generic.modules/.cvsignore
  26. +0 −28 plugins/org.eclipse.jst.server.generic.modules/.project
  27. +1 −1  plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
  28. +1 −1  ...e.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerCompositeDecorator.java
  29. +0 −2  ...g.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java
  30. +1 −2  ...pse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties
  31. +16 −33 ...pse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
  32. +0 −7 plugins/org.eclipse.jst.server.pde/.classpath
  33. +0 −2  plugins/org.eclipse.jst.server.pde/.cvsignore
  34. +0 −28 plugins/org.eclipse.jst.server.pde/.project
  35. +0 −13 plugins/org.eclipse.jst.server.pde/META-INF/MANIFEST.MF
  36. +0 −22 plugins/org.eclipse.jst.server.pde/about.html
  37. +0 −19 plugins/org.eclipse.jst.server.pde/build.properties
  38. +0 −266 plugins/org.eclipse.jst.server.pde/build.xml
  39. BIN  plugins/org.eclipse.jst.server.pde/icons/obj16/wiz_new_server_plugin.gif
  40. +0 −24 plugins/org.eclipse.jst.server.pde/plugin.properties
  41. +0 −22 plugins/org.eclipse.jst.server.pde/plugin.xml
  42. +0 −63 plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/ServerPdePlugin.java
  43. +0 −31 ...rg.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerPluginNewWizard.java
  44. +0 −285 plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerTemplate.java
  45. +0 −44 plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/Messages.java
  46. +0 −19 plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/messages.properties
  47. +0 −41 plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/buildfiles/$server_name$.xml
  48. BIN  plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/icons/server.gif
  49. +0 −142 plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/servers/$server_name$.serverdef
  50. +1 −1  plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
  51. +1 −1  plugins/org.eclipse.jst.server.tomcat.ui/META-INF/MANIFEST.MF
  52. +1 −1  plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF
  53. +1 −1  plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
  54. +6 −6 plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java
  55. +12 −8 plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
  56. +3 −2 plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerPublishInfo.java
  57. +1 −1  plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
View
8 features/org.eclipse.jst.server_adapters.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_adapters.feature"
label="JST Server Adapter Feature"
- version="1.0.100.qualifier"
+ version="1.0.2.qualifier"
provider-name="Eclipse.org">
<description>
@@ -12,15 +12,15 @@
<license url="license.html">
%license
</license>
-
+
<url>
<update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
</url>
<requires>
- <import feature="org.eclipse.jst.server_core.feature" version="1.0.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.jst.server_ui.feature" version="1.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.jst.server_core.feature" version="1.0.2" match="equivalent"/>
+ <import feature="org.eclipse.jst.server_ui.feature" version="1.0.2" match="equivalent"/>
</requires>
<plugin
View
2  features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_adapters.feature.source"
label="JST Server Adapter Feature Source"
- version="1.0.1.qualifier"
+ version="1.0.2.qualifier"
provider-name="Eclipse.org">
<description>
View
12 features/org.eclipse.jst.server_core.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_core.feature"
label="JST Server Core Feature"
- version="1.0.100.qualifier"
+ version="1.0.2.qualifier"
provider-name="Eclipse.org">
<description>
@@ -19,11 +19,11 @@
<requires>
- <import feature="org.eclipse.platform" version="3.2" match="equivalent"/>
- <import feature="org.eclipse.emf" version="2.2" match="equivalent"/>
- <import feature="org.eclipse.rcp" version="3.2" match="equivalent"/>
- <import feature="org.eclipse.jdt" version="3.2" match="equivalent"/>
- <import feature="org.eclipse.wst.server_core.feature" version="1.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.platform" version="3.1.2" match="equivalent"/>
+ <import feature="org.eclipse.emf" version="2.1.1" match="equivalent"/>
+ <import feature="org.eclipse.rcp" version="3.1.2" match="equivalent"/>
+ <import feature="org.eclipse.jdt" version="3.1.2" match="equivalent"/>
+ <import feature="org.eclipse.wst.server_core.feature" version="1.0.2" match="equivalent"/>
</requires>
<plugin
View
2  features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_core.feature.source"
label="JST Server Core Feature Source"
- version="1.0.1.qualifier"
+ version="1.0.2.qualifier"
provider-name="Eclipse.org">
<description>
View
2  features/org.eclipse.jst.server_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_sdk.feature"
label="JST Server Feature SDK"
- version="1.0.100.qualifier"
+ version="1.0.2.qualifier"
provider-name="Eclipse.org">
<description>
View
6 features/org.eclipse.jst.server_ui.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_ui.feature"
label="JST Server UI Feature"
- version="1.0.100.qualifier"
+ version="1.0.2.qualifier"
provider-name="Eclipse.org">
<description>
@@ -12,7 +12,7 @@
<license url="license.html">
%license
</license>
-
+
<url>
<update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
</url>
@@ -23,7 +23,7 @@
version="0.0.0"/>
<requires>
- <import feature="org.eclipse.jst.server_core.feature" version="1.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.jst.server_core.feature" version="1.0.2" match="equivalent"/>
</requires>
<plugin
View
2  features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_ui.feature.source"
label="JST Server UI Feature"
- version="1.0.1.qualifier"
+ version="1.0.2.qualifier"
provider-name="Eclipse.org">
<description>
View
4 features/org.eclipse.jst.server_userdoc.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_userdoc.feature"
label="JST Server Feature User Documentation"
- version="1.0.100.qualifier"
+ version="1.0.2.qualifier"
provider-name="Eclipse.org">
<description>
@@ -12,7 +12,7 @@
<license url="license.html">
%license
</license>
-
+
<url>
<update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
</url>
View
5 features/org.eclipse.wst.server_core.feature/build.properties
@@ -3,3 +3,8 @@ bin.includes = feature.xml,\
epl-v10.html,\
license.html,\
feature.properties
+src.includes = build.properties,\
+ eclipse_update_120.jpg,\
+ epl-v10.html,\
+ feature.xml,\
+ license.html
View
10 features/org.eclipse.wst.server_core.feature/feature.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.wst.server_core.feature"
- label="Server Core Feature"
- version="1.0.100.qualifier"
- provider-name="Eclipse.org">
+ label="org.eclipse.wst.server_core.feature"
+ version="1.0.2.qualifier">
<description>
%description
@@ -12,14 +11,13 @@
<license url="license.html">
%license
</license>
-
<url>
<update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
</url>
<requires>
- <import feature="org.eclipse.rcp" version="3.2" match="equivalent"/>
- <import feature="org.eclipse.platform" version="3.2" match="equivalent"/>
+ <import feature="org.eclipse.rcp" version="3.1.1" match="equivalent"/>
+ <import feature="org.eclipse.platform" version="3.1.1" match="equivalent"/>
</requires>
<plugin
View
2  features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_core.feature.source"
label="%featureName"
- version="1.0.1.qualifier"
+ version="1.0.2.qualifier"
provider-name="%providerName">
<description>
View
2  features/org.eclipse.wst.server_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_sdk.feature"
label="org.eclipse.wst.server_sdk.feature"
- version="1.0.100.qualifier">
+ version="1.0.2.qualifier">
<description>
%description
View
6 features/org.eclipse.wst.server_ui.feature/feature.xml
@@ -2,8 +2,7 @@
<feature
id="org.eclipse.wst.server_ui.feature"
label="WST Server UI Feature"
- version="1.0.100.qualifier"
- provider-name="Eclipse.org">
+ version="1.0.2.qualifier">
<description>
%description
@@ -17,12 +16,13 @@
<update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
</url>
+
<includes
id="org.eclipse.wst.server_userdoc.feature"
version="0.0.0"/>
<requires>
- <import feature="org.eclipse.wst.server_core.feature" version="1.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.wst.server_core.feature" version="1.0.2" match="equivalent"/>
</requires>
<plugin
View
2  features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/feature.xml
@@ -3,7 +3,7 @@
primary="false"
label="Source for WST Server UI Feature"
id="org.eclipse.wst.server_ui.feature.source"
- version="1.0.1.qualifier">
+ version="1.0.2.qualifier">
<description>
%description
</description>
View
2  features/org.eclipse.wst.server_userdoc.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_userdoc.feature"
label="User Documentation for WST Server Feature"
- version="1.0.100.qualifier">
+ version="1.0.2.qualifier">
<description>
%description
View
2  plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.core; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.eclipse.jst.server.core.internal.JavaServerPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
View
6 plugins/org.eclipse.jst.server.core/plugin.xml
@@ -113,17 +113,17 @@
<supported>
<facet id="jst.java" version="1.3"/>
- <runtime-component id="standard.jre" version="[1.3"/>
+ <runtime-component id="standard.jre" version="&gt;=1.3"/>
</supported>
<supported>
<facet id="jst.java" version="1.4"/>
- <runtime-component id="standard.jre" version="[1.4"/>
+ <runtime-component id="standard.jre" version="&gt;=1.4"/>
</supported>
<supported>
<facet id="jst.java" version="5.0"/>
- <runtime-component id="standard.jre" version="[5.0"/>
+ <runtime-component id="standard.jre" version="&gt;=5.0"/>
</supported>
</extension>
View
14 plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
@@ -6,13 +6,13 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.jst.server.generic.core.internal.CorePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.server.generic.core.internal;x-internal:=true,
- org.eclipse.jst.server.generic.core.internal.publishers;x-internal:=true,
- org.eclipse.jst.server.generic.internal.core.util;x-internal:=true,
- org.eclipse.jst.server.generic.internal.servertype.definition;x-internal:=true,
- org.eclipse.jst.server.generic.internal.servertype.definition.impl;x-internal:=true,
- org.eclipse.jst.server.generic.internal.servertype.definition.util;x-internal:=true,
- org.eclipse.jst.server.generic.internal.xml;x-internal:=true,
+Export-Package: org.eclipse.jst.server.generic.core.internal,
+ org.eclipse.jst.server.generic.core.internal.publishers,
+ org.eclipse.jst.server.generic.internal.core.util,
+ org.eclipse.jst.server.generic.internal.servertype.definition,
+ org.eclipse.jst.server.generic.internal.servertype.definition.impl,
+ org.eclipse.jst.server.generic.internal.servertype.definition.util,
+ org.eclipse.jst.server.generic.internal.xml,
org.eclipse.jst.server.generic.servertype.definition
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
View
11 ...ins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/CorePlugin.java
@@ -10,12 +10,11 @@
package org.eclipse.jst.server.generic.core.internal;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
+import java.io.IOException;
+import java.net.URL;
/**
* The main plugin class to be used in the desktop.
@@ -24,7 +23,7 @@
*/
public class CorePlugin extends Plugin {
- public static final String PLUGIN_ID = "org.eclipse.jst.server.generic.core"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.jst.server.generic.core";
//The shared instance.
private static CorePlugin plugin;
@@ -72,7 +71,7 @@ public ServerTypeDefinitionManager getServerTypeDefinitionManager()
private URL getInstallUrl()
{
try {
- return FileLocator.resolve(this.getBundle().getEntry("/"));
+ return Platform.resolve(this.getBundle().getEntry("/"));
} catch (IOException e) {
return null;
}
View
5 ...se.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ExternalServerBehaviour.java
@@ -28,7 +28,6 @@
import org.eclipse.jst.server.generic.internal.xml.Resolver;
import org.eclipse.jst.server.generic.servertype.definition.External;
import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerPort;
import org.eclipse.wst.server.core.internal.Server;
@@ -67,8 +66,8 @@ protected void setupLaunch(ILaunch launch, String launchMode, IProgressMonitor m
ServerPort portInUse = portInUse();
if (portInUse != null) {
Trace.trace(Trace.WARNING, "Port " + portInUse.getPort() + " is currently in use");
- Status status = new Status(IStatus.WARNING, CorePlugin.PLUGIN_ID, IStatus.OK,
- NLS.bind(GenericServerCoreMessages.errorPortInUse,Integer.toString(portInUse.getPort()),portInUse.getName()), null);
+ Status status = new Status(Status.WARNING, CorePlugin.PLUGIN_ID, Status.OK,
+ GenericServerCoreMessages.bind(GenericServerCoreMessages.errorPortInUse,Integer.toString(portInUse.getPort()),portInUse.getName()), null);
setServerStatus(status);
setServerState(IServer.STATE_UNKNOWN);
}
View
3  .../org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
@@ -26,7 +26,6 @@
import org.eclipse.jst.server.generic.servertype.definition.Port;
import org.eclipse.jst.server.generic.servertype.definition.Property;
import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.ServerPort;
import org.eclipse.wst.server.core.ServerUtil;
@@ -263,7 +262,7 @@ public IStatus validate() {
{
String path= (String)getInstanceProperties().get(property.getId());
if(path!=null && !pathExist(path))
- return new Status(IStatus.ERROR, CorePlugin.PLUGIN_ID, 0, NLS.bind(GenericServerCoreMessages.invalidPath,path), null);
+ return new Status(IStatus.ERROR, CorePlugin.PLUGIN_ID, 0, GenericServerCoreMessages.bind(GenericServerCoreMessages.invalidPath,path), null);
}
}
return new Status(IStatus.OK, CorePlugin.PLUGIN_ID, 0, "", null);
View
9 ...pse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerBehaviour.java
@@ -40,7 +40,6 @@
import org.eclipse.jst.server.generic.servertype.definition.Classpath;
import org.eclipse.jst.server.generic.servertype.definition.LaunchConfiguration;
import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerPort;
@@ -84,7 +83,7 @@ public void publishModule(int kind, int deltaKind, IModule[] module,
String publisherId = ServerTypeDefinitionUtil.getPublisherID(module[0], getServerDefinition());
GenericPublisher publisher = PublishManager.getPublisher(publisherId);
if(publisher==null){
- IStatus status = new Status(IStatus.ERROR,CorePlugin.PLUGIN_ID,0, NLS.bind(GenericServerCoreMessages.unableToCreatePublisher,publisherId),null);
+ IStatus status = new Status(IStatus.ERROR,CorePlugin.PLUGIN_ID,0, GenericServerCoreMessages.bind(GenericServerCoreMessages.unableToCreatePublisher,publisherId),null);
throw new CoreException(status);
}
publisher.initialize(module,getServer());
@@ -108,7 +107,7 @@ private void checkClosed(IModule[] module) throws CoreException
{
if(module[i] instanceof DeletedModule)
{
- IStatus status = new Status(IStatus.ERROR,CorePlugin.PLUGIN_ID,0, NLS.bind(GenericServerCoreMessages.canNotPublishDeletedModule,module[i].getName()),null);
+ IStatus status = new Status(IStatus.ERROR,CorePlugin.PLUGIN_ID,0, GenericServerCoreMessages.bind(GenericServerCoreMessages.canNotPublishDeletedModule,module[i].getName()),null);
throw new CoreException(status);
}
}
@@ -118,7 +117,7 @@ private void removeFromServer(IModule[] module, IProgressMonitor monitor) throws
String publisherId = ServerTypeDefinitionUtil.getPublisherID(module[0], getServerDefinition());
GenericPublisher publisher = PublishManager.getPublisher(publisherId);
if(publisher==null){
- IStatus status = new Status(IStatus.ERROR,CorePlugin.PLUGIN_ID,0,NLS.bind(GenericServerCoreMessages.unableToCreatePublisher,publisherId),null);
+ IStatus status = new Status(IStatus.ERROR,CorePlugin.PLUGIN_ID,0,GenericServerCoreMessages.bind(GenericServerCoreMessages.unableToCreatePublisher,publisherId),null);
throw new CoreException(status);
}
publisher.initialize(module,getServer());
@@ -408,7 +407,7 @@ protected void setupLaunch(ILaunch launch, String launchMode, IProgressMonitor m
for(int i=0;i<ports.length;i++){
sp= ports[i];
if (SocketUtil.isPortInUse(ports[i].getPort(), 5))
- throw new CoreException(new Status(IStatus.ERROR, CorePlugin.PLUGIN_ID, 0, NLS.bind(GenericServerCoreMessages.errorPortInUse,Integer.toString(sp.getPort()),sp.getName()),null));
+ throw new CoreException(new Status(IStatus.ERROR, CorePlugin.PLUGIN_ID, 0, GenericServerCoreMessages.bind(GenericServerCoreMessages.errorPortInUse,Integer.toString(sp.getPort()),sp.getName()),null));
}
}
setServerState(IServer.STATE_STARTING);
View
3  ...lipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerRuntime.java
@@ -26,7 +26,6 @@
import org.eclipse.jst.server.generic.servertype.definition.Classpath;
import org.eclipse.jst.server.generic.servertype.definition.Property;
import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.server.core.model.RuntimeDelegate;
/**
* Generic server runtime support.
@@ -112,7 +111,7 @@ protected IStatus validateClasspaths(ServerRuntime serverTypeDefinition) {
String arcPath = serverTypeDefinition.getResolver().resolveProperties(arch.getPath());
File f = new File(arcPath);
if(f.exists()==false)
- return new Status(IStatus.ERROR, CorePlugin.PLUGIN_ID, 0 ,NLS.bind(GenericServerCoreMessages.errorMissingClasspathEntry,f.getPath()),null);
+ return new Status(IStatus.ERROR, CorePlugin.PLUGIN_ID, 0 ,GenericServerCoreMessages.bind(GenericServerCoreMessages.errorMissingClasspathEntry,f.getPath()),null);
}
}
return new Status(IStatus.OK, CorePlugin.PLUGIN_ID, 0, "", null);
View
3  ...se.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/AntPublisher.java
@@ -290,8 +290,7 @@ private void runAnt(String buildFile,String targets,Map properties ,IProgressMon
*
* @param wc
*/
- protected void setupAntLaunchConfiguration(ILaunchConfigurationWorkingCopy wc) {
- //nothing to do
+ protected void setupAntLaunchConfiguration(ILaunchConfigurationWorkingCopy wc) {
}
/* (non-Javadoc)
View
5 plugins/org.eclipse.jst.server.generic.modules/.cvsignore
@@ -1,5 +0,0 @@
-bin
-build.xml
-commonmodules.jar
-org.eclipse.jst.server.generic.modules_1.0.0.jar
-temp.folder
View
28 plugins/org.eclipse.jst.server.generic.modules/.project
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.generic.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
View
2  plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.jst.server.generic.ui.internal.GenericUiPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.server.generic.ui.internal;x-internal:=true
+Export-Package: org.eclipse.jst.server.generic.ui.internal
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.wst.server.ui,
View
2  ...st.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerCompositeDecorator.java
@@ -25,7 +25,7 @@
* Called if all the fields are valid. This gives subclasses opportunity to
* validate and take necessary actions.
*
- * @return boolean
+ * @return
*/
public abstract boolean validate();
}
View
2  ...clipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java
@@ -37,7 +37,5 @@
NLS.initializeMessages(RESOURCE_BUNDLE, GenericServerUIMessages.class);
}
- public static String emptyPath;
-
}
View
3  ....jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties
@@ -19,5 +19,4 @@ installServerButton=Install Server
installationDirectory=Select installation directory
jre_select_label= &JRE:
defaultJRE = Default JRE
-invalidPath = {0} is not valid
-emptyPath=Specify a valid path
+invalidPath = {0} is not valid
View
49 ....jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
@@ -20,7 +20,6 @@
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jst.server.generic.servertype.definition.Property;
import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -57,14 +56,8 @@
private final class PathModifyListener implements ModifyListener {
public void modifyText(ModifyEvent e) {
String path = ((Text) e.widget).getText();
-
- if(path.length()<1)
- {
- fLastMessage = GenericServerUIMessages.emptyPath;
- fWizard.setMessage(fLastMessage,IMessageProvider.ERROR);
- }
- else if(!pathExist(path)){
- fLastMessage = NLS.bind(GenericServerUIMessages.invalidPath,path);
+ if(!pathExist(path)){
+ fLastMessage = GenericServerUIMessages.bind(GenericServerUIMessages.invalidPath,path);
fWizard.setMessage(fLastMessage,IMessageProvider.ERROR);
}else{
if(fLastMessage!=null && fLastMessage.equals(fWizard.getMessage())){
@@ -80,14 +73,7 @@ private boolean pathExist(String path){
}
}
- /**
- * Constructor
- *
- * @param definition
- * @param initialProperties
- * @param context
- * @param handle
- */
+
public ServerTypeDefinitionDecorator(ServerRuntime definition, Map initialProperties, String context, IWizardHandle handle) {
super();
fDefinition = definition;
@@ -96,9 +82,6 @@ public ServerTypeDefinitionDecorator(ServerRuntime definition, Map initialProper
fWizard = handle;
}
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.generic.ui.internal.GenericServerCompositeDecorator#decorate(org.eclipse.jst.server.generic.ui.internal.GenericServerComposite)
- */
public void decorate(GenericServerComposite composite) {
List properties =null;
@@ -131,7 +114,7 @@ private void createPropertyControl(Composite parent, Property property){
str.setData(property);
registerControl(str);
} else if( Property.TYPE_BOOLEAN.equals(property.getType())) {
- Button bool =createLabeledCheck(property.getLabel(),("true".equals( getPropertyValue(property))), parent); //$NON-NLS-1$
+ Button bool =createLabeledCheck(property.getLabel(),("true".equals( getPropertyValue(property))), parent);
bool.setData(property);
registerControl(bool);
}else if(Property.TYPE_SELECT.equals(property.getType())) {
@@ -160,7 +143,7 @@ private Combo createLabeledCombo(Composite defPanel, Property property) {
gridData.horizontalSpan = 2;
combo.setLayoutData(gridData);
- StringTokenizer tokenizer = new StringTokenizer(property.getDefault(),","); //$NON-NLS-1$
+ StringTokenizer tokenizer = new StringTokenizer(property.getDefault(),",");
while(tokenizer.hasMoreTokens()){
combo.add(tokenizer.nextToken());
}
@@ -188,11 +171,11 @@ private Button createLabeledCheck(String title, boolean value, Composite defPane
fButton.setSelection(value);
fButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- //nothing to do
+
}
public void widgetDefaultSelected(SelectionEvent e) {
- // nothing to do
+
}
});
@@ -284,19 +267,19 @@ private Text createLabeledText(String title, String value,
return text;
}
- private String getPropertyValue(Property property){
- if(fProperties!=null && fProperties.isEmpty()==false){
- //user properties exist use those
- return(String)fProperties.get(property.getId());
- }
- if(Property.CONTEXT_SERVER.equals(property.getContext()))
- return fDefinition.getResolver().resolveProperties(property.getDefault());
- return property.getDefault();
+ private String getPropertyValue(Property property)
+ {
+ String value = property.getDefault();
+ if(fProperties!=null && fProperties.isEmpty()==false)
+ value=(String)fProperties.get(property.getId());
+ return value;
}
+
+
/**
* Returns the property name/value pairs.
- * @return Map containing the values collected from the user
+ * @return
*/
public Map getValues(){
Map propertyMap = new HashMap();
View
7 plugins/org.eclipse.jst.server.pde/.classpath
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
View
2  plugins/org.eclipse.jst.server.pde/.cvsignore
@@ -1,2 +0,0 @@
-bin
-.settings
View
28 plugins/org.eclipse.jst.server.pde/.project
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.pde</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
View
13 plugins/org.eclipse.jst.server.pde/META-INF/MANIFEST.MF
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Generic server PDE Template
-Bundle-SymbolicName: org.eclipse.jst.server.generic.pde; singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.jst.server.generic.pde.ServerPdePlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.pde.ui,
- org.eclipse.pde.core
-Eclipse-AutoStart: true
View
22 plugins/org.eclipse.jst.server.pde/about.html
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
View
19 plugins/org.eclipse.jst.server.pde/build.properties
@@ -1,19 +0,0 @@
-##################################################################################################
-# Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors: Gorkem Ercan - initial API and implementation
-#
-###################################################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- templates_3.0/,\
- icons/,\
- plugin.properties,\
- about.html
-src.includes = src/
View
266 plugins/org.eclipse.jst.server.pde/build.xml
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.jst.server.generic.pde" default="build.jars" basedir=".">
-
- <property name="basews" value="${ws}"/>
- <property name="baseos" value="${os}"/>
- <property name="basearch" value="${arch}"/>
- <property name="basenl" value="${nl}"/>
-
- <!-- Compiler settings. -->
- <property name="javacFailOnError" value="false"/>
- <property name="javacDebugInfo" value="on"/>
- <property name="javacVerbose" value="true"/>
- <property name="javacSource" value="1.3"/>
- <property name="javacTarget" value="1.2"/>
- <property name="compilerArg" value=""/>
- <path id="path_bootclasspath">
- <fileset dir="${java.home}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
- <property name="bootclasspath" refid="path_bootclasspath"/>
-
- <target name="init" depends="properties">
- <condition property="pluginTemp" value="${buildTempFolder}/plugins">
- <isset property="buildTempFolder"/>
- </condition>
- <property name="pluginTemp" value="${basedir}"/>
- <condition property="build.result.folder" value="${pluginTemp}/org.eclipse.jst.server.generic.pde">
- <isset property="buildTempFolder"/>
- </condition>
- <property name="build.result.folder" value="${basedir}"/>
- <property name="temp.folder" value="${basedir}/temp.folder"/>
- <property name="plugin.destination" value="${basedir}"/>
- </target>
-
- <target name="properties" if="eclipse.running">
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
- </target>
-
- <target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.jst.server.generic.pde for an update site.">
- <delete dir="${temp.folder}"/>
- <mkdir dir="${temp.folder}"/>
- <antcall target="build.jars"/>
- <antcall target="gather.bin.parts">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <zip destfile="${plugin.destination}/org.eclipse.jst.server.generic.pde_1.0.0.jar" basedir="${temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0" filesonly="false" whenempty="skip" update="false"/>
- <delete dir="${temp.folder}"/>
- </target>
-
- <target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.jst.server.generic.pde @dot.">
- <delete dir="${temp.folder}/@dot.bin"/>
- <mkdir dir="${temp.folder}/@dot.bin"/>
- <!-- compile the source code -->
- <javac destdir="${temp.folder}/@dot.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" source="${javacSource}" target="${javacTarget}" >
- <compilerarg line="${compilerArg}"/>
- <classpath>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.runtime_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.osgi_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.help_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.swt_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.swt.win32.win32.x86_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.jface_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.commands_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.workbench_3.1.0.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ui.workbench.compatibility_3.1.0/compatibility.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ui.workbench.compatibility_3.1.0/@dot"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.expressions_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.resources_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.resources.compatibility_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.resources.win32_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.runtime.compatibility_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.update.configurator_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ant.core_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.variables_3.1.0.jar"/>
- <pathelement path="../org.eclipse.pde.ui/eclipse3/target-0.7/eclipse/plugins/org.eclipse.pde.ui_3.1.0.jar"/>
- <pathelement path="../org.eclipse.pde.ui/org.eclipse.pde.ui_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.ide_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.win32_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.views_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.update.core_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.update.core.win32_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.update.ui_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.forms_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.jface.text_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.text_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.workbench.texteditor_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.editors_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.core.filebuffers_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.debug.core_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.debug.ui_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.console_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.jdt.core_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.team.core_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.jdt.debug.ui_3.1.0.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.jdt.debug_3.1.0/jdi.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.jdt.debug_3.1.0/jdimodel.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.jdt.debug_3.1.0/tools.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.jdt.launching_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.jdt.ui_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.search_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.compare_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ltk.core.refactoring_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ltk.ui.refactoring_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.pde_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.pde.core_3.1.0.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.pde.build_3.1.0/pdebuild.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-antlr.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-apache-bcel.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-apache-bsf.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-apache-log4j.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-apache-oro.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-apache-regexp.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-apache-resolver.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-commons-logging.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-commons-net.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-icontract.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-jai.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-javamail.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-jdepend.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-jmf.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-jsch.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-junit.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-launcher.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-netrexx.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-nodeps.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-starteam.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-stylebook.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-swing.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-trax.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-vaj.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-weblogic.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-xalan1.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-xslp.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-antlr.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-apache-bcel.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-apache-bsf.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-apache-log4j.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-apache-oro.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-apache-regexp.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-apache-resolver.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-commons-logging.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-commons-net.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-icontract.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-jai.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-javamail.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-jdepend.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-jmf.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-jsch.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-junit.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-launcher.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-netrexx.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-nodeps.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-starteam.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-stylebook.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-swing.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-trax.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-vaj.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-weblogic.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-xalan1.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/lib/ant-xslp.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.ant.optional.junit_2.1.0/@dot"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.junit_3.8.1/junit.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ant.ui_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.externaltools_3.1.0.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.jdt.junit_3.1.0/junitsupport.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.eclipse.jdt.junit.runtime_3.1.0/junitruntime.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.intro_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.ui.cheatsheets_3.1.0.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.help.base_3.1.0.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.lucene_1.4.3/lucene-1.4.3.jar"/>
- <pathelement path="../../../../eclipse3/target-0.7/eclipse/plugins/org.apache.lucene_1.4.3/parser.jar"/>
- <pathelement path="..\..\..\..\eclipse3\target-0.7\eclipse\plugins\org.eclipse.help.appserver_3.1.0.jar"/>
- </classpath>
- <src path="src/" />
- </javac>
- <!-- Copy necessary resources -->
- <copy todir="${temp.folder}/@dot.bin" failonerror="true" overwrite="false">
- <fileset dir="src/" excludes="**/*.java, **/package.htm*,null" />
- </copy>
- <mkdir dir="${build.result.folder}"/>
- <copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
- <fileset dir="${temp.folder}/@dot.bin" />
- </copy>
- <delete dir="${temp.folder}/@dot.bin"/>
- </target>
-
- <target name="src.zip" depends="init" unless="src.zip">
- <mkdir dir="${build.result.folder}"/>
- <zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
- <fileset dir="src/" includes="**/*.java" />
- </zip>
- </target>
-
- <target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.jst.server.generic.pde.">
- <available property="@dot" file="${build.result.folder}/@dot"/>
- <antcall target="@dot"/>
- </target>
-
- <target name="build.sources" depends="init">
- <available property="src.zip" file="${build.result.folder}/src.zip"/>
- <antcall target="src.zip"/>
- </target>
-
- <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0"/>
- <copy todir="${destination.temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0" failonerror="true" overwrite="false">
- <fileset dir="${build.result.folder}/@dot" includes="**" />
- </copy>
- <copy todir="${destination.temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0" failonerror="true" overwrite="false">
- <fileset dir="${basedir}" includes="META-INF/,null,plugin.xml,templates_3.0/,icons/,plugin.properties,build.properties" />
- </copy>
- </target>
-
- <target name="build.zips" depends="init">
- </target>
-
- <target name="gather.sources" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0"/>
- <copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0" failonerror="false" overwrite="false"/>
- <copy todir="${destination.temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0" failonerror="false" overwrite="false">
- <fileset dir="${basedir}" includes="src/" />
- </copy>
- </target>
-
- <target name="gather.logs" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0"/>
- <copy file="${temp.folder}/@dot.bin.log" todir="${destination.temp.folder}/org.eclipse.jst.server.generic.pde_1.0.0" failonerror="false" overwrite="false"/>
- </target>
-
- <target name="clean" depends="init" description="Clean the plug-in: org.eclipse.jst.server.generic.pde of all the zips, jars and logs created.">
- <delete dir="${build.result.folder}/@dot"/>
- <delete file="${build.result.folder}/src.zip"/>
- <delete file="${plugin.destination}/org.eclipse.jst.server.generic.pde_1.0.0.jar"/>
- <delete file="${plugin.destination}/org.eclipse.jst.server.generic.pde_1.0.0.zip"/>
- <delete dir="${temp.folder}"/>
- </target>
-
- <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
- <eclipse.convertPath fileSystemPath="D:/_bge/workspaces/workspace/org.eclipse.jst.server.generic.pde" property="resourcePath"/>
- <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
- </target>
-
- <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.jst.server.generic.pde.">
- <delete dir="${temp.folder}"/>
- <mkdir dir="${temp.folder}"/>
- <antcall target="build.jars"/>
- <antcall target="build.sources"/>
- <antcall target="gather.bin.parts">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <antcall target="gather.sources">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <delete>
- <fileset dir="${temp.folder}" includes="**/*.bin.log" />
- </delete>
- <zip destfile="${plugin.destination}/org.eclipse.jst.server.generic.pde_1.0.0.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
- <delete dir="${temp.folder}"/>
- </target>
-
-</project>
View
BIN  plugins/org.eclipse.jst.server.pde/icons/obj16/wiz_new_server_plugin.gif
Deleted file not rendered
View
24 plugins/org.eclipse.jst.server.pde/plugin.properties
@@ -1,24 +0,0 @@
-##################################################################################################
-# Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors: Gorkem Ercan - initial API and implementation
-#
-###################################################################################################
-pluginName= Generic server PDE Template
-providerName=Eclipse.org
-template.genericServer.name=Generic Server Plugin Wizard
-template.genericServer.description=\
-<p>This wizard creates a simple generic server plug-in. \
-The .serverdef file and the build.xml file for ANT based publishing are created. \
-Created files are the same files used for JBoss 3.2.3 in Generic Examples. \
-</p>\
-<p><b>Extension Used</b></p>\
-<li>org.eclipse.jst.server.generic.core.serverdefinition</li> \
-<li>org.eclipse.wst.server.core.runtimeTargetHandlers</li> \
-<li>org.eclipse.wst.server.ui.serverImages</li> \
-<li>org.eclipse.wst.server.ui.wizardFragments</li> \
-<li>org.eclipse.wst.server.core.serverTypes</li> \
-<li>org.eclipse.wst.server.core.runtimeTypes</li>
View
22 plugins/org.eclipse.jst.server.pde/plugin.xml
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension
- point="org.eclipse.pde.ui.pluginContent">
- <wizard
- category="WTP"
- class="org.eclipse.jst.server.generic.pde.internal.GenericServerPluginNewWizard"
- icon="icons/obj16/wiz_new_server_plugin.gif"
- id="org.eclipse.jst.server.generic.pde.genericServer"
- java="true"
- name="%template.genericServer.name"
- rcp="false"
- ui-content="true">
- <description>
- %template.genericServer.description
- </description>
-
- </wizard>
- </extension>
-
-</plugin>
View
63 plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/ServerPdePlugin.java
@@ -1,63 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Gorkem Ercan - initial API and implementation
- *
- **************************************************************************************************/
-package org.eclipse.jst.server.generic.pde;
-
-import org.eclipse.ui.plugin.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class ServerPdePlugin extends AbstractUIPlugin {
-
- //The shared instance.
- private static ServerPdePlugin plugin;
-
- /**
- * The constructor.
- */
- public ServerPdePlugin() {
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static ServerPdePlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path.
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.jst.server.generic.pde", path);
- }
-}
View
31 ...eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerPluginNewWizard.java
@@ -1,31 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Gorkem Ercan - initial API and implementation
- *
- **************************************************************************************************/
-package org.eclipse.jst.server.generic.pde.internal;
-
-
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-/**
- * New Generic server plug-in wizard.
- * @author Gorkem Ercan
- *
- */
-public class GenericServerPluginNewWizard extends NewPluginTemplateWizard {
-
- public ITemplateSection[] createTemplateSections(){
- return new ITemplateSection[] {new GenericServerTemplate()};
- }
-
- public void init(IFieldData data) {
- super.init(data);
- setWindowTitle(Messages.windowTitleWizard);
- }
-}
View
285 ...ns/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerTemplate.java
@@ -1,285 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Gorkem Ercan - initial API and implementation
- *
- **************************************************************************************************/
-package org.eclipse.jst.server.generic.pde.internal;
-
-import java.net.URL;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.server.generic.pde.ServerPdePlugin;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginElement;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginModelFactory;
-import org.eclipse.pde.core.plugin.IPluginReference;
-import org.eclipse.pde.internal.ui.wizards.templates.PluginReference;
-import org.eclipse.pde.ui.templates.OptionTemplateSection;
-import org.eclipse.pde.ui.templates.TemplateOption;
-/**
- * Simple generic server plug-in template
- *
- * @author Gorkem Ercan
- *
- */
-public class GenericServerTemplate extends OptionTemplateSection {
-
- private static final String KEY_SERVER_VERSION = "server_version"; //$NON-NLS-1$
- private static final String KEY_SERVER_START_BEFORE_PUBLISH = "server_start_before_publish"; //$NON-NLS-1$
- private static final String KEY_SERVER_LAUNCHTYPE = "server_launchtype"; //$NON-NLS-1$
- private static final String KEY_SERVER_VENDOR = "server_vendor"; //$NON-NLS-1$
- private static final String KEY_SERVER_DESCRIPTION = "server_description"; //$NON-NLS-1$
- private static final String KEY_SERVER_NAME = "server_name"; //$NON-NLS-1$
- private static final String[][] launchOpts = {{"java",Messages.labelJavaLaunchConfiguration},{"external",Messages.labelExternalLaunchConfiguration}}; //$NON-NLS-1$ //$NON-NLS-3$
-
- private TemplateOption fServerNameOption;
- private TemplateOption fServerDescriptionOption;
- private TemplateOption fServerVendorOption;
- private TemplateOption fServerVersionOption;
- private TemplateOption fLaunchTypeOption;
- private TemplateOption fStartBeforPublishOption;
-
- public GenericServerTemplate() {
- setPageCount(1);
- createOptions();
- }
-
-
- private void createOptions(){
-
- fServerNameOption= addOption(KEY_SERVER_NAME,Messages.labelServerName,"your server's name",0); //$NON-NLS-2$
- fServerDescriptionOption = addOption(KEY_SERVER_DESCRIPTION,"Description","User description of your server",0); //$NON-NLS-1$ //$NON-NLS-2$
- fServerVendorOption= addOption(KEY_SERVER_VENDOR,Messages.labelServerVendor,"Server vendor' s name",0); //$NON-NLS-2$
- fServerVersionOption= addOption(KEY_SERVER_VERSION,Messages.labelServerVesion,"0",0); //$NON-NLS-2$
- fLaunchTypeOption= addOption(KEY_SERVER_LAUNCHTYPE,Messages.labelLaunchType,launchOpts,"java",0); //$NON-NLS-2$
- fStartBeforPublishOption= addOption(KEY_SERVER_START_BEFORE_PUBLISH,Messages.labelStartBeforePublish,false,0);
-
- fServerNameOption.setRequired(true);
- fServerDescriptionOption.setRequired(true);
- fServerVendorOption.setRequired(true);
- fServerVersionOption.setRequired(true);
- }
-
- public String getSectionId() {
- return "genericserver"; //$NON-NLS-1$
- }
-
- protected void updateModel(IProgressMonitor monitor) throws CoreException{
- IPluginBase plugin = model.getPluginBase();
- IPluginModelFactory factory = model.getPluginFactory();
- addRuntimeType(plugin, factory);
- addServerType(plugin, factory);
- addWizardFragment(plugin, factory);
- addServerImage(plugin, factory);
- addRuntimeTargetHandler(plugin, factory);
- addServerDefinition(plugin, factory);
- }
-
- private void addServerDefinition(IPluginBase plugin, IPluginModelFactory factory) throws CoreException {
- IPluginExtension definitionExtension = createExtension("org.eclipse.jst.server.generic.core.serverdefinition",true); //$NON-NLS-1$
- IPluginElement serverDef = factory.createElement(definitionExtension);
- serverDef.setName("serverdefinition"); //$NON-NLS-1$
- serverDef.setAttribute("id",getRuntimeId()); //$NON-NLS-1$
- serverDef.setAttribute("definitionfile","/servers/"+getStringOption(KEY_SERVER_NAME)+".serverdef"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- definitionExtension.add(serverDef);
- if(!definitionExtension.isInTheModel())
- plugin.add(definitionExtension);
- }
-
-
- private void addRuntimeTargetHandler(IPluginBase plugin, IPluginModelFactory factory) throws CoreException {
- IPluginExtension handlerExtension = createExtension("org.eclipse.wst.server.core.runtimeTargetHandlers",true); //$NON-NLS-1$
- IPluginElement handler= factory.createElement(handlerExtension);
- handler.setName("runtimeTargetHandler"); //$NON-NLS-1$
- handler.setAttribute("id",getNamespace()+".runtimeTarget"); //$NON-NLS-1$ //$NON-NLS-2$
- handler.setAttribute("runtimeTypeIds",getRuntimeId()); //$NON-NLS-1$
- handler.setAttribute("class","org.eclipse.jst.server.generic.core.internal.GenericServerRuntimeTargetHandler"); //$NON-NLS-1$ //$NON-NLS-2$
- handlerExtension.add(handler);
- if(!handlerExtension.isInTheModel())
- plugin.add(handlerExtension);
- }
-
-
- private void addServerImage(IPluginBase plugin, IPluginModelFactory factory) throws CoreException {
- IPluginExtension imageExtension = createExtension("org.eclipse.wst.server.ui.serverImages",true); //$NON-NLS-1$
- IPluginElement serverImage = factory.createElement(imageExtension);
- serverImage.setName("image"); //$NON-NLS-1$
- serverImage.setAttribute("id",getNamespace()+".serverImage"); //$NON-NLS-1$ //$NON-NLS-2$
- serverImage.setAttribute("icon","icons/server.gif"); //$NON-NLS-1$ //$NON-NLS-2$
- serverImage.setAttribute("typeIds",getServerId()); //$NON-NLS-1$
- imageExtension.add(serverImage);
-
- IPluginElement runtimeImage = factory.createElement(imageExtension);
- runtimeImage.setName("image"); //$NON-NLS-1$
- runtimeImage.setAttribute("id",getNamespace()+".runtimeImage"); //$NON-NLS-1$ //$NON-NLS-2$
- runtimeImage.setAttribute("icon","icons/server.gif"); //$NON-NLS-1$ //$NON-NLS-2$
- runtimeImage.setAttribute("typeIds",getRuntimeId()); //$NON-NLS-1$
- imageExtension.add(runtimeImage);
- if(!imageExtension.isInTheModel())
- plugin.add(imageExtension);
- }
-
-
- private void addWizardFragment(IPluginBase plugin, IPluginModelFactory factory) throws CoreException {
- IPluginExtension wizardExtension = createExtension("org.eclipse.wst.server.ui.wizardFragments",true); //$NON-NLS-1$
- IPluginElement runtimeWiz = factory.createElement(wizardExtension);
- runtimeWiz.setName("fragment"); //$NON-NLS-1$
- runtimeWiz.setAttribute("id",getNamespace()+".runtimeWizard"); //$NON-NLS-1$ //$NON-NLS-2$
- runtimeWiz.setAttribute("class","org.eclipse.jst.server.generic.ui.internal.GenericServerRuntimeWizardFragment"); //$NON-NLS-1$ //$NON-NLS-2$
- runtimeWiz.setAttribute("typeIds",getRuntimeId()); //$NON-NLS-1$
- wizardExtension.add(runtimeWiz);
- if(!wizardExtension.isInTheModel())
- plugin.add(wizardExtension);
-
- IPluginElement serverWiz = factory.createElement(wizardExtension);
- serverWiz.setName("fragment"); //$NON-NLS-1$
- serverWiz.setAttribute("id",getNamespace()+".serverWizard"); //$NON-NLS-1$ //$NON-NLS-2$
- serverWiz.setAttribute("class","org.eclipse.jst.server.generic.ui.internal.GenericServerWizardFragment"); //$NON-NLS-1$ //$NON-NLS-2$
- serverWiz.setAttribute("typeIds",getServerId()); //$NON-NLS-1$
- wizardExtension.add(serverWiz);
- }
-
-
- private void addServerType(IPluginBase plugin, IPluginModelFactory factory) throws CoreException {
- IPluginExtension serverExtension =createExtension("org.eclipse.wst.server.core.serverTypes",true); //$NON-NLS-1$
- IPluginElement serverType = factory.createElement(serverExtension);
- serverType.setName("serverType"); //$NON-NLS-1$
- serverType.setAttribute("runtime","true"); //$NON-NLS-1$ //$NON-NLS-2$
- serverType.setAttribute("class","org.eclipse.jst.server.generic.core.internal.GenericServer"); //$NON-NLS-1$ //$NON-NLS-2$
- serverType.setAttribute("id",getServerId()); //$NON-NLS-1$
- serverType.setAttribute("initialState","stopped"); //$NON-NLS-1$ //$NON-NLS-2$
- serverType.setAttribute("supportsRemoteHosts","false"); //$NON-NLS-1$ //$NON-NLS-2$
- serverType.setAttribute("runtimeTypeId",getRuntimeId()); //$NON-NLS-1$
- serverType.setAttribute("description",getStringOption(KEY_SERVER_DESCRIPTION)); //$NON-NLS-1$
- serverType.setAttribute("launchConfigId",getSelectedConfigType()); //$NON-NLS-1$
- serverType.setAttribute("behaviourClass",getSelectedBehaviourClass()); //$NON-NLS-1$
- serverType.setAttribute("name",getStringOption(KEY_SERVER_NAME)); //$NON-NLS-1$
- serverType.setAttribute("startTimeout","75000"); //$NON-NLS-1$ //$NON-NLS-2$
- serverType.setAttribute("stopTimeout","30000"); //$NON-NLS-1$ //$NON-NLS-2$
- serverType.setAttribute("hasConfiguration","false"); //$NON-NLS-1$ //$NON-NLS-2$
- serverType.setAttribute("launchModes","run,debug"); //$NON-NLS-1$ //$NON-NLS-2$
- serverType.setAttribute("startBeforePublish", Boolean.toString(getBooleanOption(KEY_SERVER_START_BEFORE_PUBLISH))); //$NON-NLS-1$
- serverExtension.add(serverType);
- if(!serverExtension.isInTheModel())
- plugin.add(serverExtension);
- }
-
-
- private void addRuntimeType(IPluginBase plugin, IPluginModelFactory factory) throws CoreException {
- IPluginExtension extension =createExtension("org.eclipse.wst.server.core.runtimeTypes",true); //$NON-NLS-1$
- IPluginElement runtimeType = factory.createElement(extension);
- runtimeType.setName("runtimeType"); //$NON-NLS-1$
- runtimeType.setAttribute("id",getRuntimeId()); //$NON-NLS-1$
- runtimeType.setAttribute("name",getStringOption(KEY_SERVER_NAME)); //$NON-NLS-1$
- runtimeType.setAttribute("description",getStringOption(KEY_SERVER_DESCRIPTION)); //$NON-NLS-1$
- runtimeType.setAttribute("vendor",getStringOption(KEY_SERVER_VENDOR)); //$NON-NLS-1$
- runtimeType.setAttribute("version",getStringOption(KEY_SERVER_VERSION)); //$NON-NLS-1$
- runtimeType.setAttribute("class","org.eclipse.jst.server.generic.core.internal.GenericServerRuntime"); //$NON-NLS-1$ //$NON-NLS-2$
-
- IPluginElement moduleType = factory.createElement(runtimeType);
- moduleType.setName("moduleType"); //$NON-NLS-1$
- moduleType.setAttribute("types","jst.web"); //$NON-NLS-1$ //$NON-NLS-2$
- moduleType.setAttribute("versions","1.2, 1.3"); //$NON-NLS-1$ //$NON-NLS-2$
- runtimeType.add(moduleType);
-
- extension.add(runtimeType);
- if(!extension.isInTheModel())
- plugin.add(extension);
- }
-
- private String getRuntimeId(){
- return getNamespace()+".runtime"; //$NON-NLS-1$
- }
-
- private String getServerId(){
- return getNamespace()+".server"; //$NON-NLS-1$
- }
- private String getNamespace()
- {
- return model.getPluginBase().getId();
- }
- private String getSelectedBehaviourClass() {
- if(isExternalSelected())
- return "org.eclipse.jst.server.generic.core.internal.ExternalServerBehaviour"; //$NON-NLS-1$
- return "org.eclipse.jst.server.generic.core.internal.GenericServerBehaviour"; //$NON-NLS-1$
- }
-
- private boolean isExternalSelected(){
- String selectedType = getStringOption(KEY_SERVER_LAUNCHTYPE);
- return "external".equals(selectedType); //$NON-NLS-1$
- }
-
- private String getSelectedConfigType(){
- if(isExternalSelected())
- return "org.eclipse.jst.server.generic.core.ExternalLaunchConfigurationType"; //$NON-NLS-1$
- return "org.eclipse.jst.server.generic.core.launchConfigurationType"; //$NON-NLS-1$
- }
-
- protected ResourceBundle getPluginResourceBundle(){
- return null;
- }
-
- public String[] getNewFiles(){
- return new String[]{"icons/", "server/","buildfiles/"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- public String getUsedExtensionPoint(){
- return null;
- }
-
- public void validateOptions(TemplateOption changed){
- if(changed.isRequired() && changed.isEmpty()){
- flagMissingRequiredOption(changed);
- return;
- }
- TemplateOption[] options = getOptions(0);
- for (int i = 0; i < options.length; i++) {
- if(options[i].isRequired() && options[i].isEmpty()){
- flagMissingRequiredOption(options[i]);
- return;
- }
- }
- resetPageState();
- }
-
-
-
- public void addPages(Wizard wizard) {
- WizardPage page = createPage(0);
- page.setTitle(Messages.pageTitle);
- page.setDescription(Messages.pageDescription);
- wizard.addPage(page);
- markPagesAdded();
- }
-
-
-
- protected URL getInstallURL() {
- return ServerPdePlugin.getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
- */
- public IPluginReference[] getDependencies(String schemaVersion) {
- IPluginReference[] dep = new IPluginReference[4];
- dep[0] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
- dep[1] = new PluginReference("org.eclipse.ui", null, 0); //$NON-NLS-1$
- dep[2] = new PluginReference("org.eclipse.jst.server.generic.core", null, 0); //$NON-NLS-1$
- dep[3] = new PluginReference("org.eclipse.jst.server.generic.ui", null, 0); //$NON-NLS-1$
- return dep;
- }
-
- public Object getValue(String variable) {
- return super.getValue(variable);
- }
-
-}
View
44 plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/Messages.java
@@ -1,44 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Gorkem Ercan - initial API and implementation
- *
- **************************************************************************************************/
-package org.eclipse.jst.server.generic.pde.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.server.generic.pde.internal.messages"; //$NON-NLS-1$
-
- private Messages() {
- }
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- public static String labelJavaLaunchConfiguration;
-
- public static String labelExternalLaunchConfiguration;
-
- public static String labelServerName;
-
- public static String labelServerVendor;
-
- public static String labelServerVesion;
-
- public static String labelLaunchType;
-
- public static String labelStartBeforePublish;
-
- public static String pageTitle;
-
- public static String pageDescription;
-
- public static String windowTitleWizard;
-}
View
19 plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/messages.properties
@@ -1,19 +0,0 @@
-##################################################################################################
-# Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors: Gorkem Ercan - initial API and implementation
-#
-###################################################################################################
-labelJavaLaunchConfiguration=Java launch cofiguration
-labelExternalLaunchConfiguration=External launch configuration
-labelServerName=Server Name
-labelServerVendor=Server Vendor
-labelServerVesion=Server Version
-labelLaunchType=Launch type
-labelStartBeforePublish=Start Before publish
-pageTitle=Generic Server Plug-in
-pageDescription=Create a new Generic server plug-in
-windowTitleWizard=New Generic Server plug-in
View
41 plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/buildfiles/$server_name$.xml
@@ -1,41 +0,0 @@
-<project name="deployextension" default="deploy.j2ee.web" basedir=".">
- <target name="deploy.j2ee.web">
- <jar destfile="${project.working.dir}/${module.name}.war">
- <zipfileset dir="${module.dir}">
- <include name="**/*.*"/>
- <exclude name="**/*.war"/>
- </zipfileset>
- </jar>
- <move file="${project.working.dir}/${module.name}.war" todir="${server.publish.dir}"/>
- </target>
-
- <target name="deploy.j2ee.ejb">
- <jar destfile="${project.working.dir}/${module.name}.jar">
- <zipfileset dir="${module.dir}">
- <include name="**/*.*"/>
- <exclude name="**/*.java"/>
- </zipfileset>
- </jar>
- <move file="${project.working.dir}/${module.name}.jar" todir="${server.publish.dir}"/>
- </target>
- <target name="deploy.j2ee.ear">
- <jar destfile="${project.working.dir}/${module.name}.ear">
- <zipfileset dir="${module.dir}">
- <include name="**/*.*"/>
- <exclude name="**/*.java"/>
- </zipfileset>
- </jar>
- <move file="${project.working.dir}/${module.name}.ear" todir="${server.publish.dir}"/>
- </target>
-
- <target name="undeploy.j2ee.web">
- <delete file="${server.publish.dir}/${module.name}.war"> </delete>
- </target>
- <target name="undeploy.j2ee.ejb">
- <delete file="${server.publish.dir}/${module.name}.jar"> </delete>
- </target>
- <target name="undeploy.j2ee.ear">
- <delete file="${server.publish.dir}/${module.name}.ear"> </delete>
- </target>
-
-</project>
View
BIN  plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/icons/server.gif
Deleted file not rendered
View
142 plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/servers/$server_name$.serverdef
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:ServerRuntime
- xmlns:tns="http://eclipse.org/jst/server/generic/ServerTypeDefinition"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://eclipse.org/jst/server/generic/ServerTypeDefinition ServerTypeDefinitionSchema.xsd "
- name="JBOSS 3.2.3" version="v3.2.3">
-<property id="serverRootDirectory"
- label="%ApplicationServerDirectory"
- type="directory"
- context="runtime"
- default="/your_server_root/appservers/jboss-3.2.3" />
-<property id="serverAddress"
- label="%serverAddress"
- type="string"
- context="server"
- default="127.0.0.1" />
-<property id="port"
- label="%serverPort"
- type="string"
- context="server"
- default="8080" />
-<property id="serverConfig"
- label="%jboss323serverConfig"
- type="string"
- context="server"
- default="default" />
-<property id="classPath"
- label="%serverclassPath"
- type="directory"
- context="runtime"
- default="/your_server_root/appservers/jboss-3.2.3" />
-
- <port>
- <no>$${port}</no>
- <name>Http</name>
- <protocol>http</protocol>
- </port>
-
- <module>
- <type>j2ee.web</type>
- <publishDir>$${serverRootDirectory}/server/$${serverConfig}/deploy</publishDir>
- <publisherReference>org.eclipse.jst.server.generic.antpublisher</publisherReference>
- </module>
- <module>
- <type>j2ee.ejb</type>
- <publishDir>$${serverRootDirectory}/server/$${serverConfig}/deploy</publishDir>
- <publisherReference>org.eclipse.jst.server.generic.antpublisher</publisherReference>
- </module>
- <module>
- <type>j2ee.ear</type>
- <publishDir>$${serverRootDirectory}/server/$${serverConfig}/deploy</publishDir>
- <publisherReference>org.eclipse.jst.server.generic.antpublisher</publisherReference>
- </module>
-
- <project>
- <classpathReference>jboss.project</classpathReference>
- </project>
-
- <start>
- <mainClass>org.jboss.Main</mainClass>
- <workingDirectory>$${serverRootDirectory}/bin</workingDirectory>
- <programArguments>-c $${serverConfig}</programArguments>
- <vmParameters></vmParameters>
- <classpathReference>jboss</classpathReference>
- </start>
-
- <stop>
- <mainClass>org.jboss.Shutdown</mainClass>
- <workingDirectory>$${serverRootDirectory}/bin</workingDirectory>
- <programArguments>-S</programArguments>
- <vmParameters></vmParameters>
- <classpathReference>jboss</classpathReference>
- </stop>
- <publisher id="org.eclipse.jst.server.generic.antpublisher">
- <publisherdata>
- <dataname>build.file</dataname>
- <datavalue>/buildfiles/jboss323.xml</datavalue>
- </publisherdata>
- <publisherdata>
- <dataname>target.publish.j2ee.web</dataname>
- <datavalue>deploy.j2ee.web</datavalue>
- </publisherdata>
- <publisherdata>
- <dataname>target.publish.j2ee.ejb</dataname>
- <datavalue>deploy.j2ee.ejb</datavalue>
- </publisherdata>
- <publisherdata>
- <dataname>target.unpublish.j2ee.web</dataname>
- <datavalue>undeploy.j2ee.web</datavalue>
- </publisherdata>
- <publisherdata>
- <dataname>target.unpublish.j2ee.ejb</dataname>
- <datavalue>undeploy.j2ee.ejb</datavalue>
- </publisherdata>
- <publisherdata>
- <dataname>target.publish.j2ee.ear</dataname>
- <datavalue>deploy.j2ee.ear</datavalue>
- </publisherdata>
- <publisherdata>
- <dataname>target.unpublish.j2ee.ear</dataname>
- <datavalue>undeploy.j2ee.ear</datavalue>
- </publisherdata>
- </publisher>
-
- <classpath id="jboss" >
- <archive path="$${classPath}/bin/run.jar" />
- <archive path="$${classPath}/bin/shutdown.jar" />
- <archive path="$${classPath}/client/jboss-j2ee.jar" />
- <archive path="$${classPath}/server/$${serverConfig}/lib/javax.servlet.jar" />
- <archive path="$${classPath}/lib/jboss-boot.jar" />
- <archive path="$${classPath}/lib/jboss-system.jar" />
- <archive path="$${classPath}/lib/jboss-jmx.jar" />
- <archive path="$${classPath}/lib/jboss-common.jar" />
- <archive path="$${classPath}/lib/concurrent.jar" />
- <archive path="$${classPath}/server/$${serverConfig}/lib/jboss.jar" />
- <archive path="$${classPath}/server/$${serverConfig}/lib/jnpserver.jar" />
- <archive path="$${classPath}/server/$${serverConfig}/lib/jpl-pattern.jar" />
- <archive path="$${classPath}/server/$${serverConfig}/lib/jpl-util.jar" />
- <archive path="$${classPath}/server/$${serverConfig}/lib/jboss-transaction.jar" />
- <archive path="$${classPath}/server/$${serverConfig}/lib/bcel.jar" />
- <archive path="$${classPath}/lib/jdom.jar" />
- <archive path="$${classPath}/lib/xercesImpl.jar" />
- <archive path="$${classPath}/lib/xml-apis.jar" />
- <archive path="$${classPath}/lib/gnu-regexp.jar" />
- <archive path="$${classPath}/lib/getopt.jar" />
- </classpath>
-
- <classpath id="jboss.project" >
- <archive path="$${classPath}/client/jboss-j2ee.jar" />
- <archive path="$${classPath}/server/default/lib/javax.servlet.jar" />
- <archive path="$${classPath}/server/default/lib/activation.jar" />
- <archive path="$${classPath}/server/default/lib/mail.jar" />
- </classpath>
- <jndiConnection>
- <providerUrl>jnp://$${serverAddress}:1099</providerUrl>
- <initialContextFactory>org.jnp.interfaces.NamingContextFactory</initialContextFactory>
- <jndiProperty>
- <name></name>
- <value></value>
- </jndiProperty>
- </jndiConnection>
-</tns:ServerRuntime>
View
2  plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.tomcat.core; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
View
2  plugins/org.eclipse.jst.server.tomcat.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.tomcat.ui; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.eclipse.jst.server.tomcat.ui.internal.TomcatUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
View
2  plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.ui; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.eclipse.jst.server.ui.internal.JavaServerUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
View
2  plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.server.core; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.eclipse.wst.server.core.internal.ServerPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
View
12 plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java
@@ -370,10 +370,10 @@ protected void deregisterRuntime(IRuntime runtime) {
Trace.trace(Trace.RESOURCES, "Deregistering runtime: " + runtime.getName());
if (runtime.equals(getDefaultRuntime()))
setDefaultRuntime(null);
-
- ((Runtime)runtime).dispose();
- fireRuntimeEvent(runtime, EVENT_REMOVED);
+
runtimes.remove(runtime);
+ fireRuntimeEvent(runtime, EVENT_REMOVED);
+ ((Runtime)runtime).dispose();
}
/**
@@ -389,10 +389,10 @@ protected void deregisterServer(IServer server) {
((Server) server).deleteLaunchConfigurations();
ServerPlugin.getInstance().removeTempDirectory(server.getId());
-
- ((Server)server).dispose();
- fireServerEvent(server, EVENT_REMOVED);
+
servers.remove(server);
+ fireServerEvent(server, EVENT_REMOVED);
+ ((Server)server).dispose();
}
/**
View
20 plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
-*
+ *
* Contributors:
* IBM Corporation - Initial API and implementation
**********************************************************************/
@@ -126,6 +126,9 @@ public void run() {
Trace.trace(Trace.FINEST, "Auto-publish thread publishing " + Server.this);
+ if (getServerState() != IServer.STATE_STARTED)
+ return;
+
PublishServerJob publishJob = new PublishServerJob(Server.this, IServer.PUBLISH_AUTO, false);
publishJob.schedule();
}
@@ -485,12 +488,12 @@ public boolean visit(IModule[] module2) {
if (getServerState() != IServer.STATE_STOPPED && behaviourDelegate != null)
behaviourDelegate.handleResourceChange();
- if (getServerState() != IServer.STATE_STOPPED)
+ if (getServerState() == IServer.STATE_STARTED)
autoPublish();
Trace.trace(Trace.FINEST, "< handleDeployableProjectChange()");
}
-
+
protected void stopAutoPublish() {
if (autoPublishThread == null)
return;
@@ -1024,10 +1027,10 @@ public IStatus canStart(String mode2) {
if (getServerType() == null || !getServerType().supportsLaunchMode(mode2))