Permalink
Browse files

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

  • Loading branch information...
ndai
ndai committed Aug 23, 2011
4 parents 23b4169 + a334a33 + f29ab5f + b9e6a57 commit bd633944567350521e86da55ebf004ae14eb8799
Showing with 213 additions and 69 deletions.
  1. +2 −2 features/org.eclipse.jst.server_adapters.ext.feature/feature.properties
  2. +1 −1 features/org.eclipse.jst.server_adapters.ext.feature/feature.xml
  3. +1 −1 features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.xml
  4. +1 −1 features/org.eclipse.jst.server_adapters.ext_tests.feature/feature.xml
  5. +1 −2 features/org.eclipse.jst.server_adapters.sdk.feature/feature.xml
  6. +1 −1 features/org.eclipse.wst.server_core.feature/feature.xml
  7. +1 −1 features/org.eclipse.wst.server_sdk.feature/feature.xml
  8. +1 −1 features/org.eclipse.wst.server_tests.feature/feature.xml
  9. +1 −1 features/org.eclipse.wst.server_ui.feature/feature.xml
  10. +1 −0 plugins/org.eclipse.jst.server.generic.jboss/build.properties
  11. +1 −0 plugins/org.eclipse.jst.server.generic.jonas/build.properties
  12. +1 −0 plugins/org.eclipse.jst.server.generic.oc4j/build.properties
  13. +1 −0 plugins/org.eclipse.jst.server.installable/.cvsignore
  14. +19 −8 plugins/org.eclipse.jst.server.installable/.project
  15. +9 −0 plugins/org.eclipse.jst.server.installable/META-INF/MANIFEST.MF
  16. +34 −0 plugins/org.eclipse.jst.server.installable/about.html
  17. +0 −6 plugins/org.eclipse.jst.server.installable/archived.txt
  18. +15 −0 plugins/org.eclipse.jst.server.installable/build.properties
  19. +11 −0 plugins/org.eclipse.jst.server.installable/plugin.properties
  20. +21 −0 plugins/org.eclipse.jst.server.installable/plugin.xml
  21. +2 −2 plugins/org.eclipse.wst.internet.monitor.ui/META-INF/MANIFEST.MF
  22. +2 −2 plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
  23. +1 −1 plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerUtil.java
  24. +6 −5 .../org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java
  25. +0 −2 plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
  26. +3 −0 ...rg.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerWorkingCopy.java
  27. +2 −2 plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
  28. +8 −1 plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorPart.java
  29. +16 −12 ...ins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/DeleteServerDialog.java
  30. +2 −1 plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.java
  31. +2 −1 plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.properties
  32. +2 −1 plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Timer.java
  33. +5 −1 ....wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/AbstractServerAction.java
  34. +4 −2 ...erver.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/fragment/NewServerWizardFragment.java
  35. +34 −10 ...t.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java
  36. +1 −1 ...pse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java
