Skip to content

Commit 3446808

Browse files
derkoederkoe
authored
Merge pull request #29 from steell0815/master
[jetty9] use jetty9.3 as embedded jetty
2 parents 29ca4ff + 7a81d92 commit 3446808

14 files changed

Lines changed: 1531 additions & 1535 deletions

File tree

‎plugins/eclipse-jetty-launcher/plugin.xml‎

Lines changed: 71 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,83 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?eclipse version="3.3"?>
33
<plugin>
4-
<extension point="org.eclipse.debug.core.launchConfigurationTypes">
5-
<launchConfigurationType
6-
delegate="net.sourceforge.eclipsejetty.launch.util.JettyLaunchConfigurationDelegate"
7-
id="net.sourceforge.eclipsejetty.launchConfigurationType" modes="run, debug"
8-
name="Jetty Webapp"
9-
sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
10-
sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">
11-
</launchConfigurationType>
12-
</extension>
4+
<extension point="org.eclipse.debug.core.launchConfigurationTypes">
5+
<launchConfigurationType
6+
delegate="net.sourceforge.eclipsejetty.launch.util.JettyLaunchConfigurationDelegate"
7+
id="net.sourceforge.eclipsejetty.launchConfigurationType"
8+
modes="run, debug" name="Jetty Webapp"
9+
sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
10+
sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">
11+
</launchConfigurationType>
12+
</extension>
1313

14-
<extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
15-
<launchConfigurationTabGroup
16-
class="net.sourceforge.eclipsejetty.launch.configuration.JettyLaunchConfigurationTabGroup"
17-
id="JettyWebAppTabGroup" type="net.sourceforge.eclipsejetty.launchConfigurationType">
18-
</launchConfigurationTabGroup>
19-
</extension>
14+
<extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
15+
<launchConfigurationTabGroup
16+
class="net.sourceforge.eclipsejetty.launch.configuration.JettyLaunchConfigurationTabGroup"
17+
id="JettyWebAppTabGroup" type="net.sourceforge.eclipsejetty.launchConfigurationType">
18+
</launchConfigurationTabGroup>
19+
</extension>
2020

21-
<extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
22-
<launchConfigurationTypeImage
23-
configTypeID="net.sourceforge.eclipsejetty.launchConfigurationType"
24-
icon="icons/jetty.png" id="net.sourceforge.eclipsejetty.launchConfigurationType.image">
25-
</launchConfigurationTypeImage>
26-
</extension>
21+
<extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
22+
<launchConfigurationTypeImage
23+
configTypeID="net.sourceforge.eclipsejetty.launchConfigurationType"
24+
icon="icons/jetty.png"
25+
id="net.sourceforge.eclipsejetty.launchConfigurationType.image">
26+
</launchConfigurationTypeImage>
27+
</extension>
2728

28-
<extension point="org.eclipse.jdt.launching.classpathProviders">
29-
<classpathProvider
30-
class="net.sourceforge.eclipsejetty.launch.util.JettyLaunchConfigurationClassPathProvider"
31-
id="net.sourceforge.eclipsejetty.launcher.JettyLaunchClassPathProvider">
32-
</classpathProvider>
33-
</extension>
29+
<extension point="org.eclipse.jdt.launching.classpathProviders">
30+
<classpathProvider
31+
class="net.sourceforge.eclipsejetty.launch.util.JettyLaunchConfigurationClassPathProvider"
32+
id="net.sourceforge.eclipsejetty.launcher.JettyLaunchClassPathProvider">
33+
</classpathProvider>
34+
</extension>
3435

35-
<extension point="org.eclipse.core.expressions.propertyTesters">
36-
<propertyTester
37-
id="net.sourceforge.eclipsejetty.launch.util.JettyLaunchPossiblePropertiesTester"
38-
type="org.eclipse.core.resources.IResource"
39-
namespace="net.sourceforge.eclipsejetty.launch.util"
40-
properties="JettyLaunchPossiblePropertiesTester"
41-
class="net.sourceforge.eclipsejetty.launch.util.JettyLaunchPossiblePropertiesTester">
42-
</propertyTester>
43-
</extension>
36+
<extension point="org.eclipse.core.expressions.propertyTesters">
37+
<propertyTester
38+
id="net.sourceforge.eclipsejetty.launch.util.JettyLaunchPossiblePropertiesTester"
39+
type="org.eclipse.core.resources.IResource" namespace="net.sourceforge.eclipsejetty.launch.util"
40+
properties="JettyLaunchPossiblePropertiesTester"
41+
class="net.sourceforge.eclipsejetty.launch.util.JettyLaunchPossiblePropertiesTester">
42+
</propertyTester>
43+
</extension>
4444

45-
<extension point="org.eclipse.debug.ui.launchShortcuts">
46-
<shortcut
47-
class="net.sourceforge.eclipsejetty.launch.shortcut.JettyLaunchShortcut"
48-
description="Launches a Jetty on the selected project." icon="icons/jetty.gif"
49-
id="net.sourceforge.eclipsejetty.launch.shortcut.JettyLaunchShortcut"
50-
label="Run with Jetty" modes="run, debug">
45+
<extension point="org.eclipse.debug.ui.launchShortcuts">
46+
<shortcut
47+
class="net.sourceforge.eclipsejetty.launch.shortcut.JettyLaunchShortcut"
48+
description="Launches a Jetty on the selected project."
49+
icon="icons/jetty.gif"
50+
id="net.sourceforge.eclipsejetty.launch.shortcut.JettyLaunchShortcut"
51+
label="Run with Jetty" modes="run, debug">
5152

52-
<contextualLaunch>
53-
<enablement>
54-
<with variable="selection">
55-
<count value="1" />
56-
<iterate>
57-
<and>
58-
<adapt type="org.eclipse.core.resources.IResource">
59-
<test property="net.sourceforge.eclipsejetty.launch.util.JettyLaunchPossiblePropertiesTester" forcePluginActivation="true" />
60-
</adapt>
61-
</and>
62-
</iterate>
63-
</with>
64-
</enablement>
65-
</contextualLaunch>
53+
<contextualLaunch>
54+
<enablement>
55+
<with variable="selection">
56+
<count value="1" />
57+
<iterate>
58+
<and>
59+
<adapt
60+
type="org.eclipse.core.resources.IResource">
61+
<test
62+
property="net.sourceforge.eclipsejetty.launch.util.JettyLaunchPossiblePropertiesTester"
63+
forcePluginActivation="true" />
64+
</adapt>
65+
</and>
66+
</iterate>
67+
</with>
68+
</enablement>
69+
</contextualLaunch>
6670

67-
<configurationType
68-
id="net.sourceforge.eclipsejetty.launchConfigurationType">
69-
</configurationType>
70-
<description description="Run Project with Jetty" mode="run">
71-
</description>
72-
<description description="Debug Project with Jetty" mode="debug">
73-
</description>
74-
</shortcut>
75-
</extension>
71+
<configurationType
72+
id="net.sourceforge.eclipsejetty.launchConfigurationType">
73+
</configurationType>
74+
<description description="Run Project with Jetty"
75+
mode="run">
76+
</description>
77+
<description description="Debug Project with Jetty"
78+
mode="debug">
79+
</description>
80+
</shortcut>
81+
</extension>
7682

7783
</plugin>

0 commit comments

Comments
 (0)