Skip to content
Browse files

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

  • Loading branch information...
2 parents 479ecba + c1e240a commit 1a46c0c5fc86ec726effb01a03e93ab8253e3f63 ndai committed Oct 27, 2005
Showing with 27 additions and 9,701 deletions.
  1. +0 −17 features/org.eclipse.wst.server_core.feature/.project
  2. +0 −1 features/org.eclipse.wst.server_core.feature/build.properties
  3. +0 −151 features/org.eclipse.wst.server_core.feature/build.xml
  4. +0 −41 features/org.eclipse.wst.server_core.feature/feature.xml
  5. +0 −17 features/org.eclipse.wst.server_sdk.feature/.project
  6. +0 −3 features/org.eclipse.wst.server_sdk.feature/build.properties
  7. +0 −29 features/org.eclipse.wst.server_sdk.feature/feature.xml
  8. +0 −1 features/org.eclipse.wst.server_tests.feature/.cvsignore
  9. +0 −17 features/org.eclipse.wst.server_tests.feature/.project
  10. +0 −1 features/org.eclipse.wst.server_tests.feature/build.properties
  11. +0 −54 features/org.eclipse.wst.server_tests.feature/feature.xml
  12. +0 −1 features/org.eclipse.wst.server_ui.feature/.cvsignore
  13. +0 −17 features/org.eclipse.wst.server_ui.feature/.project
  14. +0 −1 features/org.eclipse.wst.server_ui.feature/build.properties
  15. +0 −49 features/org.eclipse.wst.server_ui.feature/feature.xml
  16. +0 −27 features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/about.html
  17. +0 −31 features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/about.ini
  18. +0 −6 features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/about.mappings
  19. +0 −26 features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/about.properties
  20. +0 −29 features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/build.properties
  21. BIN features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/eclipse32.gif
  22. BIN features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/eclipse32.png
  23. +0 −12 features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/plugin.properties
  24. +0 −1 features/org.eclipse.wst.server_userdoc.feature/.cvsignore
  25. +0 −17 features/org.eclipse.wst.server_userdoc.feature/.project
  26. +0 −1 features/org.eclipse.wst.server_userdoc.feature/build.properties
  27. +0 −25 features/org.eclipse.wst.server_userdoc.feature/feature.xml
  28. +25 −2 ...lipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
  29. +1 −0 ...server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/AntPublisher.java
  30. +1 −1 ...rver.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/ModulePackager.java
  31. +0 −5 plugins/org.eclipse.jst.server.generic.modules/.cvsignore
  32. +0 −28 plugins/org.eclipse.jst.server.generic.modules/.project
  33. +0 −7 plugins/org.eclipse.jst.server.generic.ui/.classpath
  34. +0 −5 plugins/org.eclipse.jst.server.generic.ui/.cvsignore
  35. +0 −28 plugins/org.eclipse.jst.server.generic.ui/.project
  36. +0 −19 plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
  37. +0 −22 plugins/org.eclipse.jst.server.generic.ui/about.html
  38. +0 −9 plugins/org.eclipse.jst.server.generic.ui/build.properties
  39. BIN plugins/org.eclipse.jst.server.generic.ui/icons/obj16/server.gif
  40. BIN plugins/org.eclipse.jst.server.generic.ui/icons/wizban/new_server_wiz.gif
  41. +0 −4 plugins/org.eclipse.jst.server.generic.ui/plugin.properties
  42. +0 −30 plugins/org.eclipse.jst.server.generic.ui/plugin.xml
  43. +0 −94 ...generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericLaunchConfigurationTabGroup.java
  44. +0 −25 ....jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerComposite.java
  45. +0 −22 ...er.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerCompositeDecorator.java
  46. +0 −171 ...generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java
  47. +0 −29 ...jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java
  48. +0 −11 ...rver.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties
  49. +0 −163 ...server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java
  50. +0 −114 ...eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericUiPlugin.java
  51. +0 −131 ...ipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/JRESelectDecorator.java
  52. +0 −89 ...ins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/SWTUtil.java
  53. +0 −74 ...ic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerDefinitionTypeAwareWizardFragment.java
  54. +0 −295 ...rver.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
  55. +0 −44 ...neric.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionRuntimeDecorator.java
  56. +0 −70 ...eneric.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionServerDecorator.java
  57. +0 −7 plugins/org.eclipse.jst.server.pde/.classpath
  58. +0 −2 plugins/org.eclipse.jst.server.pde/.cvsignore
  59. +0 −28 plugins/org.eclipse.jst.server.pde/.project
  60. +0 −13 plugins/org.eclipse.jst.server.pde/META-INF/MANIFEST.MF
  61. +0 −22 plugins/org.eclipse.jst.server.pde/about.html
  62. +0 −10 plugins/org.eclipse.jst.server.pde/build.properties
  63. +0 −266 plugins/org.eclipse.jst.server.pde/build.xml
  64. BIN plugins/org.eclipse.jst.server.pde/icons/obj16/wiz_new_server_plugin.gif
  65. +0 −15 plugins/org.eclipse.jst.server.pde/plugin.properties
  66. +0 −22 plugins/org.eclipse.jst.server.pde/plugin.xml
  67. +0 −54 plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/ServerPdePlugin.java
  68. +0 −22 ....jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerPluginNewWizard.java
  69. +0 −276 ...eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerTemplate.java
  70. +0 −35 plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/Messages.java
  71. +0 −10 ...ns/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/messages.properties
  72. +0 −41 plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/buildfiles/$server_name$.xml
  73. BIN plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/icons/server.gif
  74. +0 −142 plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/servers/$server_name$.serverdef
  75. +0 −7 plugins/org.eclipse.jst.server.tomcat.ui/.classpath
  76. +0 −6 plugins/org.eclipse.jst.server.tomcat.ui/.cvsignore
  77. +0 −4 plugins/org.eclipse.jst.server.tomcat.ui/.options
  78. +0 −28 plugins/org.eclipse.jst.server.tomcat.ui/.project
  79. +0 −23 plugins/org.eclipse.jst.server.tomcat.ui/META-INF/MANIFEST.MF
  80. +0 −22 plugins/org.eclipse.jst.server.tomcat.ui/about.html
  81. +0 −20 plugins/org.eclipse.jst.server.tomcat.ui/build.properties
  82. BIN plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/mime_extension.gif
  83. BIN plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/mime_mapping.gif
  84. BIN plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/port.gif
  85. BIN plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/project_missing.gif
  86. BIN plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/tomcat.gif
  87. BIN plugins/org.eclipse.jst.server.tomcat.ui/icons/obj16/web_module.gif
  88. BIN plugins/org.eclipse.jst.server.tomcat.ui/icons/wizban/tomcat_wiz.gif
  89. +0 −14 plugins/org.eclipse.jst.server.tomcat.ui/plugin.properties
  90. +0 −140 plugins/org.eclipse.jst.server.tomcat.ui/plugin.xml
  91. +0 −35 ...ver.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/ConfigurationPropertyTester.java
  92. +0 −48 ...g.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/ContextIds.java
  93. +0 −69 ...org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/Messages.java
  94. +0 −78 ...lipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/Messages.properties
  95. +0 −62 .../org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/SWTUtil.java
  96. +0 −42 ...mcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatLaunchConfigurationTabGroup.java
  97. +0 −285 ...t.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatRuntimeComposite.java
  98. +0 −66 ...ver.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatRuntimeWizardFragment.java
  99. +0 −134 ...lipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatUIPlugin.java
  100. +0 −54 ...ns/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/Trace.java
  101. +0 −426 ....ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationMimeEditorSection.java
  102. +0 −248 ....ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationPortEditorSection.java
  103. +0 −396 ...i/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationWebModuleEditorPart.java
  104. +0 −155 ...server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/MimeMappingDialog.java
  105. +0 −203 ...mcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ServerGeneralEditorSection.java
  106. +0 −280 ...t.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/WebModuleDialog.java
  107. +0 −7 plugins/org.eclipse.jst.server.ui/.classpath
  108. +0 −6 plugins/org.eclipse.jst.server.ui/.cvsignore
  109. +0 −4 plugins/org.eclipse.jst.server.ui/.options
  110. +0 −28 plugins/org.eclipse.jst.server.ui/.project
  111. +0 −25 plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF
  112. +0 −22 plugins/org.eclipse.jst.server.ui/about.html
  113. +0 −21 plugins/org.eclipse.jst.server.ui/build.properties
  114. BIN plugins/org.eclipse.jst.server.ui/icons/obj16/appclient_module.gif
  115. BIN plugins/org.eclipse.jst.server.ui/icons/obj16/ear.gif
  116. BIN plugins/org.eclipse.jst.server.ui/icons/obj16/ejb_module.gif
  117. BIN plugins/org.eclipse.jst.server.ui/icons/obj16/java_jar.gif
  118. BIN plugins/org.eclipse.jst.server.ui/icons/obj16/new_testcase.gif
  119. BIN plugins/org.eclipse.jst.server.ui/icons/obj16/web_module.gif
  120. BIN plugins/org.eclipse.jst.server.ui/icons/wizban/new_runtime_wiz.gif
  121. BIN plugins/org.eclipse.jst.server.ui/icons/wizban/new_test_wiz.gif
  122. +0 −15 plugins/org.eclipse.jst.server.ui/plugin.properties
  123. +0 −100 plugins/org.eclipse.jst.server.ui/plugin.xml
  124. +0 −17 plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/internal/ContextIds.java
  125. +0 −267 ...org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/internal/GenericRuntimeComposite.java
  126. +0 −68 ...clipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/internal/GenericRuntimeWizardFragment.java
  127. +0 −124 plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/internal/ImageResource.java
  128. +0 −80 plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/internal/JavaServerUIPlugin.java
  129. +0 −44 plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/internal/Messages.java
  130. +0 −34 plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/internal/Messages.properties
  131. +0 −54 ...ns/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/internal/RuntimeLabelProvider.java
  132. +0 −62 plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/internal/SWTUtil.java
  133. +0 −58 ...rg.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/internal/StandardJreLabelProvider.java
  134. +0 −53 plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/internal/Trace.java
  135. +0 −175 ....eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/internal/cactus/JUnitClientDelegate.java
  136. +0 −208 ...pse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/internal/cactus/NewServletTestCaseWizard.java
  137. +0 −7 plugins/org.eclipse.jst.server.websphere.core/.classpath
  138. +0 −4 plugins/org.eclipse.jst.server.websphere.core/.cvsignore
  139. +0 −28 plugins/org.eclipse.jst.server.websphere.core/.project
  140. +0 −27 plugins/org.eclipse.jst.server.websphere.core/META-INF/MANIFEST.MF
  141. +0 −22 plugins/org.eclipse.jst.server.websphere.core/about.html
  142. +0 −10 plugins/org.eclipse.jst.server.websphere.core/build.properties
  143. BIN plugins/org.eclipse.jst.server.websphere.core/icons/obj16/websphere.gif
  144. +0 −19 plugins/org.eclipse.jst.server.websphere.core/plugin.properties
  145. +0 −123 plugins/org.eclipse.jst.server.websphere.core/plugin.xml
  146. +0 −118 plugins/org.eclipse.jst.server.websphere.core/serverdef/scripts/websphere.6.x.xml
  147. +0 −123 plugins/org.eclipse.jst.server.websphere.core/serverdef/websphere.6.serverdef
  148. +0 −14 ...org.eclipse.jst.server.websphere.core/src/org/eclipse/jst/server/websphere/core/AntPublisher.java
  149. +0 −58 ...s/org.eclipse.jst.server.websphere.core/src/org/eclipse/jst/server/websphere/core/CorePlugin.java
  150. +0 −7 plugins/org.eclipse.wst.internet.monitor.core/.classpath
  151. +0 −6 plugins/org.eclipse.wst.internet.monitor.core/.cvsignore
  152. +0 −6 plugins/org.eclipse.wst.internet.monitor.core/.options
  153. +0 −28 plugins/org.eclipse.wst.internet.monitor.core/.project
  154. +0 −13 plugins/org.eclipse.wst.internet.monitor.core/META-INF/MANIFEST.MF
  155. +0 −22 plugins/org.eclipse.wst.internet.monitor.core/about.html
  156. +0 −23 plugins/org.eclipse.wst.internet.monitor.core/build.properties
  157. +0 −8 plugins/org.eclipse.wst.internet.monitor.core/component.xml
  158. +0 −166 ...nternet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/AcceptThread.java
  159. +0 −50 ....internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/Connection.java
  160. +0 −79 ...ternet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ContentFilter.java
  161. +0 −62 ...nitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/FailedConnectionThread.java
  162. +0 −67 ...ernet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IContentFilter.java
  163. +0 −194 ...st.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IMemento.java
  164. +0 −57 ...net.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IProtocolAdapter.java
  165. +0 −25 ...st.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IStartup.java
  166. +0 −29 ...st.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/Messages.java
  167. +0 −20 ...ernet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/Messages.properties
  168. +0 −332 ...wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/Monitor.java
  169. +0 −299 ...ernet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorManager.java
  170. +0 −181 ...ternet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorPlugin.java
  171. +0 −125 ...t.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorWorkingCopy.java