@@ -15,14 +15,14 @@
# This file should be translated.
# "featureName" property - name of the feature
-featureName=JST Server Adapters
+featureName=JST Server Adapters Extensions
# "providerName" property - name of the company that provides the feature
providerName=Eclipse Web Tools Platform
# "description" property - description of the feature
-description=Server adapters for use with the JST server tools
+description=Server adapters extensions for use with the JST server tools
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_adapters.ext.feature"
label="%featureName"
- version="3.3.0.qualifier"
+ version="3.3.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_adapters.ext.sdk.feature"
label="%featureName"
- version="3.3.0.qualifier"
+ version="3.3.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_adapters.ext_tests.feature"
label="%featureName"
- version="3.3.0.qualifier"
+ version="3.3.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_adapters.sdk.feature"
label="%featureName"
- version="3.3.0.qualifier"
+ version="3.3.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -19,7 +19,6 @@
%license
</license>
-
<includes
id="org.eclipse.jst.server_adapters.feature"
version="0.0.0"/>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_core.feature"
label="%featureName"
- version="3.3.0.qualifier"
+ version="3.3.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_sdk.feature"
label="%featureName"
- version="3.3.0.qualifier"
+ version="3.3.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_tests.feature"
label="%featureName"
- version="3.3.0.qualifier"
+ version="3.3.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_ui.feature"
label="%featureName"
- version="3.3.0.qualifier"
+ version="3.3.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -15,5 +15,6 @@ bin.includes = META-INF/,\
icons/,\
buildfiles/,\
genericjboss.jar
+src.includes = build.properties
source.genericjboss.jar = servers/
jars.compile.order = genericjboss.jar
@@ -15,5 +15,6 @@ bin.includes = META-INF/,\
servers/,\
buildfiles/,\
genericjonas.jar
+src.includes = build.properties
jars.compile.order = genericjonas.jar
source.genericjonas.jar = servers/
@@ -15,5 +15,6 @@ bin.includes = META-INF/,\
plugin.properties,\
servers/,\
genericoc4j.jar
+src.includes = build.properties
source.genericoc4j.jar = servers/
jars.compile.order = genericoc4j.jar
@@ -0,0 +1 @@
+build.xml
@@ -1,11 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.jst.server.installable</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
+ <name>org.eclipse.jst.server.installable</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <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>
+ </natures>
</projectDescription>
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.jst.server.installable;singleton:=true
+Bundle-Name: %pluginName
+Bundle-Version: 1.5.202.qualifier
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)"
@@ -0,0 +1,34 @@
+<!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">
+
+<H3>About This Content</H3>
+
+<P>June, 2008</P>
+
+<H3>License</H3>
+
+<P>The Eclipse Foundation makes available all content in this plug-in
+("Content"). Unless otherwise indicated below, the Content is provided to you
+under the terms and conditions of the Eclipse Public License Version 1.0
+("EPL"). A copy of the EPL is available at
+<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
+For purposes of the EPL, "Program" 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 ("Redistributor") 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
+and such source code may be obtained at
+<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
+
+</BODY>
+</HTML>
@@ -1,6 +0,0 @@
-This bundle was last used in WTP 3.1.
-
-In WTP 3.2 the function was essentially moved to server.discovery
-bundles where p2 is used to get/install server adapters.
-
-
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 2006 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
+###############################################################################
+bin.includes = META-INF/,\
+ .,\
+ plugin.xml,\
+ about.html,\
+ plugin.properties
+src.includes = build.properties
@@ -0,0 +1,11 @@
+##################################################################################################
+# 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=Installable server adapters
+providerName=Eclipse.org
+pluginDescription=Provides installable server adapters
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+ <extension point="org.eclipse.wst.server.core.installableServers">
+ <installableServer
+ id="org.apache.geronimo.generic.runtime.10"
+ featureId="org.apache.geronimo.feature"
+ featureVersion="1.2.0"
+ featureSite="http://www.apache.org/dist/geronimo/eclipse/updates/"/>
+ <installableServer
+ id="org.apache.geronimo.generic.runtime.10"
+ featureId="com.ibm.websphere.ce.feature"
+ featureVersion="1.1.0"
+ featureSite="http://download.boulder.ibm.com/ibmdl/pub/software/websphere/wasce/updates/"/>
+ <installableServer
+ id="com.pramati"
+ featureId="com.pramati.eclipse.feature"
+ featureVersion="1.0.0"
+ featureSite="http://www.pramati.com/downloads/eclipse/updates/"/>
+ </extension>
+</plugin>
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.internet.monitor.ui; singleton:=true
-Bundle-Version: 1.0.506.qualifier
+Bundle-Version: 1.0.507.qualifier
Bundle-Activator: org.eclipse.wst.internet.monitor.ui.internal.MonitorUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -13,6 +13,6 @@ Export-Package: org.eclipse.wst.internet.monitor.ui.internal;x-internal:=true,
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.internet.monitor.core;bundle-version="[1.0.103,1.1.0)"
+ org.eclipse.wst.internet.monitor.core;bundle-version="[1.0.103,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -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.1.302.qualifier
+Bundle-Version: 1.1.303.qualifier
Bundle-Activator: org.eclipse.wst.server.core.internal.ServerPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -18,6 +18,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.update.core;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
- org.eclipse.wst.common.core;bundle-version="1.2.0"
+ org.eclipse.wst.common.core;bundle-version="[1.2.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -407,8 +407,8 @@ public static int setRuntimeDefaultName(IRuntimeWorkingCopy runtime, int suffix)
}
while (ServerPlugin.isNameInUse(runtime.getOriginal(), name)) {
- suffix++;
name = NLS.bind(Messages.defaultRuntimeName2, new String[] { typeName, suffix + "" });
+ suffix++;
}
runtime.setName(name);
return suffix;
@@ -399,11 +399,12 @@ protected void shutdownImpl() {
return;
}
- if (resourceChangeListener != null) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- if (workspace != null)
- workspace.removeResourceChangeListener(resourceChangeListener);
-
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ if (workspace != null && resourceChangeListener != null) {
+ workspace.removeResourceChangeListener(resourceChangeListener);
+ }
+
+ if (pcl != null) {
ServerPlugin.getInstance().getPluginPreferences().removePropertyChangeListener(pcl);
}
@@ -2322,8 +2322,6 @@ protected void setInternal(ServerWorkingCopy wc) {
//serverState = wc.serverState;
delegate = wc.delegate;
- if (getServerState() == IServer.STATE_STARTED)
- autoPublish();
}
protected void saveState(IMemento memento) {
@@ -447,6 +447,9 @@ public IServer save(boolean force, IProgressMonitor monitor) throws CoreExceptio
getWorkingCopyDelegate(monitor).saveConfiguration(monitor);
wch.setDirty(false);
+ if (getServerState() == IServer.STATE_STARTED)
+ autoPublish();
+
return server;
}
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.server.ui; singleton:=true
-Bundle-Version: 1.1.305.qualifier
+Bundle-Version: 1.1.306.qualifier
Bundle-Activator: org.eclipse.wst.server.ui.internal.ServerUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -39,6 +39,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.internet.monitor.core;bundle-version="[1.0.103,2.0.0)",
org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
- org.eclipse.ui.navigator;bundle-version="3.3.100"
+ org.eclipse.ui.navigator;bundle-version="[3.3.100,4.0.0)"
Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.wst.server.ui.internal.webbrowser"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -23,6 +23,7 @@
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.part.EditorPart;
import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.ui.internal.Trace;
import org.eclipse.wst.server.ui.internal.editor.*;
/**
* An abstract server editor which implements the most common methods
@@ -303,7 +304,13 @@ public void insertSections(Composite parent, String id) {
Iterator iterator = getSections(id).iterator();
while (iterator.hasNext()) {
ServerEditorSection section = (ServerEditorSection) iterator.next();
- section.createSection(parent);
+ try {
+ section.createSection(parent);
+ } catch (RuntimeException e) {
+ if (Trace.SEVERE) {
+ Trace.trace(Trace.STRING_SEVERE, "Failed to insert editor section: " + id + "\n" + e.getLocalizedMessage(), e);
+ }
+ }
}
}
Oops, something went wrong.

0 comments on commit bd63394

Please sign in to comment.