Permalink
Browse files

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

  • Loading branch information...
4 parents 537eabb + d177e0b + e049961 + 21d6c4e commit 4559fb5ad4972e65deb04893db9cdeeeb8cbe83a ndai committed Feb 15, 2008
Showing with 763 additions and 2,289 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. +2 −2 features/org.eclipse.jst.server_adapters.sdk.feature/feature.xml
  4. +1 −1 features/org.eclipse.jst.server_core.feature/feature.xml
  5. +1 −1 features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/feature.xml
  6. +2 −2 features/org.eclipse.jst.server_sdk.feature/feature.xml
  7. +1 −1 features/org.eclipse.jst.server_tests.feature/feature.xml
  8. +1 −1 features/org.eclipse.jst.server_ui.feature/feature.xml
  9. +1 −1 features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/feature.xml
  10. +1 −1 features/org.eclipse.jst.server_userdoc.feature/feature.xml
  11. +1 −1 features/org.eclipse.wst.server_adapters.feature/feature.xml
  12. +1 −1 features/org.eclipse.wst.server_adapters.feature/sourceTemplateFeature/feature.xml
  13. +1 −1 features/org.eclipse.wst.server_adapters.sdk.feature/feature.xml
  14. +0 −17 features/org.eclipse.wst.server_core.feature.patch/.project
  15. +0 −10 features/org.eclipse.wst.server_core.feature.patch/build.properties
  16. +0 −151 features/org.eclipse.wst.server_core.feature.patch/build.xml
  17. BIN features/org.eclipse.wst.server_core.feature.patch/eclipse_update_120.jpg
  18. +0 −328 features/org.eclipse.wst.server_core.feature.patch/epl-v10.html
  19. +0 −150 features/org.eclipse.wst.server_core.feature.patch/feature.properties
  20. +0 −31 features/org.eclipse.wst.server_core.feature.patch/feature.xml
  21. +0 −93 features/org.eclipse.wst.server_core.feature.patch/license.html
  22. +1 −1 features/org.eclipse.wst.server_core.feature/feature.xml
  23. +1 −1 features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/feature.xml
  24. +1 −1 features/org.eclipse.wst.server_sdk.feature/feature.xml
  25. +1 −1 features/org.eclipse.wst.server_tests.feature/feature.xml
  26. +1 −1 features/org.eclipse.wst.server_ui.feature/feature.xml
  27. +1 −1 features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/feature.xml
  28. +1 −1 features/org.eclipse.wst.server_userdoc.feature/feature.xml
  29. +1 −1 plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF
  30. +1 −1 ...eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JRERuntimeComponentProvider.java
  31. +7 −0 plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Trace.java
  32. +1 −1 plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
  33. +3 −3 plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF
  34. +1 −1 plugins/org.eclipse.jst.server.generic.jboss/plugin.xml
  35. +3 −3 plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF
  36. +1 −1 plugins/org.eclipse.jst.server.generic.jonas/servers/jonas.serverdef
  37. +0 −5 plugins/org.eclipse.jst.server.generic.modules/.cvsignore
  38. +0 −28 plugins/org.eclipse.jst.server.generic.modules/.project
  39. +3 −3 plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF
  40. +1 −1 plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
  41. +4 −4 ...generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java
  42. +2 −2 ...server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java
  43. +20 −2 ...ipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/JRESelectDecorator.java
  44. +7 −1 ...rver.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.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
  63. +1 −1 plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF
  64. +12 −3 ...t.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PingThread.java
  65. +4 −3 .../src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
  66. +0 −8 plugins/org.eclipse.jst.server.preview/.cvsignore
  67. +0 −7 plugins/org.eclipse.jst.server.preview/.options
  68. +0 −28 plugins/org.eclipse.jst.server.preview/.project
  69. +0 −3 plugins/org.eclipse.jst.server.preview/.settings/org.eclipse.core.resources.prefs
  70. +0 −74 plugins/org.eclipse.jst.server.preview/.settings/org.eclipse.jdt.core.prefs
  71. +0 −4 plugins/org.eclipse.jst.server.preview/.settings/org.eclipse.jdt.ui.prefs
  72. +0 −14 plugins/org.eclipse.jst.server.preview/.settings/org.eclipse.pde.prefs
  73. +1 −1 plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
  74. +35 −5 ...ver.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Configuration.java
  75. +37 −5 ...ver.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55Configuration.java
  76. +38 −5 ...ver.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat60Configuration.java
  77. +2 −2 ...e.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServer.java
  78. +2 −5 ...rnet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/custom/SashFormLayout.java
  79. +8 −1 ...rnet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/viewers/BrowserViewer.java
  80. +5 −4 ...ternet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/viewers/ImageViewer.java
  81. +27 −30 ...internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/viewers/XMLViewer.java
  82. +1 −1 plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
  83. +2 −2 ...rg.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ModulePublishInfo.java
  84. +69 −57 .../org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java
  85. +4 −4 plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
  86. +48 −0 ...ns/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/StopServerJob.java
  87. +7 −1 plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Trace.java
  88. +1 −1 ....core/servercore/org/eclipse/wst/server/core/internal/facets/RuntimeComponentProviderWrapper.java
  89. +1 −1 plugins/org.eclipse.wst.server.preview.adapter/META-INF/MANIFEST.MF
  90. +10 −1 ...t.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PingThread.java
  91. +44 −10 .../src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
  92. +1 −1 plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
  93. +1 −1 ...ns/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPreferences.java
  94. +13 −2 ....wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/actions/RunOnServerActionDelegate.java
  95. +54 −27 ...pse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServerTableViewer.java
  96. +34 −0 ...g.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/StartAction.java
  97. +5 −14 ...rg.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/StopAction.java
  98. +111 −2 ...clipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/DefaultViewerSorter.java
  99. +8 −0 ...rver.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/fragment/NewRuntimeWizardFragment.java
  100. +7 −3 ...wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/ModifyModulesComposite.java
  101. +33 −1 ...t.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java
  102. +60 −58 ...pse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_adapters.feature"