Sorry, we could not display the entire diff because it was too big.
View
17 features/org.eclipse.wst.server_core.feature/.project
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.server_core.feature</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>
View
1 features/org.eclipse.wst.server_core.feature/build.properties
@@ -1 +0,0 @@
-bin.includes = feature.xml
View
151 features/org.eclipse.wst.server_core.feature/build.xml
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.wst.server_core.feature" 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.internet.monitor.core" target="${target}">
- </ant>
- <ant antfile="build.xml" dir="../org.eclipse.wst.server.core" target="${target}">
- </ant>
- </target>
- <target name="all.features" depends="init">
- <ant antfile="build.xml" dir="../org.eclipse.wst.common_core.feature/" target="${target}"/>
- </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.">
- <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 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="arch" value="*"/>
- <param name="ws" value="*"/>
- <param name="nl" value="*"/>
- <param name="os" value="*"/>
- <param name="feature.base" value="${feature.temp.folder}"/>
- </antcall>
- <jar destfile="${feature.destination}/org.eclipse.wst.server_core.feature_1.0.0.jar" basedir="${feature.temp.folder}/features/org.eclipse.wst.server_core.feature_1.0.0"/>
- <delete dir="${feature.temp.folder}"/>
- </target>
-
- <target name="gather.bin.parts" depends="init" if="feature.base">
- <antcall target="children">
- <param name="destination.temp.folder" value="${feature.base}/plugins"/>
- <param name="target" value="gather.bin.parts"/>
- </antcall>
- <mkdir dir="${feature.base}/features/org.eclipse.wst.server_core.feature_1.0.0"/>
- <copy todir="${feature.base}/features/org.eclipse.wst.server_core.feature_1.0.0" failonerror="true" overwrite="false">
- <fileset dir="${basedir}" includes="feature.xml" />
- </copy>
- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.wst.server_core.feature_1.0.0/feature.xml" selfVersion="1.0.0" featureIds="org.eclipse.wst.common_core.feature,1.0.0," pluginIds="org.eclipse.wst.server.core,0.7.0,org.eclipse.wst.internet.monitor.core,0.7.0,"/>
- <antcall target="rootFiles${os}_${ws}_${arch}"/>
- </target>
- <target name="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.">
- <delete dir="${feature.temp.folder}"/>
- <mkdir dir="${feature.temp.folder}"/>
- <antcall target="gather.bin.parts">
- <param name="arch" value="*"/>
- <param name="ws" value="*"/>
- <param name="nl" value="*"/>
- <param name="include.children" value="true"/>
- <param name="feature.base" value="${feature.temp.folder}"/>
- <param name="os" value="*"/>
- </antcall>
- <zip destfile="${feature.destination}/org.eclipse.wst.server_core.feature_1.0.0.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="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.wst.server_core.feature.source_1.0.0/src"/>
- <param name="include.children" value="true"/>
- <param name="target" value="gather.sources"/>
- </antcall>
- <zip destfile="${feature.destination}/org.eclipse.wst.server_core.feature_1.0.0.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="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
- <param name="include.children" value="true"/>
- <param name="target" value="gather.logs"/>
- </antcall>
- <zip destfile="${feature.destination}/org.eclipse.wst.server_core.feature_1.0.0.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 of all the zips, jars and logs created.">
- <delete file="${feature.destination}/org.eclipse.wst.server_core.feature_1.0.0.jar"/>
- <delete file="${feature.destination}/org.eclipse.wst.server_core.feature_1.0.0.bin.dist.zip"/>
- <delete file="${feature.destination}/org.eclipse.wst.server_core.feature_1.0.0.log.zip"/>
- <delete file="${feature.destination}/org.eclipse.wst.server_core.feature_1.0.0.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/pureHeadWTP/org.eclipse.wst.server_core.feature/" 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="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.wst.server_core.feature.source_1.0.0/src"/>
- <param name="target" value="gather.sources"/>
- </antcall>
- </target>
-
- <target name="gather.logs" depends="init">
- <mkdir dir="${feature.temp.folder}"/>
- <antcall target="all.children" inheritAll="false">
- <param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
- <param name="target" value="gather.logs"/>
- </antcall>
- </target>
-
-</project>
View
41 features/org.eclipse.wst.server_core.feature/feature.xml
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.server_core.feature"
- label="org.eclipse.wst.server_core.feature"
- version="1.0.0">
-
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
- </description>
-
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
- </copyright>
-
- <license url="http://www.example.com/license">
- [Enter License Description here.]
- </license>
-
- <includes
- id="org.eclipse.wst.common_core.feature"
- version="0.0.0"/>
-
- <requires>
- <import feature="org.eclipse.wst.common_core.feature" version="1.0.0"/>
- </requires>
-
- <plugin
- id="org.eclipse.wst.server.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.internet.monitor.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
View
17 features/org.eclipse.wst.server_sdk.feature/.project
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.server_sdk.feature</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>
View
3 features/org.eclipse.wst.server_sdk.feature/build.properties
@@ -1,3 +0,0 @@
-bin.includes = feature.xml
-
-generate.plugin@org.eclipse.wst.server.source=org.eclipse.wst.server_ui.feature
View
29 features/org.eclipse.wst.server_sdk.feature/feature.xml
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.server_sdk.feature"
- label="org.eclipse.wst.server_sdk.feature"
- version="1.0.0">
-
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
- </description>
-
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
- </copyright>
-
- <license url="http://www.example.com/license">
- [Enter License Description here.]
- </license>
-
- <includes
- id="org.eclipse.wst.common_sdk.feature"
- version="0.0.0"/>
-
- <requires>
- <import feature="org.eclipse.wst.common_sdk.feature" version="1.0.0"/>
- <import feature="org.eclipse.wst.server_ui.feature" version="1.0.0"/>
- <import feature="org.eclipse.wst.xml_sdk.feature" version="1.0.0"/>
- </requires>
-
-</feature>
View
1 features/org.eclipse.wst.server_tests.feature/.cvsignore
@@ -1 +0,0 @@
-build.xml
View
17 features/org.eclipse.wst.server_tests.feature/.project
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.server_tests.feature</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>
View
1 features/org.eclipse.wst.server_tests.feature/build.properties
@@ -1 +0,0 @@
-bin.includes = feature.xml
View
54 features/org.eclipse.wst.server_tests.feature/feature.xml
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.server_tests.feature"
- label="org.eclipse.wst.server_tests.feature"
- version="1.0.0">
-
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
- </description>
-
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
- </copyright>
-
- <license url="http://www.example.com/license">
- [Enter License Description here.]
- </license>
-
- <requires>
- <import feature="org.eclipse.wst.server_core.feature" version="1.0.0"/>
- <import feature="org.eclipse.wst.server_ui.feature" version="1.0.0"/>
- </requires>
-
- <plugin
- id="org.eclipse.wst.internet.monitor.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.internet.monitor.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.server.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.server.tests.performance"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.server.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
View
1 features/org.eclipse.wst.server_ui.feature/.cvsignore
@@ -1 +0,0 @@
-build.xml
View
17 features/org.eclipse.wst.server_ui.feature/.project
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.server_ui.feature</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>
View
1 features/org.eclipse.wst.server_ui.feature/build.properties
@@ -1 +0,0 @@
-bin.includes = feature.xml
View
49 features/org.eclipse.wst.server_ui.feature/feature.xml
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.server_ui.feature"
- label="org.eclipse.wst.server_ui.feature"
- version="1.0.0">
-
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
- </description>
-
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
- </copyright>
-
- <license url="http://www.example.com/license">
- [Enter License Description here.]
- </license>
-
- <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"/>
- <import feature="org.eclipse.wst.common_ui.feature" version="1.0.0"/>
- </requires>
-
- <plugin
- id="org.eclipse.wst.internet.monitor.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.server.ui.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.wst.server.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
View
27 features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/about.html
@@ -1,27 +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>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
View
31 features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/about.ini
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
View
6 features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/about.mappings
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
View
26 features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/about.properties
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# 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:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools SDK\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
View
29 features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/build.properties
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# 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:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-#
-# Note, this is the template files used to create the
-# org.eclipse.wst.source plugin
-#
-# see org.eclipse.wst.sdk feature and its
-# build.properites file for the the generate statement
-# generate.plugin@org.eclipse.wst.source=org.eclipse.wst
-#
-#
-# The plugin.xml and manifest.mf files are created
-# automatically by the build process, but, apparently
-# still need to be "included" in the bin spec.
-# note: do not use src.includes, as this "doubles" source!
-#
-#
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/*
-#src/**/*.zip, src/**/schema/*.exsd
-sourcePlugin = true
View
BIN features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/eclipse32.gif
Deleted file not rendered
View
BIN features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/eclipse32.png
Deleted file not rendered
View
12 features/org.eclipse.wst.server_ui.feature/sourceTemplatePlugin/plugin.properties
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# 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:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Web Standard Tools SDK - Server Component
-providerName=Eclipse.org
View
1 features/org.eclipse.wst.server_userdoc.feature/.cvsignore
@@ -1 +0,0 @@
-build.xml
View
17 features/org.eclipse.wst.server_userdoc.feature/.project
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.server_userdoc.feature</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>
View
1 features/org.eclipse.wst.server_userdoc.feature/build.properties
@@ -1 +0,0 @@
-bin.includes = feature.xml
View
25 features/org.eclipse.wst.server_userdoc.feature/feature.xml
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.server_userdoc.feature"
- label="org.eclipse.wst.server_userdoc.feature"
- version="1.0.0">
-
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
- </description>
-
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
- </copyright>
-
- <license url="http://www.example.com/license">
- [Enter License Description here.]
- </license>
-
- <plugin
- id="org.eclipse.wst.server.ui.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
View
27 ...t.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
@@ -37,6 +37,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -105,14 +107,35 @@ public void modifyModules(IModule[] add, IModule[] remove, IProgressMonitor moni
}
- /*
+
+
+ private org.eclipse.wst.server.core.IModule[] getModules() {
+ List modules = getAttribute(ATTR_GENERIC_SERVER_MODULES,(List)null);
+ List imodules = new ArrayList();
+ Iterator iterator = modules.iterator();
+ while(iterator.hasNext()){
+ String moduleId = (String)iterator.next();
+ int sep = moduleId.indexOf(":");
+ IProject project =ResourcesPlugin.getWorkspace().getRoot().getProject(moduleId.substring(0,sep));
+ IModule mod = ServerUtil.getModule(project);
+ if(mod.getId().equals(moduleId.substring(sep+1)))
+ imodules.add(mod);
+ }
+ if(modules!= null)
+ return (IModule[])imodules.toArray(new IModule[imodules.size()]);
+ return new IModule[0];
+ }
+
+
+
+ /*
* (non-Javadoc)
*
* @see org.eclipse.wst.server.core.model.IServerDelegate#getChildModules(org.eclipse.wst.server.core.model.IModule[])
*/
public IModule[] getChildModules(IModule[] module) {
if (module[0] != null && module[0].getModuleType() != null) {
- if (module.length == 1 && "jst.ear".equals(module[0].getModuleType().getId())) {
+ if (module.length == 1) {
IEnterpriseApplication enterpriseApplication = (IEnterpriseApplication) module[0]
.loadAdapter(IEnterpriseApplication.class, null);
if (enterpriseApplication != null) {
View
1 ...eneric.core/src/org/eclipse/jst/server/generic/core/internal/publishers/AntPublisher.java
@@ -310,6 +310,7 @@ private Map getPublishProperties()
String moduleName=guessModuleName(getModule()[0]);
+ String moduleDir="";//$NON-NLS-1$
props.put(PROP_PROJECT_WORKING_DIR,getProjectWorkingLocation().toString());
props.put(PROP_MODULE_NAME,moduleName);
props.put(PROP_MODULE_DIR,getModuleWorkingDir().toString());
View
2 ...eric.core/src/org/eclipse/jst/server/generic/core/internal/publishers/ModulePackager.java
@@ -18,7 +18,7 @@
*/
public class ModulePackager {
private ZipOutputStream outputStream;
-// private StringBuffer manifestContents;
+ private StringBuffer manifestContents;
private boolean useCompression = true;
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
7 plugins/org.eclipse.jst.server.generic.ui/.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
5 plugins/org.eclipse.jst.server.generic.ui/.cvsignore
@@ -1,5 +0,0 @@
-bin
-build.xml
-genericui.jar
-org.eclipse.jst.server.generic.ui_1.0.0.jar
-temp.folder
View
28 plugins/org.eclipse.jst.server.generic.ui/.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
19 plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.server.generic.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: genericui.jar
-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
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.wst.server.ui,
- org.eclipse.debug.ui,
- org.eclipse.jdt.debug.ui,
- org.eclipse.jst.server.core,
- org.eclipse.jst.server.generic.core,
- org.eclipse.wst.server.core
-Eclipse-AutoStart: true
View
22 plugins/org.eclipse.jst.server.generic.ui/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
9 plugins/org.eclipse.jst.server.generic.ui/build.properties
@@ -1,9 +0,0 @@
-source.genericui.jar = src/
-output.genericui.jar = bin/
-bin.includes = plugin.xml,\
- genericui.jar,\
- icons/,\
- plugin.properties,\
- META-INF/,\
- about.html
-src.includes = build.properties
View
BIN plugins/org.eclipse.jst.server.generic.ui/icons/obj16/server.gif
Deleted file not rendered
View
BIN plugins/org.eclipse.jst.server.generic.ui/icons/wizban/new_server_wiz.gif
Deleted file not rendered
View
4 plugins/org.eclipse.jst.server.generic.ui/plugin.properties
@@ -1,4 +0,0 @@
-pluginName=Generic Server Plugin UI
-providerName=Eclipse.org
-pluginDescription=UI Components for the generic server plugin.
-
View
30 plugins/org.eclipse.jst.server.generic.ui/plugin.xml
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
- <launchConfigurationTypeImage
- id="org.eclipse.jst.server.generic.image.ui.launchConfigurationTypeImage"
- configTypeID="org.eclipse.jst.server.generic.core.launchConfigurationType"
- icon="icons/obj16/server.gif">
- </launchConfigurationTypeImage>
- <launchConfigurationTypeImage
- id="org.eclipse.jst.server.generic.image.ui.ExternalLaunchConfigurationTypeImage"
- configTypeID="org.eclipse.jst.server.generic.core.ExternalLaunchConfigurationType"
- icon="icons/obj16/server.gif">
- </launchConfigurationTypeImage>
- </extension>
-
- <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
- <launchConfigurationTabGroup
- id="org.eclipse.jst.server.generic.ui.internal.launchConfigurationTabGroup"
- type="org.eclipse.jst.server.generic.core.launchConfigurationType"
- class="org.eclipse.jst.server.generic.ui.internal.GenericLaunchConfigurationTabGroup">
- </launchConfigurationTabGroup>
- <launchConfigurationTabGroup
- id="org.eclipse.jst.server.generic.ui.internal.launchConfigurationTabGroup"
- type="org.eclipse.jst.server.generic.core.ExternalLaunchConfigurationType"
- class="org.eclipse.jst.server.generic.ui.internal.GenericLaunchConfigurationTabGroup">
- </launchConfigurationTabGroup>
- </extension>
-
-</plugin>
View
94 ...ui/src/org/eclipse/jst/server/generic/ui/internal/GenericLaunchConfigurationTabGroup.java
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common 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
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.ui.internal;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.EnvironmentTab;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-import org.eclipse.jst.server.generic.internal.core.util.ExtensionPointUtil;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.ui.ServerLaunchConfigurationTab;
-
-
-public class GenericLaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabGroup{
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup ILaunchConfigurationTabGroup#createTabs(ILaunchConfigurationDialog, String)
- */
- public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
- ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[7];
- tabs[0] = new ServerLaunchConfigurationTab(getTypeIds());
- tabs[0].setLaunchConfigurationDialog(dialog);
- tabs[1] = new JavaArgumentsTab();
- tabs[1].setLaunchConfigurationDialog(dialog);
- tabs[2] = new JavaClasspathTab();
- tabs[2].setLaunchConfigurationDialog(dialog);
- tabs[3] = new SourceLookupTab();
- tabs[3].setLaunchConfigurationDialog(dialog);
- tabs[4] = new EnvironmentTab();
- tabs[4].setLaunchConfigurationDialog(dialog);
- tabs[5] = new JavaJRETab();
- tabs[5].setLaunchConfigurationDialog(dialog);
- tabs[6] = new CommonTab();
- tabs[6].setLaunchConfigurationDialog(dialog);
- setTabs(tabs);
- }
-
- private String[] getTypeIds() {
- ArrayList list = new ArrayList();
- IExtension[] extensions= ExtensionPointUtil.getGenericServerDefinitionExtensions();
- for (int i = 0; extensions!=null && i < extensions.length; i++) {
- IExtension extension = extensions[i];
- IConfigurationElement[] elements = ExtensionPointUtil.getConfigurationElements(extension);
- for (int j = 0; j < elements.length; j++) {
- IConfigurationElement element = elements[j];
- String genericRuntimeID = element.getAttribute("id");
- IServerType[] serverTypes = ServerCore.getServerTypes();
- for (int k = 0; k < serverTypes.length; k++) {
- if(serverTypes[k].hasRuntime() && serverTypes[k].getRuntimeType().getId().equals(genericRuntimeID))
- list.add(serverTypes[k].getId());
- }
- }
- }
- return (String[])list.toArray(new String[list.size()]);
- }
-
-
-}
View
25 ...ver.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerComposite.java
@@ -1,25 +0,0 @@
-package org.eclipse.jst.server.generic.ui.internal;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-public class GenericServerComposite extends Composite {
-
- private GenericServerCompositeDecorator[] fDecorators;
- public GenericServerComposite(Composite parent, GenericServerCompositeDecorator[] decorators) {
- super(parent, SWT.NONE);
- fDecorators = decorators;
- GridLayout layout =new GridLayout(3,false);
- setLayout(layout);
- setLayoutData(new GridData(GridData.FILL_BOTH));
- createControl();
- }
-
- private void createControl(){
- for (int i = 0; fDecorators!= null && i < fDecorators.length; i++) {
- fDecorators[i].decorate(this);
- }
- }
-}
View
22 ...ic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerCompositeDecorator.java
@@ -1,22 +0,0 @@
-package org.eclipse.jst.server.generic.ui.internal;
-
-
-/**
- *
- * @author Gorkem Ercan
- */
-public interface GenericServerCompositeDecorator
-{
- /**
- *
- * @param composite
- */
- public abstract void decorate(GenericServerComposite composite);
- /**
- * Called if all the fields are valid. This gives subclasses opportunity to
- * validate and take necessary actions.
- *
- * @return
- */
- public abstract boolean validate();
-}
View
171 ...ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.ui.internal;
-
-import java.util.Map;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
-import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.TaskModel;
-import org.eclipse.wst.server.core.model.RuntimeDelegate;
-import org.eclipse.wst.server.ui.wizard.IWizardHandle;
-
-/**
- * A serverDefinitionType aware wizard for defining runtimes.
- *
- * @author Gorkem Ercan
- */
-public class GenericServerRuntimeWizardFragment extends ServerDefinitionTypeAwareWizardFragment {
-
- private GenericServerCompositeDecorator[] fDecorators;
-
-
- /**
- * Constructor
- */
- public GenericServerRuntimeWizardFragment() {
- super();
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.ui.wizard.IWizardFragment#isComplete()
- */
- public boolean isComplete() {
- RuntimeDelegate runtime = getRuntimeDelegate();
- if (runtime == null)
- return false;
- IStatus status = runtime.validate();
- return (status != null && status.isOK());
- }
-
- public void createContent(Composite parent, IWizardHandle handle) {
- Map properties= null;
- ServerRuntime definition=null;
- if(getRuntimeDelegate()!=null){
- properties = getRuntimeDelegate().getServerInstanceProperties();
- definition = getServerTypeDefinition(getServerDefinitionId(),properties);
- }
- fDecorators= new GenericServerCompositeDecorator[2];
- fDecorators[0]= new JRESelectDecorator(getRuntimeDelegate());
- fDecorators[1]= new ServerTypeDefinitionRuntimeDecorator(definition,properties,getWizard(),getRuntimeDelegate());
- GenericServerComposite composite = new GenericServerComposite(parent,fDecorators);
- }
-
-
- private String getServerDefinitionId(){
- String currentDefinition= null;
- if(getRuntimeDelegate()!=null)
- currentDefinition = getRuntimeDelegate().getRuntime().getRuntimeType().getId();
- if(currentDefinition!= null && currentDefinition.length()>0)
- {
- return currentDefinition;
- }
- return null;
- }
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.ui.wizard.IWizardFragment#enter()
- */
- public void enter() {
- if(getRuntimeDelegate()!=null)
- getRuntimeDelegate().getRuntimeWorkingCopy().setName(createName());
-
- for (int i = 0; i < fDecorators.length; i++) {
- if(fDecorators[i].validate())
- return;
- }
- }
-
- public void exit() {
-// fRuntimeDelegate=null;
- }
-
-
- private String createName()
- {
- RuntimeDelegate dl = getRuntimeDelegate();
- IRuntimeType runtimeType = dl.getRuntime().getRuntimeType();
- String name = GenericServerUIMessages.bind(GenericServerUIMessages.runtimeName,runtimeType.getName());
- IRuntime[] list = ServerCore.getRuntimes();
- int suffix = 1;
- String suffixName=name;
- for(int i=0;i<list.length;i++)
- {
- if((list[i].getName().equals(name)|| list[i].getName().equals(suffixName))&& !list[i].equals(dl.getRuntime()))
- suffix++;
- suffixName= name+" "+suffix;
- }
-
- if(suffix>1)
- return suffixName;
- return name;
- }
-
- private GenericServerRuntime getRuntimeDelegate(){
- IRuntimeWorkingCopy wc = (IRuntimeWorkingCopy) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
- if (wc == null)
- return null;
- return (GenericServerRuntime) wc.loadAdapter(GenericServerRuntime.class, new NullProgressMonitor());
- }
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.generic.internal.ui.ServerDefinitionTypeAwareWizardFragment#description()
- */
- public String description() {
- String rName = getRuntimeName();
- if(rName == null || rName.length()<1)
- rName="Generic";
- return GenericServerUIMessages.bind(GenericServerUIMessages.runtimeWizardDescription,rName);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.generic.internal.ui.ServerDefinitionTypeAwareWizardFragment#title()
- */
- public String title() {
- String rName = getRuntimeName();
- if(rName == null || rName.length()<1)
- rName="Generic";
- return GenericServerUIMessages.bind(GenericServerUIMessages.runtimeWizardTitle,rName);
- }
-
- private String getRuntimeName()
- {
- if(getRuntimeDelegate()!=null && getRuntimeDelegate().getRuntime()!=null)
- return getRuntimeDelegate().getRuntime().getName();
- return null;
- }
-
-}
View
29 ...er.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java
@@ -1,29 +0,0 @@
-package org.eclipse.jst.server.generic.ui.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Helper class to get messages
- *
- * @author Gorkem Ercan
- */
-public class GenericServerUIMessages extends NLS{
-
- private static final String RESOURCE_BUNDLE= "org.eclipse.jst.server.generic.ui.internal.GenericServerUIMessages";//$NON-NLS-1$
- public static String serverTypeGroup_label_browse;
- public static String runtimeName;
- public static String runtimeWizardDescription;
- public static String runtimeWizardTitle;
- public static String serverName;
- public static String serverWizardDescription;
- public static String serverWizardTitle;
- public static String installed_jre_link;
- public static String jre_select_label;
- public static String defaultJRE;
- public static String invalidPath;
-
- static{
- NLS.initializeMessages(RESOURCE_BUNDLE, GenericServerUIMessages.class);
- }
-
-}
View
11 ...eric.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties
@@ -1,11 +0,0 @@
-serverWizardTitle=New {0} Server
-serverWizardDescription=Create a new {0} server
-runtimeWizardTitle=New {0} Runtime
-runtimeWizardDescription=Define a new {0} runtime
-serverTypeGroup_label_browse=Browse...
-serverName = {0}
-runtimeName= {0}
-installed_jre_link = You can use <a>Installed JRE preferences</a> to create a new JRE
-jre_select_label= &JRE:
-defaultJRE = Default JRE
-invalidPath = {0} is not valid
View
163 ...eneric.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.ui.internal;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.server.generic.core.internal.GenericServer;
-import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
-import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.TaskModel;
-import org.eclipse.wst.server.ui.wizard.IWizardHandle;
-/**
- *
- *
- * @author Gorkem Ercan
- */
-public class GenericServerWizardFragment extends ServerDefinitionTypeAwareWizardFragment
-{
- private GenericServerCompositeDecorator[] fDecorators;
-
- /**
- *
- */
- public boolean isComplete() {
-
- ServerRuntime serverRuntime = getServerTypeDefinitionFor(getServer());
- if(serverRuntime==null)
- return false;
-
- IServerWorkingCopy server = getServer();
- GenericServer dl= (GenericServer)server.loadAdapter(GenericServer.class,null);
-
- IStatus status = dl.validate();
- return (status != null && status.isOK());
-
- }
-
- public void createContent(Composite parent, IWizardHandle handle){
- IServerWorkingCopy server = getServer();
- GenericServer dl= (GenericServer)server.loadAdapter(GenericServer.class,null);
- ServerRuntime definition = getServerTypeDefinitionFor(server);
- fDecorators = new GenericServerCompositeDecorator[1];
- fDecorators[0]=new ServerTypeDefinitionServerDecorator(definition,null,getWizard(),dl);
- new GenericServerComposite(parent,fDecorators);
-
- }
- /**
- * @param server
- * @return
- */
- private ServerRuntime getServerTypeDefinitionFor(IServerWorkingCopy server) {
- GenericServerRuntime runtime = (GenericServerRuntime)server.getRuntime().getAdapter(GenericServerRuntime.class);
- if(runtime==null){
- IRuntime wc = (IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME);
- runtime= (GenericServerRuntime)wc.getAdapter(GenericServerRuntime.class);
- if(runtime==null)
- runtime= (GenericServerRuntime)wc.loadAdapter(GenericServerRuntime.class,new NullProgressMonitor());
- }
- String id = runtime.getRuntime().getRuntimeType().getId();
- if(id==null){
- return null;
- }
- Map runtimeProperties = runtime.getServerInstanceProperties();
- ServerRuntime definition = getServerTypeDefinition(id,runtimeProperties);
- return definition;
- }
-
- /**
- * @return
- */
- private IServerWorkingCopy getServer() {
- IServerWorkingCopy server = (IServerWorkingCopy)getTaskModel().getObject(TaskModel.TASK_SERVER);
- return server;
- }
-
- private boolean isNameInUse(String name){
- IServer[] servers =ServerCore.getServers();
- for (int i = 0; i < servers.length; i++) {
- if(!servers[i].equals(getServer().getOriginal()) && (servers[i].getName().equals(name) ))
- return true;
- }
- return false;
- }
-
- private String createName(){
- String name = GenericServerUIMessages.bind(GenericServerUIMessages.serverName,getServerTypeDefinitionFor(getServer()).getName());
- int suffix=1;
- String suffixName =name;
- while(isNameInUse(suffixName)){
- suffixName = name+" "+suffix;
- suffix++;
- }
- return suffixName;
- }
- public void enter() {
- getServer().setName(createName());
- for (int i = 0; i < fDecorators.length; i++) {
- if(fDecorators[i].validate())
- return;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.generic.internal.ui.ServerDefinitionTypeAwareWizardFragment#description()
- */
- public String description() {
- String sName = getServerName();
- if(sName==null || sName.length()<1)
- sName="Generic";
- return GenericServerUIMessages.bind(GenericServerUIMessages.serverWizardDescription,sName);
- }
-
- private String getServerName()
- {
- if(getServer()!=null && getServer().getRuntime()!=null)
- return getServer().getRuntime().getRuntimeType().getName();
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jst.server.generic.internal.ui.ServerDefinitionTypeAwareWizardFragment#title()
- */
- public String title() {
- String sName= getServerName();
- if(sName==null || sName.length()<1)
- sName="Generic";
- return GenericServerUIMessages.bind(GenericServerUIMessages.serverWizardTitle,sName);
- }
-}
View
114 ...jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericUiPlugin.java
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * Gorkem Ercan - initial API and implementation
- * Naci M. Dai
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-package org.eclipse.jst.server.generic.ui.internal;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.ui.plugin.*;
-import org.osgi.framework.BundleContext;
-import java.util.*;
-
-/**
- * The main plugin class to be used in the desktop.
- *
- * @author Gorkem Ercan
- */
-public class GenericUiPlugin extends AbstractUIPlugin {
-
- public static final String WIZBAN_IMAGE = "genericlogo";
- //The shared instance.
- private static GenericUiPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public GenericUiPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.server.generic.ui.GenericUiPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * 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);
- }
-
- /**
- * Returns the shared instance.
- */
- public static GenericUiPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = GenericUiPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- protected ImageRegistry createImageRegistry() {
- ImageRegistry registry = new ImageRegistry();
- ImageDescriptor desc = ImageDescriptor.createFromURL(getDefault().getBundle().getEntry("/icons/wizban/new_server_wiz.gif"));
- registry.put(WIZBAN_IMAGE,desc);
- return registry;
- }
- public ImageDescriptor imageDescriptor(String key){
- return getImageRegistry().getDescriptor(key);
- }
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-}
View
131 ....server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/JRESelectDecorator.java
@@ -1,131 +0,0 @@
-package org.eclipse.jst.server.generic.ui.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.ui.PlatformUI;
-
-
-public class JRESelectDecorator implements GenericServerCompositeDecorator {
- private List installedJREs;
- private String[] jreNames;
- private GenericServerRuntime fRuntime;
- public JRESelectDecorator(GenericServerRuntime runtime){
- super();
- fRuntime = runtime;
- }
-
- public void decorate(final GenericServerComposite composite) {
- updateJREs();
- Link link = new Link(composite,SWT.NONE);
- link.setLayoutData(new GridData(SWT.FILL,SWT.NONE,true,false,3,1));
- link.setText(GenericServerUIMessages.installed_jre_link);
-
- Label label = new Label(composite, SWT.NONE);
- label.setText(GenericServerUIMessages.jre_select_label);
-
- final Combo combo = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY);
- combo.setItems(jreNames);
- GridData data = new GridData(SWT.FILL,SWT.NONE,false,false,2,1);
-
- combo.setLayoutData(data);
-
- combo.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- int sel = combo.getSelectionIndex();
- IVMInstall vmInstall = null;
- if (sel > 0)
- vmInstall = (IVMInstall) installedJREs.get(sel - 1);
-
- fRuntime.setVMInstall(vmInstall);
- validate();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
- });
-
- link.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- String currentVM = combo.getText();
- if (showPreferencePage(composite)) {
- updateJREs();
- combo.setItems(jreNames);
- combo.setText(currentVM);
- if (combo.getSelectionIndex() == -1)
- combo.select(0);
- }
- }
- });
-
- if (fRuntime!=null){
- if(fRuntime.isUsingDefaultJRE()){
- combo.select(0);
- }else{
- combo.setText(fRuntime.getVMInstall().getName());
- }
- }
- }
-
-
- protected boolean showPreferencePage(GenericServerComposite composite) {
- PreferenceManager manager = PlatformUI.getWorkbench().getPreferenceManager();
- IPreferenceNode node = manager.find("org.eclipse.jdt.ui.preferences.JavaBasePreferencePage").findSubNode("org.eclipse.jdt.debug.ui.preferences.VMPreferencePage");
- PreferenceManager manager2 = new PreferenceManager();
- manager2.addToRoot(node);
- final PreferenceDialog dialog = new PreferenceDialog(composite.getShell(), manager2);
- final boolean[] result = new boolean[] { false };
- BusyIndicator.showWhile(composite.getDisplay(), new Runnable() {
- public void run() {
- dialog.create();
- if (dialog.open() == Window.OK)
- result[0] = true;
- }
- });
- return result[0];
- }
-
- protected void updateJREs() {
- installedJREs = new ArrayList();
- IVMInstallType[] vmInstallTypes = JavaRuntime.getVMInstallTypes();
- int size = vmInstallTypes.length;
- for (int i = 0; i < size; i++) {
- IVMInstall[] vmInstalls = vmInstallTypes[i].getVMInstalls();
- int size2 = vmInstalls.length;
- for (int j = 0; j < size2; j++) {
- installedJREs.add(vmInstalls[j]);
- }
- }
-
- size = installedJREs.size();
- jreNames = new String[size+1];
- jreNames[0] = GenericServerUIMessages.defaultJRE;
- for (int i = 0; i < size; i++) {
- IVMInstall vmInstall = (IVMInstall) installedJREs.get(i);
- jreNames[i+1] = vmInstall.getName();
- }
- }
-
-
-
- public boolean validate() {
- return false;
- }
-}
View
89 ...eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/SWTUtil.java
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * 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:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.server.generic.ui.internal;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-/**
- * SWT Utility class.
- * Copied from org.eclipse.wst.server.ui.internal.
- */
-public class SWTUtil {
- private static FontMetrics fontMetrics;
-
- protected static void initializeDialogUnits(Control testControl) {
- // Compute and store a font metric
- GC gc = new GC(testControl);
- gc.setFont(JFaceResources.getDialogFont());
- fontMetrics = gc.getFontMetrics();
- gc.dispose();
- }
-
- /**
- * Returns a width hint for a button control.
- */
- protected static int getButtonWidthHint(Button button) {
- int widthHint = Dialog.convertHorizontalDLUsToPixels(fontMetrics, IDialogConstants.BUTTON_WIDTH);
- return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
- }
-
- /**
- * Create a new button with the standard size.
- *
- * @param comp the component to add the button to
- * @param label the button label
- * @return a button
- */
- public static Button createButton(Composite comp, String label) {
- Button b = new Button(comp, SWT.PUSH);
- b.setText(label);
- if (fontMetrics == null)
- initializeDialogUnits(comp);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
- data.widthHint = getButtonWidthHint(b);
- b.setLayoutData(data);
- return b;
- }
-
- /**
- * Convert DLUs to pixels.
- *
- * @param comp a component
- * @param x pixels
- * @return dlus
- */
- public static int convertHorizontalDLUsToPixels(Composite comp, int x) {
- if (fontMetrics == null)
- initializeDialogUnits(comp);
- return Dialog.convertHorizontalDLUsToPixels(fontMetrics, x);
- }
-
- /**
- * Convert DLUs to pixels.
- *
- * @param comp a component
- * @param y pixels
- * @return dlus
- */
- public static int convertVerticalDLUsToPixels(Composite comp, int y) {
- if (fontMetrics == null)
- initializeDialogUnits(comp);
- return Dialog.convertVerticalDLUsToPixels(fontMetrics, y);
- }
-}
View
74 ...c/org/eclipse/jst/server/generic/ui/internal/ServerDefinitionTypeAwareWizardFragment.java
@@ -1,74 +0,0 @@
-/*
- * Created on Oct 19, 2004
- */
-package org.eclipse.jst.server.generic.ui.internal;
-
-import java.util.Map;
-
-import org.eclipse.jst.server.generic.core.internal.CorePlugin;
-import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.server.ui.wizard.IWizardHandle;
-import org.eclipse.wst.server.ui.wizard.WizardFragment;
-
-/**
- * A wizard fragment that provides support for serverdef files.
- *
- * @author Gorkem Ercan
- */
-public abstract class ServerDefinitionTypeAwareWizardFragment extends WizardFragment {
-
- private IWizardHandle fWizard;
-
- public boolean hasComposite() {
- return true;
- }
-
- public Composite createComposite(Composite parent, IWizardHandle handle) {
-
- this.fWizard = handle;
- Composite container = new Composite(parent, SWT.NONE);
- GridLayout grid = new GridLayout(1,false);
- grid.marginWidth=0;
- container.setLayout(grid);
- container.setLayoutData(new GridData(GridData.FILL_BOTH));
- handle.setImageDescriptor(GenericUiPlugin.getDefault().imageDescriptor(GenericUiPlugin.WIZBAN_IMAGE));
- handle.setTitle(title());
- handle.setDescription(description());
- createContent(container,handle);
- return container;
- }
- public IWizardHandle getWizard(){
- return fWizard;
- }
- /**
- * Returns the description to be displayed on the wizard head.
- * @return
- */
- public abstract String description();
- /**
- * Returns the title of the wizard.
- * @return
- */
- public abstract String title();
- /**
- * Create the real content
- * @param parent
- * @param handle
- */
- public abstract void createContent(Composite parent, IWizardHandle handle);
-
- /**
- * Retuns the ServerRuntime.
- * @param definitionID
- * @param properties
- * @return
- */
- protected ServerRuntime getServerTypeDefinition(String definitionID, Map properties)
- {
- return CorePlugin.getDefault().getServerTypeDefinitionManager().getServerRuntimeDefinition(definitionID,properties);
- }
-}
View
295 ...eric.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
@@ -1,295 +0,0 @@
-package org.eclipse.jst.server.generic.ui.internal;
-
-import java.io.File;
-import java.util.ArrayList;