Permalink
Browse files

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

  • Loading branch information...
3 parents 5978bb9 + 636efbb + 4d8d3e3 commit 591395acea1962bf4ad46c059e9b3b4cb4d14ab1 ndai committed Oct 19, 2006
Showing with 336 additions and 2,238 deletions.
  1. +1 −1 features/org.eclipse.jst.server_adapters.feature/feature.xml
  2. +1 −1 features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/feature.xml
  3. +1 −1 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. +1 −1 features/org.eclipse.jst.server_tests.feature/feature.xml
  7. +1 −1 features/org.eclipse.jst.server_ui.feature/feature.xml
  8. +1 −1 features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/feature.xml
  9. +1 −1 features/org.eclipse.jst.server_userdoc.feature/feature.xml
  10. +1 −1 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. +1 −1 features/org.eclipse.wst.server_tests.feature/feature.xml
  14. +1 −1 features/org.eclipse.wst.server_ui.feature/feature.xml
  15. +1 −1 features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/feature.xml
  16. +1 −1 features/org.eclipse.wst.server_userdoc.feature/feature.xml
  17. +5 −6 plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
  18. +0 −1 plugins/org.eclipse.jst.server.generic.core/plugin.properties
  19. +0 −1 plugins/org.eclipse.jst.server.generic.core/plugin.xml
  20. +0 −120 plugins/org.eclipse.jst.server.generic.core/schema/runtimedefinition.exsd
  21. +30 −41 ...lipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
  22. +28 −23 ....server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerBehaviour.java
  23. +21 −78 ...er.generic.core/src/org/eclipse/jst/server/generic/core/internal/ServerTypeDefinitionManager.java
  24. +1 −10 ...server.generic.core/src/org/eclipse/jst/server/generic/internal/core/util/ExtensionPointUtil.java
  25. +0 −117 ...er.generic.core/src/org/eclipse/jst/server/generic/internal/core/util/ServerRuntimeMergeUtil.java
  26. +23 −31 ...org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/Resolver.java
  27. +20 −74 ...org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLUtils.java
  28. +0 −5 plugins/org.eclipse.jst.server.generic.modules/.cvsignore
  29. +0 −28 plugins/org.eclipse.jst.server.generic.modules/.project
  30. +3 −4 plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
  31. +1 −9 plugins/org.eclipse.jst.server.generic.ui/plugin.xml
  32. +1 −1 ...generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericLaunchConfigurationTabGroup.java
  33. +3 −3 ...generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java
  34. +1 −4 ...jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java
  35. +0 −3 ...rver.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties
  36. +7 −8 ...server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java
  37. +3 −8 ...eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericUiPlugin.java
  38. +2 −2 ...server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/InstallableRuntimeDecorator.java
  39. +1 −1 ...ipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/JRESelectDecorator.java
  40. +12 −305 ...ins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/SWTUtil.java
  41. +0 −14 ...ic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerDefinitionTypeAwareWizardFragment.java
  42. +158 −20 ...rver.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
  43. +0 −204 ...neric.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/ServerPropertiesEditorSection.java
  44. +0 −61 ...neric.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/UpdateServerPropertyOperation.java
  45. +0 −7 plugins/org.eclipse.jst.server.pde/.classpath
  46. +0 −2 plugins/org.eclipse.jst.server.pde/.cvsignore
  47. +0 −28 plugins/org.eclipse.jst.server.pde/.project
  48. +0 −13 plugins/org.eclipse.jst.server.pde/META-INF/MANIFEST.MF
  49. +0 −34 plugins/org.eclipse.jst.server.pde/about.html
  50. +0 −19 plugins/org.eclipse.jst.server.pde/build.properties
  51. +0 −266 plugins/org.eclipse.jst.server.pde/build.xml
  52. BIN plugins/org.eclipse.jst.server.pde/icons/obj16/wiz_new_server_plugin.gif
  53. +0 −24 plugins/org.eclipse.jst.server.pde/plugin.properties
  54. +0 −22 plugins/org.eclipse.jst.server.pde/plugin.xml
  55. +0 −63 plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/ServerPdePlugin.java
  56. +0 −31 ....jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerPluginNewWizard.java
  57. +0 −285 ...eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerTemplate.java
  58. +0 −44 plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/Messages.java
  59. +0 −19 ...ns/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/messages.properties
  60. +0 −41 plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/buildfiles/$server_name$.xml
  61. BIN plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/icons/server.gif
  62. +0 −142 plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/servers/$server_name$.serverdef
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_adapters.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_adapters.feature.source"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_core.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_core.feature.source"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_sdk.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_tests.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.1.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_ui.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.1.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_ui.feature.source"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.1.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_userdoc.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.1.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_core.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_core.feature.source"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_sdk.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_tests.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.1.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_ui.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_ui.feature.source"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_userdoc.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.1.qualifier"
provider-name="%providerName">
<description>
@@ -18,15 +18,14 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
+ org.eclipse.jdt.launching;visibility:="reexport";bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.server.core;bundle-version="[1.0.102,1.2.0)",
org.eclipse.jst.server.core;bundle-version="[1.0.102,1.2.0)",
- org.eclipse.ant.ui;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
- org.eclipse.emf.common;bundle-version="[2.2.0,2.3.0)";visibility:=reexport,
+ org.eclipse.ant.ui;resolution:="optional";bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.common;visibility:="reexport";bundle-version="[2.2.0,2.3.0)",
org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.ui.externaltools;bundle-version="[3.1.100,3.3.0)";resolution:=optional,
+ org.eclipse.ui.externaltools;resolution:="optional";bundle-version="[3.1.100,3.3.0)",
org.apache.ant;bundle-version="[1.6.5,1.7.0)",
- org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
- org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)"
+ org.eclipse.debug.ui;resolution:="optional";bundle-version="[3.2.0,4.0.0)"
Eclipse-LazyStart: true
@@ -14,7 +14,6 @@ pluginDescription=Provides generic server tools with easy to develop meta data c
externalLaunchConfigurationTypeName=Generic Server(External Launch)
launchConfigurationTypeName=Generic Server
extensionPointServerdefinition=Server definition
-extensionPointRuntimedefinition=Runtime definition
extensionPointGenericpublisher=Generic Publisher
# ====================================================================
@@ -3,7 +3,6 @@
<plugin>
<extension-point id="serverdefinition" name="%extensionPointServerdefinition" schema="schema/serverdefinition.exsd"/>
- <extension-point id="runtimedefinition" name="%extensionPointRuntimedefinition" schema="schema/runtimedefinition.exsd"/>
<extension-point id="genericpublisher" name="%extensionPointGenericpublisher" schema="schema/genericpublisher.exsd"/>
<extension point="org.eclipse.debug.core.launchConfigurationTypes">
@@ -1,120 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.server.generic.core">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.server.generic.core" id="runtimedefinition" name="Runtime Definition"/>
- </appInfo>
- <documentation>
- This extension point defines a new generic server runtime definition file.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="runtimedefinition" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="runtimedefinition">
- <complexType>
- <sequence>
- </sequence>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- runtime id
- </documentation>
- </annotation>
- </attribute>
- <attribute name="definitionfile" type="string" use="required">
- <annotation>
- <documentation>
- location of the generic server runtime definition file
- </documentation>
- <appInfo>
- <meta.attribute kind="resource"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 2.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- &lt;pre&gt;
-&lt;extension point=&quot;org.eclipse.jst.server.generic.core.runtimedefinition&quot;&gt;
- &lt;runtimedefinition id=&quot;org.eclipse.jst.server.generic.runtime.jonas4&quot; definitionfile=&quot;/runtimes/jonas.runtimedef&quot;&gt;
- &lt;/runtimedefinition&gt;
-&lt;/extension&gt;
-&lt;/pre&gt;
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2006 Cape Clear Software. 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
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
- </documentation>
- </annotation>
-
-</schema>
Oops, something went wrong.

0 comments on commit 591395a

Please sign in to comment.