label="%featureName"
- version="2.0.0.qualifier"
+ version="2.0.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_adapters.feature.source"
label="%featureName"
- version="2.0.0.qualifier"
+ version="2.0.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_adapters.sdk.feature"
label="%featureName"
- version="2.0.0.qualifier"
+ version="2.0.2.qualifier"
provider-name="%providerName">
<description>
@@ -28,5 +28,5 @@
<includes
id="org.eclipse.jst.server_adapters.feature.source"
version="0.0.0"/>
-
+
</feature>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_core.feature"
label="%featureName"
- version="2.0.0.qualifier"
+ version="2.0.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_core.feature.source"
label="%featureName"
- version="2.0.0.qualifier"
+ version="2.0.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_sdk.feature"
label="%featureName"
- version="2.0.0.qualifier"
+ version="2.0.2.qualifier"
provider-name="%providerName">
<description>
@@ -28,5 +28,5 @@
<includes
id="org.eclipse.jst.server_ui.feature.source"
version="0.0.0"/>
-
+
</feature>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_tests.feature"
label="%featureName"
- version="2.0.0.qualifier"
+ version="2.0.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_ui.feature"
label="%featureName"
- version="2.0.0.qualifier"
+ version="2.0.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_ui.feature.source"
label="%featureName"
- version="2.0.0.qualifier"
+ version="2.0.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_userdoc.feature"
label="%featureName"
- version="2.0.0.qualifier"
+ version="2.0.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_adapters.feature"
label="%featureName"
- version="2.0.0.qualifier"
+ version="2.0.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_adapters.feature.source"
label="%featureName"
- version="2.0.0.qualifier"
+ version="2.0.2.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_adapters.sdk.feature"
label="%featureName"
- version="2.0.0.qualifier"
+ version="2.0.2.qualifier"
provider-name="%providerName">
<description>
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.server_core.feature.patch</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
@@ -1,10 +0,0 @@
-bin.includes = feature.xml,\
- license.html,\
- feature.properties,\
- epl-v10.html,\
- eclipse_update_120.jpg
-src.includes = license.html,\
- feature.xml,\
- feature.properties,\
- epl-v10.html,\
- eclipse_update_120.jpg
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.wst.server_core.feature.patch" default="build.update.jar" basedir=".">
-
- <target name="init">
- <property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/>
- <property name="feature.destination" value="${basedir}"/>
- </target>
-
- <target name="all.plugins" depends="init">
- <ant antfile="build.xml" dir="../org.eclipse.wst.server.core" target="${target}">
- </ant>
- </target>
- <target name="all.features" depends="init">
- </target>
- <target name="update.feature" depends="init">
- </target>
-
- <target name="all.children" depends="init,all.features,all.plugins,update.feature">
- </target>
-
- <target name="children" if="include.children">
- <antcall target="all.children"/>
- </target>
-
- <target name="build.jars" depends="init" description="Build all the jars for the feature: org.eclipse.wst.server_core.feature.patch.">
- <antcall target="all.children">
- <param name="target" value="build.jars"/>
- </antcall>
- </target>
-
- <target name="build.sources" depends="init">
- <antcall target="all.children">
- <param name="target" value="build.sources"/>
- </antcall>
- </target>
-
- <target name="build.zips" depends="init">
- <antcall target="all.children">
- <param name="target" value="build.zips"/>
- </antcall>
- </target>
-
- <target name="build.update.jar" depends="init" description="Build the feature jar of: org.eclipse.wst.server_core.feature.patch for an update site.">
- <antcall target="all.children">
- <param name="target" value="build.update.jar"/>
- </antcall>
- <property name="feature.base" value="${feature.temp.folder}"/>
- <delete dir="${feature.temp.folder}"/>
- <mkdir dir="${feature.temp.folder}"/>
- <antcall target="gather.bin.parts" inheritAll="false">
- <param name="nl" value="*"/>
- <param name="arch" value="*"/>
- <param name="os" value="*"/>
- <param name="ws" value="*"/>
- <param name="feature.base" value="${feature.temp.folder}"/>
- </antcall>
- <jar destfile="${feature.destination}/org.eclipse.wst.server_core.feature.patch_1.0.0.200705241442.jar" basedir="${feature.temp.folder}/features/org.eclipse.wst.server_core.feature.patch_1.0.0.200705241442"/>
- <delete dir="${feature.temp.folder}"/>
- </target>
-
- <target name="gather.bin.parts" depends="init" if="feature.base">
- <mkdir dir="${feature.base}/features/org.eclipse.wst.server_core.feature.patch_1.0.0.200705241442"/>
- <antcall target="children">
- <param name="target" value="gather.bin.parts"/>
- <param name="destination.temp.folder" value="${feature.base}/plugins"/>
- </antcall>
- <copy todir="${feature.base}/features/org.eclipse.wst.server_core.feature.patch_1.0.0.200705241442" failonerror="true" overwrite="false">
- <fileset dir="${basedir}" includes="feature.xml,license.html,feature.properties,epl-v10.html,eclipse_update_120.jpg" />
- </copy>
- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.wst.server_core.feature.patch_1.0.0.200705241442/feature.xml" selfVersion="1.0.0.200705241442" featureIds="" pluginIds="org.eclipse.wst.server.core,1.0.107.200705241442,"/>
- <antcall target="rootFiles${os}_${ws}_${arch}"/>
- </target>
- <target name="rootFiles*_*_*">
- </target>
- <target name="rootFilesgroup_group_group">
- <antcall target="rootFiles*_*_*"/>
- </target>
-
- <target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: org.eclipse.wst.server_core.feature.patch.">
- <delete dir="${feature.temp.folder}"/>
- <mkdir dir="${feature.temp.folder}"/>
- <antcall target="gather.bin.parts">
- <param name="nl" value="*"/>
- <param name="arch" value="*"/>
- <param name="include.children" value="true"/>
- <param name="os" value="*"/>
- <param name="ws" value="*"/>
- <param name="feature.base" value="${feature.temp.folder}"/>
- </antcall>
- <zip destfile="${feature.destination}/org.eclipse.wst.server_core.feature.patch_1.0.0.200705241442.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
- <delete dir="${feature.temp.folder}"/>
- </target>
-
- <target name="zip.sources" depends="init">
- <delete dir="${feature.temp.folder}"/>
- <mkdir dir="${feature.temp.folder}"/>
- <antcall target="all.children">
- <param name="include.children" value="true"/>
- <param name="target" value="gather.sources"/>
- <param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.wst.server_core.feature.patch.source_1.0.0.200705241442/src"/>
- </antcall>
- <zip destfile="${feature.destination}/org.eclipse.wst.server_core.feature.patch_1.0.0.200705241442.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
- <delete dir="${feature.temp.folder}"/>
- </target>
-
- <target name="zip.logs" depends="init">
- <delete dir="${feature.temp.folder}"/>
- <mkdir dir="${feature.temp.folder}"/>
- <antcall target="all.children" inheritAll="false">
- <param name="include.children" value="true"/>
- <param name="target" value="gather.logs"/>
- <param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
- </antcall>
- <zip destfile="${feature.destination}/org.eclipse.wst.server_core.feature.patch_1.0.0.200705241442.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
- <delete dir="${feature.temp.folder}"/>
- </target>
-
- <target name="clean" depends="init" description="Clean the feature: org.eclipse.wst.server_core.feature.patch of all the zips, jars and logs created.">
- <delete file="${feature.destination}/org.eclipse.wst.server_core.feature.patch_1.0.0.200705241442.jar"/>
- <delete file="${feature.destination}/org.eclipse.wst.server_core.feature.patch_1.0.0.200705241442.bin.dist.zip"/>
- <delete file="${feature.destination}/org.eclipse.wst.server_core.feature.patch_1.0.0.200705241442.log.zip"/>
- <delete file="${feature.destination}/org.eclipse.wst.server_core.feature.patch_1.0.0.200705241442.src.zip"/>
- <delete dir="${feature.temp.folder}"/>
- <antcall target="all.children">
- <param name="target" value="clean"/>
- </antcall>
- </target>
-
- <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
- <eclipse.convertPath fileSystemPath="D:/builds/Workspaces/WTP15maintenance/org.eclipse.wst.server_core.feature.patch/" property="resourcePath"/>
- <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
- <antcall target="all.children">
- <param name="target" value="refresh"/>
- </antcall>
- </target>
- <target name="gather.sources">
- <antcall target="children">
- <param name="target" value="gather.sources"/>
- <param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.wst.server_core.feature.patch.source_1.0.0.200705241442/src"/>
- </antcall>
- </target>
-
- <target name="gather.logs" depends="init">
- <mkdir dir="${feature.temp.folder}"/>
- <antcall target="all.children" inheritAll="false">
- <param name="target" value="gather.logs"/>
- <param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
- </antcall>
- </target>
-
-</project>
Oops, something went wrong.

0 comments on commit 4559fb5

Please sign in to comment.